2023-11-20 设备和质量修改

src/api/qc/qc.js

@@ -34,6 +34,7 @@ export const getItemList = data => createAPI(`/pms/qc/getItemList`,'post',data)
 export const delItemDetails = data => createAPI(`/pms/qc/delItemDetails`,'post',data)
 export const uploadTemplateExcel = data => createAPI(`/pms/qc/uploadTemplateExcel`,'post',data)
 export const saveItemDetailed = data => createAPI(`/pms/qc/saveItemDetailed`,'post',data)
+export const getItem = data => createAPI(`/pms/qc/getItem`,'post',data)
 
 // ===================================== 样本量 =====================================
 export const samplingQtySearch = data => createAPI(`/pms/qc/samplingQtySearch`,'post',data)

src/views/modules/qc/IPQCResultEntry.vue

@@ -1740,6 +1740,10 @@
     },
     methods: {
 
+      handleKeyUp (event) {
+        this.$message.error(event.keyCodes)
+      },
+
       // 子明细导入
       subDetailUpload () {
         let currentData = {

src/views/modules/qc/qcTemplate.vue

@@ -56,34 +56,6 @@
       border
       v-loading="dataListLoading"
       style="width: 100%;">
-<!--      <el-table-column-->
-<!--        prop="templateId"-->
-<!--        header-align="center"-->
-<!--        align="center"-->
-<!--        label="检验模板编码"-->
-<!--        width="100">-->
-<!--      </el-table-column>-->
-<!--      <el-table-column-->
-<!--        prop="templateName"-->
-<!--        header-align="center"-->
-<!--        align="left"-->
-<!--        label="检验模板名称"-->
-<!--        :width="flexColumnWidth('检验模板名称','templateName')">-->
-<!--      </el-table-column>-->
-<!--      <el-table-column-->
-<!--        prop="samplingProgrammeNo"-->
-<!--        header-align="center"-->
-<!--        align="center"-->
-<!--        label="抽样方案"-->
-<!--        :width="flexColumnWidth('抽样方案','samplingProgrammeNo')">-->
-<!--      </el-table-column>-->
-<!--      <el-table-column-->
-<!--        prop="samplingLevelDesc"-->
-<!--        header-align="center"-->
-<!--        align="left"-->
-<!--        label="检验水平"-->
-<!--        :width="flexColumnWidth('检验水平','samplingLevelDesc')">-->
-<!--      </el-table-column>-->
       <el-table-column
         v-for="(item,index) in columnList" :key="index"
         :sortable="item.columnSortable"
@@ -312,19 +284,32 @@
     </el-dialog>
 
     <!-- 检验项目->快速新增 -->
-    <el-dialog title="新增" @close="refreshDetailList" :close-on-click-modal="false" v-drag :visible.sync="fastAddFlag" width="900px">
+    <el-dialog title="新增" @close="refreshDetailList" :close-on-click-modal="false" v-drag :visible.sync="fastAddFlag" width="1100px">
       <div style="font-size: 12px">
-        <el-form :inline="true"  label-position="top" :model="detailData">
-          <el-form-item :label="'模板编码'">
-            <el-input v-model="detailData.templateId" readonly style="width: 120px"></el-input>
+        <el-form :inline="true" label-position="top" :model="detailData">
+          <el-form-item :label="'项目编码'">
+            <el-input v-model="detailData.itemNo" clearable style="width: 120px"></el-input>
           </el-form-item>
-          <el-form-item :label="'模板名称'">
-            <el-input v-model="detailData.templateName" readonly style="width: 200px"></el-input>
+          <el-form-item :label="'项目名称'">
+            <el-input v-model="detailData.itemDesc" clearable style="width: 200px"></el-input>
+          </el-form-item>
+          <el-form-item label="检验类型">
+            <el-select v-model="detailData.inspectionTypeNo" clearable placeholder="请选择" style="width: 120px">
+              <el-option
+                v-for = "i in options"
+                :key = "i.inspectionTypeNo"
+                :label = "i.inspectionTypeName"
+                :value = "i.inspectionTypeNo">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="' '">
+            <el-button type="primary" @click="getItem()">查询</el-button>
           </el-form-item>
         </el-form>
       </div>
       <el-container style="margin-top: 0px;">
-        <el-main style="width: 400px; padding: 1px">
+        <el-main style="width: 720px; padding: 1px">
           <span style="font-size: 12px" >可选项目：</span>
           <el-table
             height="400px"
@@ -354,12 +339,33 @@
               prop="itemDesc"
               header-align="center"
               align="center"
-              min-width="230"
+              min-width="120"
               label="项目名称">
             </el-table-column>
+            <el-table-column
+              prop="defaultValue"
+              header-align="center"
+              align="center"
+              min-width="100"
+              label="标准值">
+            </el-table-column>
+            <el-table-column
+              prop="maxValue"
+              header-align="center"
+              align="center"
+              min-width="60"
+              label="最大值">
+            </el-table-column>
+            <el-table-column
+              prop="minValue"
+              header-align="center"
+              align="center"
+              min-width="60"
+              label="最小值">
+            </el-table-column>
           </el-table>
         </el-main>
-        <el-main style="width: 100px;padding: 1px">
+        <el-main style="width: 111px;padding: 1px">
           <div style="margin-top: 182px;margin-left: 18px">
             <el-button type="primary" @click="addItem()">添加>></el-button>
           </div>
@@ -397,7 +403,7 @@
               prop="itemDesc"
               header-align="center"
               align="center"
-              min-width="230"
+              min-width="200"
               label="项目名称">
             </el-table-column>
           </el-table>
@@ -427,6 +433,7 @@
     getItemList, // 获取明细列表
     delItemDetails, // 删除项目的检验明细
     saveItemDetailed, // 新增项目明细的最大最小值
+    getItem, // 查询检验项目
   } from "@/api/qc/qc.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
   import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
@@ -538,7 +545,7 @@
             fixed: '',
           },
           {
-            columnProp: 'samplingProgrammeNo',
+            columnProp: 'samplingProgrammeDesc',
             headerAlign: "center",
             align: "center",
             columnLabel: '抽样方案',
@@ -805,6 +812,17 @@
       this.favoriteIsOk()
     },
     methods: {
+      /**
+       * 查询检验项目
+       */
+      getItem () {
+        getItem(this.detailData).then(({data}) => {
+          if (data.code === 0) {
+            this.itemList1 = data.rows
+          }
+        })
+      },
+
       /**
        *  自适应
        * @param label
@@ -1086,7 +1104,7 @@
           this.detailList = data.rows
           this.objectSearch()
         })
-        this.detailModelFlag = true;
+        this.detailModelFlag = true
       },
       // 保存模板项目
       saveDetail(){
@@ -1113,10 +1131,10 @@
         this.itemSelections1 = null
         this.itemSelections2 = null
         getItemList(this.detailData).then(({data}) => {
-          this.itemList1 = data.row1;
-          this.itemList2 = data.row2;
+          this.itemList1 = data.row1
+          this.itemList2 = data.row2
         })
-        this.fastAddFlag = true;
+        this.fastAddFlag = true
       },
       // clickItem1(row){
       //   this.itemListRow1 = JSON.parse(JSON.stringify(row));