Просмотр исходного кода

refactor(workOrder): 简化班组选择条件并调整获取详情逻辑

liujt 6 месяцев назад
Родитель
Сommit
4699b6e29b

+ 3 - 3
src/views/produce/components/prenatalExamination/components/workOrder/programRulesEventDialog.vue

@@ -75,7 +75,7 @@
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
-        <el-col :span="8" v-if="((addForm.autoOrder && addForm.status == 4) || (!addForm.autoOrder && addForm.status == 0)) && addForm.type == 1">
+        <el-col :span="8" v-if="addForm.autoOrder && addForm.type == 1">
           <el-form-item label="班组" prop="teamId">
           <el-form-item label="班组" prop="teamId">
             <el-select
             <el-select
               v-model="addForm.teamId"
               v-model="addForm.teamId"
@@ -92,7 +92,7 @@
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
-        <el-col :span="8" v-if="((addForm.autoOrder && addForm.status == 4) || (!addForm.autoOrder && addForm.status == 0)) && addForm.type == 0">
+        <el-col :span="8" v-if="addForm.autoOrder && addForm.type == 0">
           <el-form-item label="部门" prop="groupId">
           <el-form-item label="部门" prop="groupId">
             <deptSelect
             <deptSelect
               v-model="addForm.groupId"
               v-model="addForm.groupId"
@@ -100,7 +100,7 @@
             />
             />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
-        <el-col :span="8" v-if="((addForm.autoOrder && addForm.status == 4) || (!addForm.autoOrder && addForm.status == 0)) && addForm.type == 0">
+        <el-col :span="8" v-if="addForm.autoOrder && addForm.type == 0">
           <el-form-item label="负责人" prop="executeIdList">
           <el-form-item label="负责人" prop="executeIdList">
             <el-select
             <el-select
               v-model="addForm.executeIdList"
               v-model="addForm.executeIdList"

+ 4 - 2
src/views/produce/components/prenatalExamination/components/workOrder/workOrderEvent.vue

@@ -354,7 +354,7 @@
         handler(newVal) {
         handler(newVal) {
           if (newVal) {
           if (newVal) {
             console.log('workOrderId~~~~~~~~~~~', newVal);
             console.log('workOrderId~~~~~~~~~~~', newVal);
-            this.getOrderDetials();
+            // this.getOrderDetials();
           }
           }
         },
         },
         deep: true,
         deep: true,
@@ -719,9 +719,10 @@
               (item) => item.id == this.addForm.teamId
               (item) => item.id == this.addForm.teamId
             );
             );
             this.teamUserList = this.teamAllList[index];
             this.teamUserList = this.teamAllList[index];
-            console.log('this.teamUserList', this.teamUserList);
           }
           }
 
 
+          console.log('this.addForm~~~~~~~~~~', this.addForm);
+
           this.$nextTick(() => {
           this.$nextTick(() => {
             this.$refs.formRef.clearValidate();
             this.$refs.formRef.clearValidate();
 
 
@@ -852,6 +853,7 @@
 
 
           this.teamAllList.push(item.userVOList);
           this.teamAllList.push(item.userVOList);
         });
         });
+        this.getOrderDetials();
       },
       },
       changeId() {
       changeId() {
         if (this.addForm.executeUsersIds.length == this.teamUserList.length) {
         if (this.addForm.executeUsersIds.length == this.teamUserList.length) {