logo

src/views/saleOrder/salesToProduction.vue

@@ -58,7 +58,7 @@
                 dictName="余量系数"
                 v-model="form.marginCoefficient"
               ></DictSelection> -->
-              <el-select filterable allow-create @change="itemChange">
+              <el-select filterable allow-create @change="itemChange" v-model="form.marginCoefficient">
                 <el-option
                   v-for="(item, index) in marginList"
                   :key="index"

src/views/schedulingCalculation/mergePutMesh/index.vue

@@ -77,7 +77,7 @@
           <el-table-column label="开槽类型" align="center" prop="slottingType">
             <template slot-scope="scope">
               <span>{{
-                getDictValue('开槽类型', scope.row.slottingType+"")
+                getDictValue('开槽类型', scope.row.slottingType + '')
               }}</span>
             </template>
           </el-table-column>
@@ -279,13 +279,12 @@
                 align="center"
                 prop="slottingType"
               >
-            
-              <template slot-scope="scope">
-              <span>{{
-                getDictValue('开槽类型', scope.row.slottingType+'')
-              }}</span>
-            </template>
-            </el-table-column>
+                <template slot-scope="scope">
+                  <span>{{
+                    getDictValue('开槽类型', scope.row.slottingType + '')
+                  }}</span>
+                </template>
+              </el-table-column>
             </el-table>
             <div class="merge-btns">
               <el-button size="small" type="primary" @click="updateMerge"
@@ -426,7 +425,6 @@
               width="120"
               prop="blockCount"
             >
-        
             </el-table-column>
             <!-- <el-table-column label="是否开槽" align="center"></el-table-column> -->
             <el-table-column
@@ -441,17 +439,15 @@
               ]"
               :filter-method="filterSlottingMethod1"
             >
-            
-            <template slot-scope="scope">
-              <span>{{
-                getDictValue('开槽类型', scope.row.slottingType+"")
-              }}</span>
-            </template>
-          
-          </el-table-column>
+              <template slot-scope="scope">
+                <span>{{
+                  getDictValue('开槽类型', scope.row.slottingType + '')
+                }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="日期" align="center" prop="taskTime">
               <template slot-scope="scope">
-                <span>{{ scope.row.taskTime}}</span>
+                <span>{{ scope.row.taskTime }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -565,7 +561,7 @@
               width="120"
             >
               <template slot-scope="scope">
-                <span>{{ scope.row.blockCount}}</span>
+                <span>{{ scope.row.blockCount }}</span>
               </template>
             </el-table-column>
             <!-- <el-table-column label="是否开槽" align="center"></el-table-column> -->
@@ -580,27 +576,19 @@
                 { text: '不开槽', value: '不开槽' }
               ]"
               :filter-method="filterSlottingMethod1"
-            >
-            <template slot-scope="scope">
-              <span>{{
-                getDictValue('开槽类型', scope.row.slottingType+'')
-              }}</span>
-            </template>
-          </el-table-column>
-            <el-table-column
-              label="任务日期"
-              prop="taskTime"
-              align="center"
             >
+              <template slot-scope="scope">
+                <span>{{
+                  getDictValue('开槽类型', scope.row.slottingType + '')
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="任务日期" prop="taskTime" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.taskTime }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              label="下发日期"
-              align="center"
-              prop="issuedTime"
-            >
+            <el-table-column label="下发日期" align="center" prop="issuedTime">
               <template slot-scope="scope">
                 <span>{{ scope.row.issuedTime }}</span>
               </template>
@@ -634,7 +622,7 @@ import {
   deletePutMeshWorkOrder,
   deleteScheduleWorkOrder
 } from '@/api/mergePutMesh/mergePutMesh';
-import {mapState } from 'vuex';
+import { mapState } from 'vuex';
 import dictMixins from '@/mixins/dictMixins';
 
 export default {
@@ -665,7 +653,7 @@ export default {
         productName: '', // 产品名称下拉
         specification: '', // 规格型号
         weight: '', // 等级
-        isSlotting:""
+        isSlotting: ''
       },
       projectNameList: [],
       materialNameList: [],
@@ -777,7 +765,7 @@ export default {
         pageSize: 100
       };
       let query = Object.assign(pages, params, {
-        status: ['3', '2','4']
+        status: ['3', '2', '4']
       });
       getScheduleWorkOrderByPage(query)
         .then((res) => {
@@ -788,7 +776,10 @@ export default {
           );
           console.log(this.unMergeTableData, 'unMergeTableData');
           this.unMergeTableData.map((item) => {
-            if (!this.projectNameList.includes(item.projectName)&&item.projectName) {
+            if (
+              !this.projectNameList.includes(item.projectName) &&
+              item.projectName
+            ) {
               this.projectNameList.push(item.projectName);
             }
             if (!this.materialNameList.includes(item.productName)) {
@@ -807,13 +798,13 @@ export default {
       let pages = {
         // pageNum: 1,
         // pageSize: 100,
-        listStatus: [0],
+        listStatus: [0]
         // artisanStatus: '0'
       };
       const res = await getPutMeshWorkOrderByPage(pages);
       console.log('任务未下发数据列表:', res.list);
       this.taskDistTableLoading = false;
-      this.taskDistTableData = res.list
+      this.taskDistTableData = res.list;
 
       let tempHeight = [];
       this.taskDistTableData.map((item) => {
@@ -835,13 +826,13 @@ export default {
       let pages = {
         // pageNum: 1,
         // pageSize: 100,
-        listStatus: [1],
+        listStatus: [1]
         // artisanStatus: '0'
       };
       const res = await getPutMeshWorkOrderByPage(pages);
-      console.log('任务已下发数据列表:',res.list);
+      console.log('任务已下发数据列表:', res.list);
       // this.taskDistTableLoading = false
-      this.workUnreportTableData = res.list
+      this.workUnreportTableData = res.list;
       this.workUnreportTableLoading = false;
 
       let tempHeight = [];
@@ -863,7 +854,7 @@ export default {
         productName: '',
         specification: '',
         weight: '',
-        isSlotting:""
+        isSlotting: ''
       };
       this.searchDialogVisible = false;
       this.getScheduleWorkOrder({});
@@ -893,7 +884,7 @@ export default {
       let allowLong = 0; // 已添加计划的长度
       let addLong = Number(rowModelArr[0]); // 要添加计划的长度
       if (this.editTableData.length > 0) {
-        allowSlotting = this.editTableData[0].slottingType
+        allowSlotting = this.editTableData[0].slottingType;
         let modelArr = this.editTableData[0].specification.split('*');
         allowWide = Number(modelArr[1]);
         allowHeight = Number(modelArr[2].substr(0, modelArr[2].indexOf('cm')));
@@ -909,7 +900,12 @@ export default {
           return this.$alert('挂网并模总长度不能大于610！');
         }
         if (row.slottingType != allowSlotting) {
-          return this.$alert(`请添加${this.getDictValue('开槽类型',allowSlotting+"")}工艺的计划！`);
+          return this.$alert(
+            `请添加${this.getDictValue(
+              '开槽类型',
+              allowSlotting + ''
+            )}工艺的计划！`
+          );
         }
         if (addHeight != allowHeight) {
           return this.$alert(`请添加高度为${allowHeight}cm的计划！`);
@@ -989,7 +985,7 @@ export default {
         return this.$alert('请输入班组模数！');
       if (!this.taskDate) return this.$alert('请选择任务日期！');
       if (!this.modulsNumInput()) return;
- 
+
       this.pageLoading = true;
       let ids = [];
       let meshSpecs = [];
@@ -1007,11 +1003,14 @@ export default {
       // }
 
       let data = {
-        mergeIds:  this.editTableData.map(item=>item.id).toString(),
-        meshNumber:  this.editTableData.map(item=>item.blockCount).join('+'),
-        modulus:this.modulusNum1&&this.modulusNum2?this.modulusNum1+','+this.modulusNum2:this.modulusNum1||this.modulusNum2,
-        job:this.modulusNum1&&this.modulusNum2?2:1,
-        endTime:this.taskDate
+        mergeIds: this.editTableData.map((item) => item.id).toString(),
+        meshNumber: this.editTableData.map((item) => item.blockCount).join('+'),
+        modulus:
+          this.modulusNum1 && this.modulusNum2
+            ? this.modulusNum1 + ',' + this.modulusNum2
+            : this.modulusNum1 || this.modulusNum2,
+        job: this.modulusNum1 && this.modulusNum2 ? 2 : 1,
+        endTime: this.taskDate
         // mergeId: ids.join(','),
         // numbers: numbersArr.join(','),
         // moduls: String(this.modulusSum), // 合计模数
@@ -1075,8 +1074,8 @@ export default {
         type: 'warning'
       })
         .then(async () => {
-          let ids = this.taskDistSelection.map((item) => item.id)
-          const res = await issuedPutMeshWorkOrder({ id:ids,status:1 });
+          let ids = this.taskDistSelection.map((item) => item.id);
+          const res = await issuedPutMeshWorkOrder({ id: ids, status: 1 });
           this.$message.success('任务下发成功！');
           this.getPutMeshWorkOrder();
           this.getWorkUnreport();
@@ -1110,9 +1109,9 @@ export default {
           } else if (btnType == '撤回' || btnType == '中止') {
             ids = this.workUnreportSelection.map((item) => item.id);
           }
-          
+
           // let params = { type, ids };
-          deletePutMeshWorkOrder({id:ids},type)
+          deletePutMeshWorkOrder({ id: ids }, type)
             .then((res) => {
               this.pageLoading = false;
               this.$message.success(res.data.msg);