2024-10-16

优化

src/views/modules/qc/DoInspectionBySeqNo.vue

@@ -16,31 +16,45 @@
       <el-form-item label="派工单号">
         <el-input v-model="searchData.seqNo" clearable style="width: 150px"></el-input>
       </el-form-item>
-      <el-form-item label="状态">
-        <el-select v-model="searchData.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-select>
+      <el-form-item label="物料编码">
+        <el-input v-model="searchData.partNo" clearable style="width: 150px"></el-input>
       </el-form-item>
+      <el-form-item label="物料名称">
+        <el-input v-model="searchData.partDesc" clearable style="width: 315px"></el-input>
+      </el-form-item>
+<!--      <el-form-item label="状态">-->
+<!--        <el-select v-model="searchData.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-select>-->
+<!--      </el-form-item>-->
       <el-form-item label=" ">
-        <el-checkbox v-model="searchData.cancelFlag" true-label="Y">包含已取消工单</el-checkbox>
+        <el-checkbox v-model="searchData.cancelFlag" true-label="Y">显示超出派工数量单据</el-checkbox>
       </el-form-item>
     </el-form>
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
-      <el-form-item label="物料编码">
-        <el-input v-model="searchData.partNo" clearable style="width: 150px"></el-input>
+      <el-form-item label="车间编码">
+        <el-input v-model="searchData.departmentID" clearable style="width: 150px"></el-input>
       </el-form-item>
-      <el-form-item label="物料名称">
-        <el-input v-model="searchData.partDesc" clearable style="width: 315px"></el-input>
+      <el-form-item label="加工中心">
+        <el-input v-model="searchData.workCenterNo" clearable style="width: 150px"></el-input>
       </el-form-item>
       <el-form-item label="工序">
         <el-input v-model="searchData.operationDesc" clearable style="width: 150px"></el-input>
       </el-form-item>
+      <el-form-item label="派工单创建人">
+        <el-input v-model="searchData.operatorName" clearable style="width: 150px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'派工日期'">
+        <el-date-picker style="width: 160px" v-model="searchData.startDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="开始日期"></el-date-picker>
+        -
+        <el-date-picker style="width: 160px" v-model="searchData.endDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item :label="' '">
         <el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button>
       </el-form-item>
@@ -147,7 +161,7 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="检验类型" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType">
-          <el-select v-model="modalData.inspectionTypeNo" style="width: 221px">
+          <el-select v-model="modalData.inspectionTypeNo" style="width: 104px">
             <el-option label="首件检" value="首件检"></el-option>
             <el-option label="自检" value="自检"></el-option>
             <el-option label="巡检" value="巡检"></el-option>
@@ -155,10 +169,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="送检数量" prop="rollQty" :rules="rules.rollQtyType">
-          <el-input v-model="modalData.rollQty" type="number" style="width: 103px"></el-input>
+          <el-input v-model="modalData.rollQty" type="number" style="width: 104px"></el-input>
         </el-form-item>
         <el-form-item label="单位" prop="umId" :rules="rules.umIdType">
-          <el-select v-model="modalData.umId" placeholder="请选择" style="width: 103px">
+          <el-select v-model="modalData.umId" placeholder="请选择" style="width: 104px">
             <el-option
               v-for = "i in umList"
               :key = "i.umId"
@@ -167,6 +181,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label=" ">
+          <el-checkbox v-model="modalData.importantFlag" true-label="Y">重点检验</el-checkbox>
+        </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item prop="templateId" :rules="rules.templateId">
@@ -175,7 +192,7 @@
           <el-input v-model="modalData.templateName" readonly style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item label="送检总数">
-          <el-input v-model="modalData.sjzs" disabled style="width: 120px"></el-input>
+          <el-input v-model="modalData.sjzs" disabled style="width: 104px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
@@ -266,10 +283,13 @@
           partNo: '',
           partDesc: '',
           operationDesc: '',
-          qtyrequired: '',
-          lotsize: '',
           status: '',
           cancelFlag: '',
+          startDate: new Date(),
+          endDate: new Date(),
+          workCenterNo: '',
+          operatorName: '',
+          departmentID: '',
           page: 1,
           limit: 10
         },
@@ -281,6 +301,7 @@
         modalFlag: false,
         modalDisableFlag: false,
         modalData: {
+          flag: '',
           site: '',
           bu: '',
           inspectionNo:'',
@@ -308,7 +329,9 @@
           umId: '',
           umName: '',
           sjzs: '',
-          boxNo: ''
+          boxNo: '',
+          createBy: '',
+          importantFlag: ''
         },
         rules: {
           seqNoType: [
@@ -426,7 +449,7 @@
             columnSortable: false,
             sortLv: 0,
             status: true,
-            columnWidth: 170,
+            columnWidth: 150,
           },
           {
             userId: this.$store.state.user.name,
@@ -464,6 +487,96 @@
             status: true,
             columnWidth: 300,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 3010005001,
+            serialNumber: '3010005001Table1DepartmentID',
+            tableId: "3010005001Table1",
+            tableName: "派工单号表",
+            fixed: '',
+            columnProp: 'departmentID',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '车间编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 3010005001,
+            serialNumber: '3010005001Table1DepartmentName',
+            tableId: "3010005001Table1",
+            tableName: "派工单号表",
+            fixed: '',
+            columnProp: 'departmentName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '车间名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            columnWidth: 150,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 3010005001,
+            serialNumber: '3010005001Table1WorkCenterNo',
+            tableId: "3010005001Table1",
+            tableName: "派工单号表",
+            fixed: '',
+            columnProp: 'workCenterNo',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '加工中心编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 3010005001,
+            serialNumber: '3010005001Table1WorkCenterDesc',
+            tableId: "3010005001Table1",
+            tableName: "派工单号表",
+            fixed: '',
+            columnProp: 'workCenterDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '加工中心名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            columnWidth: 150,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 3010005001,
+            serialNumber: '3010005001Table1OperationDesc',
+            tableId: "3010005001Table1",
+            tableName: "派工单号表",
+            fixed: '',
+            columnProp: 'operationDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '工序',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            columnWidth: 100,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 3010005001,
@@ -503,21 +616,57 @@
           {
             userId: this.$store.state.user.name,
             functionId: 3010005001,
-            serialNumber: '3010005001Table1OperationDesc',
+            serialNumber: '3010005001Table1RollQty',
             tableId: "3010005001Table1",
             tableName: "派工单号表",
             fixed: '',
-            columnProp: 'operationDesc',
+            columnProp: 'rollQty',
             headerAlign: "center",
-            align: "center",
-            columnLabel: '工序',
+            align: "right",
+            columnLabel: '送检数量',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             columnWidth: 100,
-          }
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 3010005001,
+            serialNumber: '3010005001Table1ScheduledDate',
+            tableId: "3010005001Table1",
+            tableName: "派工单号表",
+            fixed: '',
+            columnProp: 'scheduledDate',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '派工日期',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            columnWidth: 150,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 3010005001,
+            serialNumber: '3010005001Table1OperatorName',
+            tableId: "3010005001Table1",
+            tableName: "派工单号表",
+            fixed: '',
+            columnProp: 'operatorName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '派工单创建人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            columnWidth: 150,
+          },
         ],
         templateDetailList: [
           {
@@ -691,6 +840,7 @@
       // 生成检验任务
       doInspectionModal (row) {
         this.modalData = {
+          flag: 'doInspection',
           site: row.site,
           bu: this.userBuList[0].buNo,
           inspectionNo: '',
@@ -704,7 +854,7 @@
           operationDesc: row.operationDesc,
           resourceId: row.resourceId,
           resourceDesc: row.resourceDesc,
-          rollQty: row.qtyrequired,
+          rollQty: row.qtyrequired - row.rollQty > 0 ? row.qtyrequired - row.rollQty : 0,
           seqNo: row.seqNo,
           spec: row.spec,
           specialRequirements: '',
@@ -716,6 +866,8 @@
           umId: row.umId,
           sjzs: row.sjzs,
           boxNo: '',
+          createBy: this.$store.state.user.name,
+          importantFlag: ''
         }
         this.getOperationList()
         this.modalDisableFlag = false
@@ -897,7 +1049,7 @@
       async createExportData() {
         this.searchData.limit = -1
         this.searchData.page = 1
-        await searchSeqInfo(this.searchData).then(({data}) => {
+        await searchSeqInfo2(this.searchData).then(({data}) => {
           this.exportList= data.rows
         })
         return this.exportList

src/views/modules/qc/IPQCResultEntry.vue

@@ -74,15 +74,18 @@
       </el-form-item>
     </el-form>
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
+      <el-form-item :label="'送检人员'">
+        <el-input v-model="searchData.createBy" clearable style="width: 125px"></el-input>
+      </el-form-item>
       <el-form-item :label="'送检日期'">
-        <el-date-picker style="width: 160px" v-model="searchData.startDate2" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="开始日期"></el-date-picker>
+        <el-date-picker style="width: 130px" v-model="searchData.startDate2" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="开始日期"></el-date-picker>
         -
-        <el-date-picker style="width: 160px" v-model="searchData.endDate2" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="结束日期"></el-date-picker>
+        <el-date-picker style="width: 130px" v-model="searchData.endDate2" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item :label="'检验日期：'">
-        <el-date-picker style="width: 170px" v-model="searchData.startDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="开始日期"></el-date-picker>
+        <el-date-picker style="width: 130px" v-model="searchData.startDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="开始日期"></el-date-picker>
         -
-        <el-date-picker style="width: 170px" v-model="searchData.endDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="结束日期"></el-date-picker>
+        <el-date-picker style="width: 130px" v-model="searchData.endDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item :label="' '">
         <el-button v-if="!authSearch" type="primary" @click="getDataList">查询</el-button>
@@ -132,7 +135,7 @@
         label="状态">
         <template slot-scope="scope">
           <div :style="{fontWeight:'bold', color: scope.row.state =='待检验' ? 'red' : scope.row.state =='待审核' ? '#ffa500e0' : scope.row.state =='已完成' ? '#3ac252' : ''}">
-            {{ scope.row.state }}
+            <i v-if="scope.row.importantFlag === 'Y'" class="el-icon-s-flag" style="color: red"></i> {{ scope.row.state }}
           </div>
         </template>
       </el-table-column>
@@ -262,7 +265,7 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="检验类型" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType">
-          <el-select v-model="modalData.inspectionTypeNo" style="width: 221px">
+          <el-select v-model="modalData.inspectionTypeNo" style="width: 104px">
             <el-option label="首件检" value="首件检"></el-option>
             <el-option label="自检" value="自检"></el-option>
             <el-option label="巡检" value="巡检"></el-option>
@@ -270,10 +273,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="送检数量" prop="rollQty" :rules="rules.rollQtyType">
-          <el-input v-model="modalData.rollQty" type="number" style="width: 103px"></el-input>
+          <el-input v-model="modalData.rollQty" type="number" style="width: 104px"></el-input>
         </el-form-item>
         <el-form-item label="单位" prop="umId" :rules="rules.umIdType">
-          <el-select v-model="modalData.umId" placeholder="请选择" style="width: 103px">
+          <el-select v-model="modalData.umId" placeholder="请选择" style="width: 104px">
             <el-option
               v-for = "i in umList"
               :key = "i.umId"
@@ -282,6 +285,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label=" ">
+          <el-checkbox v-model="modalData.importantFlag" true-label="Y">重点检验</el-checkbox>
+        </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item prop="templateId" :rules="rules.templateId">
@@ -290,7 +296,7 @@
           <el-input v-model="modalData.templateName" readonly style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item label="送检总数">
-          <el-input v-model="modalData.sjzs" disabled style="width: 120px"></el-input>
+          <el-input v-model="modalData.sjzs" disabled style="width: 104px"></el-input>
         </el-form-item>
         <el-form-item label=" ">
           <input type="checkbox" id="specialTask" name="specialTask" v-model="checked" @click="changeSpecialTask"/> <label for="specialTask">无工单检验</label>
@@ -921,7 +927,7 @@
       Chooselist,
       qcFAIUploadFile,
       comQcItemImageUploadFile,
-      subDetailUpload
+      subDetailUpload,
     },
     computed: {
       templateTableData () {
@@ -1009,6 +1015,7 @@
           limit: 10,
           seqNo: '',
           states: ['未开始','待检验'],
+          createBy: ''
         },
         pageIndex: 1,
         pageSize: 20,
@@ -1052,7 +1059,9 @@
           umId: '',
           umName: '',
           sjzs: '',
-          boxNo: ''
+          boxNo: '',
+          createBy: '',
+          importantFlag: ''
         },
         // 展示列集
         columnList1: [
@@ -1182,6 +1191,24 @@
             fixed: '',
             columnWidth: 170,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table1CreateBy',
+            tableId: "301014Table1",
+            tableName: "IPQC检验记录表",
+            columnProp: 'createBy',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '送检人员',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 301014,
@@ -1236,6 +1263,78 @@
             fixed: '',
             columnWidth: 150,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table1DepartmentID',
+            tableId: "301014Table1",
+            tableName: "IPQC检验记录表",
+            columnProp: 'departmentID',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '车间编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table1DepartmentName',
+            tableId: "301014Table1",
+            tableName: "IPQC检验记录表",
+            columnProp: 'departmentName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '车间名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 150,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table1WorkCenterNo',
+            tableId: "301014Table1",
+            tableName: "IPQC检验记录表",
+            fixed: '',
+            columnProp: 'workCenterNo',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '加工中心编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table1WorkCenterDesc',
+            tableId: "301014Table1",
+            tableName: "IPQC检验记录表",
+            fixed: '',
+            columnProp: 'workCenterDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '加工中心名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            columnWidth: 150,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 301014,
@@ -3077,7 +3176,9 @@
           umId: this.umList[0].umId,
           umName: this.umList[0].umName,
           sjzs: '',
-          boxNo: ''
+          boxNo: '',
+          createBy: this.$store.state.user.name,
+          importantFlag: ''
         }
         this.operationList = []
         this.resourceList = []
@@ -3191,7 +3292,9 @@
           rollNo: '',
           umId: this.umList[0].umId,
           umName: this.umList[0].umName,
-          boxNo: ''
+          boxNo: '',
+          createBy: this.$store.state.user.name,
+          importantFlag: ''
         }
         // 获取选中框
         let obj = document.getElementsByName('specialTask')