2024-09-14

优化

src/api/qc/qc.js

@@ -140,6 +140,7 @@ export const getPartInformation = data => createAPI(`/pms/qc/getPartInformation`
 export const getSpecialOperationList = data => createAPI(`/pms/qc/getSpecialOperationList`,'post',data)
 export const getRollNo = data => createAPI(`/pms/qc/getRollNo`,'post',data)
 export const rollNoEnter = data => createAPI(`/pms/qc/rollNoEnter`,'post',data)
+export const boxNoEnter = data => createAPI(`/pms/qc/boxNoEnter`,'post',data)
 export const queryPartList = data => createAPI(`/pms/qc/queryPartList`,'post',data)
 export const umSearch = data => createAPI(`/pms/qc/umSearch`,'post',data)
 

src/views/modules/qc/IPQCResultEntry.vue

@@ -198,10 +198,14 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="标签号">
-          <el-input v-if="this.modalData.specialTaskFlag === 'Y'" disabled v-model="modalData.rollNo" style="width: 221px"></el-input>
-          <el-input v-else v-model="modalData.rollNo" @keyup.native.enter="rollNoEnter" clearable style="width: 221px"></el-input>
+        <el-form-item label="箱号">
+          <el-input v-if="this.modalData.specialTaskFlag === 'Y'" disabled v-model="modalData.boxNo" style="width: 221px"></el-input>
+          <el-input v-else v-model="modalData.boxNo" @keyup.native.enter="boxNoEnter" clearable style="width: 221px"></el-input>
         </el-form-item>
+<!--        <el-form-item label="标签号">-->
+<!--          <el-input v-if="this.modalData.specialTaskFlag === 'Y'" disabled v-model="modalData.rollNo" style="width: 221px"></el-input>-->
+<!--          <el-input v-else v-model="modalData.rollNo" @keyup.native.enter="rollNoEnter" clearable style="width: 221px"></el-input>-->
+<!--        </el-form-item>-->
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item v-if="this.modalData.specialTaskFlag !== 'Y' && (this.modalData.rollNo === '' || this.modalData.rollNo == null)" prop="orderNo" :rules="rules.seqNoType">
@@ -576,15 +580,18 @@
         </el-form-item>
         <el-form-item label="状态">
           <el-select v-model="seqDetailData.status" style="width: 100px" placeholder="请选择">
+            <el-option label="全部" value=""></el-option>
             <el-option label="已发料" value="已发料"></el-option>
             <el-option label="已关闭" value="已关闭"></el-option>
             <el-option label="已计划" value="已计划"></el-option>
             <el-option label="已开工" value="已开工"></el-option>
-            <el-option label="已取消" value="已取消"></el-option>
             <el-option label="已入库" value="已入库"></el-option>
             <el-option label="已下达" value="已下达"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label=" ">
+          <el-checkbox v-model="seqDetailData.cancelFlag" true-label="Y">包含已取消工单</el-checkbox>
+        </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="seqDetailData" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="物料编码">
@@ -618,6 +625,16 @@
           :label="item.columnLabel">
         </el-table-column>
       </el-table>
+      <!-- 分页插件 -->
+      <el-pagination
+        @size-change="sizeChangeHandle3"
+        @current-change="currentChangeHandle3"
+        :current-page="pageIndex3"
+        :page-sizes="[20, 50, 100, 200, 500]"
+        :page-size="pageSize3"
+        :total="totalPage3"
+        layout="total, sizes, prev, pager, next, jumper">
+      </el-pagination>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
         <el-button type="primary" @click="seqDetailFlag = false">关闭</el-button>
       </el-footer>
@@ -884,6 +901,7 @@
     searchSeqInfo, // 派工单号查询
     actionIPQCInspection, // 开始检验
     dataAcquisition, // 数据采集
+    boxNoEnter, // 箱号回车事件
   } from "@/api/qc/qc.js"
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -989,6 +1007,9 @@
         pageIndex2: 1,
         pageSize2: 20,
         totalPage2: 0,
+        pageIndex3: 1,
+        pageSize3: 20,
+        totalPage3: 0,
         height: 200,
         dataList: [],
         dataListSelections: [],
@@ -1022,7 +1043,8 @@
           rollNo: '',
           umId: '',
           umName: '',
-          sjzs: ''
+          sjzs: '',
+          boxNo: ''
         },
         // 展示列集
         columnList1: [
@@ -1826,7 +1848,10 @@
           operationDesc: '',
           qtyrequired: '',
           lotsize: '',
-          status: '已下达'
+          status: '',
+          cancelFlag: '',
+          page: 1,
+          limit: 10
         },
         seqDetailColumnList: [
           {
@@ -1836,16 +1861,16 @@
             tableId: "301014Table3",
             tableName: "派工单号表",
             fixed: '',
-            columnWidth: 80,
             columnProp: 'orderNo',
             headerAlign: "center",
-            align: "center",
+            align: "left",
             columnLabel: '工单号',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
+            columnWidth: 150,
           },
           {
             userId: this.$store.state.user.name,
@@ -1854,16 +1879,16 @@
             tableId: "301014Table3",
             tableName: "派工单号表",
             fixed: '',
-            columnWidth: 80,
             columnProp: 'seqNo',
             headerAlign: "center",
-            align: "center",
+            align: "left",
             columnLabel: '派工单号',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
+            columnWidth: 170,
           },
           {
             userId: this.$store.state.user.name,
@@ -1872,16 +1897,16 @@
             tableId: "301014Table3",
             tableName: "派工单号表",
             fixed: '',
-            columnWidth: 80,
             columnProp: 'partNo',
             headerAlign: "center",
-            align: "center",
+            align: "left",
             columnLabel: '物料编码',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
+            columnWidth: 150,
           },
           {
             userId: this.$store.state.user.name,
@@ -1890,16 +1915,16 @@
             tableId: "301014Table3",
             tableName: "派工单号表",
             fixed: '',
-            columnWidth: 80,
             columnProp: 'partDesc',
             headerAlign: "center",
-            align: "center",
+            align: "left",
             columnLabel: '物料名称',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
+            columnWidth: 300,
           },
           {
             userId: this.$store.state.user.name,
@@ -1908,16 +1933,16 @@
             tableId: "301014Table3",
             tableName: "派工单号表",
             fixed: '',
-            columnWidth: 80,
             columnProp: 'lotsize',
             headerAlign: "center",
-            align: "center",
+            align: "right",
             columnLabel: '工单数量',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
+            columnWidth: 100,
           },
           {
             userId: this.$store.state.user.name,
@@ -1926,16 +1951,16 @@
             tableId: "301014Table3",
             tableName: "派工单号表",
             fixed: '',
-            columnWidth: 80,
             columnProp: 'qtyrequired',
             headerAlign: "center",
-            align: "center",
+            align: "right",
             columnLabel: '派工数量',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
+            columnWidth: 100,
           },
           {
             userId: this.$store.state.user.name,
@@ -1944,7 +1969,6 @@
             tableId: "301014Table3",
             tableName: "派工单号表",
             fixed: '',
-            columnWidth: 80,
             columnProp: 'operationDesc',
             headerAlign: "center",
             align: "center",
@@ -1954,6 +1978,7 @@
             columnSortable: false,
             sortLv: 0,
             status: true,
+            columnWidth: 100,
           }
         ],
         // 子明细数据对象
@@ -2306,6 +2331,7 @@
           this.detailData.passQty = 0
         }
       },
+
       // 数据采集
       dataAcquisition () {
         this.loadFlag = true
@@ -2592,6 +2618,33 @@
         })
       },
 
+      // 箱号扫描事件
+      boxNoEnter () {
+        let tempData = {
+          site: '',
+          bu: this.modalData.bu,
+          boxNo: this.modalData.boxNo
+        }
+        boxNoEnter(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.operationList = data.rows
+            this.modalData.seqNo = data.rows[0].seqNo
+            this.modalData.orderNo = data.rows[0].orderNo
+            this.modalData.operationDesc = data.rows[0].operationDesc
+            this.modalData.workCenterNo = data.rows[0].workCenterNo
+            this.modalData.resourceId = data.rows[0].resourceId
+            this.modalData.resourceDesc = data.rows[0].resourceDesc
+            this.modalData.partNo = data.rows[0].partNo
+            this.modalData.partDesc = data.rows[0].partDesc
+            this.modalData.spec = data.rows[0].spec
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+
       // input 模糊搜索
       querySearchAsync (queryString, cb) {
         clearTimeout(this.timeout)
@@ -3014,6 +3067,7 @@
           umId: this.umList[0].umId,
           umName: this.umList[0].umName,
           sjzs: '',
+          boxNo: ''
         }
         this.operationList = []
         this.resourceList = []
@@ -3083,7 +3137,6 @@
         this.seqDetailFlag = false
       },
 
-
       // 选中物料
       getRowData2 (row) {
         this.modalData.partNo = row.partNo
@@ -3128,7 +3181,8 @@
           workCenterNo: '',
           rollNo: '',
           umId: this.umList[0].umId,
-          umName: this.umList[0].umName
+          umName: this.umList[0].umName,
+          boxNo: ''
         }
         // 获取选中框
         let obj = document.getElementsByName('specialTask')
@@ -3254,6 +3308,17 @@
         this.getDataList()
       },
 
+      sizeChangeHandle3 (val) {
+        this.pageSize3 = val
+        this.pageIndex3 = 1
+        this.searchSeqInfo()
+      },
+
+      currentChangeHandle3 (val) {
+        this.pageIndex3 = val
+        this.searchSeqInfo()
+      },
+
       // 多选
       selectionChangeHandle (val) {
         this.dataListSelections = val
@@ -3364,7 +3429,6 @@
         })
       },
 
-
       // 开始检验
       actionModal (row) {
         this.$confirm(`确认开始检验?`, '提示', {
@@ -3837,23 +3901,37 @@
           }
         }
       },
+
       searchSeqInfo () {
-        let tempData = {
-          // 取modalData.bu中index为0的字符作为site  例：2_01-Label 取2
-          site: this.modalData.bu.at(0),
-          seqNo: this.seqDetailData.seqNo,
-          orderNo: this.seqDetailData.orderNo,
-          partDesc: this.seqDetailData.partDesc,
-          partNo: this.seqDetailData.partNo,
-          operationDesc: this.seqDetailData.operationDesc,
-          status: this.seqDetailData.status
+        if (this.seqDetailData.cancelFlag === 'Y' && this.seqDetailData.status.length > 0) {
+          this.$message.warning('状态冲突！')
+          return
         }
         if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.partNo && !this.seqDetailData.partDesc && !this.seqDetailData.operationDesc){
+          this.pageIndex3 = 1
+          this.pageSize3 = 20
+          this.totalPage3 = 0
           this.seqInfoList = []
         } else {
+          let tempData = {
+            // 取modalData.bu中index为0的字符作为site  例：2_01-Label 取2
+            limit: this.pageSize3,
+            page: this.pageIndex3,
+            site: this.modalData.bu.at(0),
+            seqNo: this.seqDetailData.seqNo,
+            orderNo: this.seqDetailData.orderNo,
+            partDesc: this.seqDetailData.partDesc,
+            partNo: this.seqDetailData.partNo,
+            operationDesc: this.seqDetailData.operationDesc,
+            status: this.seqDetailData.status,
+            cancelFlag: this.seqDetailData.cancelFlag,
+          }
           searchSeqInfo(tempData).then(({data}) => {
             if (data && data.code === 0) {
-              this.seqInfoList = data.rows
+              this.seqInfoList = data.page.list
+              this.pageIndex3 = data.page.currPage
+              this.pageSize3 = data.page.pageSize
+              this.totalPage3 = data.page.totalCount
             } else {
               this.$alert(data.msg, '错误', {
                 confirmButtonText: '确定'
@@ -3862,6 +3940,7 @@
           })
         }
       },
+
       closeDialog () {
         this.seqDetailData = {
           seqNo : '',
@@ -3869,7 +3948,10 @@
           partNo: '',
           partDesc: '',
           operationDesc: '',
-          status: '已下达'
+          status: '',
+          cancelFlag: '',
+          page: 1,
+          limit: 10
         }
         this.seqInfoList = []
       },