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

pages/mes/prodReport/index.vue

@@ -61,12 +61,10 @@
           <!--          </view>-->
         </view>
       </view>
-      <view class="prod-body-right">
+      <scroll-view class="prod-body-right" scroll-y>
         <view style="text-align: center;line-height: 80rpx;font-size: 28rpx;font-weight: 600;">
           {{ this.vuex_workunit == null ? '请选择工作单元' : this.vuex_workunit.workunitName }}
         </view>
-        <u-button type="primary" @click="changeWorkstation">切换工作单元</u-button>
-        <br/>
         <u-button type="warning" @click="commonClick('KnifeTemp')">刀模版上下机</u-button>
         <u-button type="primary" @click="commonClick('Refresh')">刷新</u-button>
         <u-button type="success" @click="commonClick('StartTask')">开始作业</u-button>
@@ -79,7 +77,7 @@
         <u-button type="primary" @click="commonClick('MaterialRequest')">领料申请</u-button>
         <u-button type="primary" @click="commonClick('MaterialReturn')">退料申请</u-button>
         <u-button type="success" @click="commonClick('StockIn')">完工入库申请</u-button>
-      </view>
+      </scroll-view>
     </view>
 
     <u-modal :title="title" @confirm="feedback()" show-cancel-button
@@ -512,22 +510,6 @@ export default {
                   type: 'selection',
                   width: 35
               },
-			  {
-			      name: 'status',
-			      label: '状态',
-			      filters: {
-			          // 'START': '生产中',
-			          // 'PAUSE': '暂停',
-			          // 'NORMARL': '未开始'
-			          'PREPARE': '未开工',
-			          'START': '已开工',
-			          'PAUSE': '暂停',
-			          'ERROR_STOP': '异常停工',
-			          'FINISHED': '完工'
-			      },
-			      width: 140,
-			      align: "center"
-			  },
               {
                   name: 'arrangeCode',
                   label: '编排单号',
@@ -548,23 +530,39 @@ export default {
               {
                   name: 'quantity',
                   label: '待加工数量',
-                  width: 80,
+                  width: 140,
+              },
+              {
+                  name: 'status',
+                  label: '状态',
+                  filters: {
+                      // 'START': '生产中',
+                      // 'PAUSE': '暂停',
+                      // 'NORMARL': '未开始'
+                      'PREPARE': '未开工',
+                      'BEGINNING': '已开工',
+                      'PAUSE': '暂停',
+                      'ERROR_STOP': '异常停工',
+                      'FINISH': '完工'
+                  },
+                  width: 60,
+                  align: "center"
               },
               // {
               //   name: 'date',
               //   label: '批号',
               //   width: 50,
               // },
-              // {
-              //     name: 'taskCode',
-              //     label: '任务单号',
-              //     width: 110,
-              // },
-              // {
-              //     name: 'workorderCode',
-              //     label: '生产单号',
-              //     width: 120,
-              // },
+              {
+                  name: 'taskCode',
+                  label: '任务单号',
+                  width: 110,
+              },
+              {
+                  name: 'workorderCode',
+                  label: '生产单号',
+                  width: 120,
+              },
               // {
               //   name: 'itemCode',
               //   label: '物料编号',
@@ -588,21 +586,21 @@ export default {
               {
                   name: 'quantityQuanlify',
                   label: '合格数量',
-                  width: 70,
+                  width: 60,
                   align: "center"
               },
               {
                   name: 'quantityUnquanlify',
                   label: '不合格数量',
-                  width: 70,
+                  width: 60,
+                  align: "center"
+              },
+              {
+                  name: 'clientName',
+                  label: '作业人员',
+                  width: 60,
                   align: "center"
               },
-              // {
-              //     name: 'clientName',
-              //     label: '作业人员',
-              //     width: 60,
-              //     align: "center"
-              // },
           ],
             dModelData: [],
             tableSelectData: [],
@@ -821,7 +819,7 @@ export default {
             this.knifeTempVisible = true
             return
         } else {
-		  return this.$u.toast('该任务不需刀模板上下机记录')
+		  return this.$u.toast('该刀模版具不属于该工单')
 	  }
         this.addDModelRecord(params)
     },
@@ -1071,23 +1069,31 @@ export default {
         }
         this.$u.api.feedback({
             taskId: item.taskId,
+            taskCode: item.taskCode,
             quantityFeedback: item.quantity,
             quantityQualified: item.quantityQualify,
             quantityUnquanlified: item.quantityUnqualify,
             userName: this.vuex_user.userName,
             feedbackType: item.feedbackType,
             routeId: item.routeId,
+            routeCode: item.routeCode,
             processId: item.processId,
+            processCode: item.processCode,
+            processName: item.processName,
             itemId: item.itemId,
             itemCode: item.itemCode,
-          itemName: item.itemName
+            itemName: item.itemName,
+            workstationId: item.workstationId,
+            workstationCode: item.workstationCode,
+            workstationName: item.workstationName,
+            startTime: item.startTime
         }).then(res => {
           if (res.code === 200) {
             this.$u.toast('上报成功');
+            this.getTaskList()
           }
         });
       })
-      this.getTaskList()
       this.open = false;
     },
     feedingInspectionShow(){

pages/mes/qc/index.vue

@@ -7,9 +7,9 @@
         </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" 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" />
+          <image class="icon-button" src="/static/icons/png/pro.png"/>
         </view>
         <view class="grid-text">{{ qcType.label }}</view>
       </view>
@@ -61,7 +61,8 @@
             </uni-td>
             <uni-td>
               <view class="uni-group">
-                <button class="uni-button" size="mini" type="primary" @click="qcLineClick(line)">编辑
+                <button class="uni-button" size="mini" type="primary" v-if="line.quantityCheck>=line.maxNum"
+                        @click="qcLineClick(line)">查看编辑
                 </button>
               </view>
             </uni-td>
@@ -74,8 +75,7 @@
       </view>
     </view>
 
-    <u-modal width="90%" v-model="qcModalFlag" :showConfirmButton=true :showCancelButton="true"
-             title="请填写检验单"
+    <u-modal width="90%" v-model="qcModalFlag" :showConfirmButton=true :showCancelButton="true" title="请填写检验单"
              content="操作内容">
       <u-form ref="qcForm" label-width="70px">
         <u-row>
@@ -121,8 +121,8 @@
           <u-col span="12">
             <u-form-item label="检测人员" prop="inspector">
               <!--                <u-input v-model="qcForm.inspector"></u-input>-->
-              <zxz-uni-data-select v-model="qcForm.inspector" filterable multiple dataKey="label" dataValue="value"
-                                   :localdata="qcUserList" @change="change"></zxz-uni-data-select>
+              <zxz-uni-data-select v-model="qcForm.inspector" filterable multiple dataKey="label"
+                                   dataValue="value" :localdata="qcUserList" @change="change"></zxz-uni-data-select>
             </u-form-item>
           </u-col>
         </u-row>
@@ -139,8 +139,7 @@
       </u-form>
       <scroll-view scroll-y="true" scroll-x="true" class="line-list">
         <view class="line-content">
-          <uni-table ref="qcLineTable" class="line-table" border stripe :loading="loading"
-                     emptyText="未查询到数据">
+          <uni-table ref="qcLineTable" class="line-table" border stripe :loading="loading" emptyText="未查询到数据">
             <uni-tr>
               <uni-th width="160px" align="center">检测项名称</uni-th>
               <uni-th width="150px" align="center">检测工具</uni-th>
@@ -167,7 +166,8 @@
               <uni-td align="center">{{ line.minQuantity }}</uni-td>
               <uni-td>
                 <view class="uni-group">
-                  <button class="uni-button" size="mini" type="primary" @click="qcLineItemClick(line)">缺陷登记
+                  <button class="uni-button" size="mini" type="primary"
+                          @click="qcLineItemClick(line)">缺陷登记
                   </button>
                 </view>
               </uni-td>
@@ -177,8 +177,8 @@
       </scroll-view>
     </u-modal>
 
-    <u-modal width="80%" v-model="qcMsgVisible" :showConfirmButton=false :showCancelButton="true"
-             title="检验通知" content="操作内容">
+    <u-modal width="80%" v-model="qcMsgVisible" :showConfirmButton=false :showCancelButton="true" title="检验通知"
+             content="操作内容">
       <uni-table class="line-table" border stripe :loading="loading" emptyText="未查询到数据">
         <uni-tr>
           <uni-th width="60px" align="center">单号</uni-th>
@@ -217,9 +217,7 @@
     </u-modal>
 
     <u-modal width="80%" v-model="deffectModalFlag" @confirm="subQcdeffect" @cancel="getTemplateLineList"
-             confirm-text="提交"
-             :showConfirmButton=true :showCancelButton=true
-             title="缺陷登记">
+             confirm-text="提交" :showConfirmButton=true :showCancelButton=true title="缺陷登记">
       <u-button @click="addQcdeffect">新增</u-button>
       <uni-card v-for="item in defectrecordList">
         <u-form label-width="100px">
@@ -237,7 +235,8 @@
             <u-col>
               <u-form-item label="缺陷等级">
                 <u-radio-group v-model="item.defectLevel">
-                  <u-radio :name="item.value" v-for="item in dict.type.mes_defect_level" v-key="item.value">
+                  <u-radio :name="item.value" v-for="item in dict.type.mes_defect_level"
+                           v-key="item.value">
                     {{ item.label }}
                   </u-radio>
                 </u-radio-group>
@@ -251,12 +250,13 @@
 </template>
 
 <script>
-
 import SearchInput from "@/components/ScanInput/index.vue";
 
 export default {
   name: "QcContent",
-  components: {SearchInput},
+  components: {
+    SearchInput
+  },
   dicts: ['mes_ipqc_type', 'mes_qc_result', 'mes_order_status', 'mes_defect_level'],
   data() {
     return {
@@ -281,8 +281,7 @@ export default {
       qcMsgVisible: false,
       //所有检测单的列表
       qcList: [],
-      qcUserList: [
-        {
+      qcUserList: [{
         value: 0,
         label: 'admin'
       }, {
@@ -294,8 +293,7 @@ export default {
       }, {
         value: 3,
         label: '王五'
-        }
-      ],
+      }],
       taskInfo: {},
       curQcType: '',
       defectrecordList: [],
@@ -321,7 +319,9 @@ export default {
       }
     },
     async searchTask(val) {
-      const res = await this.$u.api.getTaskInfoByTaskCode({taskCode: val})
+      const res = await this.$u.api.getTaskInfoByTaskCode({
+        taskCode: val
+      })
       if (res.code === 200) {
         if (!res.data) {
           this.$u.toast('暂未查询到任务订单信息！');