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

pages/index/index.vue

 <template>
   <view class="common-container">
+    <!-- <u-button @click="handleTest">跳转测试</u-button> -->
     <view class="header">
-      <image mode="widthFix" class="header-logo" style="width: 110px;margin: 10px auto;display: block;"
+      <image mode="widthFix" class="header-logo" style="width: 100px;margin: 10px auto;display: block;"
              src="/static/logo.png"></image>
       <TabHeader></TabHeader>
       <view class="setting-body"
@@ -55,6 +56,7 @@
   import QcContent from "../mes/qc/index.vue"
   import ProdReport from "../mes/prodReport/index.vue"
   import DictData from '@/components/DictData'
+  import UButton from '../../uview-ui/components/u-button/u-button.vue'
 
   export default {
     name: 'HomePage',
@@ -63,7 +65,8 @@
       ProContent,
       GxContent,
       QcContent,
-      ProdReport
+      ProdReport,
+        UButton
     },
     data() {
       return {
@@ -97,6 +100,11 @@
       uni.$off('changeWorkunit');
     },
     methods: {
+      handleTest() {
+        uni.navigateTo({
+          url:'/pages/test/test'
+        })
+      },
       //用户部分点击
       handleUserTaped() {
         console.log("TAPED")
@@ -198,7 +206,7 @@
   }
 
   .header {
-    width: 120px;
+    width: 110px;
     background-color: #132138;
     color: aliceblue;
     font-size: 25px;

pages/mes/prodReport/components/dModelList.vue

@@ -56,11 +56,11 @@
 					},
 				],
 			}
-		},
-		computed: {
-			tableData() {
-				return this.data || []
-			}
+		},
+		computed: {
+			tableData() {
+				return this.data || []
+			}
 		},
 		methods: {
 			async commonClick(type) {
@@ -81,16 +81,18 @@
 					if (!flag) {
 						return this.$u.toast('请选择状态相同的数据')
 					}
-				}
-				
-				const params = {
-					toolMachinesRecordIdList: this.tableSelectData.map(v => v.toolMachinesRecordId),
-					type
-				}
-				const {code} = await this.$u.api.dModel.tmToolMachinesRecord(params)
-				if (code == 200) {
-					this.$emit('action')
-				}
+				}
+				
+				const params = this.tableSelectData.map(v => {
+					 return {
+						 toolMachinesId: v.toolMachinesId,
+						 type
+					 }
+				})
+				const {code} = await this.$u.api.dModel.tmToolMachinesRecord(params)
+				if (code == 200) {
+					this.$emit('action')
+				}
 				
 			},
 			toggleAllSelection(checked, arr) {
@@ -109,4 +111,4 @@
 		margin-top: 20rpx;
 		padding: 0 20rpx;
 	}
-</style>
+</style>

pages/mes/prodReport/index.vue

@@ -16,10 +16,11 @@
 
         <view class="prod-body-left-task">
           <zb-table
+            ref="zbtable"
             :columns="tableColumn"
             :stripe="true"
+            rowKey="taskWorkunitId"
             @rowClick="rowClick"
-            @cellClick="cellClick"
             @toggleRowSelection="toggleRowSelection"
             @toggleAllSelection="toggleAllSelection"
             :border="true"
@@ -697,19 +698,22 @@ export default {
       tableColumn: [
         {
           type: 'selection',
-          width: 35
+          width: 80
         },
         {
           name: 'arrangeCode',
           label: '编排单号',
-          width: 140,
-          func: 'numclik'
+          width: 200,
+          cellFun: (row, index) => {
+            console.log(row, index)
+            this.tableDataDetail = row.proWorkorderList;
+            this.showRowDeatilFlag = true;
+          }
         },
         {
           name: 'startTime',
           label: '计划开始时间',
           width: 140,
-          func: 'numclik'
         },
         {
           name: 'endTime',
@@ -737,7 +741,7 @@ export default {
             ERROR_STOP: '异常停工',
             FINISH: '完工'
           },
-          width: 60,
+          width: 100,
           align: 'center'
         },
         // {
@@ -748,14 +752,14 @@ export default {
         {
           name: 'taskCode',
           label: '任务单号',
-          width: 110
-        },
-        {
-          name: 'workorderCode',
-          label: '生产单号',
-          width: 120
+          width: 180
         },
         // {
+        //   name: 'workorderCode',
+        //   label: '生产单号',
+        //   width: 120
+        // },
+        // {
         //   name: 'itemCode',
         //   label: '物料编号',
         //   width: 110,
@@ -770,7 +774,7 @@ export default {
           width: 60
         },
         {
-          name: 'quantityQuanlify',
+          name: 'quantityQualify',
           label: '合格数量',
           width: 80,
           align: 'center'
@@ -781,12 +785,12 @@ export default {
           width: 80,
           align: 'center'
         },
-        {
-          name: 'clientName',
-          label: '作业人员',
-          width: 60,
-          align: 'center'
-        }
+        // {
+        //   name: 'clientName',
+        //   label: '作业人员',
+        //   width: 60,
+        //   align: 'center'
+        // }
       ],
       dModelData: [],
       tableSelectData: [],
@@ -944,12 +948,14 @@ export default {
         urls: this.viewSop
       });
     },
-    cellClick(row, index, column) {
-      if (column.name === 'arrangeCode') {
-        this.tableDataDetail = row.proWorkorderList;
-        this.showRowDeatilFlag = true;
-      }
-    },
+    // cellClick(row, index, column) {
+    //   if (column.name === 'arrangeCode') {
+    //     this.tableDataDetail = row.proWorkorderList;
+    //     this.showRowDeatilFlag = true;
+    //     console.log(e)
+    //     e.stopPropagation()
+    //   }
+    // },
     numclik(...arg) {
       console.log('99999999', arg);
     },
@@ -1067,6 +1073,7 @@ export default {
           workunitName: this.vuex_workunit.workunitName,
           processId: selectData.processId,
           taskId: selectData.taskId,
+          taskWorkunitId: selectData.taskWorkunitId,
           workorderId: selectData.workorderId,
           toolRequestUseId: data[0].toolRequestUseId,
           toolMachinesRecordList: data.map((v) => {
@@ -1096,14 +1103,16 @@ export default {
       });
     },
     rowClick(row, index) {
+      this.$refs.zbtable.toggleRowSelection(row)
       this.curTaskInfo = row;
       this.getMaterialUsageRecordList();
     },
     toggleAllSelection(checked, arr) {
+      // console.log(arr, 'this.tableSelectData');
       this.tableSelectData = arr;
     },
     toggleRowSelection(checked, arr) {
-      console.log(this.tableSelectData, 'this.tableSelectData');
+      // console.log(arr, 'this.tableSelectData');
       this.tableSelectData = arr;
     },
     knifeTemp() {
@@ -1292,6 +1301,8 @@ export default {
       // this.reset();
       this.feedbackForms = [];
       this.tableSelectData.forEach((item) => {
+        let tempQualify = item.quantity-item.quantityQualify<0?0:item.quantity-item.quantityQualify;
+        tempQualify = tempQualify>item.quantityWait?item.quantityWait:tempQualify;
         const feedback = {
           ...item,
           workstationId: item.workstationId,
@@ -1300,7 +1311,7 @@ export default {
           taskWorkunitId: item.taskWorkunitId,
           feedbackChannel: 'PAD',
           quantity: item.quantity,
-          quantityQualify: item.quantity-item.quantityQuanlify-item.quantityUnquanlify,//默认为排产数量-合格数-不合格数
+          quantityQualify: tempQualify,//默认为排产数量-合格数
           quantityUnqualify: 0,
           printName: false,
           nickName: this.vuex_user.nicfeedbackkName,
@@ -1358,8 +1369,8 @@ export default {
             taskId: item.taskId,
             taskCode: item.taskCode,
             quantityFeedback: item.quantityQualify+item.quantityUnqualify,
-            quantityQualified: item.quantityQualify,
-            quantityUnquanlified: item.quantityUnqualify,
+            quantityQualify: item.quantityQualify,
+            quantityUnqualify: item.quantityUnqualify,
             userName: this.vuex_user.userName,
             feedbackType: item.feedbackType,
             routeId: item.routeId,
@@ -1411,9 +1422,10 @@ export default {
     },
     feedingInspectionScan() {
       const t = this;
+      const taskInfo = this.tableSelectData[0];
       uni.scanCode({
         success: function (res) {
-          t.$u.api.validateFeedingInspection({ plnr: res.result }).then((res2) => {
+          t.$u.api.validateFeedingInspection({ plnr: res.result,taskId: taskInfo.taskId }).then((res2) => {
             if (res2.code === 200) {
               t.feedingInspectionLoadAndScan(true);
             }

pages/sys/login/login.vue

 <template>
 	<view class="login">
 		<u-form ref="loginForm" :modelValue="loginForm" :rules="loginRules" class="login-form">
-		  <h3 class="title">MES-PAD</h3>
+		  <h3 class="title">MES作业端</h3>
 		  <u-form-item prop="username">
 		    <input
 		      v-model="loginForm.username"

uni_modules/zb-table/components/zb-table/zb-table.vue

@@ -140,6 +140,11 @@
                       <text v-else>{{ ite.emptyString }}</text>
                     </view>
                   </template>
+                  <template v-else-if="ite.cellFun">
+                    <view @click.stop="ite.cellFun(item,index)" class="cellfunction">
+                      <text>{{ ite.filters ? itemFilter(item, ite) : formatterAction(item, ite, index, i) }}</text>
+                    </view>
+                  </template>
                   <template v-else>
                     <!--                      {{ ite.filters?itemFilter(item,ite):(item[ite.name]==null||item[ite.name]==='')?ite.emptyString:item[ite.name] }}-->
                     {{ ite.filters ? itemFilter(item, ite) : formatterAction(item, ite, index, i) }}
@@ -796,6 +801,30 @@ export default {
     cellClick(row, index, column) {
       this.$emit('cellClick', row, index, column)
     },
+    toggleRowSelection(row) {
+      const items = this.selectArr.find(v => v[this.rowKey] === row[this.rowKey])
+      if (items&&Object.keys(items).length > 0) {
+        this.data.forEach(item => {
+          if (item[this.rowKey] === row[this.rowKey]) {
+            this.$set(item, 'checked', false)
+          }
+        })
+        this.selectArr.forEach((item, index) => {
+          if (item[this.rowKey] === row[this.rowKey]) {
+            this.selectArr.splice(index, 1)
+          }
+        });
+        this.$emit('toggleRowSelection', false, this.selectArr)
+      } else {
+        this.data.forEach(item => {
+          if (item[this.rowKey] === row[this.rowKey]) {
+            this.$set(item, 'checked', true)
+            this.selectArr.push(item)
+          }
+        })
+        this.$emit('toggleRowSelection', true, this.selectArr)
+      }
+    },
     rowClick(row, index) {
       if (this.highlight) {
         this.currentRowIndex = index
@@ -1352,6 +1381,9 @@ export default {
     //height: 100%;
     width: 100%;
   }
+  .cellfunction{
+    text-align: left;
+  }
 
   .even {
     background-color: white;