Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/api/mes/pro/feedback.js

@@ -35,6 +35,15 @@ export function addFeedback(data) {
   })
 }
 
+// 
+export function taskWorkunitInfo(data) {
+  return request({
+    url: '/mes/pro/workorder/taskWorkunitInfo',
+    method: 'post',
+    data: data
+  })
+}
+
 // 修改生产报工记录
 export function updateFeedback(data) {
   return request({

src/components/qcindexSelect/single.vue

@@ -24,6 +24,14 @@
           @keyup.enter.native="handleQuery"
         />
         </el-form-item>
+        <el-form-item label="检测项编码" prop="indexCode">
+        <el-input
+          v-model="queryParams.indexCode"
+          placeholder="请输入检测项编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+        </el-form-item>
         <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -170,7 +178,6 @@ export default {
     },
     // 单选选中数据
     handleRowChange(row) {
-      debugger;
       if(row){
         this.selectedRows = row;
       }

src/views/mes/pro/ItemTemplateMapping/index.vue

@@ -248,7 +248,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="模板" prop="templateId">
-              <el-select v-model="form.templateId" placeholder="请选择模板" style="width: 100%">
+              <el-select v-model="form.templateId" placeholder="请选择模板" style="width: 100%" @change="templateChange">
                 <el-option
                   v-for="item in templateOptions"
                   :key="item.id"
@@ -258,6 +258,15 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="模版图片" prop="filePath">
+              <ImagePreview
+                :src="form.filePath"
+                width="100px"
+                height="100px"
+              ></ImagePreview>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -341,6 +350,15 @@ export default {
     this.getList()
   },
   methods: {
+    templateChange(){
+      const item = this.templateOptions.find(v => v.id === this.form.templateId)
+      console.log('item', item)
+      if (item) {
+        this.form.filePath = item.filePath || ''
+      } else {
+        this.form.filePath = ''
+      }
+    },
     onItemSelected(obj) {
       if (obj != undefined && obj != null) {
         this.form.itemId = obj.itemId
@@ -402,7 +420,8 @@ export default {
         templateType: null,
         templateCode: null,
         templateId: null,
-        createBy: null
+        createBy: null,
+        filePath: ''
       }
       this.resetForm('form')
     },
@@ -448,6 +467,9 @@ export default {
       if(!row || !row.id) row = this.selectedRows[0]
       this.reset()
       this.form = row
+      this.$nextTick(() => {
+        this.templateChange()
+      })
       this.open = true
       this.title = '修改客户产品标签模板对照表'
     },

src/views/mes/pro/feedback/index.vue

@@ -91,6 +91,8 @@
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-query" @click="handleView(scope.row)"
             v-hasPermi="['mes:pro:feedback:query']">查看</el-button>
+          <el-button size="mini" type="text" @click="handleQrcode(scope.row)" v-if="!scope.row.isPackage"
+            v-hasPermi="['mes:pro:feedback:print']">补打</el-button>
           <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:pro:feedback:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -251,7 +253,7 @@
 </template>
 
 <script>
-import { listFeedback, getFeedback, delFeedback, addFeedback, updateFeedback, execute, listNextProcess } from "@/api/mes/pro/feedback";
+import { listFeedback, getFeedback, delFeedback, addFeedback, updateFeedback, execute, listNextProcess, taskWorkunitInfo } from "@/api/mes/pro/feedback";
 import WorkorderSelect from "@/components/workorderSelect/single.vue"
 import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
 import UserSingleSelect from "@/components/userSelect/single.vue"
@@ -550,34 +552,34 @@ export default {
     },
 
     /** 二维码打印 */
-    handleQrcode() {
+    async handleQrcode(row) {
       let workunitName = '';
       let detail = []
-      if(this.selectRow.some(v => v.qrcode!=null)){
-        this.$message.warning('该数据是包装工序的报工，不能打印二维码')
-        return
+      const res = await taskWorkunitInfo({
+        taskWorkunitId: row.taskWorkunitId
+      })
+      let operNo = 0
+      if(res.code === 200) {
+        operNo = res.data.operNo
       }
-      this.selectRow.forEach((s, i) => {
-        
-        listNextProcess({ taskId: s.taskId }).then(workunit => {
-          workunitName = workunit.data.workunitName;
-          detail.push({
-            "barcode": s.workorderCode,
-            "showText": '编排单号' + s.arrangeCode + '\n工单号' + s.workorderCode + '\n数量' + s.quantityQualify + '\n下道工序机台:' + workunitName,
-            "gp": i + 1
-          })
-          detail.push({
-            "barcode": s.workorderCode,
-            "showText": '编排单号' + s.arrangeCode + '\n工单号' + s.workorderCode + '\n数量' + s.quantityQualify + '\n下道工序机台:' + workunitName,
-            "gp": i + 1
-          })
-          postPrintPdf(
-            "qrcode-50*50-2",
-            {
-              detail
-            }
-          );
-        });
+      listNextProcess({ taskId: row.taskId }).then(workunit => {
+        workunitName = workunit.data.workunitName;
+        detail.push({
+          "barcode": row.workorderCode,
+          showText: '编排单号:'+row.arrangeCode+'\n报工次数:'+operNo+'\n数量:'+row.quantityQualify+'\n工单号:'+row.workorderCode+'\n下道工序机台:'+workunitName,
+          "gp": 1
+        })
+        detail.push({
+          "barcode": row.workorderCode,
+          showText: '编排单号:'+row.arrangeCode+'\n报工次数:'+operNo+'\n数量:'+row.quantityQualify+'\n工单号:'+row.workorderCode+'\n下道工序机台:'+workunitName,
+          "gp": 1
+        })
+        postPrintPdf(
+          "qrcode-50*50-2",
+          {
+            detail
+          }
+        );
       });
 
     },

src/views/mes/pro/request/index.vue

 <template>
   <div class="app-container">
     <el-form :model="queryParams" @submit.native.prevent ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      
+      <el-form-item label="物料编码" prop="sapItemCode">
+        <el-input v-model="queryParams.sapItemCode" placeholder="请输入物料编码" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item label="编排单号" prop="arrangeCode">
         <el-input v-model="queryParams.arrangeCode" placeholder="请输入编排单号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -100,6 +102,7 @@
           </el-button>
         </template>
       </el-table-column>
+      <el-table-column label="物料编码" align="center" prop="sapItemCode" width="100" />
       <el-table-column label="工作单元" align="center" prop="workunitName" width="100" />
       <el-table-column label="领料类型" align="center" prop="applyType">
         <template slot-scope="scope">
@@ -443,6 +446,7 @@ export default {
         workstationCode: null,
         workstationName: null,
         materialType: null,
+        sapItemCode: null,
         confirm: null,
         windCase: null,
         createBy: null,

src/views/mes/report/index.vue

@@ -145,6 +145,17 @@
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
+        <el-form-item label="模版图片" prop="filePath">
+          <ImageUpload
+            :limit="1"
+            :value="form.filePath"
+            fieldName="filePath"
+            :fileSize="5"
+            @onUploaded="handleImgUploaded"
+            @onRemoved="handleImgRemoved"
+          ></ImageUpload>
+          <img src="" alt="">
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -219,6 +230,14 @@ export default {
     this.getList();
   },
   methods: {
+    //图片上传成功
+    handleImgUploaded(imgUrl, obj) {
+      this.form[obj.$attrs.fieldName] = imgUrl;
+    },
+    //图片移除
+    handleImgRemoved(imgUrl, obj) {
+      this.form[obj.$attrs.fieldName] = null;
+    },
     /** 查询模版管理列表 */
     getList() {
       this.loading = true;
@@ -240,6 +259,7 @@ export default {
     reset() {
       this.form = {
         id: null,
+        filePath: null,
         name: null,
         content: null,
         createTime: null,

src/views/mes/tm/toolrequestuse/index.vue

@@ -16,6 +16,30 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="物料名称" prop="itemName">
+        <el-input
+          v-model="queryParams.itemName"
+          placeholder="请输入物料名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料编码" prop="sapItemCode">
+        <el-input
+          v-model="queryParams.sapItemCode"
+          placeholder="请输入物料编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="刀模SN" prop="toolCode">
+        <el-input
+          v-model="queryParams.toolCode"
+          placeholder="请输入刀模SN"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="申请时间">
         <el-date-picker v-model="daterangePurchaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
@@ -96,6 +120,7 @@
       <el-table-column
         label="领用单编码"
         align="center"
+        width="180"
         prop="toolRequestUseCode"
       />
       <!-- <el-table-column
@@ -103,8 +128,11 @@
         align="center"
         prop="toolRequestCode"
       /> -->
-      <el-table-column label="工序" align="center" prop="processName" />
-      <el-table-column label="作业单元" align="center" prop="workunitName" />
+      <el-table-column label="工序" align="center" prop="processName" width="180"/>
+      <el-table-column label="作业单元" align="center" prop="workunitName" width="180"/>
+      <el-table-column label="物料名称" align="center" prop="itemName" width="180"/>
+      <el-table-column label="物料编码" align="center" prop="sapItemCode" width="180"/>
+      <el-table-column label="刀模SN" align="center" prop="toolCode" width="180"/>
       <el-table-column
         label="申请时间"
         align="center"
@@ -421,6 +449,9 @@ export default {
         toolRequestId: null,
         processId: null,
         workunitId: null,
+        itemName: null,
+        sapItemCode: null,
+        toolCode: null,
         requestDate: null,
         startTime: null,
         endTime: null,