yusheng 11 месяцев назад
Родитель
Сommit
3a225e04c2

+ 1 - 1
src/views/bpm/handleTask/components/inquiryManage/submit.vue

@@ -31,7 +31,7 @@
         type="danger"
         size="mini"
         @click="handleAudit(0)"
-        v-if="!['starter', 'starterFillApprove'].includes(taskDefinitionKey)"
+     
         >驳回
       </el-button>
 

+ 9 - 3
src/views/bpm/stockManagement/storage.vue

@@ -798,10 +798,16 @@ export default {
         if (packingBoolen && measureBoolen && row.packingUnit != 'L') {
           row.weight = total;
           console.log(total, '6')
-        } else {
-          row.weight = this.$math.format(total * row.netWeight, 14);
-          console.log(total, '7')
         }
+        let weight = 0
+        if(row.measureUnit==row.weightUnit){
+            weight = row.measureQuantity
+          }else if(row.singleWeight){
+            weight = row.measureQuantity * Number(row.singleWeight);
+          }
+          this.$set(this.productList[index], 'weight', weight)
+
+    
       }
     },
     // 获取动态表头