生产管理问题修改

src/views/productionManagement/blbWorkOrder/components/glass.vue

@@ -142,7 +142,7 @@ export default {
       option: {
         height: 'auto',
         calcHeight: 32,
-        rowKey: 'cardNo',
+        rowKey: 'woId',
         tip: false,
         simplePage: true,
         searchShow: true,

src/views/productionManagement/blbWorkOrder/components/others.vue

@@ -142,7 +142,7 @@ export default {
       option: {
         height: 'auto',
         calcHeight: 32,
-        rowKey: 'cardNo',
+        rowKey: 'woId',
         tip: false,
         simplePage: true,
         searchShow: true,

src/views/productionManagement/components/batchesDialog.vue

@@ -24,7 +24,7 @@
           </template>
         </el-popover>
       </el-form-item>
-      <el-form-item label="分批数量" prop="makeQty">
+      <el-form-item label="分批数量：" prop="makeQty">
         <!-- <el-input
           placeholder="请输入分批数量"
           v-model="batchesForm.makeQty"
@@ -37,13 +37,21 @@
           :min="1"
         ></el-input-number>
       </el-form-item>
-      <el-form-item label="分批原因" prop="batchReason">
+      <el-form-item label="分批原因：" prop="batchReason">
         <el-select placeholder="请选择分批原因" v-model="batchesForm.batchReason">
           <el-option value="1" label="返工"></el-option>
           <el-option value="2" label="关闭"></el-option>
           <el-option value="3" label="其他"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="车间订单号：" prop="batchReason"> 
+        {{ batchesInfo.woCode }}
+      </el-form-item>
+      <el-form-item label="流程卡号：" prop="batchReason">
+        {{ batchesInfo.cardNo }} </el-form-item>
+      <el-form-item label="批次号：" prop="batchReason">
+        {{ batchesInfo.batchNo }} 
+       </el-form-item>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
@@ -51,12 +59,11 @@
         <el-button type="primary" @click="submit()" :loading="saveLoading">确 认</el-button>
       </span>
     </template>
-
   </el-dialog>
 </template>
 
 <script>
-import { inBatches,batchesPrepare } from '@/api/productionManagement/productionMonitoring';
+import { inBatches, batchesPrepare } from '@/api/productionManagement/productionMonitoring';
 export default {
   props: {
     showBatches: {
@@ -77,15 +84,17 @@ export default {
         makeQty: [{ required: true, message: '请输入分批数量', trigger: 'blur' }],
         batchReason: [{ required: true, message: '请选择分批原因', trigger: 'blur' }],
       },
+      batchesInfo: {}, //分批数据
     };
   },
   mounted() {
-    this.init()
+    this.init();
   },
   methods: {
-    init(){
+    init() {
-      batchesPrepare(this.itemData[0].woId).then(res => { 
+      batchesPrepare(this.itemData[0].woId).then(res => {
-        console.log(res,98989898);
+        this.batchesInfo = res.data.data;
+        console.log(this.batchesInfo, 98989898);
       });
     },
     // 关闭弹窗
@@ -98,10 +107,10 @@ export default {
         if (valid) {
           this.saveLoading = true;
           let query = {
-            id: this.itemData[0].woId,
+            id: this.batchesInfo.id,
-            batchNo: this.itemData[0].batchNo,
+            batchNo: this.batchesInfo.batchNo,
-            cardNo: this.itemData[0].cardNo,
+            cardNo: this.batchesInfo.cardNo,
-            woCode: this.itemData[0].woCode,
+            woCode: this.batchesInfo.woCode,
             makeQty: this.batchesForm.makeQty,
             batchReason: this.batchesForm.batchReason,
           };

src/views/productionManagement/components/outsourceDialog.vue

@@ -17,9 +17,13 @@
         ></el-input>
       </el-form-item>
     </el-form>
-    <el-table :data="outsourceData">
+    <el-table :data="outsourceData" @selection-change="handleSelectionChange">
       <el-table-column align="center" type="selection"></el-table-column>
-      <el-table-column align="center" label="工序号" prop="workPlan.processSet.code"></el-table-column>
+      <el-table-column
+        align="center"
+        label="工序号"
+        prop="orders"
+      ></el-table-column>
       <el-table-column
         align="center"
         label="工序代码"
@@ -31,26 +35,15 @@
         prop="workPlan.processSet.name"
       ></el-table-column>
 
-      <el-table-column align="center" label="工艺能力" prop="caId">
+      <el-table-column align="center" label="工艺能力" prop="processAbility.name"> </el-table-column>
-        <template #default="scope">
-          <el-select v-model="scope.row.processAbility.caId">
-            <el-option
-              v-for="item in craftData"
-              :key="item.caId"
-              :label="item.caName"
-              :value="item.caId"
-            ></el-option>
-          </el-select>
-        </template>
-      </el-table-column>
 
       <el-table-column align="center" label="工序描述" prop="makeMemo"> </el-table-column>
       <el-table-column align="center" label="不可转外协原因" prop="reason"> </el-table-column>
     </el-table>
     <template #footer>
       <span class="dialog-footer">
-        <el-button @click="closeDialog">取 消</el-button>
+        <el-button @click="closeDialog" :loading="loading">取 消</el-button>
-        <el-button type="primary" @click="turnOem">确定</el-button>
+        <el-button type="primary" @click="turnOem" :loading="loading">确定</el-button>
       </span>
     </template>
   </el-dialog>
@@ -71,59 +64,20 @@ export default {
   },
   data() {
     return {
+      loading:false,
       outsourceForm: {},
       outsourceRules: {
         memo: [{ required: true, message: '请输入', trigger: 'blur' }],
       },
       outsourceData: [],
-      craftData: [
+      selectedRows: [],
-        {
-          bsWorkType: null,
-          caCode: 'E3240',
-          caId: 25,
-          caName: '化学氧化',
-          keyValue: 25,
-          updateTime: '2023-04-03 18:35:23',
-        },
-        {
-          bsWorkType: null,
-          caCode: 'E802',
-          caId: 26,
-          caName: '镀后检验',
-          keyValue: 26,
-          updateTime: '2023-04-11 15:31:32',
-        },
-        {
-          bsWorkType: null,
-          caCode: 'E390',
-          caId: 27,
-          caName: '超声波清洗',
-          keyValue: 27,
-          updateTime: '2023-04-11 10:19:50',
-        },
-        {
-          bsWorkType: null,
-          caCode: 'E379',
-          caId: 28,
-          caName: '滚镀金或振镀金',
-          keyValue: 28,
-          updateTime: '2023-04-11 10:20:29',
-        },
-        {
-          bsWorkType: null,
-          caCode: 'E386',
-          caId: 36,
-          caName: '化学镀镍',
-          keyValue: 36,
-          updateTime: '2023-04-11 15:31:25',
-        },
-      ],
     };
   },
   mounted() {
     this.getListProProcess();
   },
   methods: {
+    // 获取转外协数据
     getListProProcess() {
       let params = {
         woIds: this.itemData.map(item => item.woId),
@@ -136,24 +90,41 @@ export default {
     closeDialog() {
       this.$emit('closeDialog');
     },
+    // 监听选择变化
+    handleSelectionChange(selection) {
+      this.selectedRows = selection;
+    },
     // 确定
     turnOem() {
       if (this.outsourceData.length == 0) {
         this.$message.error('当前数据列表为空');
         return;
       }
-      this.itemData.forEach(item=>{
+      if (this.selectedRows.length == 0) {
-        item.runType = 1
+        this.$message.error('请选择需要转外协的数据');
-      })
+        return;
-      let query={
-        workOrderRuns:this.itemData,
-        workPlanRuns:this.outsourceData
       }
+      this.loading = true
+      let orderData = [];
+      this.itemData.forEach(item => {
+        item.runType = 1;
+        orderData.push({
+          runType: 1,
+          woId: item.woId,
+        });
+      });
+      let query = {
+        workOrderRuns: orderData,
+        workPlanRuns: this.selectedRows,
+      };
 
       transferBill(query).then(res => {
         this.$message.success('操作成功');
         this.closeDialog();
-      });
+        this.loading = false
+      }).catch(err=>{
+        this.loading = false
+      })
     },
   },
 };

src/views/productionManagement/productionMonitoring/index.vue

@@ -644,7 +644,7 @@ export default {
         type: 'warning',
       }).then(() => {
         let query = {
-          id: row.yoId,
+          yoId: row.yoId,
           yieldType: '12002',
         };
         turnType(query).then(res => {
@@ -676,7 +676,7 @@ export default {
           let ids = this.selectionList.map(item => item.woId);
           window.open(
             window.PROCESS_FLOW_CARD_PRINT +
-              '?wolds' +
+              '?wolds=' +
               ids.join(',') +
               '&num=' +
               this.printForm.quantity

src/views/productionManagement/sinTerWorkOrder/index.vue

@@ -154,7 +154,7 @@ export default {
       option: {
         height: 'auto',
         calcHeight: 32,
-        rowKey: 'cardNo',
+        rowKey: 'woId',
         tip: false,
         simplePage: true,
         searchShow: true,