8

src/api/qc/qc.js

@@ -42,7 +42,6 @@ export const checkCompleted = data => createAPI(`/pms/qc/checkCompleted`,'post',
 export const selectModelByPartNo = data => createAPI(`/pms/qc/selectModelByPartNo`,'post',data)
 export const workOrderSearch = data => createAPI(`/pms/qc/workOrderSearch`,'post',data)
 export const selectInformationByWorkOrderNo = data => createAPI(`/pms/qc/selectInformationByWorkOrderNo`,'post',data)
-export const checkSubDetailValue = data => createAPI(`/pms/qc/checkSubDetailValue`,'post',data)
 
 // ===================================== 质检员信息 =====================================
 export const inspectorSearch = data => createAPI(`/pms/qc/inspectorSearch`,'post',data)
@@ -123,6 +122,7 @@ export const saveFAISubmitResult = data => createAPI(`/pms/qc/saveFAISubmitResul
 export const saveFAISubDetailed = data => createAPI(`/pms/qc/saveFAISubDetailed`,'post',data)
 export const selectFAISubDetailedRecord = data => createAPI(`/pms/qc/selectFAISubDetailedRecord`,'post',data)
 export const checkFAIIsSubmit = data => createAPI(`/pms/qc/checkFAIIsSubmit`,'post',data)
+export const checkFAISubDetailValue = data => createAPI(`/pms/qc/checkFAISubDetailValue`,'post',data)
 
 // ===================================== IPQC检验 =====================================
 export const qcIPQCInspectionSearch = data => createAPI(`/pms/qc/qcIPQCInspectionSearch`,'post',data)
@@ -132,6 +132,12 @@ export const saveIPQCDetailedRecord = data => createAPI(`/pms/qc/saveIPQCDetaile
 export const saveIPQCSubmitResult = data => createAPI(`/pms/qc/saveIPQCSubmitResult`,'post',data)
 export const saveIPQCSubDetailed = data => createAPI(`/pms/qc/saveIPQCSubDetailed`,'post',data)
 export const selectIPQCSubDetailedRecord = data => createAPI(`/pms/qc/selectIPQCSubDetailedRecord`,'post',data)
+export const checkIPQCIsSubmit = data => createAPI(`/pms/qc/checkIPQCIsSubmit`,'post',data)
+export const checkIPQCSubDetailValue = data => createAPI(`/pms/qc/checkIPQCSubDetailValue`,'post',data)
+export const getOperationList = data => createAPI(`/pms/qc/getOperationList`,'post',data)
+export const getResourceList = data => createAPI(`/pms/qc/getResourceList`,'post',data)
+export const getPartList = data => createAPI(`/pms/qc/getPartList`,'post',data)
+export const saveOsInspection = data => createAPI(`/pms/qc/saveOsInspection`,'post',data)
 
 
 

src/views/modules/qc/FAIResultEntry.vue

@@ -345,9 +345,8 @@
     saveFAISubmitResult, // 审核
     saveFAISubDetailed, // 新增子明细信息
     selectFAISubDetailedRecord, // 子明细记录信息查询
-
     checkFAIIsSubmit, // 检查是否已提交
-    checkSubDetailValue // 检查子明细中的实测值是否在规定范围
+    checkFAISubDetailValue // 检查子明细中的实测值是否在规定范围
   } from "@/api/qc/qc.js";
   import Chooselist from '@/views/modules/common/Chooselist_eam';
   import {getFileContentList} from '@/api/eam/eam_object_list.js';
@@ -1053,7 +1052,7 @@
             return false
           }
           if(this.detailList[i].valueTypeDb == 'N') {
-            checkSubDetailValue(this.detailList[i]).then(({data}) => {
+            checkFAISubDetailValue(this.detailList[i]).then(({data}) => {
               if (data.flag == 2 && this.detailList[i].itemResult == 'Y') {
                 this.$confirm(this.detailList[i].itemDesc + ' 中实测值不在合格范围！是否保存为合格？', '提示', {
                   confirmButtonText: '确定',

src/views/modules/qc/IPQCResultEntry.vue

@@ -26,6 +26,13 @@
           <el-option label="不合格" value="不合格"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="'检验类型'">
+        <el-select v-model="searchData.checkType" style="width: 100px">
+          <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-input v-model="searchData.orderNo" style="width: 120px"></el-input>
       </el-form-item>
@@ -44,6 +51,7 @@
       <el-form-item  :label="' '">
         <el-button @click="doEmpty()">清空</el-button>
         <el-button type="primary" @click="getDataList()">查询</el-button>
+        <el-button type="primary" @click="addModal()">新增</el-button>
         <download-excel
           :fields="fields()"
           :data="exportData"
@@ -109,6 +117,53 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
 
+    <!-- 新增巡检记录 -->
+    <el-dialog title="新增巡检记录"  :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item >
+          <span slot="label" style="" @click="getBaseList(1052)"><a herf="#">工单号</a></span>
+          <el-input v-model="modalData.orderNo" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="工序">
+          <el-select v-model="modalData.operationDesc" @change="getResourceList()" placeholder="请选择" style="width: 120px">
+            <el-option
+              v-for = "i in operationList"
+              :key = "i.operationNo"
+              :label = "i.operationDesc"
+              :value = "i.operationDesc">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="机台">
+          <el-select v-model="modalData.resourceId" placeholder="请选择" style="width: 120px">
+            <el-option
+              v-for = "i in resourceList"
+              :key = "i.resourceId"
+              :label = "i.resourceDesc"
+              :value = "i.resourceId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="物料">
+          <el-select v-model="modalData.partNo" placeholder="请选择" style="width: 255px">
+            <el-option
+              v-for = "i in partList"
+              :key = "i.partNo"
+              :label = "i.partDesc"
+              :value = "i.partNo">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="送检数量:">
+          <el-input v-model="modalData.rollQty" type="number" style="width: 120px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="saveData()">保存</el-button>
+        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
     <!-- 检验单详情页 -->
     <el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag :visible.sync="detailInformationFlag" width="1700px">
       <el-form :inline="true"  label-position="top" @keyup.enter.native = "getDataList()">
@@ -345,9 +400,12 @@
     saveIPQCSubmitResult, // 审核
     saveIPQCSubDetailed, // 新增子明细信息
     selectIPQCSubDetailedRecord, // 子明细记录信息查询
-
-    checkOutIsSubmit, // 检查是否已提交
-    checkSubDetailValue // 检查子明细中的实测值是否在规定范围
+    checkIPQCIsSubmit, // 检查是否已提交
+    checkIPQCSubDetailValue, // 检查子明细中的实测值是否在规定范围
+    getOperationList, // 查询工序列表
+    getResourceList, // 查询机台列表
+    getPartList, // 查询物料列表
+    saveOsInspection, // 新增巡检记录
   } from "@/api/qc/qc.js";
   import Chooselist from '@/views/modules/common/Chooselist_eam';
   import {getFileContentList} from '@/api/eam/eam_object_list.js';
@@ -373,8 +431,8 @@
         favorite: false,
         // 导出 start
         exportData: [],
-        exportName: "FAI检验录入" + this.dayjs().format('YYYYMMDDHHmmss'),
-        exportHeader: ["FAI检验录入"],
+        exportName: "IPQC检验录入" + this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader: ["IPQC检验录入"],
         exportFooter: [],
         exportList:[],
         // 导出 end
@@ -397,6 +455,7 @@
           operationDesc: '',
           startDate: '',
           endDate: '',
+          checkType: '',
           page: 1,
           limit: 10,
         },
@@ -414,11 +473,17 @@
           inspectionNo:'',
           partNo: '',
           partDesc: '',
-          inspectionTypeNo:'102',
-          inspectionTypeName:'FAI',
+          inspectionTypeNo:'101',
+          inspectionTypeName:'IPQC',
           inspectorNo:'',
           inspectorName:'',
           submit_flag:'',
+          orderNo: '',
+          operationDesc: '',
+          operationNo: '',
+          resourceId: '',
+          resourceDesc: '',
+          rollQty: '',
         },
         // 展示列集
         columnList: [
@@ -458,6 +523,18 @@
             status: true,
             fixed: '',
           },
+          {
+            columnProp: 'checkType',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '检验类型',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
           {
             columnProp: 'taskDate',
             headerAlign: "center",
@@ -854,6 +931,11 @@
           subDetailValues:[]
         },
         options: [],
+        modalDisableFlag: false,
+        modalFlag: false,
+        operationList: [],
+        resourceList: [],
+        partList: [],
       }
     },
     mounted () {
@@ -967,10 +1049,141 @@
           operationDesc: '',
           startDate: '',
           endDate: '',
+          checkType: '',
           page: 1,
           limit: 10,
         }
       },
+      // 获取基础数据列表S
+      getBaseList (val,type) {
+        this.tagNo = val
+        this.$nextTick(() => {
+          let strVal = ''
+          if (val === 1052) {
+            strVal = this.modalData.orderNo
+            this.$refs.baseList.init(val, strVal)
+          }
+        })
+      },
+      /* 列表方法的回调 */
+      getBaseData (val) {
+        if (this.tagNo === 1052) {
+          this.modalData.orderNo = val.orderno
+          this.getOperationList()
+          this.getPartList()
+        }
+      },
+      // 获取工序列表
+      getOperationList(){
+        getOperationList(this.modalData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.operationList = data.rows
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      // 获取机台列表
+      getResourceList(){
+        getResourceList(this.modalData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.resourceList = data.rows
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      // 获取物料列表
+      getPartList(){
+        getPartList(this.modalData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.partList = data.rows
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      addModal(){
+        this.modalData={
+          flag: '1',
+          site: this.$store.state.user.site,
+          inspectionNo:'',
+          partNo: '',
+          partDesc: '',
+          inspectionTypeNo:'101',
+          inspectionTypeName:'IPQC',
+          inspectorNo:'',
+          inspectorName:'',
+          submit_flag:'',
+          orderNo: '',
+          operationDesc: '',
+          operationNo: '',
+          resourceId: '',
+          resourceDesc: '',
+          rollQty: '',
+        };
+        this.modalDisableFlag = false;
+        this.modalFlag = true;
+      },
+      // 新增IPQC巡检记录
+      saveData(){
+        if (this.modalData.orderNo == '' || this.modalData.orderNo == null) {
+          this.$alert('请选择工单！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.modalData.partNo == '' || this.modalData.partNo == null) {
+          this.$alert('请选择物料！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.modalData.operationDesc == '' || this.modalData.operationDesc == null) {
+          this.$alert('请选择工序！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.modalData.resourceId == '' || this.modalData.resourceId == null) {
+          this.$alert('请选择机台！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.modalData.rollQty == '' || this.modalData.rollQty == null) {
+          this.$alert('请填写送检数量！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if(this.modalData.flag=='1'){
+          saveOsInspection(this.modalData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.getDataList()
+              this.modalFlag = false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }
+      },
+
       // 获取主信息数据列表
       getDataList () {
         this.searchData.limit = this.pageSize
@@ -1000,6 +1213,7 @@
       selectionChangeHandle (val) {
         this.dataListSelections = val
       },
+
       // 删除检验记录
       deleteModal (row) {
         this.$confirm(`是否删除这条检验记录?`, '提示', {
@@ -1053,7 +1267,7 @@
             return false
           }
           if(this.detailList[i].valueTypeDb == 'N') {
-            checkSubDetailValue(this.detailList[i]).then(({data}) => {
+            checkIPQCSubDetailValue(this.detailList[i]).then(({data}) => {
               if (data.flag == 2 && this.detailList[i].itemResult == 'Y') {
                 this.$confirm(this.detailList[i].itemDesc + ' 中实测值不在合格范围！是否保存为合格？', '提示', {
                   confirmButtonText: '确定',
@@ -1186,7 +1400,7 @@
       },
       //点击新增更多
       handleAddBtn(td) {
-        checkOutIsSubmit(td).then(({data}) => {
+        checkIPQCIsSubmit(td).then(({data}) => {
           if (data.flag != 1) {
             let obj = {};
             obj.subDetailValue = "";
@@ -1201,7 +1415,7 @@
       },
       //删除
       handleDeleteBtn(td) {
-        checkOutIsSubmit(td).then(({data}) => {
+        checkIPQCIsSubmit(td).then(({data}) => {
           if (data.flag != 1) {
             if (this.checkedDetail.length == 0) {
               this.$alert("请先选择要删除的数据", "提示", {

src/views/modules/qc/IQCResultEntry.vue

@@ -907,7 +907,7 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          qcInspectionInformationDelete(row).then(({data}) => {
+          faiRecordDelete(row).then(({data}) => {
             if (data && data.code ==0) {
               this.getDataList()
               this.$message({

src/views/modules/qc/qcFamilyAttribute.vue

@@ -677,6 +677,7 @@
         }
         if (this.tagNo === 1049) {
           this.tempPlanRow.samplingPlanNo = val.sampling_plan_no
+          this.tempPlanRow.samplingPlanDesc = val.sampling_plan_desc
         }
       },
       // 获取数据列表

src/views/modules/qc/qcSamplingInspectionProgramme.vue

@@ -243,7 +243,6 @@
     getPlanLists, // 获取矩阵列表
     saveSamplingProgrammeDetails, // 新增抽样方案中的矩阵
     deleteSamplingProgrammeDetails, // 删除抽样方案中的矩阵
-
   } from "@/api/qc/qc.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
   import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'

src/views/modules/qc/qcTemplate.vue

@@ -98,14 +98,11 @@
     </el-pagination>
 
     <!-- 检验模板新增/修改 -->
-    <el-dialog title="检验模板"  :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px">
+    <el-dialog title="检验模板"  :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="630px">
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="检验模板名称:">
           <el-input v-model="modalData.templateName"  style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item label="检验周期(h):">
-          <el-input v-model="modalData.inspectionCycle" type="number" style="width: 120px"></el-input>
-        </el-form-item>
         <el-form-item label="检验类型">
           <el-select v-model="modalData.inspectionTypeNo" placeholder="请选择" style="width: 120px">
             <el-option
@@ -117,6 +114,7 @@
           </el-select>
         </el-form-item>
       </el-form>
+
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item >
           <span slot="label" style="" @click="getBaseList(1051)"><a herf="#">抽样方案编码</a></span>
@@ -125,6 +123,9 @@
         <el-form-item label="抽样方案名称:">
           <el-input v-model="modalData.samplingProgrammeDesc" disabled style="width: 120px"></el-input>
         </el-form-item>
+      </el-form>
+
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item >
           <span slot="label" style="" @click="getBaseList(1048)"><a herf="#">检验水平编码</a></span>
           <el-input v-model="modalData.samplingLevelNo" style="width: 120px"></el-input>
@@ -133,6 +134,19 @@
           <el-input v-model="modalData.samplingLevelDesc" disabled style="width: 120px"></el-input>
         </el-form-item>
       </el-form>
+
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="检验周期(h):">
+          <el-input v-model="modalData.inspectionCycle" type="number" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="默认抽样数量:">
+          <el-input v-model="modalData.defaultSamplingQuantity" type="number" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="默认抽样比例:">
+          <el-input v-model="modalData.defaultSamplingProportion" type="number" style="width: 120px"></el-input>
+        </el-form-item>
+      </el-form>
+
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="AQL:">
           <el-input v-model="modalData.aql" style="width: 120px"></el-input>
@@ -417,6 +431,8 @@
           aql: '',
           ac: '',
           re: '',
+          defaultSamplingQuantity: '',
+          defaultSamplingProportion: '',
         },
         detailData:{
           site: this.$store.state.user.site,
@@ -912,6 +928,8 @@
           aql: row.aql,
           ac: row.ac,
           re: row.re,
+          defaultSamplingQuantity: row.defaultSamplingQuantity,
+          defaultSamplingProportion: row.defaultSamplingProportion
         };
         this.modalDisableFlag = true;
         this.modalFlag = true;
@@ -967,20 +985,14 @@
           })
           return false
         }
-        // if (this.modalData.aql == '' || this.modalData.aql == null) {
-        //   this.$alert('请输入AQL！', '错误', {
-        //     confirmButtonText: '确定'
-        //   })
-        //   return false
-        // }
-        // if (this.modalData.ac == '' || this.modalData.ac == null) {
-        //   this.$alert('请输入AC！', '错误', {
+        // if (this.modalData.defaultSamplingQuantity == '' || this.modalData.defaultSamplingQuantity == null) {
+        //   this.$alert('请输入默认抽样数量！', '错误', {
         //     confirmButtonText: '确定'
         //   })
         //   return false
         // }
-        // if (this.modalData.re == '' || this.modalData.re == null) {
-        //   this.$alert('请输入RE！', '错误', {
+        // if (this.modalData.defaultSamplingProportion == '' || this.modalData.defaultSamplingProportion == null) {
+        //   this.$alert('请输入默认抽样比例！', '错误', {
         //     confirmButtonText: '确定'
         //   })
         //   return false