检验标准

src/api/qc/qc.js

@@ -83,6 +83,8 @@ export const uploadPartAttributeExcel = data => createAPI(`/pms/qc/uploadPartAtt
 export const getOperationDescList = data => createAPI(`/pms/qc/getOperationDescList`,'post',data)
 export const getManufacturerList = data => createAPI(`/pms/qc/getManufacturerList`,'post',data)
 export const getPartTemplateLists = data => createAPI(`/pms/qc/getPartTemplateLists`,'post',data)
+export const qcAttributeTemplateItemDetailsSearch = data => createAPI(`/pms/qc/qcAttributeTemplateItemDetailsSearch`,'post',data)
+export const qcAttributeTemplateItemSave = data => createAPI(`/pms/qc/qcAttributeTemplateItemSave`,'post',data)
 export const qcPartAttributeEdit = data => createAPI(`/pms/qc/qcPartAttributeEdit`,'post',data)
 export const overLoadSearchPartInfo = data => createAPI(`/pms/qc/overLoadSearchPartInfo`,'post',data)
 

src/api/sift/queryUserSetting.js

@@ -7,3 +7,8 @@ export const saveOrUpdateBatch = (data) => createAPI(`/sift/saveOrUpdateBatch`,'
 export const saveQueryHeaderDetail = (data) => createAPI(`/sift/saveRecord`,'post',data)
 export const removeQueryHeaderDetail = (data) => createAPI(`/sift/record/remove`,'post',data)
 export const updateQueryHeaderDetail = (data) => createAPI(`/sift/record/update`,'post',data)
+export const searchSavedSchemeSummary = (data) => createAPI(`/sift/center/summary`,'post',data)
+export const searchSavedSchemeCount = (data) => createAPI(`/sift/center/count`,'post',data)
+export const resolveSavedSchemeRoute = (data) => createAPI(`/sift/center/resolveRoute`,'post',data)
+export const searchCenterMenuSearchFields = (data) => createAPI(`/sift/center/menuSearchFields`,'post',data)
+export const saveCenterScheme = (data) => createAPI(`/sift/center/saveScheme`,'post',data)

src/views/modules/eam/eamProjectPartInfo.vue

@@ -96,7 +96,7 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="'ERP正式料号'">
-        <el-select v-model="searchData.finalPartNo" placeholder="请选择" clearable style="width: 130px">
+        <el-select v-model="searchData.finalPartNo" filterable placeholder="请选择" clearable style="width: 130px">
           <el-option
             v-for = "i in finalPartNosList"
             :key = "i.finalPartNoId"

src/views/modules/qc/PQCResultEntry.vue

@@ -891,7 +891,7 @@
     <el-dialog title="人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
       <div class="rq">
         <el-form :inline="true" label-position="top" :model="operatorData">
-          <el-form-item v-if="operatorData.flag !== '2'" :label="'所属角色'">
+          <el-form-item :label="'所属角色'">
             <el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px">
               <el-option
                 v-for = "i in roleList"
@@ -1167,6 +1167,7 @@ export default {
       eamObjectList:[],
       queryResourceData:[],
       partList2:[],
+      partList2CacheMap: {},
       // 是否收藏
       favorite: false,
       // 导出 start
@@ -1223,7 +1224,10 @@ export default {
       dataListSelections: [],
       partFlag: false,
       pdfDialogVisible: false,
-      partModalData:{},
+      partModalData: {
+        partNo: '',
+        partDesc: ''
+      },
       modalData: {
         flag: '',
         site: '',
@@ -2766,12 +2770,10 @@ export default {
       })
     },
 
-    // 获取协同人员列表
-    getOperatorList () {
-      this.operatorData.flag = '1'
-      this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo
+    // 默认所属角色（换线点检）
+    setDefaultLineInspectionRole () {
       if (this.roleList.length > 0) {
-        let filterList = this.roleList.filter(item => item.roleName === '机修人员')
+        let filterList = this.roleList.filter(item => item.roleName && item.roleName.indexOf('换线点检') > -1)
         if (filterList.length > 0) {
           this.operatorData.roleId = filterList[0].roleId
         } else {
@@ -2780,6 +2782,13 @@ export default {
       } else {
         this.operatorData.roleId = ''
       }
+    },
+
+    // 获取协同人员列表
+    getOperatorList () {
+      this.operatorData.flag = '1'
+      this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo
+      this.setDefaultLineInspectionRole()
       // 先清空缓存选中
       this.$nextTick(() => this.$refs.operatorTable.clearSelection())
       // 拿到选中的人员编号
@@ -2806,6 +2815,7 @@ export default {
     getResponsiblePersonList () {
       this.operatorData.flag = '2'
       this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo
+      this.setDefaultLineInspectionRole()
 
       // 先清空缓存选中
       this.$nextTick(() => this.$refs.operatorTable.clearSelection())
@@ -2934,6 +2944,42 @@ export default {
       }
     },
 
+    // 获取默认BU（优先RFID）
+    getDefaultBuNo () {
+      if (!this.userBuList || this.userBuList.length === 0) {
+        return ''
+      }
+      // 先精确匹配“RFID”，再模糊匹配，避免“软标&RFID”被误判
+      let exactRfidBu = this.userBuList.find(item => (item.buDesc || '').trim().toUpperCase() === 'RFID')
+      if (exactRfidBu) {
+        return exactRfidBu.buNo
+      }
+      let fuzzyRfidBu = this.userBuList.find(item => (item.buDesc || '').toUpperCase().indexOf('RFID') > -1)
+      return fuzzyRfidBu ? fuzzyRfidBu.buNo : this.userBuList[0].buNo
+    },
+
+    // 由前端bu值解析site和buNo
+    resolveSiteAndBuNoByBu (bu) {
+      if (!bu) {
+        return {
+          site: '',
+          buNo: ''
+        }
+      }
+      const buVal = String(bu)
+      if (buVal.indexOf('_') > -1) {
+        const buArr = buVal.split('_')
+        return {
+          site: buArr[0],
+          buNo: buArr[1] || ''
+        }
+      }
+      return {
+        site: this.$store.state.user.site,
+        buNo: buVal
+      }
+    },
+
     // 获取用户的bu
     getSiteAndBuByUserName () {
       let tempData = {
@@ -2942,6 +2988,9 @@ export default {
       getSiteAndBuByUserName(tempData).then(({data}) => {
         if (data.code === 0) {
           this.userBuList = data.rows
+          if (!this.modalData.bu) {
+            this.modalData.bu = this.getDefaultBuNo()
+          }
         }
       })
     },
@@ -3203,10 +3252,29 @@ export default {
       })
     },
     queryALLPartList(){
-      queryPartDescByNo(this.partModalData).then(({data})=>{
-        if (data.code==0){
-          this.partList2 = data.rows
       this.partFlag = true
+      const partNo = (this.partModalData.partNo || '').trim()
+      const partDesc = (this.partModalData.partDesc || '').trim()
+      const buInfo = this.resolveSiteAndBuNoByBu(this.modalData.bu)
+      if (!buInfo.site || !buInfo.buNo) {
+        this.$message.warning('请先选择BU！')
+        return
+      }
+      const queryData = {
+        site: buInfo.site,
+        sourceBu: buInfo.buNo,
+        partNo: partNo,
+        partDesc: partDesc
+      }
+      const cacheKey = `${queryData.site}|${queryData.sourceBu}|${queryData.partNo}|${queryData.partDesc}`
+      if (this.partList2CacheMap[cacheKey]) {
+        this.partList2 = this.partList2CacheMap[cacheKey]
+        return
+      }
+      queryPartDescByNo(queryData).then(({data})=>{
+        if (data.code==0){
+          this.partList2 = data.rows || []
+          this.partList2CacheMap[cacheKey] = this.partList2
         }else {
           this.$message.error("系统异常")
         }
@@ -3277,7 +3345,7 @@ export default {
       this.modalData = {
         flag: '1',
         site: '',
-        bu: this.userBuList[0].buNo,
+        bu: this.getDefaultBuNo(),
         inspectionNo: '',
         partNo: '',
         partDesc: '',
@@ -3541,7 +3609,7 @@ export default {
       this.modalData = {
         flag: '1',
         site: '',
-        bu: this.userBuList[0].buNo,
+        bu: this.getDefaultBuNo(),
         inspectionNo: '',
         partNo: '',
         partDesc: '',
@@ -3576,6 +3644,11 @@ export default {
         changePeople:[this.$store.state.user.name],
         sopType: 'SOP-ST',
       }
+      this.partModalData = {
+        partNo: '',
+        partDesc: ''
+      }
+      this.partList2 = []
       this.operationList = []
       this.resourceList = []
       this.partList = []

src/views/modules/qc/qcPartAttribute.vue

@@ -254,9 +254,10 @@
           fixed="right"
           header-align="center"
           align="center"
-          width="80"
+          width="150"
           label="操作">
           <template slot-scope="scope">
+            <a type="text" size="small" style="margin-right: 8px" @click="inspectionStandardListModal(scope.row)">检验标准</a>
             <a type="text" size="small" @click="deletePartAttributeDetails(scope.row)">删除模板</a>
           </template>
         </el-table-column>
@@ -268,6 +269,42 @@
       </el-footer>
     </el-dialog>
 
+    <!-- 物料模板检验标准 -->
+    <el-dialog title="检验标准清单" :close-on-click-modal="false" v-drag :visible.sync="inspectionStandardListFlag" width="1200px">
+      <el-form :inline="true" label-position="top">
+        <el-form-item label="物料编码">
+          <el-input v-model="standardHeader.attributeNo" readonly style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="物料名称">
+          <el-input v-model="standardHeader.partDesc" readonly style="width: 300px"></el-input>
+        </el-form-item>
+        <el-form-item label="模板编码">
+          <el-input v-model="standardHeader.templateId" readonly style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="检验类型">
+          <el-input v-model="standardHeader.inspectionTypeName" readonly style="width: 120px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-table :height="360" :data="standardList" border style="width: 100%;">
+        <el-table-column prop="itemNo" header-align="center" align="center" width="130" label="检验项目编码"></el-table-column>
+        <el-table-column prop="itemDesc" header-align="center" align="left" min-width="260" label="检验项目名称"></el-table-column>
+        <el-table-column prop="valueType" header-align="center" align="center" width="110" label="检测值类型"></el-table-column>
+        <el-table-column prop="" header-align="center" align="right" width="140" label="标准值">
+          <template slot-scope="scope"><el-input v-model="scope.row.defaultValue" style="width: 100%"></el-input></template>
+        </el-table-column>
+        <el-table-column prop="" header-align="center" align="right" width="120" label="最大值">
+          <template slot-scope="scope"><el-input v-model="scope.row.maxValue" style="width: 100%"></el-input></template>
+        </el-table-column>
+        <el-table-column prop="" header-align="center" align="right" width="120" label="最小值">
+          <template slot-scope="scope"><el-input v-model="scope.row.minValue" style="width: 100%"></el-input></template>
+        </el-table-column>
+      </el-table>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveStandardList()">保存</el-button>
+        <el-button type="primary" @click="inspectionStandardListFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
     <!-- 检验模板->快速新增（append-to-body 避免嵌套弹窗关闭后父弹窗表格不刷新/空白） -->
     <el-dialog title="新增" append-to-body @close="refreshDetailList" :close-on-click-modal="false" v-drag :visible.sync="fastAddFlag" width="1100px">
       <div style="font-size: 12px">
@@ -678,6 +715,8 @@
     deletePartAttributeDetails, // 删除物料属性模板
     saveAttributeDetailed, // 新增物料属性模板详情
     getPartTemplateLists, // 获取模板列表
+    qcAttributeTemplateItemDetailsSearch, // 查询物料模板检验标准明细
+    qcAttributeTemplateItemSave, // 保存物料模板检验标准明细
     inspectionTypeSearch, // 搜索所有检验类型
     getOperationDescList, // 查询工序列表
     getManufacturerList, // 查询供应商列表
@@ -1251,6 +1290,18 @@
         // 单选框绑定的值
         operationCurrent: -1,
         resourceCurrent: -1,
+        inspectionStandardListFlag: false,
+        standardHeader: {
+          site: '',
+          buNo: '',
+          attributeNo: '',
+          attributeType: 'A',
+          partDesc: '',
+          templateId: '',
+          inspectionTypeNo: '',
+          inspectionTypeName: ''
+        },
+        standardList: [],
         sopData: {
           site: '',
           buNo: '',
@@ -1685,6 +1736,7 @@
         this.detailData.buNo = row.buNo
         this.detailData.partNo = row.partNo
         this.detailData.attributeNo = row.partNo
+        this.detailData.attributeType = row.attributeType || 'A'
         this.detailData.partDesc = row.partDesc
         this.detailModelFlag = true
         this.loadTemplateDetailList()
@@ -1784,7 +1836,9 @@
           resourceID: this.resourceId,
           manufacturerList: this.selectionManufacturer,
           attributeType: this.detailData.attributeType,
-          inspectionTypeNo: this.detailData.inspectionTypeNo
+          inspectionTypeNo: this.detailData.inspectionTypeNo,
+          createBy: this.$store.state.user.name,
+          updateBy: this.$store.state.user.name
         }
         savePartAttributeDetails(inData).then(({data}) => {
           if (data && data.code === 0) {
@@ -1866,6 +1920,79 @@
         })
       },
 
+      // 物料模板检验标准弹窗
+      inspectionStandardListModal (row) {
+        this.standardHeader = {
+          site: row.site || this.detailData.site,
+          buNo: row.buNo || this.detailData.buNo,
+          attributeNo: this.detailData.partNo,
+          attributeType: this.detailData.attributeType || 'A',
+          partDesc: this.detailData.partDesc,
+          templateId: row.templateId,
+          inspectionTypeNo: row.inspectionTypeNo || '',
+          inspectionTypeName: row.inspectionTypeName || ''
+        }
+        let req = {
+          site: this.standardHeader.site,
+          buNo: this.standardHeader.buNo,
+          attributeNo: this.standardHeader.attributeNo,
+          templateId: this.standardHeader.templateId
+        }
+        qcAttributeTemplateItemDetailsSearch(req).then(({data}) => {
+          if (data && data.code === 0) {
+            this.standardList = data.rows || []
+            this.inspectionStandardListFlag = true
+          } else {
+            this.$alert(data.msg || '查询失败', '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+
+      // 保存物料模板检验标准
+      saveStandardList () {
+        if (!this.standardHeader.templateId) {
+          this.$message.warning('请先选择模板！')
+          return
+        }
+        if (this.standardList == null || this.standardList.length === 0) {
+          this.$message.warning('当前模板没有可保存的检验项目！')
+          return
+        }
+        let req = {
+          site: this.standardHeader.site,
+          buNo: this.standardHeader.buNo,
+          attributeNo: this.standardHeader.attributeNo,
+          attributeType: this.standardHeader.attributeType,
+          templateId: this.standardHeader.templateId,
+          createBy: this.$store.state.user.name,
+          updateBy: this.$store.state.user.name,
+          itemList: this.standardList.map(item => ({
+            itemNo: item.itemNo,
+            defaultValue: item.defaultValue,
+            maxValue: item.maxValue,
+            minValue: item.minValue,
+            orderId: item.orderId
+          }))
+        }
+        qcAttributeTemplateItemSave(req).then(({data}) => {
+          if (data && data.code === 0) {
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+            this.inspectionStandardListFlag = false
+          } else {
+            this.$alert(data.msg || '保存失败', '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+
       // 校验用户是否收藏
       favoriteIsOk () {
         let userFavorite = {