update:修改补单工单

src/views/mes/pro/workorder/components/ProcessProd.vue

@@ -240,6 +240,7 @@
 
 <script>
 export default {
+  inject: ["mode"],
   props: {
     bomList: {
       type: Array,
@@ -286,10 +287,22 @@ export default {
   watch: {
     process: {
       handler(val) {
-        this.tableData = val.processItemList;
+        if(this.mode !== 'make') {
+          this.tableData = val.processItemList;
+        }
       },
       deep: true,
     },
+    bomList: {
+      handler(newName) {
+        // console.log(newName, this.mode, 'modename')
+        if (this.mode === 'make') {
+          this.tableData = newName
+        }
+      },
+      immediate: true,
+      deep: true
+    }
   },
   methods: {
     handleRowChange(row) {

src/views/mes/pro/workorder/components/ProogingBom.vue

 <template>
   <div>
-    <el-row :gutter="10" class="mb8" v-if="mode != 'info'">
+    <el-row :gutter="10" class="mb8" v-if="!(mode === 'info'|| mode === 'make')">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -52,7 +52,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        v-if="mode != 'info'"
+        v-if="!(mode === 'info'|| mode === 'make')"
         label="操作"
         align="center"
         width="120"
@@ -75,7 +75,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        v-if="mode == 'info'"
+        v-if="mode == 'info'|| mode == 'make'"
         label="操作"
         align="center"
         width="120"

src/views/mes/pro/workorder/components/ProogingProcess.vue

 <template>
   <div>
     <el-table :data="tableData">
-      <el-table-column label="序号" prop="processRef" align="center" />
+      <el-table-column label="序号" prop="processRef" width="50" align="center" />
       <el-table-column label="工序名称" prop="processName" align="center" />
       <el-table-column label="工序编码" prop="processCode" align="center" />
       <el-table-column label="工作站" prop="workstationName" align="center" />
@@ -17,8 +17,10 @@
         </template>
       </el-table-column>
       <el-table-column label="标准文本代码" prop="x" align="center" />
+      <el-table-column label="开始时间" align="center" prop="startTime" />
+      <el-table-column label="结束时间" align="center" prop="endTime" />
       <el-table-column
-        v-if="mode != 'info'"
+         v-if="!(mode === 'info'|| mode === 'make')"
         label="操作"
         align="center"
         width="300"
@@ -44,7 +46,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        v-if="mode == 'info'"
+        v-if="mode == 'info'|| mode == 'make'"
         label="操作"
         align="center"
         width="300"

src/views/mes/pro/workorder/components/WorkOrderSale.vue

@@ -490,7 +490,7 @@
       <!-- </el-table-column> -->
 
       <el-table-column
-        v-if="mode != 'info'"
+        v-if="!(mode === 'info'|| mode === 'make')"
         label="操作"
         align="center"
         width="120"

src/views/mes/pro/workorder/indexApply.vue

@@ -315,6 +315,14 @@
           />
         </template>
       </el-table-column>
+      <el-table-column label="工单类型" align="center" prop="workorderType">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.mes_workorder_type"
+            :value="scope.row.workorderType"
+          />
+        </template>
+      </el-table-column>
       <el-table-column
         label="组合单号"
         width="180"

src/views/mes/pro/workorder/proofingInfo.vue

@@ -64,7 +64,7 @@
             </el-form-item>
           </el-col>
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
-            <el-form-item label="工艺名称" prop="routeId">
+            <el-form-item  label="工艺名称" prop="routeId">
               <el-input
                 v-model="form.routeName"
                 readonly
@@ -72,6 +72,7 @@
               >
                 <el-button
                   slot="append"
+                  v-if="mode !== 'make'"
                   icon="el-icon-search"
                   @click="$refs['RoutesProcessSelectRef'].showFlag = true"
                 ></el-button>
@@ -80,9 +81,10 @@
           </el-col>
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="产品编号" prop="productCode">
-              <el-input v-model="form.productCode" placeholder="请选择产品">
+              <el-input :disabled="mode == 'make'" v-model="form.productCode" placeholder="请选择产品">
                 <el-button
                   slot="append"
+                  v-if="mode !== 'make'"
                   @click="handleSelectProduct"
                   icon="el-icon-search"
                 ></el-button>
@@ -114,6 +116,7 @@
                 placeholder="请输入生产数量"
                 type="number"
                 min="1"
+                @blur="handleChangeQuantity"
               />
             </el-form-item>
           </el-col>
@@ -122,6 +125,7 @@
               <el-input
                 v-model="form.unitOfMeasure"
                 placeholder="请输入计量单位"
+                :disabled="mode == 'make'"
               />
             </el-form-item>
           </el-col>
@@ -131,6 +135,7 @@
                 clearable
                 v-model="form.startDate"
                 type="date"
+                :disabled="mode == 'make'"
                 value-format="yyyy-MM-dd"
                 placeholder="请选择开始日期"
               >
@@ -143,6 +148,7 @@
                 clearable
                 v-model="form.requestDate"
                 type="date"
+                :disabled="mode == 'make'"
                 value-format="yyyy-MM-dd"
                 placeholder="请选择需求日期"
               >
@@ -152,6 +158,7 @@
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="生产主管" prop="productionAdministrator">
               <el-input
+                :disabled="mode == 'make'"
                 v-model="form.productionAdministrator"
                 placeholder="请输入生产主管"
               />
@@ -160,6 +167,7 @@
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="库存地点" prop="stockLocation">
               <el-input
+                :disabled="mode == 'make'"
                 v-model="form.stockLocation"
                 placeholder="请输入库存地点"
               />
@@ -167,12 +175,12 @@
           </el-col>
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="批号" prop="batchNumber">
-              <el-input v-model="form.batchNumber" placeholder="请输入批号" />
+              <el-input v-model="form.batchNumber" :disabled="mode == 'make'" placeholder="请输入批号" />
             </el-form-item>
           </el-col>
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="工单状态" prop="status">
-              <el-select v-model="form.status" placeholder="请选择工单状态">
+              <el-select v-model="form.status" :disabled="mode == 'make'" placeholder="请选择工单状态">
                 <el-option
                   v-for="dict in dict.type.mes_workorder_status"
                   :key="dict.value"
@@ -183,7 +191,7 @@
             </el-form-item>
           </el-col>
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
-            <el-form-item label="派工倍数" prop="dispatchMultiple">
+            <el-form-item label="派工倍数" :disabled="mode == 'make'" prop="dispatchMultiple">
               <el-input
                 v-model="form.dispatchMultiple"
                 placeholder="请输入派工倍数"
@@ -192,28 +200,28 @@
           </el-col>
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="排班行数" prop="rowNum">
-              <el-input v-model="form.rowNum" placeholder="请输入排版行数" />
+              <el-input v-model="form.rowNum" :disabled="mode == 'make'" placeholder="请输入排版行数" />
             </el-form-item>
           </el-col>
 
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="单重" prop="singleWeight">
-              <el-input v-model="form.singleWeight" placeholder="请输入单重" />
+              <el-input v-model="form.singleWeight" :disabled="mode == 'make'" placeholder="请输入单重" />
             </el-form-item>
           </el-col>
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="厚度(丝)" prop="thickness">
-              <el-input v-model="form.thickness" placeholder="请输入厚度(丝)" />
+              <el-input v-model="form.thickness" :disabled="mode == 'make'" placeholder="请输入厚度(丝)" />
             </el-form-item>
           </el-col>
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="包装数量" prop="packNum">
-              <el-input v-model="form.packNum" placeholder="请输入包装数量" />
+              <el-input v-model="form.packNum" :disabled="mode == 'make'" placeholder="请输入包装数量" />
             </el-form-item>
           </el-col>
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="按指令包装" prop="packByDirective">
-              <el-select v-model="form.packByDirective" placeholder="请选择类型">
+              <el-select v-model="form.packByDirective" :disabled="mode == 'make'" placeholder="请选择类型">
                 <el-option
                   v-for="dict in dict.type.sys_yes_no"
                   :key="dict.value"
@@ -225,7 +233,7 @@
           </el-col>
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="按size包装" prop="packBySize">
-              <el-select v-model="form.packBySize" placeholder="请选择类型">
+              <el-select v-model="form.packBySize" :disabled="mode == 'make'" placeholder="请选择类型">
                 <el-option
                   v-for="dict in dict.type.sys_yes_no"
                   :key="dict.value"
@@ -242,6 +250,7 @@
               <el-input
                 v-model="form.remark"
                 type="textarea"
+                :disabled="mode == 'make'"
                 placeholder="请输入内容"
               />
             </el-form-item>
@@ -397,6 +406,7 @@ export default {
           { required: true, message: "需求日期不能为空", trigger: "blur" },
         ],
       },
+      currentData: {}
     };
   },
   computed: {
@@ -424,6 +434,26 @@ export default {
   },
 
   methods: {
+    handleChangeQuantity() {
+      // 计算补单的时候 数量变更修改
+      if (this.mode === 'make') {
+        // this.form.quantity
+        this.bomList = []
+        const bomList = this.currentData.bomList.map((item,index) => {
+          // console.log(item, 'items')
+          console.log(this.currentData.quantity, 'this.currentData.quantity')
+          let quantity = parseInt(this.form.quantity*item.quantity*100/this.currentData.quantity)
+          // console.log(quantity, 'quantity')
+          return {
+            ...item,
+            quantity: quantity/100
+          }
+        })
+        console.log(bomList, 'bomList')
+        this.bomList = bomList
+        this.$refs["ProogingBomRef"].tableData = bomList
+      }
+    },
     /** 查询生产工单下拉树结构 */
     getTreeselect() {
       listWorkorder().then((response) => {
@@ -520,8 +550,10 @@ export default {
         getWorkorder(id)
           .then(({ data }) => {
             Object.assign(this.form, data);
+            this.currentData = {}
             if (this.mode == 'make') {
-              this.form = Object.assign(data, {quantity: null , workorderType:"complements",  parentCode: data.workorderCode, workorderCode: ''})
+              this.currentData = data
+              this.form = Object.assign({}, data, {quantity: null , workorderType:"complements",  parentCode: data.workorderCode, workorderCode: ''})
               this.gCode();
             }
             this.bomList = data.bomList;