Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/serveBill/modules/detail.vue

@@ -33,7 +33,7 @@
         <changeBill
           v-if="
             mainData.status == '已提交' &&
-            tool.checkAuth($route.name, 'changeBill')
+            tool.checkAuth($route.name, 'changeBill') && mainData.status_workorder == ''
           "
           class="inline-16"
           @onSuccess="queryMainData"

src/HDrpManagement/serveBillMag/modules/detail.vue

@@ -26,7 +26,7 @@
       <div slot="customOperation" >
         <Edit v-if="tool.checkAuth($route.name,'update') && ((mainData.status == '新建' && isworker == 0) || isworker == 1) && mainData.status != '已受理' && mainData.status != '已中止'"
               class="inline-16" :data="mainData" @onSuccess="queryMainData" />
-        <changeBill v-if="mainData.status == '已提交' && tool.checkAuth($route.name,'changeBill')" class="inline-16" @onSuccess="queryMainData" :data="mainData"></changeBill>
+        <changeBill v-if="mainData.status == '已提交' && tool.checkAuth($route.name,'changeBill') && mainData.status_workorder == ''" class="inline-16" @onSuccess="queryMainData" :data="mainData"></changeBill>
         <customBtn
           btnName="提交"
           message="确认提交当前服务申请单吗?"