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

common/http.api.js

@@ -106,6 +106,9 @@ const install = (Vue, vm) => {
       //增加检验
       addIpqc: (params = {}) =>
         vm.$u.postJson(config.adminPath + '/mes/qc/ipqc', params),
+      //切换检验单状态
+      changeState: (params = {}) =>
+          vm.$u.postJson(config.adminPath + '/mes/qc/ipqc/changeState', params),
       //根据字典类型查询字典数据信息
       getDicts: (params = {}) =>
         vm.$u.get(config.adminPath + '/system/dict/data/type/' + params),

pages/mes/qc/index.vue

@@ -7,7 +7,14 @@
         </view>
         <view class="grid-text">检查通知</view>
       </view>
-      <view class="button-frame" v-for="qcType in dict.type.mes_ipqc_type" @click="addQC(qcType.value )">
+      <view class="button-frame" @click="addQC('SJQR')">
+        <view class="shortcut-icon icon-color01">
+          <image class="icon-button" src="/static/icons/png/pro.png"/>
+        </view>
+        <view class="grid-text">首检确认</view>
+      </view>
+      <view class="button-frame" v-for="qcType in dict.type.mes_ipqc_type" v-if="qcType.value !== 'FIRST'"
+            @click="addQC(qcType.value )">
         <view class="shortcut-icon icon-color01">
           <image class="icon-button" src="/static/icons/png/pro.png"/>
         </view>
@@ -209,6 +216,58 @@
     </u-modal>
 
 
+    <u-modal width="80%" v-model="qcFirstVisible" @close="getIpqcList" @cancel="getIpqcList" :showConfirmButton=false :showCancelButton="true" title="首检确认"
+             content="操作内容">
+      <uni-table style="min-height: 900rpx;">
+        <uni-tr>
+          <uni-th width="160px" align="center">检验单编号</uni-th>
+          <uni-th width="160px" align="center">检验单名称</uni-th>
+          <uni-th width="150px" align="center">检验类型</uni-th>
+          <uni-th width="150px" align="center">工单编号</uni-th>
+          <uni-th width="100px" align="center">产品物料编码</uni-th>
+          <uni-th width="110px" align="center">产品物料名称</uni-th>
+          <uni-th width="100px" align="center">规格型号</uni-th>
+          <uni-th width="100px" align="center">单位</uni-th>
+          <uni-th width="100px" align="center">检测数量</uni-th>
+          <uni-th width="100px" align="center">检测结果</uni-th>
+          <uni-th width="120px" align="center">检测日期</uni-th>
+          <uni-th width="100px" align="center">检测人员</uni-th>
+          <uni-th width="150px" align="center">单据状态</uni-th>
+          <uni-th width="150px" align="center">操作</uni-th>
+        </uni-tr>
+        <uni-tr v-for="(line,index) in qcFirstLines" :key="index">
+          <uni-td align="center">{{ line.ipqcCode }}</uni-td>
+          <uni-td align="center">{{ line.ipqcName }}</uni-td>
+          <uni-td align="center">
+            <dict-tag :options="dict.type.mes_ipqc_type" :value="line.ipqcType"/>
+          </uni-td>
+          <uni-td>{{ line.workorderCode }}</uni-td>
+          <uni-td align="center">{{ line.itemCode }}</uni-td>
+          <uni-td align="center">{{ line.itemName }}</uni-td>
+          <uni-td align="center">{{ line.specification }}</uni-td>
+          <uni-td align="center">{{ line.quantityCheck }}</uni-td>
+          <uni-td align="center">
+            <dict-tag :options="dict.type.mes_qc_result" :value="line.checkResult"/>
+          </uni-td>
+          <uni-td align="center">{{ line.unitOfMeasure }}</uni-td>
+
+          <uni-td align="center">{{ line.inspectDate }}</uni-td>
+          <uni-td align="center">{{ line.inspector }}</uni-td>
+          <uni-td align="center">
+            <dict-tag :options="dict.type.mes_order_status" :value="line.status"/>
+          </uni-td>
+          <uni-td>
+            <view class="uni-group">
+              <button class="uni-button" size="mini" type="primary" v-if="line.quantityCheck>=line.maxNum"
+                      @click="firstCONFIRMED(line)">确认
+              </button>
+            </view>
+          </uni-td>
+        </uni-tr>
+      </uni-table>
+    </u-modal>
+
+
     <u-modal width="760px" v-model="qcEditModalFlag" :showConfirmButton=false :showCancelButton="true"
              title="请填写出货检验单" content="操作内容">
       <u-form ref="qcEditForm" label-width="100px" :model="qcEditForm" :rules="qcEditRules">
@@ -298,7 +357,9 @@ export default {
       curQcType: '',
       defectrecordList: [],
       qcLineItem: {},
-      deffectModalFlag: false
+      deffectModalFlag: false,
+      qcFirstVisible: false,
+      qcFirstLines: []
     }
   },
   created() {
@@ -312,12 +373,24 @@ export default {
     this.getIpqcList()
   },
   methods: {
+    async firstCONFIRMED(item) {
+      const res = await this.$u.api.changeState({ipqcId: item.ipqcId, status: 'CONFIRMED'})
+      if (res.code === 200) {
+        this.getQcFirstLines();
+      }
+    },
     async getIpqcList() {
       const res = await this.$u.api.ipqcList({})
       if (res.code === 200) {
         this.qcList = res.rows;
       }
     },
+    async getQcFirstLines() {
+      const res = await this.$u.api.ipqcList({status: 'PREPARE'})
+      if (res.code === 200) {
+        this.qcFirstLines = res.rows;
+      }
+    },
     async searchTask(val) {
       const res = await this.$u.api.getTaskInfoByTaskCode({
         taskCode: val
@@ -399,6 +472,9 @@ export default {
       this.curQcType = type;
       if (type === 'QCMSG') {
         this.qcMsgVisible = true
+      } else if (type === 'SJQR') {
+        this.getQcFirstLines()
+        this.qcFirstVisible = true
       } else {
         this.qcModalFlag = true;
         // this.getTemplateLineList(type);