外协增加是否关单

pages/mes/prodReport/index.vue

@@ -31,7 +31,7 @@
         <view class="prod-body-left-task">
           <zb-table ref="zbtable" :columns="tableColumn" :stripe="true" rowKey="taskWorkunitId" :cellStyle="cellStyle"
             :isTrClassStyle="isTrClassStyle" @rowClick="rowClick" @toggleRowSelection="toggleRowSelection"
-            @toggleAllSelection="toggleAllSelection" :border="true" :data="tableData"></zb-table>
+            :border="true" :data="tableData"></zb-table>
         </view>
         <view class="prod-body-left-num">可选订单数：{{ tableData.length }}</view>
       </view>
@@ -277,12 +277,12 @@
                         {{ feedback.workorderCode }}
                       </u-form-item>
                     </u-col>
-                    <u-col span="4">
+                    <u-col span="3">
                       <u-form-item label="采购单号:" prop="quantity">
                         {{ feedback.assistProcessCode }}
                       </u-form-item>
                     </u-col>
-                    <u-col span="4">
+                    <u-col span="5">
                       <u-form-item label="工序:" prop="nickName">
                         {{ feedback.processName }}
                       </u-form-item>
@@ -432,6 +432,16 @@
                         </u-radio-group>
                       </view>
                     </u-form-item>
+                  </u-col>
+                  <u-col span="6"  v-if="isWaiXie">
+                    <u-form-item label="是否关单:" prop="whether">
+                      <view class="uni-list-item__extra">
+                        <u-radio-group v-model="feedback.closeType">
+                          <u-radio :name="1">是</u-radio>
+                          <u-radio :name="0">否</u-radio>
+                        </u-radio-group>
+                      </view>
+                    </u-form-item>
                   </u-col>
 				   <u-col span="6" v-if="!isWaiXie" v-show="!buttonShow || buttonShow.MaterialReturnView === '1'">
 				  				    <u-form-item label="退料:" prop="returnMa">
@@ -1278,7 +1288,7 @@ export default {
       ],
       tableColumn: [
         {
-          type: 'selection',
+          type: 'radio',
           width: 60
         },
         {
@@ -1581,7 +1591,7 @@ export default {
       if (this.isWaiXie) {
         this.tableColumn = [
           {
-            type: 'selection',
+            type: 'radio',
             width: 60
           },
           {
@@ -1636,7 +1646,7 @@ export default {
       } else {
         this.tableColumn = [
           {
-            type: 'selection',
+            type: 'radio',
             width: 60
           },
           {
@@ -2153,19 +2163,15 @@ export default {
       });
     },
     rowClick(row, index) {
-      this.$refs.zbtable.toggleRowSelection(row);
+      this.$refs.zbtable.handleRadio({target:{value: row.taskWorkunitId}});
       this.curTaskInfo = row;
     },
     getCode(row) {
       this.usePersonData = row;
       this.userTempVisible = true;
     },
-    toggleAllSelection(checked, arr) {
-      // console.log(arr, 'this.tableSelectData');
-      this.tableSelectData = arr;
-    },
     toggleRowSelection(checked, arr) {
-      // console.log(arr, 'this.tableSelectData');
+      console.log(arr, 'this.tableSelectData');
       this.tableSelectData = arr;
       
       if(this.tableSelectData.length > 0) {

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

@@ -137,7 +137,7 @@
                     </template>
                     <template v-else-if="ite.type === 'radio'">
                       <view class="checkbox-item">
-                        <radio :value="item[rowKey] + ''" />
+                        <radio :value="item[rowKey] + ''" :checked="selectArr && selectArr[0] && selectArr[0][rowKey] === item[rowKey]" />
                       </view>
                     </template>
                     <template v-else-if="ite.type === 'index'">