Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt

src/BIZComponents/inventoryTableDetails.vue

@@ -57,7 +57,7 @@
           :prop="'datasource.' + scope.$index + '.' + countObj.countKey"
         >
           {{ scope.row[countObj.countKey] }}
-          {{ scope.row[countObj.unitKey] }}
+          {{ scope.row[countObj.unitKey] || '' }}
         </el-form-item>
       </template>
       <!-- <template v-slot:saleUnit="scope">
@@ -392,7 +392,7 @@
             headerSlot: 'headerTotalCount',
             formatter: (row, column) => {
               if (row.totalCount) {
-                return row.totalCount + ' ' + row.measuringUnit;
+                return row.totalCount + ' ' + (row.measuringUnit || '');
               }
             },
             align: 'center'
@@ -406,7 +406,7 @@
             headerSlot: 'headerSingleWeight',
             formatter: (row, column) => {
               if (row.singleWeight) {
-                return row.singleWeight + ' ' + row.weightUnit;
+                return row.singleWeight + ' ' + (row.weightUnit || '');
               }
             },
             align: 'center'
@@ -418,7 +418,7 @@
             slot: 'totalWeight',
             formatter: (row, column) => {
               if (row.totalWeight) {
-                return row.totalWeight + ' ' + row.weightUnit;
+                return row.totalWeight + ' ' + (row.weightUnit || '');
               }
             },
             align: 'center'

src/views/bpm/handleTask/components/entrust/create.vue

@@ -171,11 +171,13 @@
         height="40vh"
       >
         <template v-slot:totalCount="{ row }">
-          <el-input v-model="row.totalCount"> </el-input>
+          <el-input v-model="row.totalCount" disabled>
+            <template slot="append">{{ row.measuringUnit }}</template>
+          </el-input>
         </template>
 
         <template v-slot:describes="{ row }">
-          <el-input v-model="row.describes"> </el-input>
+          <el-input v-model="row.describes" disabled> </el-input>
         </template>
 
         <template v-slot:taskId="{ row, $index }">
@@ -186,6 +188,7 @@
             v-model="row.taskId"
             placeholder="请选择"
             @change="taskListChange(row, $index)"
+            disabled
           >
             <el-option
               v-for="item in row.taskList"
@@ -204,6 +207,7 @@
             placeholder="选择日期时间"
             format="yyyy-MM-dd HH:mm:ss"
             value-format="yyyy-MM-dd HH:mm:ss"
+            disabled
           >
           </el-date-picker>
         </template>
@@ -366,13 +370,6 @@
         selection: [],
         current: null,
         columns: [
-          {
-            width: 45,
-            type: 'selection',
-            columnKey: 'selection',
-            align: 'center',
-            reserveSelection: true
-          },
           {
             columnKey: 'index',
             label: '序号',
@@ -431,7 +428,7 @@
             slot: 'totalCount',
             label: '请托数量',
             align: 'center',
-            minWidth: 110,
+            minWidth: 140,
             showOverflowTooltip: true
           },
           {

src/views/bpm/handleTask/components/purchaseNeedManage/detailDialog.vue

@@ -179,7 +179,7 @@
             align: 'center',
             formatter: (row, column) => {
               if (row.purchaseCount) {
-                return row.purchaseCount + ' ' + row.purchaseUnit;
+                return row.purchaseCount + ' ' + (row.purchaseUnit || '');
               }
             }
           },
@@ -198,7 +198,7 @@
             align: 'center',
             formatter: (row, column) => {
               if (row.totalCount) {
-                return row.totalCount + ' ' + row.measuringUnit;
+                return row.totalCount + ' ' + (row.measuringUnit || '');
               }
             }
           },

src/views/bpm/handleTask/components/purchaseOrder/detailDialog.vue

@@ -349,7 +349,7 @@
             align: 'center',
             formatter: (row, column) => {
               if (row.purchaseCount) {
-                return row.purchaseCount + ' ' + row.purchaseUnit;
+                return row.purchaseCount + ' ' + (row.purchaseUnit || '');
               }
             }
           },
@@ -372,7 +372,7 @@
             label: '计量数量',
             formatter: (row, column) => {
               if (row.totalCount) {
-                return row.totalCount + ' ' + row.measuringUnit;
+                return row.totalCount + ' ' + (row.measuringUnit || '');
               }
             },
             align: 'center'
@@ -415,7 +415,7 @@
             label: '单重',
             formatter: (row, column) => {
               if (row.singleWeight) {
-                return row.singleWeight + ' ' + row.weightUnit;
+                return row.singleWeight + ' ' + (row.weightUnit || '');
               }
             },
             align: 'center'
@@ -426,7 +426,7 @@
             label: '总重',
             formatter: (row, column) => {
               if (row.totalWeight) {
-                return row.totalWeight + ' ' + row.weightUnit;
+                return row.totalWeight + ' ' + (row.weightUnit || '');
               }
             },
             align: 'center'
@@ -679,7 +679,7 @@
             slot: 'totalCount',
             formatter: (row, column) => {
               if (row.totalCount) {
-                return row.totalCount + ' ' + row.measuringUnit;
+                return row.totalCount + ' ' + (row.measuringUnit || '');
               }
             },
             align: 'center'
@@ -691,7 +691,7 @@
             label: '单重',
             formatter: (row, column) => {
               if (row.singleWeight) {
-                return row.singleWeight + ' ' + row.weightUnit;
+                return row.singleWeight + ' ' + (row.weightUnit || '');
               }
             },
             align: 'center'
@@ -702,7 +702,7 @@
             label: '总重',
             formatter: (row, column) => {
               if (row.totalWeight) {
-                return row.totalWeight + ' ' + row.weightUnit;
+                return row.totalWeight + ' ' + (row.weightUnit || '');
               }
             },
             align: 'center'

src/views/bpm/handleTask/components/purchasePlanManage/detailDialog.vue

@@ -312,7 +312,7 @@
             align: 'center',
             formatter: (row, column) => {
               if (row.purchaseCount) {
-                return row.purchaseCount + ' ' + row.purchaseUnit;
+                return row.purchaseCount + ' ' + (row.purchaseUnit || '');
               }
             }
           },
@@ -336,7 +336,7 @@
             align: 'center',
             formatter: (row, column) => {
               if (row.totalCount) {
-                return row.totalCount + ' ' + row.measuringUnit;
+                return row.totalCount + ' ' + (row.measuringUnit || '');
               }
             }
             // slot: 'totalCount'
@@ -371,7 +371,7 @@
             label: '重量',
             formatter: (row, column) => {
               if (row.totalWeight) {
-                return row.totalWeight + ' ' + row.weightUnit;
+                return row.totalWeight + ' ' + (row.weightUnit || '');
               }
             },
             align: 'center'