2024-08-30

优化

src/api/qc/qc.js

@@ -28,6 +28,7 @@ export const templateSave = data => createAPI(`/pms/qc/templateSave`,'post',data
 export const templateUpdate = data => createAPI(`/pms/qc/templateUpdate`,'post',data)
 export const templateDelete = data => createAPI(`/pms/qc/templateDelete`,'post',data)
 export const inspectionTypeSearch = data => createAPI(`/pms/qc/inspectionTypeSearch`,'post',data)
+export const itemTypeSearch = data => createAPI(`/pms/qc/itemTypeSearch`,'post',data)
 export const objectSearch = data => createAPI(`/pms/qc/objectSearch`,'post',data)
 export const templateDetailsSearch = data => createAPI(`/pms/qc/templateDetailsSearch`,'post',data)
 export const addItemDetails = data => createAPI(`/pms/qc/addItemDetails`,'post',data)

src/views/modules/qc/FQASResultEntry.vue

@@ -43,20 +43,27 @@
     </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-input v-model="searchData.orderRef1" clearable style="width: 138px"></el-input>
       </el-form-item>
       <el-form-item :label="'关联单号2'">
-        <el-input v-model="searchData.orderRef2" clearable style="width: 159px"></el-input>
+        <el-input v-model="searchData.orderRef2" clearable style="width: 138px"></el-input>
       </el-form-item>
       <el-form-item :label="'关联单号3'">
-        <el-input v-model="searchData.orderRef3" clearable style="width: 159px"></el-input>
+        <el-input v-model="searchData.orderRef3" clearable style="width: 138px"></el-input>
       </el-form-item>
       <el-form-item :label="'关联单号4'">
-        <el-input v-model="searchData.orderRef4" clearable style="width: 159px"></el-input>
+        <el-input v-model="searchData.orderRef4" clearable style="width: 138px"></el-input>
       </el-form-item>
       <el-form-item :label="'关联单号5'">
-        <el-input v-model="searchData.orderRef5" clearable style="width: 159px"></el-input>
+        <el-input v-model="searchData.orderRef5" clearable style="width: 138px"></el-input>
       </el-form-item>
+      <el-form-item>
+        <span slot="label" @click="getBaseList(24)"><a herf="#">关联单号6</a></span>
+        <el-input v-model="searchData.orderRef6" clearable style="width: 130px"></el-input>
+      </el-form-item>
+<!--      <el-form-item :label="'关联单号6'">-->
+<!--        <el-input v-model="searchData.orderRef6" clearable style="width: 138px"></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>
@@ -258,9 +265,12 @@
           <el-input v-model="detailData.operatorName" readonly style="width: 224px"></el-input>
         </el-form-item>
         <el-form-item>
-          <span v-if="detailData.submitFlag === 'Y'" slot="label">责任人</span>
-          <span v-else style="cursor: pointer" slot="label" @click="getResponsiblePersonList"><a>责任人</a></span>
-          <el-input v-model="detailData.responsiblePersonName" readonly style="width: 224px"></el-input>
+          <span v-if="detailData.submitFlag === 'Y'" slot="label">责任人(供应商)</span>
+          <span v-else style="cursor: pointer" slot="label" @click="getBaseList(509)" ><a>责任人(供应商)</a></span>
+          <el-input v-model="detailData.responsiblePerson" :readonly="detailData.submitFlag === 'Y'" style="width: 224px"></el-input>
+<!--          <span v-if="detailData.submitFlag === 'Y'" slot="label">责任人</span>-->
+<!--          <span v-else style="cursor: pointer" slot="label" @click="getResponsiblePersonList"><a>责任人</a></span>-->
+<!--          <el-input v-model="detailData.responsiblePersonName" readonly style="width: 224px"></el-input>-->
         </el-form-item>
         <el-form-item :label="' '" style="margin-left: 20px">
           <el-button type="primary" icon="el-icon-upload" @click="subDetailUpload">明细导入</el-button>
@@ -739,6 +749,7 @@
           orderRef3: '',
           orderRef4: '',
           orderRef5: '',
+          orderRef6: '',
         },
         pageIndex: 1,
         pageSize: 20,
@@ -1098,6 +1109,24 @@
             fixed: '',
             columnWidth: 130,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301016,
+            serialNumber: '301016Table1OrderRef6',
+            tableId: "301016Table1",
+            tableName: "FQAS检验记录表",
+            columnProp: 'orderRef6',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '关联单号6',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 130,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 301016,
@@ -2252,6 +2281,14 @@
             conSql = " and bu_no = '" + this.changeData.buNo + "'"
             this.$refs.baseList.init(val, strVal, conSql)
           }
+          if (val === 509) {
+            strVal = this.detailData.responsiblePerson
+            this.$refs.baseList.init(val, strVal)
+          }
+          if (val === 24) {
+            strVal = this.searchData.orderRef6
+            this.$refs.baseList.init(val, strVal)
+          }
         })
       },
 
@@ -2273,6 +2310,12 @@
           this.changeData.samplingLevelNo = val.sampling_level_no
           this.changeData.samplingLevelDesc = val.sampling_level_desc
         }
+        if (this.tagNo === 509) {
+          this.detailData.responsiblePerson = val.SupplierID
+        }
+        if (this.tagNo === 24) {
+          this.searchData.orderRef6 = val.WorkCenterNo
+        }
       },
 
       // 获取主信息数据列表

src/views/modules/qc/IPQCResultEntry.vue

@@ -208,7 +208,7 @@
           <span style="cursor: pointer" slot="label" @click="getBaseList(1052)"><a herf="#">派工单号</a></span>
           <el-input v-model="modalData.seqNo" style="width: 221px"></el-input>
         </el-form-item>
-        <el-form-item v-if="this.modalData.specialTaskFlag !== 'Y' && this.modalData.rollNo !== '' && this.modalData.rollNo != null" prop="orderNo" :rules="rules.seqNoType">
+        <el-form-item v-if="this.modalData.specialTaskFlag !== 'Y' && this.modalData.rollNo != null && this.modalData.rollNo !== ''" prop="orderNo" :rules="rules.seqNoType">
           <span slot="label">派工单号</span>
           <el-input v-model="modalData.seqNo" disabled style="width: 221px"></el-input>
         </el-form-item>
@@ -231,13 +231,13 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item v-if="this.modalData.specialTaskFlag === 'Y'">
+        <el-form-item>
           <span style="cursor: pointer" slot="label" @click="getBaseList(505)"><a herf="#">机台</a></span>
-          <el-input v-model="modalData.resourceDesc" style="width: 221px"></el-input>
-        </el-form-item>
-        <el-form-item v-else label="机台" prop="resourceId" :rules="rules.resourceIdType">
-          <el-input v-model="modalData.resourceDesc" style="width: 221px"></el-input>
+          <el-input v-model="modalData.resourceDesc" readonly style="width: 221px"></el-input>
         </el-form-item>
+<!--        <el-form-item v-else label="机台" prop="resourceId" :rules="rules.resourceIdType">-->
+<!--          <el-input v-model="modalData.resourceDesc" style="width: 221px"></el-input>-->
+<!--        </el-form-item>-->
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item v-if="this.modalData.specialTaskFlag === 'Y'" :model="modalData">
@@ -283,7 +283,7 @@
         <el-form-item prop="templateId" :rules="rules.templateId">
           <span style="cursor: pointer" v-if="this.controlData.baseData === '控制'" slot="label" @click="queryTemplateList"><a>检验模板</a></span>
           <span v-else slot="label">检验模板</span>
-          <el-input v-model="modalData.templateName" disabled style="width: 221px"></el-input>
+          <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>
@@ -298,7 +298,7 @@
         </el-form-item>
       </el-form>
       <el-footer style="height:40px;margin-top: 55px;text-align:center">
-        <el-button type="primary" @click="saveData">保存</el-button>
+        <el-button :loading="saveLoading" type="primary" @click="saveData">保存</el-button>
         <el-button type="primary" @click="modalFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
@@ -375,9 +375,12 @@
           <el-input v-model="detailData.operatorName" readonly style="width: 173px"></el-input>
         </el-form-item>
         <el-form-item>
-          <span v-if="detailData.submitFlag === 'Y'" slot="label">责任人</span>
-          <span v-else style="cursor: pointer" slot="label" @click="getResponsiblePersonList"><a>责任人</a></span>
-          <el-input v-model="detailData.responsiblePersonName" readonly style="width: 173px"></el-input>
+          <span v-if="detailData.submitFlag === 'Y'" slot="label">责任人(供应商)</span>
+          <span v-else style="cursor: pointer" slot="label" @click="getBaseList(509)" ><a>责任人(供应商)</a></span>
+          <el-input v-model="detailData.responsiblePerson" :readonly="detailData.submitFlag === 'Y'" style="width: 224px"></el-input>
+<!--          <span v-if="detailData.submitFlag === 'Y'" slot="label">责任人</span>-->
+<!--          <span v-else style="cursor: pointer" slot="label" @click="getResponsiblePersonList"><a>责任人</a></span>-->
+<!--          <el-input v-model="detailData.responsiblePersonName" readonly style="width: 173px"></el-input>-->
         </el-form-item>
         <el-form-item :label="' '">
           <el-button type="primary" @click="getFileContentData(detailData)">工作文件</el-button>
@@ -2113,7 +2116,7 @@
           {
             columnProp: 'partNo',
             headerAlign: "center",
-            align: "center",
+            align: "left",
             columnLabel: '物料编码',
             columnHidden: false,
             columnImage: false,
@@ -2121,11 +2124,12 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 120,
           },
           {
             columnProp: 'partDesc',
             headerAlign: "center",
-            align: "center",
+            align: "left",
             columnLabel: '物料名称',
             columnHidden: false,
             columnImage: false,
@@ -2133,6 +2137,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 300,
           },
         ],
         checked: false,
@@ -2221,6 +2226,7 @@
           inspectionTypeNo: ''
         },
         currentRow: {},
+        saveLoading: false
       }
     },
 
@@ -2852,6 +2858,10 @@
             strVal = this.modalData.resourceDesc
             this.$refs.baseList.init(val, strVal)
           }
+          if (val === 509) {
+            strVal = this.detailData.responsiblePerson
+            this.$refs.baseList.init(val, strVal)
+          }
           // if (val === 206) {
           //   strVal = this.modalData.partNo
           //   this.$refs.baseList.init(val, strVal)
@@ -2870,8 +2880,11 @@
           //this.getPartList()
         }
         if (this.tagNo === 505) {
-          this.modalData.resourceId = val.resource_id
-          this.modalData.resourceDesc = val.resource_desc
+          this.modalData.resourceId = val.ResourceID
+          this.modalData.resourceDesc = val.ResourceDesc
+        }
+        if (this.tagNo === 509) {
+          this.detailData.responsiblePerson = val.SupplierID
         }
         // if (this.tagNo === 206) {
         //   this.modalData.partNo = val.part_no
@@ -3065,6 +3078,7 @@
         this.modalData.qtyrequired = row.qtyrequired
         this.modalData.rollQty = row.qtyrequired
         this.modalData.sjzs = row.sjzs
+        this.modalData.umId = row.umId
         this.getOperationList()
         this.seqDetailFlag = false
       },
@@ -3186,6 +3200,7 @@
           this.$message.warning('请选择检验模板！')
           return
         }
+        this.saveLoading = true
         if(this.modalData.flag === '1'){
           saveOsInspection(this.modalData).then(({data}) => {
             if (data && data.code === 0) {
@@ -3205,6 +3220,9 @@
                 confirmButtonText: '确定'
               })
             }
+            this.saveLoading = false
+          }).catch(()=>{
+            this.saveLoading = false
           })
         }
       },

src/views/modules/qc/OQCResultEntry.vue

@@ -258,9 +258,12 @@
           <el-input v-model="detailData.operatorName" readonly style="width: 224px"></el-input>
         </el-form-item>
         <el-form-item>
-          <span v-if="detailData.submitFlag === 'Y'" slot="label">责任人</span>
-          <span v-else style="cursor: pointer" slot="label" @click="getResponsiblePersonList"><a>责任人</a></span>
-          <el-input v-model="detailData.responsiblePersonName" readonly style="width: 224px"></el-input>
+          <span v-if="detailData.submitFlag === 'Y'" slot="label">责任人(供应商)</span>
+          <span v-else style="cursor: pointer" slot="label" @click="getBaseList(509)" ><a>责任人(供应商)</a></span>
+          <el-input v-model="detailData.responsiblePerson" :readonly="detailData.submitFlag === 'Y'" style="width: 224px"></el-input>
+<!--          <span v-if="detailData.submitFlag === 'Y'" slot="label">责任人</span>-->
+<!--          <span v-else style="cursor: pointer" slot="label" @click="getResponsiblePersonList"><a>责任人</a></span>-->
+<!--          <el-input v-model="detailData.responsiblePersonName" readonly style="width: 224px"></el-input>-->
         </el-form-item>
         <el-form-item :label="' '" style="margin-left: 20px">
           <el-button type="primary" icon="el-icon-upload" @click="subDetailUpload">明细导入</el-button>
@@ -2252,6 +2255,10 @@
             conSql = " and bu_no = '" + this.changeData.buNo + "'"
             this.$refs.baseList.init(val, strVal, conSql)
           }
+          if (val === 509) {
+            strVal = this.detailData.responsiblePerson
+            this.$refs.baseList.init(val, strVal)
+          }
         })
       },
 
@@ -2273,6 +2280,9 @@
           this.changeData.samplingLevelNo = val.sampling_level_no
           this.changeData.samplingLevelDesc = val.sampling_level_desc
         }
+        if (this.tagNo === 509) {
+          this.detailData.responsiblePerson = val.SupplierID
+        }
       },
 
       // 获取主信息数据列表

src/views/modules/qc/qcItem.vue

@@ -85,7 +85,7 @@
         fixed="right"
         header-align="center"
         align="center"
-        width="160"
+        width="120"
         label="操作">
         <template slot-scope="scope">
           <a v-if="!authUpdate" type="text" size="small" @click="updateModal(scope.row)">编辑</a>
@@ -108,41 +108,44 @@
     <el-dialog title="检验项目" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="BU" prop="bu" :rules="rules.bu">
-          <el-select v-model="modalData.bu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 456px">
+          <el-select v-model="modalData.bu" @change="changeBu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 143px">
             <el-option
               v-for = "i in userBuList"
               :key = "i.buNo"
               :label = "i.buNo"
               :value = "i.buNo">
-              <span style="float: left;width: 100px">{{ i.sitename }}</span>
-              <span style="float: right; color: #8492a6;white-space:nowrap;overflow:hidden;text-overflow:ellipsis; font-size: 11px;width: 60px">
-                {{ i.buDesc }}
-              </span>
+              <span style="float: center;width: 100px">{{ i.sitename }}</span>
+<!--              <span style="float: right; color: #8492a6;white-space:nowrap;overflow:hidden;text-overflow:ellipsis; font-size: 11px;width: 60px">-->
+<!--                {{ i.buDesc }}-->
+<!--              </span>-->
             </el-option>
           </el-select>
         </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 label="项目名称" prop="itemDesc" :rules="rules.itemDescType">
-          <el-input v-model="modalData.itemDesc" style="width: 143px"></el-input>
-        </el-form-item>
         <el-form-item label="检验值类型" prop="valueTypeDb" :rules="rules.valueTypeDbType">
           <el-select filterable v-model="modalData.valueTypeDb" style="width: 143px">
             <el-option label="文本" value="T"></el-option>
             <el-option label="数字" value="N"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="检验类型" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType">
-          <el-select v-model="modalData.inspectionTypeNo" placeholder="请选择" style="width: 143px">
+        <el-form-item label="项目类型" prop="typeNo" :rules="rules.typeNoType">
+          <el-select v-model="modalData.typeNo" placeholder="请选择" style="width: 143px">
             <el-option
-              v-for = "i in options"
-              :key = "i.inspectionTypeNo"
-              :label = "i.inspectionTypeName"
-              :value = "i.inspectionTypeNo">
+              v-for = "i in itemTypeList"
+              :key = "i.typeNo"
+              :label = "i.typeDesc"
+              :value = "i.typeNo">
             </el-option>
           </el-select>
         </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 label="项目编码" prop="itemNo" :rules="rules.itemNoType">
+          <el-input v-model="modalData.itemNo" :disabled="modalDisableFlag" style="width: 143px"></el-input>
+        </el-form-item>
+        <el-form-item label="项目名称" prop="itemDesc" :rules="rules.itemDescType">
+          <el-input v-model="modalData.itemDesc" style="width: 300px"></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 prop="methodNo" :rules="rules.methodNoType">
           <span slot="label" @click="queryMethodList"><a>检验方法编码</a></span>
@@ -199,6 +202,16 @@
         <el-form-item label="抽样比例%">
           <el-input v-model="modalData.defaultSamplingProportion" type="number" style="width: 143px"></el-input>
         </el-form-item>
+        <el-form-item label="检验类型" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType">
+          <el-select v-model="modalData.inspectionTypeNo" placeholder="请选择" style="width: 143px">
+            <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>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
         <el-button type="primary" @click="saveData()">保存</el-button>
@@ -273,7 +286,8 @@
     qcItemDelete, // 删除项目
     inspectionTypeSearch, // 查询检验类型
     queryMethodList, // 查询检验方法
-    getSiteAndBuByUserName
+    getSiteAndBuByUserName,
+    itemTypeSearch, // 检验项目类型
   } from "@/api/qc/qc.js"
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -351,7 +365,8 @@
           samplingLevelDesc: '',
           defaultSamplingProportion: '',
           defectLevelCode: '',
-          defectLevelDescription: ''
+          defectLevelDescription: '',
+          typeNo: ''
         },
         // 检验项目展示标头
         columnList: [
@@ -361,7 +376,6 @@
             serialNumber: '301002TableBuDesc',
             tableId: "301002Table",
             tableName: "检验项目维护表",
-            columnWidth: 100,
             columnProp: 'buDesc',
             headerAlign: 'center',
             align: "center",
@@ -372,6 +386,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 100,
           },
           {
             userId: this.$store.state.user.name,
@@ -379,7 +394,6 @@
             serialNumber: '301002TableItemNo',
             tableId: "301002Table",
             tableName: "检验项目维护表",
-            columnWidth: 99,
             columnProp: 'itemNo',
             headerAlign: 'center',
             align: "center",
@@ -390,6 +404,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 120,
           },
           {
             userId: this.$store.state.user.name,
@@ -397,10 +412,9 @@
             serialNumber: '301002TableItemDesc',
             tableId: "301002Table",
             tableName: "检验项目维护表",
-            columnWidth: 85,
             columnProp: 'itemDesc',
             headerAlign: 'center',
-            align: "center",
+            align: "left",
             columnLabel: '检验项目名称',
             columnHidden: false,
             columnImage: false,
@@ -408,6 +422,25 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 200,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301002,
+            serialNumber: '301002TableTypeDesc',
+            tableId: "301002Table",
+            tableName: "检验项目维护表",
+            columnProp: 'typeDesc',
+            headerAlign: 'center',
+            align: "center",
+            columnLabel: '项目类型',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
           },
           {
             userId: this.$store.state.user.name,
@@ -415,10 +448,9 @@
             serialNumber: '301002TableMethodName',
             tableId: "301002Table",
             tableName: "检验项目维护表",
-            columnWidth: 85,
             columnProp: 'methodName',
             headerAlign: 'center',
-            align: "center",
+            align: "left",
             columnLabel: '检验方法',
             columnHidden: false,
             columnImage: false,
@@ -426,6 +458,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 150,
           },
           {
             userId: this.$store.state.user.name,
@@ -433,10 +466,9 @@
             serialNumber: '301002TableMethodRemark',
             tableId: "301002Table",
             tableName: "检验项目维护表",
-            columnWidth: 85,
             columnProp: 'methodRemark',
             headerAlign: 'center',
-            align: "center",
+            align: "left",
             columnLabel: '检验方法说明',
             columnHidden: false,
             columnImage: false,
@@ -444,6 +476,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 200,
           },
           {
             userId: this.$store.state.user.name,
@@ -451,7 +484,6 @@
             serialNumber: '301002TableValueType',
             tableId: "301002Table",
             tableName: "检验项目维护表",
-            columnWidth: 85,
             columnProp: 'valueType',
             headerAlign: 'center',
             align: "center",
@@ -462,6 +494,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 100,
           },
           {
             userId: this.$store.state.user.name,
@@ -469,7 +502,6 @@
             serialNumber: '301002TableInspectionTypeName',
             tableId: "301002Table",
             tableName: "检验项目维护表",
-            columnWidth: 85,
             columnProp: 'inspectionTypeName',
             headerAlign: 'center',
             align: "center",
@@ -480,6 +512,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 100,
           },
           {
             userId: this.$store.state.user.name,
@@ -487,7 +520,6 @@
             serialNumber: '301002TableDefaultValue',
             tableId: "301002Table",
             tableName: "检验项目维护表",
-            columnWidth: 85,
             columnProp: 'defaultValue',
             headerAlign: 'center',
             align: "right",
@@ -498,6 +530,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 100,
           },
           {
             userId: this.$store.state.user.name,
@@ -505,7 +538,6 @@
             serialNumber: '301002TableMaxValue',
             tableId: "301002Table",
             tableName: "检验项目维护表",
-            columnWidth: 85,
             columnProp: 'maxValue',
             headerAlign: 'center',
             align: "right",
@@ -516,6 +548,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 100,
           },
           {
             userId: this.$store.state.user.name,
@@ -523,7 +556,6 @@
             serialNumber: '301002TableMinValue',
             tableId: "301002Table",
             tableName: "检验项目维护表",
-            columnWidth: 85,
             columnProp: 'minValue',
             headerAlign: 'center',
             align: "right",
@@ -534,6 +566,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 100,
           },
           {
             userId: this.$store.state.user.name,
@@ -541,10 +574,9 @@
             serialNumber: '301002TableSamplingProgrammeDesc',
             tableId: "301002Table",
             tableName: "检验项目维护表",
-            columnWidth: 85,
             columnProp: 'samplingProgrammeDesc',
             headerAlign: 'center',
-            align: "center",
+            align: "left",
             columnLabel: '抽样方案',
             columnHidden: false,
             columnImage: false,
@@ -552,6 +584,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 150,
           },
           {
             userId: this.$store.state.user.name,
@@ -559,10 +592,9 @@
             serialNumber: '301002TableSamplingLevelDesco',
             tableId: "301002Table",
             tableName: "检验项目维护表",
-            columnWidth: 85,
             columnProp: 'samplingLevelDesc',
             headerAlign: 'center',
-            align: "center",
+            align: "left",
             columnLabel: '检验水平',
             columnHidden: false,
             columnImage: false,
@@ -570,6 +602,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 150,
           },
           {
             userId: this.$store.state.user.name,
@@ -577,7 +610,6 @@
             serialNumber: '301002TableItemSamplingQuantity',
             tableId: "301002Table",
             tableName: "检验项目维护表",
-            columnWidth: 85,
             columnProp: 'itemSamplingQuantity',
             headerAlign: 'center',
             align: "right",
@@ -588,6 +620,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 100,
           },
           {
             userId: this.$store.state.user.name,
@@ -595,7 +628,6 @@
             serialNumber: '301002TableDefaultSamplingProportion',
             tableId: "301002Table",
             tableName: "检验项目维护表",
-            columnWidth: 85,
             columnProp: 'defaultSamplingProportion',
             headerAlign: 'center',
             align: "right",
@@ -606,6 +638,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 100,
           },
           {
             userId: this.$store.state.user.name,
@@ -613,7 +646,6 @@
             serialNumber: '301002TableCreatedDate',
             tableId: "301002Table",
             tableName: "检验项目维护表",
-            columnWidth: 85,
             columnProp: 'createdDate',
             headerAlign: 'center',
             align: "center",
@@ -624,6 +656,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 170,
           },
           {
             userId: this.$store.state.user.name,
@@ -631,7 +664,6 @@
             serialNumber: '301002TableCreatedBy',
             tableId: "301002Table",
             tableName: "检验项目维护表",
-            columnWidth: 85,
             columnProp: 'createdBy',
             headerAlign: 'center',
             align: "center",
@@ -642,6 +674,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 100,
           },
           {
             userId: this.$store.state.user.name,
@@ -649,7 +682,6 @@
             serialNumber: '301002TableUpdateDate',
             tableId: "301002Table",
             tableName: "检验项目维护表",
-            columnWidth: 85,
             columnProp: 'updateDate',
             headerAlign: 'center',
             align: "center",
@@ -660,6 +692,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 170,
           },
           {
             userId: this.$store.state.user.name,
@@ -667,7 +700,6 @@
             serialNumber: '301002TableUpdateBy',
             tableId: "301002Table",
             tableName: "检验项目维护表",
-            columnWidth: 85,
             columnProp: 'updateBy',
             headerAlign: 'center',
             align: "center",
@@ -678,9 +710,17 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 100,
           },
         ],
         rules: {
+          itemNoType:[
+            {
+              required: true,
+              message: ' ',
+              trigger: ['blur','change']
+            }
+          ],
           itemDescType:[
             {
               required: true,
@@ -695,6 +735,13 @@
               trigger: ['blur','change']
             }
           ],
+          typeNoType:[
+            {
+              required: true,
+              message: ' ',
+              trigger: ['blur','change']
+            }
+          ],
           methodNoType:[
             {
               required: true,
@@ -739,6 +786,7 @@
           ],
         },
         options: [],
+        itemTypeList:[],
         methodData: {
           site: '',
           bu: '',
@@ -900,6 +948,24 @@
         })
       },
 
+      // 查询项目类型
+      itemTypeSearch () {
+        let tempData = {
+          site: this.modalData.bu.split('_')[0],
+          buNo: this.modalData.bu.split('_')[1],
+        }
+        itemTypeSearch(tempData).then(({data}) => {
+          if (data.code === 0) {
+            this.itemTypeList = data.rows
+          }
+        })
+      },
+
+      // bu改变事件
+      changeBu () {
+        this.itemTypeSearch()
+      },
+
       // 列表方法的回调
       getBaseData (val) {
         if (this.tagNo === 1036) {
@@ -957,8 +1023,11 @@
           samplingLevelDesc: '',
           defaultSamplingProportion: '',
           defectLevelCode: '',
-          defectLevelDescription: ''
+          defectLevelDescription: '',
+          typeNo: ''
         }
+        // 获取检验项目类型
+        this.itemTypeSearch()
         this.modalDisableFlag = false
         this.modalFlag = true
       },
@@ -988,8 +1057,11 @@
           samplingLevelDesc: row.samplingLevelDesc,
           defaultSamplingProportion: row.defaultSamplingProportion,
           defectLevelCode: row.defectLevelCode,
-          defectLevelDescription: row.defectLevelDescription
+          defectLevelDescription: row.defectLevelDescription,
+          typeNo: row.typeNo
         }
+        // 获取检验项目类型
+        this.itemTypeSearch()
         this.modalDisableFlag = true
         this.modalFlag = true
       },
@@ -1025,14 +1097,22 @@
           this.$message.warning('请选择BU！')
           return
         }
-        if (this.modalData.itemDesc === '' || this.modalData.itemDesc == null) {
-          this.$message.warning('请输入检验项目名称！')
-          return
-        }
         if (this.modalData.valueTypeDb === '' || this.modalData.valueTypeDb == null) {
           this.$message.warning('请选择检验值类型！')
           return
         }
+        if (this.modalData.typeNo === '' || this.modalData.typeNo == null) {
+          this.$message.warning('请选项目类型！')
+          return
+        }
+        if (this.modalData.itemNo === '' || this.modalData.itemNo == null) {
+          this.$message.warning('请输入检验项目编码！')
+          return
+        }
+        if (this.modalData.itemDesc === '' || this.modalData.itemDesc == null) {
+          this.$message.warning('请输入检验项目名称！')
+          return
+        }
         if (this.modalData.inspectionTypeNo === '' || this.modalData.inspectionTypeNo == null) {
           this.$message.warning('请选择检验类型！')
           return