Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!514

src/components/super-table/index.vue

@@ -299,7 +299,7 @@ export default {
               return '';
             }
           }, 0);
-          sums[index] = sums[index].toFixed(2) // 保留2位小数，解决小数合计列;
+          sums[index] = sums[index] && sums[index].toFixed(2) // 保留2位小数，解决小数合计列;
           }
 				});
 				return sums;

src/views/material/basicFile/details.vue

@@ -112,7 +112,7 @@
         </el-col>
       </el-row>
 
-    </div>
+      </div>
     
       <div class="md-content" :key="basicData.value.id">
         <el-form :inline="true" label-position="right" :model="basicData.value">
@@ -240,8 +240,9 @@
                           <el-input size="mini" 
                             v-model="basicData.value[f.prop]" 
                             :type="f.attribute || 'text'"
-                            :readonly="handleJudge(f)">
-                          </el-input>
+                            :readonly="handleJudge(f)"
+                            :maxlength="judgeMaxLength(f.prop)"
+                          ></el-input>
                         </el-form-item>
 
                       </template>
@@ -881,6 +882,13 @@
     },
 
     methods: {
+      judgeMaxLength(prop){
+        // 规格
+        if(prop === 'specification'){
+          return 150;
+        }
+        return Infinity;
+      },
       // 判断效期管理
       handleJudge(attribute) {
         // 维护新版本才能修改:批号及库存状态管理(isInventoryStatus)、

src/views/material/changeApply/add/column.js

@@ -213,8 +213,10 @@ export default function useColumns(){
           },
           attr:{
             is: "el-input",
+            maxlength:150,
           },
 
+
         },
         {
           item:{

src/views/material/requisition/add.vue

@@ -82,7 +82,7 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="规格" prop="specification">
-                  <el-input :disabled="disable" v-model="basicForm.specification"></el-input>
+                  <el-input :disabled="disable" v-model="basicForm.specification" :maxlength="150"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">

src/views/purchase/task/xie-yi-zhi-cai/index.vue

@@ -110,6 +110,7 @@ export default {
           ),
         }))
         .filter((item) => item.orderPriceVos.length);
+        console.log(params,'params');
       try {
         // try
         const { msg, code } = await ADD(params);
@@ -209,7 +210,7 @@ export default {
         
       </template>
 
-      <el-row style="padding: 0 16px;">
+      <!-- <el-row style="padding: 0 16px;">
         <el-col>
           <el-autocomplete
             class="inline-input"
@@ -222,10 +223,10 @@ export default {
             @clear="handleClear"
           ></el-autocomplete>
         </el-col>
-      </el-row>
+      </el-row> -->
 
 
-      <div v-for="(item, index) in showData" :key="index" class="m-4">
+      <div v-for="(item, index) in data" :key="index" class="m-4">
 
         <template v-if="item.orderPriceVos.length">
           <el-descriptions>