生产管理接口调整

src/api/productionManagement/sinTerWorkOrder.js

@@ -10,4 +10,13 @@ export const getList = (current, size, params) => {
       size,
     },
   });
-};
+};
+
+// 合批   /
+export const interlocking = (data) => {
+  return request({
+    url: '/blade-desk/sjWorkOrder/interlocking',
+    method: 'post',
+    data,
+  });
+};

src/views/processManagement/components/processMainte/dsPartBasicInfo.vue

@@ -29,6 +29,11 @@
               <el-input v-model="formData.productType" placeholder="请输入" disabled />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <!-- <el-form-item label="相似零件:" prop="productType">
+              
+            </el-form-item> -->
+          </el-col>
           <el-col :span="8" v-if="partType == '烧结'">
             <el-form-item label="是否为玻璃饼:" prop="isClassCake">
               <el-switch
@@ -110,7 +115,11 @@
                 clearable
                 filterable
               >
-                <el-option v-for="item in plateList" :label="item.label" :value="item.value"></el-option>
+                <el-option
+                  v-for="item in plateList"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -133,7 +142,11 @@
                 clearable
                 filterable
               >
-                 <el-option v-for="item in plateList" :label="item.plating" :value="item.id"></el-option>
+                <el-option
+                  v-for="item in plateList"
+                  :label="item.plating"
+                  :value="item.id"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -275,28 +288,35 @@
               <el-checkbox v-model="formData.goldMark" v-if="partType == '热表'"
                 >镀金标识</el-checkbox
               >
-              <el-checkbox v-model="formData.markingsTest" @change="setDataLocal" :true-label="'1'" :false-label="'0'"
+              <el-checkbox
+                v-model="formData.markingsTest"
+                @change="setDataLocal"
+                :true-label="'1'"
+                :false-label="'0'"
                 >涂色标</el-checkbox
               >
               <el-checkbox
                 v-model="formData.fluorescenceCheck"
                 @change="setDataLocal"
                 v-if="partType == '热表'"
-                :true-label="'1'" :false-label="'0'"
+                :true-label="'1'"
+                :false-label="'0'"
                 >荧光检</el-checkbox
               >
               <el-checkbox
                 v-model="formData.hotDispose"
                 @change="setDataLocal"
                 v-if="partType == '热表'"
-                :true-label="'1'" :false-label="'0'"
+                :true-label="'1'"
+                :false-label="'0'"
                 >热处理检验</el-checkbox
               >
               <el-checkbox
                 v-model="formData.inkjetPrinting"
                 @change="setDataLocal"
                 v-if="partType == '热表'"
-                :true-label="'1'" :false-label="'0'"
+                :true-label="'1'"
+                :false-label="'0'"
                 >喷码</el-checkbox
               >
             </el-form-item>
@@ -325,7 +345,11 @@
   </div>
 </template>
 <script>
-import { getPartDetail, authorizedAccomplish,getPlatingList } from '@/api/processManagement/taskProcessing';
+import {
+  getPartDetail,
+  authorizedAccomplish,
+  getPlatingList,
+} from '@/api/processManagement/taskProcessing';
 
 export default {
   components: {},
@@ -551,7 +575,7 @@ export default {
       },
       partType: '',
       loading: false,
-      plateList:[],//
+      plateList: [], //
     };
   },
   created() {},
@@ -559,17 +583,17 @@ export default {
     this.disabled = this.dialogType == 'view' ? true : false;
     // this.formData = this.dsPartInfo;
     this.getPartDetails();
-    this.getPlatingList()
+    this.getPlatingList();
   },
   methods: {
-    getPlatingList(){
-      getPlatingList().then(res => { 
+    getPlatingList() {
+      getPlatingList().then(res => {
         this.plateList = res.data.data;
       });
     },
     // 获取零件信息详情数据
     getPartDetails() {
-      getPartDetail({taskId:this.updateRow.id,version:this.updateRow.version}).then(res => {
+      getPartDetail({ taskId: this.updateRow.id, version: this.updateRow.version }).then(res => {
         this.formData = res.data.data.dsPartEntity;
         this.data = res.data.data.dsPartEntities;
 
@@ -578,7 +602,7 @@ export default {
         if (this.data.length > 0) {
           this.data.forEach(item => {
             item.$cellEdit = true;
-            item.totalArea  = (item.quota * item.area).toFixed(5);     // 保留5位小数（字符串）
+            item.totalArea = (item.quota * item.area).toFixed(5); // 保留5位小数（字符串）
           });
         }
 

src/views/processManagement/procepssPlanning.vue

@@ -24,6 +24,9 @@
       <template #menu-left>
         <el-button type="primary" @click="setIndate()">有效期维护</el-button>
       </template>
+      <template #partCode="scope"> 
+          <el-button type="text" @click="openPage(scope.row)">{{scope.row.partCode}}</el-button>
+      </template>
 
       <!-- <template #menu-right="{ size }"> </template> -->
       <template #menu="scope">
@@ -366,6 +369,9 @@ export default {
   },
 
   methods: {
+    openPage(row){
+      window.open(row.docLink)
+    },
     cancel() {
       this.showPartDetails = false;
     },

src/views/productionManagement/sinTerWorkOrder/index.vue

@@ -21,9 +21,10 @@
         <el-button type="primary" @click="handlePrintTags">过程记录打印</el-button>
         <el-button type="primary" @click="handlePrintTags">打印标签</el-button>
         <el-button type="primary" @click="handlePrint">配套单打印</el-button>
+        <el-button type="primary" @click="handleInterlocking">合批</el-button>
       </template>
       <template #menu-right>
-     <el-button type="primary" plain @click="queryOrdersHandle('3,4,5,6')">在制品</el-button>
+        <el-button type="primary" plain @click="queryOrdersHandle('3,4,5,6')">在制品</el-button>
         <el-button type="warning" plain @click="queryOrdersHandle('3')">加工中</el-button>
         <el-button type="danger" plain @click="queryOrdersHandle('4')">检验中</el-button>
         <el-button type="success" plain @click="queryOrdersHandle('15')">已完工</el-button>
@@ -74,10 +75,12 @@
       @closeDialog="closeDialog"
     ></production-dialog>
     <!-- 分批弹窗  -->
-    <batches-dialog  v-if="showBatches"
+    <batches-dialog
+      v-if="showBatches"
       :show-batches="showBatches"
       :itemData="itemData"
-      @closeDialog="closeDialog"></batches-dialog>
+      @closeDialog="closeDialog"
+    ></batches-dialog>
     <!-- 关闭弹窗  -->
     <closed-dialog
       v-if="showClose"
@@ -86,9 +89,11 @@
       :itemData="itemData"
     ></closed-dialog>
     <!-- 异常处理 -->
-    <abnormalDialog  v-if="showAbnormal"
+    <abnormalDialog
+      v-if="showAbnormal"
       :show-abnormal="showAbnormal"
-      @closeDialog="closeDialog"></abnormalDialog>
+      @closeDialog="closeDialog"
+    ></abnormalDialog>
     <!-- 优先级调整 -->
     <productionMonitoringDialog
       :showDialog="isPriorityOpen"
@@ -105,7 +110,7 @@ import closedDialog from '../components/closedDialog.vue';
 import abnormalDialog from '../components/abnormalDialog.vue';
 import productionMonitoringDialog from '../components/productionMonitoringDialog.vue';
 
-import { getList } from '@/api/productionManagement/sinTerWorkOrder';
+import { getList,interlocking } from '@/api/productionManagement/sinTerWorkOrder';
 export default {
   components: {
     productionDialog,
@@ -473,6 +478,26 @@ export default {
   },
   mounted() {},
   methods: {
+    // 合批
+    handleInterlocking(row) {
+      if (this.selectionList.length == 0) {
+        return this.$message.error('请先选择数据');
+      }
+      this.$confirm('是否确认合批?', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        let ids= this.selectionList.map(item => item.id);
+        let query = { 
+          woIds:ids.join(','),
+        };
+        interlocking(query).then((res) => {
+          this.$message.success('操作成功');
+          this.onLoad(this.page, this.query);
+        });
+      });
+    },
     //查询【生产中3、工艺变更5、检验中4、审理中6】状态的订单
     queryOrdersHandle(status) {
       this.query = {