bug修复

src/HDrpManagement/serveWorkBill/modules/detail.vue

@@ -22,7 +22,7 @@
       <div slot="tags"></div>
       <div slot="customOperation">
         <checkInfo :data="mainData" class="inline-16" @onSuccess="queryMainData"></checkInfo>
-        <transferWorkOrder btnType="primary" btnTitle="转工单" class="inline-16" @dialogShow="queryPerson" :disabledSubmit="personName == ''"
+        <transferWorkOrder btnType="primary" btnTitle="转单" class="inline-16" @dialogShow="queryPerson" :disabledSubmit="personName == ''"
         @onSubmit="transferWorkSubmit" v-if="mainData.status == '待接单'" ref="transferWorkRef" :data="mainData" :disabled="!mainData.isServerMag && !mainData.isleader">
           <template slot="formRule">
             <div>

src/HDrpManagement/serveWorkBill/modules/serviceWorkOrder/modules/addMaterials.vue

@@ -137,30 +137,20 @@
 <script>
 export default {
   name: "addMaterials",
-  props:['itemtype','sa_serviceorderid'],
+  props:['itemtype','sa_serviceorderid','sa_workorderid'],
   data(){
     return {
       drawerVisible:false,
       loading:false,
       param:{
-        "id": "20220923140602",
+        "id": "2026022710102502",
         "content": {
+          "sa_workorderid":0,
           "pageSize": 20,
           "pageNumber": 1,
+          "type":1,// 1 查询档案商品  2 查询申请单商品
           "where": {
-            "condition": "",
-            "isservice": 1
-          }
-        }
-      },
-      param2:{
-        "id": 20230206161903,
-        "content": {
-          "sa_serviceorderid":'',
-          "pageNumber":1,
-          "pageSize":20,
-          "where":{
-            "condition":''
+            "condition": ""
           }
         }
       },
@@ -181,12 +171,15 @@ export default {
     async listData(){
       console.log(this.itemtype,'itemtype')
       if (this.itemtype == '服务商品'){
-        this.param2.content.sa_serviceorderid = this.sa_serviceorderid
-        const res = await this.$api.requested(this.param2)
+        this.param.content.sa_workorderid = this.sa_workorderid
+        this.param.content.type = 2
+        const res = await this.$api.requested(this.param)
         this.list = res.data
         this.total = res.total
         this.currentPage = res.pageNumber
       }else {
+        this.param.content.sa_workorderid = this.sa_workorderid
+        this.param.content.type = 1
         const res = await this.$api.requested(this.param)
         this.list = res.data
         this.total = res.total

src/HDrpManagement/serveWorkBill/modules/serviceWorkOrder/modules/edit.vue

@@ -149,7 +149,7 @@
       <div v-if="detailInfo && detailInfo.workpresetjson.additem != 0">
         <div class="title-div-title">{{$t(`工单物料`)}}<span v-if="detailInfo.workpresetjson.additem == 11" style="color: #e13333">{{$t(`(必填)`)}}</span></div>
         <div class="drawer__panel" style="margin-bottom: 0 !important;" v-if="detailInfo">
-          <workMaterials :data="titems" @traintitems="traintitems" :itemtype="detailInfo.workpresetjson.itemtype" :sa_serviceorderid="mainData.sa_serviceorderid"></workMaterials>
+          <workMaterials :data="titems" @traintitems="traintitems" :itemtype="detailInfo.workpresetjson.itemtype" :sa_serviceorderid="mainData.sa_serviceorderid" :sa_workorderid="mainData.sa_workorderid"></workMaterials>
         </div>
         <div class="div-style-div"></div>
       </div>

src/HDrpManagement/serveWorkBill/modules/serviceWorkOrder/modules/workMaterials.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <add style="margin-bottom: 10px" @addList="addList" :itemtype="itemtype" :sa_serviceorderid="sa_serviceorderid"></add>
+    <add style="margin-bottom: 10px" @addList="addList" :itemtype="itemtype" :sa_serviceorderid="sa_serviceorderid" :sa_workorderid="sa_workorderid"></add>
     <el-table ref="table" :fit="tool.calculatedColumnWidth($refs.table,layout)"  current-row-key="id"  highlight-current-row
               :data="list"  size="mini"  :height="height"  :style="{width:'100%',minHeight:minHeight?minHeight:''}" :header-cell-style="{height:'40px',color:'#606266',fontWeight:'400',fontSize:'14px'}"
               :cell-style="{height:'40px',color:'#666666',fontWeight:'400'}" border >
@@ -46,7 +46,7 @@
 import add from './addMaterials'
 export default {
   name: "workMaterials", //工单物料
-  props:['data','itemtype','sa_serviceorderid'],
+  props:['data','itemtype','sa_serviceorderid','sa_workorderid'],
   components:{add},
   data(){
     return {

src/HDrpManagement/serveWorkBillTask/index.vue

@@ -144,20 +144,24 @@
         </div>
         <div
           v-else-if="scope.data.column.columnname == 'required'"
-          :style="
-            scope.data.column.data.required
-              ? scope.data.column.data.required == 1
-                ? 'color:green'
-                : 'color:red'
-              : 'color:#333333'
-          "
+          :style="{color:scope.data.column.data.required ?tool.getStatusColor('是',true):
+          tool.getStatusColor('否',true)}"
         >
           {{
             scope.data.column.data.required
-              ? scope.data.column.data.required == 1
-                ? $t("非必填")
-                : $t("必填")
-              : $t("无")
+              ? $t("是")
+              : $t("否")
+          }}
+        </div>
+        <div
+            v-else-if="scope.data.column.columnname == 'signature'"
+            :style="{color:scope.data.column.data.signature ?tool.getStatusColor('是',true):
+          tool.getStatusColor('否',true)}"
+        >
+          {{
+            scope.data.column.data.signature
+                ? $t("是")
+                : $t("否")
           }}
         </div>
         <div v-else-if="scope.data.column.columnname == 'confirm_options'">

src/HDrpManagement/serviceImprovement/components/actionImplementation/actionDetail.vue

@@ -28,7 +28,7 @@
                 type="button">
             </upload>
 <!--            <editFollow :data="item" @onSuccess="onSuccess" :disabled="disabled" v-if="!disabled && item.createuserid == userid"></editFollow>-->
-            <el-button size="small" type="text" @click="onDel(item)">
+            <el-button size="small" type="text" @click="onDel(item)" v-if="userid == data.userid_charge && mainData.status == '方案已发布' && data.status != '已完成'">
               {{$t(`删除`)}}</el-button>
           </div>
         </div>

src/HDrpManagement/serviceImprovement/components/actionImplementation/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div style="display:flex;justify-content: space-between;">
-      <table-detail ref="tableRef" :layout="tablecols" :data="list" :opwidth="200" :custom="true" style="margin-top: 10px" @rowClick="rowClick" >
+      <table-detail ref="tableRef" :layout="tablecols" :data="list" :opwidth="200" :custom="true" style="margin-top: 10px" @rowClick="rowClick">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'status'">
             <div :style="tool.getStatusColor(scope.column.data[scope.column.columnname])">{{scope.column.data[scope.column.columnname]}}</div>

src/HDrpManagement/serviceImprovement/components/causeAnalysis/edit.vue

@@ -87,7 +87,7 @@ export default {
       name_charge:'',
       rules:{
         userid_charge:[
-          { required: true, message: this.$t('请选择责任人'), trigger: 'change'},
+          { required: true, message: this.$t('请选择责任人'), trigger: 'change,blur'},
         ],
         departmentid:[
           { required: true, message: this.$t('请选择责任部门'), trigger: 'change'},
@@ -168,6 +168,7 @@ export default {
       this.depname_charge = data.depname
       this.form.userid_charge = data.userid
       this.form.departmentid = data.departmentid
+      this.$refs['form'].validateField('userid_charge');
     },
     checkFileType (type) {
       let arr = ['JPG','JPEG','PNG']
@@ -214,6 +215,7 @@ export default {
       this.attinfos = res.data
     },
     onClose(){
+      this.$refs['form'].resetFields();
     }
   }
 }

src/HDrpManagement/serviceImprovement/modules/detail.vue

@@ -20,7 +20,7 @@
       <div slot="customOperation">
         <edit class="inline-16" v-if="(mainData.status != '已完成' && mainData.status != '已中止') && someUserid" @editSuccess="queryMainData($route.query.id)" :data="mainData"></edit>
         <refundOrder class="inline-16" btnTitle="转单" btnType="primary" @dialogShow="dialogShow" @onSubmit="onSubmit" ref="refundOrderRef"
-                     @onCancel="onCancel">
+                     @onCancel="onCancel" v-if="mainData.status == '新建' && (userid == mainData.userid_analysis)">
           <template slot="formRule">
             <el-form
                 :model="form"