2024-07-05 功能优化

src/views/modules/qc/FQASResultEntry.vue

@@ -27,7 +27,7 @@
         <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'物料名称'">
-        <el-input v-model="searchData.partDesc" clearable style="width: 295px"></el-input>
+        <el-input v-model="searchData.partDesc" clearable style="width: 230px"></el-input>
       </el-form-item>
       <el-form-item :label="'质检员'">
         <el-input v-model="searchData.inspectorName" clearable style="width: 120px"></el-input>
@@ -42,6 +42,21 @@
       </el-form-item>
     </el-form>
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
+      <el-form-item :label="'关联单号1'">
+        <el-input v-model="searchData.orderRef1" clearable style="width: 159px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'关联单号2'">
+        <el-input v-model="searchData.orderRef2" clearable style="width: 159px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'关联单号3'">
+        <el-input v-model="searchData.orderRef3" clearable style="width: 159px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'关联单号4'">
+        <el-input v-model="searchData.orderRef4" clearable style="width: 159px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'关联单号5'">
+        <el-input v-model="searchData.orderRef5" clearable style="width: 159px"></el-input>
+      </el-form-item>
       <el-form-item :label="'检验结论'">
         <el-select v-model="searchData.inspectionResult" clearable style="width: 80px">
           <el-option label="合格" value="合格"></el-option>
@@ -59,15 +74,17 @@
           </el-option>
         </el-select>
       </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
       <el-form-item :label="'送检日期'">
-        <el-date-picker style="width: 150px" v-model="searchData.startDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
+        <el-date-picker style="width: 170px" v-model="searchData.startDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
         -
-        <el-date-picker style="width: 150px" v-model="searchData.endDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
+        <el-date-picker style="width: 170px" v-model="searchData.endDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item :label="'检验时间'">
-        <el-date-picker style="width: 150px" v-model="searchData.startDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
+        <el-date-picker style="width: 170px" v-model="searchData.startDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
         -
-        <el-date-picker style="width: 150px" v-model="searchData.endDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
+        <el-date-picker style="width: 170px" v-model="searchData.endDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item :label="' '">
         <el-button v-if="!authSearch" type="primary" @click="getDataList">查询</el-button>
@@ -647,6 +664,11 @@
           page: 1,
           limit: 10,
           states: ['未开始','待检验'],
+          orderRef1: '',
+          orderRef2: '',
+          orderRef3: '',
+          orderRef4: '',
+          orderRef5: '',
         },
         pageIndex: 1,
         pageSize: 20,
@@ -913,6 +935,96 @@
             fixed: '',
             columnWidth: 100,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301016,
+            serialNumber: '301016Table1OrderRef1',
+            tableId: "301016Table1",
+            tableName: "FQAS检验记录表",
+            columnProp: 'orderRef1',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '关联单号1',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 130,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301016,
+            serialNumber: '301016Table1OrderRef2',
+            tableId: "301016Table1",
+            tableName: "FQAS检验记录表",
+            columnProp: 'orderRef2',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '关联单号2',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 130,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301016,
+            serialNumber: '301016Table1OrderRef3',
+            tableId: "301016Table1",
+            tableName: "FQAS检验记录表",
+            columnProp: 'orderRef3',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '关联单号3',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 130,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301016,
+            serialNumber: '301016Table1OrderRef4',
+            tableId: "301016Table1",
+            tableName: "FQAS检验记录表",
+            columnProp: 'orderRef4',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '关联单号4',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 130,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301016,
+            serialNumber: '301016Table1OrderRef5',
+            tableId: "301016Table1",
+            tableName: "FQAS检验记录表",
+            columnProp: 'orderRef5',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '关联单号5',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 130,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 301016,

src/views/modules/qc/IQCResultEntry.vue

@@ -36,6 +36,29 @@
         <el-input v-model="searchData.partDesc" clearable style="width: 315px"></el-input>
       </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.receiptNo" clearable style="width: 140px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'通知单序号'">
+        <el-input v-model="searchData.receiptItemNo" clearable style="width: 68px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'关联单号1'">
+        <el-input v-model="searchData.refInfo1" clearable style="width: 140px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'关联单号2'">
+        <el-input v-model="searchData.refInfo2" clearable style="width: 140px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'关联单号3'">
+        <el-input v-model="searchData.refInfo3" clearable style="width: 140px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'关联单号4'">
+        <el-input v-model="searchData.refInfo4" clearable style="width: 140px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'关联单号5'">
+        <el-input v-model="searchData.refInfo5" clearable style="width: 140px"></el-input>
+      </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.supplierDesc" clearable style="width: 170px"></el-input>
@@ -678,7 +701,14 @@
           poItemNo: '',
           orderType: '',
           states: ['未开始','待检验'],
-          warehouseName: ''
+          warehouseName: '',
+          receiptNo: '',
+          receiptItemNo: '',
+          refInfo1: '',
+          refInfo2: '',
+          refInfo3: '',
+          refInfo4: '',
+          refInfo5: '',
         },
         pageIndex: 1,
         pageSize: 20,
@@ -963,6 +993,42 @@
             fixed: '',
             columnWidth: 130,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1ReceiptNo',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'receiptNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '通知单号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 130,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1ReceiptItemNo',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'receiptItemNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '通知单序号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 301006,
@@ -1035,6 +1101,24 @@
             fixed: '',
             columnWidth: 130,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1RefInfo5',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'refInfo5',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '关联单号5',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 130,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 301006,
@@ -1700,6 +1784,8 @@
       }
       // 获取用户角色
       this.getUserRoleList()
+      // 获取仓库类别
+
     },
 
     methods: {

static/config/index-prod.js

@@ -5,7 +5,7 @@
   window.SITE_CONFIG = {};
 
   // api接口请求地址
-  window.SITE_CONFIG['baseUrl'] = 'http://172.26.68.17:9002';
+  window.SITE_CONFIG['baseUrl'] = 'http://192.168.0.222:9004';
 
   // cdn地址 = 域名 + 版本号
   window.SITE_CONFIG['domain']  = './'; // 域名