Merge remote-tracking branch 'origin/master'

src/api/qc/qc.js

@@ -143,8 +143,9 @@ export const rollNoEnter = data => createAPI(`/pms/qc/rollNoEnter`,'post',data)
 export const boxNoEnter = data => createAPI(`/pms/qc/boxNoEnter`,'post',data)
 export const queryPartList = data => createAPI(`/pms/qc/queryPartList`,'post',data)
 export const umSearch = data => createAPI(`/pms/qc/umSearch`,'post',data)
-
 export const getShiftList = data => createAPI(`/pms/qc/getShiftList`,'post',data)
+export const batchSaveOsInspection = data => createAPI(`/pms/qc/batchSaveOsInspection`,'post',data)
+export const ipqcRecordOverLoad = data => createAPI(`/pms/qc/ipqcRecordOverLoad`,'post',data)
 
 // ===================================== IQC检验 =====================================
 export const qcIQCInspectionSearch = data => createAPI(`/pms/qc/qcIQCInspectionSearch`,'post',data)

src/views/modules/qc/DoInspectionBySeqNo.vue

@@ -75,6 +75,7 @@
       </el-form-item>
       <el-form-item :label="' '">
         <el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button>
+        <el-button v-if="!authDoInspection" type="primary" @click="batchDoInspectionModal()">批量生成检验任务</el-button>
       </el-form-item>
     </el-form>
 
@@ -85,7 +86,14 @@
       border
       :row-style="rowStyle"
       @row-click="clickRow"
+      @selection-change="selectionOrder"
       style="width: 100%;">
+      <el-table-column
+        type="selection"
+        header-align="center"
+        align="center"
+        width="50">
+      </el-table-column>
       <el-table-column
         v-for="(item,index) in columnList" :key="index"
         :sortable="item.columnSortable"
@@ -127,7 +135,7 @@
     <el-dialog title="新增检验记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
       <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="请选择" @change="buChange" style="width: 221px">
+          <el-select v-model="modalData.bu" placeholder="请选择" style="width: 221px">
             <el-option
               v-for = "i in userBuList"
               :key = "i.buNo"
@@ -152,14 +160,7 @@
       </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="operationDesc" :rules="rules.operationDescType">
-          <el-select v-model="modalData.operationDesc" placeholder="请选择" style="width: 221px">
-            <el-option
-              v-for = "i in operationList"
-              :key = "i.operationDesc"
-              :label = "i.operationDesc"
-              :value = "i.operationDesc">
-            </el-option>
-          </el-select>
+          <el-input v-model="modalData.operationDesc" readonly style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item>
           <span style="cursor: pointer" slot="label" @click="getBaseList(505)"><a herf="#">机台</a></span>
@@ -226,6 +227,55 @@
       </el-footer>
     </el-dialog>
 
+    <!-- 批量新增巡检记录 -->
+    <el-dialog title="新增检验记录" :close-on-click-modal="false" v-drag :visible.sync="batchModalFlag" width="495px">
+      <el-form :inline="true" label-position="top" :model="batchModalData" :rules="batchRules" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="BU" prop="bu">
+          <el-select v-model="batchModalData.bu" placeholder="请选择" style="width: 221px">
+            <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>
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="batchModalData" :rules="batchRules" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="检验类型" prop="inspectionTypeNo">
+          <el-select v-model="batchModalData.inspectionTypeNo" style="width: 104px">
+            <el-option label="首件检" value="首件检"></el-option>
+            <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-checkbox v-model="batchModalData.importantFlag" true-label="Y">重点检验</el-checkbox>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="batchModalData" :rules="batchRules" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item prop="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="batchModalData.templateName" readonly style="width: 221px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="batchModalData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="特殊要求">
+          <el-input type="textarea" v-model="batchModalData.specialRequirements" :rows="3" resize='none' show-word-limit style="width: 456px;height: 30px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 55px;text-align:center">
+        <el-button :loading="saveLoading" type="primary" @click="batchSaveData">保存</el-button>
+        <el-button type="primary" @click="batchModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
     <!-- 检验模板 -->
     <el-dialog title="检验模板清单" :close-on-click-modal="false" v-drag :visible.sync="templateModelFlag" width="520px">
       <div class="rq">
@@ -275,13 +325,13 @@
   import {
     getSiteAndBuByUserName, // 获取site、bu
     searchSeqInfo2, // 派工单号查询
-    getOperationList, // 查询工序列表
     umSearch, // 查询单位列表
     queryController, // 检查动控
     queryTemplateList, // 获取检验模板列表
     saveOsInspection, // 新增检验记录
     inspectionTypeSearch, // 搜索所有检验类型
     getShiftList, // 获取班次
+    batchSaveOsInspection, // 批量新增检验记录
   } from "@/api/qc/qc.js"
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
   import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
@@ -322,6 +372,7 @@
         height: 200,
         dataList: [],
         modalFlag: false,
+        batchModalFlag: false,
         modalDisableFlag: false,
         modalData: {
           flag: '',
@@ -356,78 +407,113 @@
           createBy: '',
           importantFlag: ''
         },
+        batchModalData: {
+          flag: '',
+          bu: '',
+          inspectionTypeNo: '',
+          inspectionTypeName: '',
+          specialRequirements: '',
+          templateId: '',
+          templateName: '',
+          createBy: '',
+          importantFlag: '',
+          submitList: []
+        },
         rules: {
           seqNoType: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           orderNoType: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           operationDescType: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           resourceIdType: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           rollQtyType: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           inspectionTypeNoType: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           partNoType: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           umIdType: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           templateId: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           bu:[
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ]
         },
+        batchRules: {
+          bu: [
+            {
+              required: true,
+              message: ' ',
+              trigger: ['blur','change']
+            }
+          ],
+          inspectionTypeNo: [
+            {
+              required: true,
+              message: ' ',
+              trigger: ['blur','change']
+            }
+          ],
+          templateId: [
+            {
+              required: true,
+              message: ' ',
+              trigger: ['blur','change']
+            }
+          ],
+        },
         templateData: {
           site: '',
           bu: '',
@@ -855,7 +941,6 @@
             fixed: '',
           },
         ],
-        operationList: [],
         userBuList: [],
         umList: [],
         templateList: [],
@@ -869,6 +954,7 @@
         typeOptions: [],
         currentRow: {},
         shiftList: [],
+        orderSelections: []
       }
     },
 
@@ -1033,7 +1119,6 @@
           createBy: this.$store.state.user.name,
           importantFlag: ''
         }
-        this.getOperationList()
         this.modalDisableFlag = false
         this.modalFlag = true
         this.checked = false
@@ -1081,7 +1166,6 @@
         saveOsInspection(this.modalData).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
-            this.operationList = []
             this.modalFlag = false
             // 跳转IPQC任务
             this.checkOutToIPQC(data.no)
@@ -1096,14 +1180,55 @@
         })
       },
 
-      // 获取工序列表
-      getOperationList () {
-        getOperationList(this.modalData).then(({data}) => {
+      // 生成检验任务
+      batchDoInspectionModal () {
+        if (this.orderSelections.length === 0) {
+          this.$message.warning('请勾选单据！')
+          return
+        }
+        if (!this.orderSelections.every(item => item.workCenterNo === this.orderSelections[0].workCenterNo)) {
+          this.$message.warning('所选单据的加工中心必须相同！')
+          return
+        }
+        this.batchModalData = {
+          flag: 'doInspection',
+          bu: this.userBuList[0].buNo,
+          inspectionTypeNo: '',
+          inspectionTypeName: '',
+          templateId: '',
+          templateName: '',
+          createBy: this.$store.state.user.name,
+          importantFlag: '',
+          specialRequirements: '',
+          submitList: []
+        }
+        this.batchModalFlag = true
+      },
+
+      // 批量新增IPQC巡检记录
+      batchSaveData () {
+        if (this.batchModalData.bu === '' || this.batchModalData.bu == null) {
+          this.$message.warning('请选择BU！')
+          return
+        }
+        if (this.controlData.baseData === '控制' && (this.batchModalData.templateId == null || this.batchModalData.templateId === '')) {
+          this.$message.warning('请选择检验模板！')
+          return
+        }
+        this.batchModalData.submitList = this.orderSelections
+        this.saveLoading = true
+        batchSaveOsInspection(this.batchModalData).then(({data}) => {
           if (data && data.code === 0) {
-            this.operationList = data.rows
+            this.getDataList()
+            this.batchModalFlag = false
           } else {
-            this.operationList = []
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
           }
+          this.saveLoading = false
+        }).catch(()=>{
+          this.saveLoading = false
         })
       },
 
@@ -1123,7 +1248,11 @@
 
       // 获取检验模板列表
       queryTemplateList () {
-        this.templateData.bu = this.modalData.bu
+        if (this.batchModalFlag) {
+          this.templateData.bu = this.batchModalData.bu
+        } else {
+          this.templateData.bu = this.modalData.bu
+        }
         // 查询所有检验模板
         queryTemplateList(this.templateData).then(({data}) => {
           if (data && data.code === 0) {
@@ -1135,10 +1264,20 @@
         })
       },
 
+      // 复选
+      selectionOrder (val) {
+        this.orderSelections = val
+      },
+
       // 选中检验模板
       getRowData (row) {
-        this.modalData.templateId = row.templateId
-        this.modalData.templateName = row.templateName
+        if (this.batchModalFlag) {
+          this.batchModalData.templateId = row.templateId
+          this.batchModalData.templateName = row.templateName
+        } else {
+          this.modalData.templateId = row.templateId
+          this.modalData.templateName = row.templateName
+        }
         this.templateModelFlag = false
       },
 

src/views/modules/qc/IPQCResultEntry.vue

@@ -112,6 +112,7 @@
         <el-button v-if="!authSave" type="primary" @click="addModal">新增</el-button>
         <el-button v-if="!authCheck" type="primary" @click="submitResult">审核</el-button>
         <el-button v-if="!authDelete" type="primary" @click="deleteModal">删除</el-button>
+        <el-button v-if="!authOverLoad" type="primary" :loading="overLoading" @click="overLoadModal">任务重载</el-button>
         <download-excel
           :fields="fields()"
           :data="exportData"
@@ -145,7 +146,6 @@
         type="selection"
         header-align="center"
         align="center"
-        :selectable="selectFlag"
         width="50">
       </el-table-column>
       <el-table-column
@@ -936,6 +936,7 @@
     dataAcquisition, // 数据采集
     boxNoEnter, // 箱号回车事件
     getShiftList, // 获取班次
+    ipqcRecordOverLoad, // 任务重载
   } from "@/api/qc/qc.js"
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -2184,70 +2185,70 @@
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           orderNoType: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           operationDescType: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           resourceIdType: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           rollQtyType: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           inspectionTypeNoType: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           partNoType: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           umIdType: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           templateId: [
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ],
           bu:[
             {
               required: true,
               message: ' ',
-              trigger: 'change'
+              trigger: ['blur','change']
             }
           ]
         },
@@ -2354,6 +2355,7 @@
         authDelete: false,
         authDetail: false,
         authFile: false,
+        authOverLoad: false,
         menuId: this.$route.meta.menuId,
         roleList: [],
         operatorList: [],
@@ -2429,7 +2431,8 @@
         currentRow: {},
         currentDetailRow: {},
         saveLoading: false,
-        searchLoading: false
+        searchLoading: false,
+        overLoading: false,
       }
     },
 
@@ -2917,10 +2920,6 @@
         })
       },
 
-      selectFlag () {
-        return true
-      },
-
       // 单机选中
       IPQCClickRow (row) {
         this.currentRow = JSON.parse(JSON.stringify(row))
@@ -3635,6 +3634,50 @@
         })
       },
 
+      // 任务重载
+      overLoadModal () {
+        if (this.IPQCSelections.length === 0) {
+          this.$message.warning('请勾选要重载的检验单！')
+          return
+        }
+        if (this.IPQCSelections.every(val => val.state === '待检验' || val.state === '未开始')) {
+          this.$confirm(`是否重载该 `+ this.IPQCSelections.length +` 条检验单?`, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            let tempData = {
+              site: '',
+              submitList: this.IPQCSelections
+            }
+            this.overLoading = true
+            ipqcRecordOverLoad(tempData).then(({data}) => {
+              if (data && data.code === 0) {
+                this.getDataList()
+                this.IPQCSelections = []
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {}
+                })
+                this.overLoading = false
+              } else {
+                this.overLoading = false
+                this.$alert(data.msg, '错误', {
+                  confirmButtonText: '确定'
+                })
+              }
+            }).catch(() => {
+              this.overLoading = false
+            })
+          })
+        } else {
+          this.$message.warning('检验单必须为待检验状态！')
+          return
+        }
+      },
+
       Transfer () {
         if (this.detailData.inspectionResult === '' || this.detailData.inspectionResult == null) {
           this.$message.warning('请选择检验结论！')