修改宝悦

src/components/AssetTree/treeIndex.vue

@@ -80,6 +80,7 @@
           this.treeLoading = true;
 
           const res = await getTreeByIds({ ids: this.treeIds.join(',') });
+
           this.treeLoading = false;
           if (res?.code === '0') {
             this.treeList = res.data;

src/views/productionPlan/components/productionPlan-search.vue

@@ -196,6 +196,11 @@
                     <el-input size="mini" clearable v-model="where.model" placeholder="请输入" />
                   </el-form-item>
                 </el-row>
+                <el-row>
+                  <el-form-item label="批次号:" label-width="80px">
+                    <el-input size="mini" clearable v-model="where.batchNo" placeholder="请输入" />
+                  </el-form-item>
+                </el-row>
                 <!-- <el-row v-if="activeName == 'second'">
                   <el-form-item label-width="150px">
                     <template slot="label">

src/views/productionPlan/index.vue

@@ -9,6 +9,7 @@
         :activeName="activeName"
       >
       </productionPlan-search>
+      
       <div class="statistics">
         <el-row :gutter="24">
           <el-col :span="cardSpan">
@@ -78,6 +79,13 @@
         </el-row>
       </div>
       <div class="btn_box">
+        <el-button
+          type="success"
+          size="mini"
+          v-if="timeDimensionPlanType == 3"
+          @click="factAdd(3)"
+          >新增</el-button
+        >
         <el-button type="success" size="mini" @click="homogeneityInspect"
           >齐套性检查</el-button
         >
@@ -93,13 +101,7 @@
         <el-button type="danger" size="mini">延期申请</el-button>
         <el-button type="danger" size="mini">变更申请</el-button>
 
-        <el-button
-          type="success"
-          size="mini"
-          v-if="timeDimensionPlanType == 3"
-          @click="factAdd(3)"
-          >新增</el-button
-        >
+       
       </div>
 
       <el-tabs v-model="activeName" type="card" size="mini">

src/views/workOrder/components/unpackDialog.vue

@@ -80,7 +80,7 @@
 
 
           <template v-slot:planCompleteTime="scope">
-            <el-form-item v-if="formingNum != 0" :prop="'surplusUnpack.' + scope.$index + '.planCompleteTime'" :rules="{
+            <el-form-item v-if="formingNum != 0"  :rules="{
               required: true,
               message: '请选择计划结束时间',
               trigger: 'change'

src/views/workOrder/index.vue

@@ -88,7 +88,7 @@
         </el-form-item>
 
         <el-form-item label="指定:" prop="assignType">
-          <el-radio-group v-model="form.assignType" size="mini">
+          <el-radio-group v-model="form.assignType" size="mini" @change="assignTypeFn">
             <el-radio-button :label="1">工位</el-radio-button>
             <el-radio-button :label="2">人员</el-radio-button>
           </el-radio-group>
@@ -163,9 +163,9 @@ export default {
 
       form: {
         assignType: 1,
-        crewIds:'',
-        workstationIds:'',
-        teamId:'',
+        crewIds: '',
+        workstationIds: '',
+        teamId: '',
         singleReport: this.clientEnvironmentId == 2 ? 0 : 1
       },
 
@@ -376,6 +376,11 @@ export default {
   },
 
   methods: {
+    assignTypeFn(e) {
+
+    },
+
+
     statusFormatter(status) {
       const obj = this.statusOpt.find((i) => i.value == status);
       return obj && obj.label;
@@ -447,6 +452,13 @@ export default {
     // 下达
     confirm() {
       const loading = this.$loading({ text: '加载中...' });
+      if (this.form.assignType * 1 == 2) {
+        this.form.workstationIds = [];
+      } else {
+        this.form.crewIds = [];
+      }
+
+
       releaseWorkOrder({
         id: this.current.id,
         ...this.form
@@ -454,7 +466,7 @@ export default {
         .then((res) => {
           if (res) {
             this.$message.success('成功');
-            
+
             this.reData();
             this.reload();
             this.visible = false;
@@ -464,18 +476,18 @@ export default {
           loading.close();
         });
     },
-    close(){
+    close() {
       this.visible = false;
       this.reData();
     },
-    reData(){
-      this.form= {
-              assignType: 1,
-              crewIds:'',
-              workstationIds:'',
-              teamId:'',
-              singleReport: this.clientEnvironmentId == 2 ? 0 : 1
-            };
+    reData() {
+      this.form = {
+        assignType: 1,
+        crewIds: '',
+        workstationIds: '',
+        teamId: '',
+        singleReport: this.clientEnvironmentId == 2 ? 0 : 1
+      };
     },
 
     /* 刷新表格 */
@@ -517,12 +529,12 @@ export default {
         this.teamsList = res;
 
         this.$nextTick(() => {
-          if(this.teamId){
-      
+          if (this.teamId) {
+
             this.$set(this.form, 'teamId', this.teamId);
 
           }
-          
+
           // this.$refs.form.clearValidate();
         })