Merge remote-tracking branch 'origin/purchaseDev' into purchaseDev

src/views/purchase/task/xie-yi-zhi-cai/column.js

@@ -18,8 +18,10 @@ export const TableColumns = [
     attr: {},
   },
   {
-    item: { key: "supplierName", title: "供应商" },
-    attr: {},
+    item: { key: "supplierName", title: "供应商", filterabled:true, },
+    attr: {
+     
+    },
   },
   {
     item: { key: "customerName", title: "客户" },

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

@@ -57,6 +57,7 @@ export default {
             orderPriceVos: item.orderPriceVos.map((cItem) => ({
               ...item,
               ...cItem,
+              purchaseQuantity: item.orderPriceVos.length === 1 ? (item.puQty - item.executeQty) : undefined
             })),
           }));
           return true;
@@ -119,19 +120,21 @@ export default {
     >
       <template slot="title">
         <span>{{ title }}</span>
+
         <el-button
+          type="primary"
           :size="$attrs.size"
           :loading="loading"
-          @click="visible = false"
-          >取 消</el-button
+          @click="submit(data)"
+          >确 认</el-button
         >
         <el-button
-          type="primary"
           :size="$attrs.size"
           :loading="loading"
-          @click="submit(data)"
-          >确 认</el-button
+          @click="visible = false"
+          >取 消</el-button
         >
+        
       </template>
       <div v-for="(item, index) in data" :key="index" class="m-4">
         <h3 class="mb-4">
@@ -147,6 +150,7 @@ export default {
           :columns="tableColumns"
           :size="$attrs.size"
           :dict="dict"
+          
         >
           <template slot="purchaseQuantity" slot-scope="scope">
             <component