更改领用单

src/views/plan/requisition/index.vue

@@ -144,8 +144,8 @@
             <el-col :span="4" ><el-text tag="p" >{{form.applyUser}}</el-text></el-col>
             <el-col :span="2" ><el-text tag="p">审核: </el-text></el-col>
             <el-col :span="4" ><el-text tag="p" >{{form.auditUser}} </el-text></el-col>
-            <el-col :span="2" ><el-text tag="p">会签:</el-text></el-col>
-            <el-col :span="4" ><el-text tag="p" >{{form.countersignUser}}</el-text></el-col>
+<!--            <el-col :span="2" ><el-text tag="p">会签:</el-text></el-col>
+            <el-col :span="4" ><el-text tag="p" >{{form.countersignUser}}</el-text></el-col>-->
             <el-col :span="2" ><el-text tag="p">批准:</el-text></el-col>
             <el-col :span="4" ><el-text tag="p" >{{form.approveUser}}</el-text></el-col>
           </el-row>
@@ -219,13 +219,12 @@
                         <el-radio :value=1>不通过</el-radio>
                       </el-radio-group>
                     </el-form-item>
-                    <el-form-item label="会签人员" v-if="dialogType !== 1 && form.state === '1' && form.auditUser === username">
+                    <el-form-item label="审批人员" v-if="dialogType !== 1 && form.state === '1' && form.auditUser === username">
                       <el-select
                           size="small"
                           filterable
-                          multiple
-                          v-model="form.countersignUsers"
-                          placeholder="请选择会签人员"
+                          v-model="form.approveUser"
+                          placeholder="请选择审批人员"
                           clearable>
                         <el-option
                             v-for="option in userList"
@@ -243,12 +242,12 @@
                   </el-form>
                 </el-card>
               </el-timeline-item>
-              <el-timeline-item center placement="top" :type="form.state > 3 ? 'success' : 'primary'">
+<!--              <el-timeline-item center placement="top" :type="form.state > 3 ? 'success' : 'primary'">
                 <el-card>
                   <h4>会签</h4>
                   <el-form v-if="form.state >= 3"  size="small" :model="form" label-width="auto" style="max-width: 400px">
                     <el-form-item v-for="item of form.countersign" label="会签人员:">
-                      <el-text tag="p" >{{item.user}}--</el-text>
+                      <el-text tag="p" >{{item.user}}&#45;&#45;</el-text>
                       <el-text tag="p" v-if="dialogType === 1  ||  item.user !== username">{{item.state === -1 ? '未审核' : item.state === 0 ? '通过' : '未通过'}}</el-text>
                       <el-text tag="p" v-else-if="item.state !== -1 && item.user === username">{{item.state === 0 ? '通过' : '未通过'}}</el-text>
                       <el-radio-group v-model="form.countersignState" v-if="dialogType !== 1  && item.state === -1 && item.user === username">
@@ -277,7 +276,7 @@
                     </el-form-item>
                   </el-form>
                 </el-card>
-              </el-timeline-item>
+              </el-timeline-item>-->
               <el-timeline-item center placement="top" :type="form.state > 5 ? 'success' : 'primary'">
                 <el-card>
                   <h4>批准</h4>
@@ -386,8 +385,8 @@ const saveForm = (type) =>{
   step = "audit";
   if(type === 2){
     if(form.value.auditState != undefined){
-      if(form.value.auditState === 0 && form.value.countersignUsers.length === 0){
-        ElMessage.error("会签人员不能为空")
+      if(form.value.auditState === 0 && !form.value.approveUser){
+        ElMessage.error("审批人员不能为空")
         return;
       }
     }else{
@@ -396,10 +395,10 @@ const saveForm = (type) =>{
         return;
       }
     }
-    nextUsers = form.value.countersignUsers.join(",")
+    nextUsers = form.value.approveUser
     state = form.value.auditState
   }
-  if(type === 3){
+  /*if(type === 3){
     step = "countersign";
     if(!form.value.approveUser && form.value.countersignOk){
       ElMessage.error("请选择审批人员")
@@ -411,7 +410,7 @@ const saveForm = (type) =>{
     }
     nextUsers = form.value.approveUser
     state = form.value.countersignState
-  }
+  }*/
   if(type === 4){
     step = "approve";
     if(form.value.approveState === undefined){
@@ -548,12 +547,12 @@ option.value = Object.assign(option.value, {
       width: 150,
       overHidden: true,
     },
-    {
+   /* {
       label: "会签人员",
       width: 150,
       overHidden: true,
       prop: "countersignUser",
-    },
+    },*/
     {
       label: "审批人员",
       width: 150,

src/views/quality/outsource/index.vue

@@ -105,7 +105,7 @@
         <el-row :gutter="24">
           <el-col :lg="24" :xs="24">
             <el-form-item label="委外工序">
-              <el-text>{{form.operationName}}</el-text>
+              <el-text>{{form.operationNames}}</el-text>
             </el-form-item>
           </el-col>
         </el-row>
@@ -259,7 +259,7 @@ option.value = Object.assign(option.value, {
       label: "委外工序",
       width: 150,
       overHidden: true,
-      prop: "operationName",
+      prop: "operationNames",
     },
     {
       label: "委外厂商",