生产补数

.env.production

@@ -5,4 +5,4 @@ VUE_APP_TITLE = 宝绅-生产执行系统
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = 'http://192.168.3.91:8100'
+VUE_APP_BASE_API = 'http://192.168.222.60:8080'

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

@@ -355,8 +355,20 @@
         label="数量"
         align="center"
         prop="quantity"
-        width="120"
+        width="140"
+      >
+        <template v-slot="scope">
+          <el-input-number
+            :max="scope.row.max"
+            style="width: 130px"
+            v-if="mode === 'make'"
+            :disabled="disabled"
+            v-model="scope.row.quantity"
+            @change="(val) => handleChange(val, index)"
           />
+          <div v-else>{{scope.row.quantity}}</div>
+        </template>
+      </el-table-column>
       <el-table-column
         label="客户编号"
         align="center"
@@ -585,6 +597,7 @@ export default {
   components: {},
   inject: ["mode"],
   dicts: ["sys_yes_no"],
+  props: ["disabled"],
   data() {
     return {
       /**弹窗状态 */
@@ -716,6 +729,9 @@ export default {
         purchaseOrg: "",
       };
     },
+    handleChange(val, index){
+      this.$emit('change', this.tableData)
+    },
     /**重置组件状态 */
     resetState() {
       this.resetForm();

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

@@ -31,7 +31,34 @@
         align="center"
         :prop="item.prop"
         :width="item.width"
+      >
+      <template v-slot="scope">
+        <el-input-number
+          :max="scope.row.max"
+          style="width: 150px"
+          v-model="scope.row.quantity"
+          v-if="item.prop === 'quantity' && mode === 'make'"
+          @change="(val) => handleChange(val, index)"
         />
+        <div v-else>{{scope.row[item.prop]}}</div>
+      </template>
+    </el-table-column>
+    <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            v-if="mode === 'make'"
+            @click="deleteRow(scope.$index)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
       <!-- <el-table-column
         label="销线"
         align="center"
@@ -410,7 +437,7 @@ export default {
         { prop: "salesId", label: "销售订单号" },
         { prop: "salesItem", label: "销售订单行项目" },
         { prop: "clientCmd", label: "销售订单指令号" },
-        { prop: "quantity", label: "派工数" },
+        { prop: "quantity", label: "派工数", width: "160" },
         { prop: "lossNum", label: "Loss数" },
         { prop: "brandCode", label: "品牌" },
         { prop: "salePath", label: "销线" },
@@ -554,6 +581,10 @@ export default {
     /**删除行 */
     deleteRow(index) {
       this.tableData.splice(index, 1);
+      this.$emit('change', this.tableData)
+    },
+    handleChange(val, index){
+      this.$emit('change', this.tableData)
     },
     /**表单提交 */
     submitForm() {

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

@@ -131,6 +131,7 @@
                 v-model="form.quantity"
                 placeholder="请输入生产数量"
                 type="number"
+                :disabled="mode == 'make' && ((currentData.saleDirectiveList && currentData.saleDirectiveList.length) || (currentData.sizeList && currentData.sizeList.length))"
                 min="1"
                 @change="handleChangeQuantity"
               />
@@ -329,10 +330,10 @@
           <ProogingProcess ref="ProogingProcessRef" :bomList="bomList" />
         </el-tab-pane>
         <el-tab-pane label="指令">
-          <WorkOrderSale ref="WorkOrderSaleRef" />
+          <WorkOrderSale ref="WorkOrderSaleRef" @change="changeSale" :disabled="currentData.sizeList && currentData.sizeList.length > 0"/>
         </el-tab-pane>
         <el-tab-pane label="SIZE">
-          <WorkOrderSize ref="WorkOrderSizeRef" />
+          <WorkOrderSize ref="WorkOrderSizeRef" @change="changeSize" />
         </el-tab-pane>
       </el-tabs>
     </PageWrapper>
@@ -529,6 +530,32 @@ export default {
   },
 
   methods: {
+    changeSale(tableData){
+      if (this.mode === 'make') {
+        tableData.forEach(item => {
+          quantity += item.quantity
+        })
+        this.form.quantity = quantity
+      }
+    },
+    changeSize(tableData){
+      let quantity = 0
+      let lossNum = 0
+      let samples = 0
+      if (this.mode === 'make') {
+        tableData.forEach(item => {
+          quantity += item.quantity
+          lossNum += item.lossNum
+          samples += item.samples
+        })
+        this.$refs["WorkOrderSaleRef"].tableData[0]['lossNum'] = lossNum
+        this.$refs["WorkOrderSaleRef"].tableData[0]['quantity'] = quantity
+        this.$refs["WorkOrderSaleRef"].tableData[0]['samples'] = samples
+        console.log('this.currentData', this.currentData)
+        this.currentData.saleDirectiveList = this.$refs["WorkOrderSaleRef"].tableData
+        this.form.quantity = quantity
+      }
+    },
     handleChangeQuantity() {
     // console.log(quantity);
       // 计算补单的时候 数量变更修改
@@ -672,6 +699,8 @@ export default {
             // 设置组件数据
             this.$refs["ProogingBomRef"].tableData = data.bomList;
             console.log('生产工单', data.processList)
+            data.sizeList.forEach(v => v["max"] = v.quantity)
+            data.saleDirectiveList.forEach(v => v["max"] = v.quantity)
             this.$refs["ProogingProcessRef"].tableData = data.processList;
             this.$refs["WorkOrderSaleRef"].tableData = data.saleDirectiveList;
             this.$refs["WorkOrderSizeRef"].tableData = data.sizeList;