修改

src/views/productionPlan/components/factoryAdd/index.vue

@@ -1,7 +1,6 @@
 <template>
   <!-- :close-on-click-modal="false" -->
-  <ele-modal width="80vw" :visible.sync="visible"   custom-class="ele-dialog-form"
-    :title="title" :maxable="true">
+  <ele-modal width="80vw" :visible.sync="visible" custom-class="ele-dialog-form" :title="title" :maxable="true">
     <div class="form-wrapper">
       <el-form ref="form" :model="form" :rules="rules" label-width="90px" class="formbox">
         <el-row :gutter="24">
@@ -60,7 +59,7 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="工艺路线:" prop="produceRoutingId">
+            <el-form-item label="工艺路线:" prop="produceRoutingId" v-if="clientEnvironmentId !== 4">
               <el-select v-model="form.produceRoutingId" style="width: 100%" @change="changeRoute" size="mini">
                 <el-option v-for="item of routingList" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
@@ -68,6 +67,13 @@
               </el-select>
             </el-form-item>
           </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="工艺路线:" prop="produceRoutingId" v-if="clientEnvironmentId == 4">
+              <el-input v-model="form.produceRoutingName" style="width: 100%" readonly></el-input>
+            </el-form-item>
+          </el-col>
+
         </el-row>
 
         <el-row :gutter="24">
@@ -167,18 +173,22 @@ export default {
       deep: true,
       handler(val) {
 
+
         // this.type = val;
         this.title = !val.id ? '新增临时计划' : '编辑临时计划';
         // this.form = this.factoryObj;
+
+
+
         this.form = val;
         // 修改
         this.$nextTick(() => {
           if (val.id) {
             this.bomListVersion();
-            if(val.bomCategoryId){
+            if (val.bomCategoryId) {
               this.getPlanRouting();
             }
-            
+
           }
         });
 
@@ -215,11 +225,14 @@ export default {
         productName: [
           { required: true, message: '请选择名称', trigger: 'change' }
         ],
-        
+
         bomCategoryId: [
           { required: true, message: '请选择BOM版本', trigger: 'blur' }
         ],
 
+        produceType: [
+          { required: true, message: '请选择工艺路线', trigger: 'blur' }
+        ],
         produceRoutingId: [
           { required: true, message: '请选择工艺路线', trigger: 'blur' }
         ],
@@ -246,9 +259,17 @@ export default {
     }
   },
   methods: {
-    open(){
+    open() {
 
       this.visible = true;
+      console.log(this.clientEnvironmentId, '999999999');
+
+      //this.clientEnvironmentId 环境判断 宝悦环境
+      if (this.clientEnvironmentId == 4) {
+        this.getPlanRoutingNew();
+      }
+
+      // this.getPlanRoutingNew();
     },
 
     handleAdd() {
@@ -256,6 +277,29 @@ export default {
     },
 
     confirmChoose(list) {
+
+      console.log(list, '6666666666666666');
+      if (this.clientEnvironmentId == '4') {
+        let data = {};
+        if (list[0].name.includes('板材')) {
+
+          data = {
+            id: '1856970794952372226',
+            name: '板材',
+            produceVersionName: '板材'
+          };
+        } else {
+          data = {
+            id: '1857313733642596353',
+            name: '砌块',
+            produceVersionName: '砌块'
+          };
+        }
+        this.$set(this.form, 'produceRoutingName', data.name);
+        this.$set(this.form, 'produceRoutingId', data.id);
+        this.$set(this.form, 'produceVersionName', data.produceVersionName);
+      }
+
       this.$set(this.form, 'categoryId', list[0].id);
       this.$set(this.form, 'productName', list[0].name);
       this.$set(this.form, 'productCode', list[0].code);
@@ -264,6 +308,9 @@ export default {
       this.$set(this.form, 'modelType', list[0].modelType);
       this.$set(this.form, 'measuringUnit', list[0].measuringUnit);
 
+
+
+
       this.bomListVersion();
     },
 
@@ -279,7 +326,7 @@ export default {
       } catch (err) { }
     },
     initForm() {
-      this.form= {
+      this.form = {
         timeDimensionPlanType: 3,
         categoryId: '',
         productName: '',
@@ -342,12 +389,23 @@ export default {
       });
     },
 
+    // 工艺路线
+
     getPlanRouting() {
       bomRoutingList(this.form.bomCategoryId).then((res) => {
         this.routingList = res || [];
       });
     },
 
+    // 宝悦 工艺路线
+    getPlanRoutingNew() {
+
+      // bomRoutingList(this.form.bomCategoryId).then((res) => {
+      //   this.routingList = res || []
+      // })
+    },
+
+
     changeProduceType() {
       this.form.bomCategoryId = '';
       this.form['bomCategoryName'] = '';

src/views/productionPlan/components/unpackDialog.vue

@@ -32,6 +32,7 @@
           <el-descriptions-item label="要求完成日期">{{
             formData.reqMoldTime
           }}</el-descriptions-item>
+
         </el-descriptions>
       </el-form>
 
@@ -80,10 +81,11 @@
               message: '请输入要求生产数量',
               trigger: 'change'
             }">
-            <!-- @change="changeNum(scope.$index)" @input="(scope.$index)"-->
+              <!-- @change="changeNum(scope.$index)" @input="(scope.$index)"-->
               <!-- <el-input-number type="number" @input="inputNum"  :min="0" :max="maxNum"
                 v-model="scope.row.requiredFormingNum" placeholder="请输入"></el-input-number> -->
-                <el-input v-model="scope.row.requiredFormingNum" type="number" @input="changeNum(scope.$index)"  :min="0"  placeholder="请输入内容"></el-input>
+              <el-input v-model="scope.row.requiredFormingNum" type="number" @input="changeNum(scope.$index)" :min="0"
+                placeholder="请输入内容"></el-input>
 
 
             </el-form-item>
@@ -140,13 +142,13 @@ export default {
       pickerOptions: {
         disabledDate: (time) => {
           // 根据某个条件动态设置最大日期
-          if(this.formData.reqMoldTime){
+          if (this.formData.reqMoldTime) {
             const maxDate = new Date(this.formData.reqMoldTime); // 您的逻辑方法
             return time.getTime() > maxDate.getTime();
-          }else{
+          } else {
             return false;
           }
-          
+
         }
       },
 
@@ -268,7 +270,7 @@ export default {
     },
 
     changeNum(index) {
-      console.log(index,'111111111111');
+      console.log(index, '111111111111');
 
       let num = this.formData.splitBatch == 1 ? this.formData.splitResidue : this.formData.requiredFormingNum
       this.form.unpackList.forEach((e) => {
@@ -303,7 +305,7 @@ export default {
     cancel() {
       this.formData = {};
       this.visible = false;
-      this.$refs.form.resetFields();
+      // this.$refs.form.resetFields();
     },
 
     confirm() {
@@ -327,19 +329,28 @@ export default {
           }
 
           let params = [];
-          if (this.requiredFormingNum != 0) {
-            this.form.surplusUnpack[0].requiredFormingNum =
-              this.requiredFormingNum;
+          // console.log(this.requiredFormingNum,'22222222223333');
+          // if (this.requiredFormingNum != 0) {
+            this.form.surplusUnpack[0].requiredFormingNum =this.requiredFormingNum;
             params = [...this.form.unpackList, ...this.form.surplusUnpack];
-          } else {
-            params = this.form.unpackList;
-          }
+          // } else {
+          //   params = this.form.unpackList;
+          // }
 
-          const res = await splitWork(params);
+          // console.log(this.form.surplusUnpack,'2222222222');
 
+          // form.surplusUnpack
+          // console.log(params, '拆分参数----------------------');
+
+          // return;
+
+          const res = await splitWork(params);
+          
           if (res) {
             this.$message.success('拆分成功！');
-            this.$emit('success');
+
+
+            this.$emit('success',[]);
             this.cancel();
           }
         }

src/views/productionPlan/index.vue

@@ -267,7 +267,7 @@
       </ele-pro-table>
     </el-card>
 
-    <unpackDialog ref="unpackRef" @success="reload" />
+    <unpackDialog ref="unpackRef" @success="newReload" />
 
     <mergeDialog ref="mergeRef" @success="reload"></mergeDialog>
 
@@ -801,7 +801,6 @@
       },
       // 修改计划
       planEdit(row) {
-        console.log(row,'888888888');
         if (row.timeDimensionPlanType == 3) {
           this.factoryObj = row;
           // this.factoryType = ;
@@ -856,11 +855,17 @@
 
       /* 刷新表格 */
       reload(where) {
+        
         this.$nextTick(() => {
           this.$refs.table.reload({ page: 1, where });
         });
       },
-
+      newReload() {
+        
+        this.$nextTick(() => {
+          this.$refs.table.reload({ page: 1});
+        });
+      },
       /* 数据转为树形结构 */
       parseData(data) {
         return {

src/views/saleOrder/salesToProduction.vue

@@ -163,7 +163,8 @@
           </el-col>
 
           <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
-            <el-form-item label="所属工厂:" prop="factoriesId">
+            <!-- prop="factoriesId" -->
+            <el-form-item label="所属工厂:">
               <el-select v-model="form.factoriesId" style="width: 100%" @change="factoriesIdFn">
                 <el-option
                   v-for="item of factoryList"
@@ -175,7 +176,16 @@
             </el-form-item>
           </el-col>
 
-
+          <!-- <el-form-item label="加工方式:" prop="produceType">
+              <el-select v-model="form.produceType" style="width: 100%"   @change="changeProduceType" >
+                  <el-option
+                    v-for="item of producedList"
+                    :key="item.code"
+                    :label="item.name"
+                    :value="item.code"
+                  ></el-option>
+                </el-select>
+            </el-form-item> -->
 
 
 
@@ -305,6 +315,7 @@
               </el-form-item>
             </template>
           </el-table-column>
+
           <el-table-column
             :label="'要求生产数量' + (clientEnvironmentId == '4' ? '(方)' : '')"
             align="center"
@@ -707,7 +718,7 @@ export default {
           { required: true, message: '请选择BOM版本', trigger: 'blur' }
         ],
         factoriesId: [
-          { required: true, message: '请选择所属工厂', trigger: 'blur' }
+          { required: true, message: '请选择所属工厂', trigger: 'change' }
         ],
       },
       // selection: [],
@@ -861,7 +872,7 @@ export default {
     getSaleInfo() {
       let params = JSON.parse(this.$route.query.selection);
       productionToPlan(params).then((res) => {
-        console.log(res);
+        console.log(res,'555555555555555555');
         this.form = deepClone(res);
         if(!this.form.produceType) {
           this.form.produceType = 2;
@@ -873,7 +884,7 @@ export default {
           res.produceRoutingId || this.$route.query.produceRoutingId;
         this.form.factoriesId =
           res.factoriesId || this.$route.query.factoriesId;
-        console.log(this.form.factoriesId)
+        console.log(this.form.factoriesId,'99999999999999')
         if (this.clientEnvironmentId == '4') {
           if (this.form.salesOrders[0].productName.includes('板材')) {
             this.changeProduct({
@@ -925,7 +936,10 @@ export default {
       });
     },
 
-    factoriesIdFn(){
+    factoriesIdFn(e){
+
+
+
       this.$forceUpdate()
     },
 
@@ -939,7 +953,10 @@ export default {
       removePageTab({ key });
     },
     toSubmit() {
+      if(!this.form.factoriesId) return this.$message.warning('请选择所属工厂');
+
       this.$refs.form.validate((valid) => {
+
         if (valid) {
           this.mapList();
 

src/views/workOrder/components/unpackDialog.vue

@@ -404,6 +404,7 @@ export default {
             params = this.form.unpackList
           }
 
+         
 
           const res = await splitBatch(params);
           if (res) {