Merge branch 'purchaseDev' into 'dev'

Purchase dev

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

src/components/super-search/index.vue

@@ -116,7 +116,7 @@ export default {
               v-if="attr.is === 'el-select'"
               v-bind="attr"
               v-model="innerValue[item.key]"
-              @change="$emit('submit')"
+              @change="attr.multiple ? '': $emit('submit')"
               style="width: 100%"
             >
               <template>

src/views/material/changeApply/add/index.vue

@@ -279,7 +279,7 @@ export default {
 
     async handleTemDownload(){
 
-      this.download('/material/change/downloadInner',{}, `物料信息模板${new Date().getTime()}.xlsx`);
+      this.download('/material/change/downloadInner',{}, `变更单物料信息模板${new Date().getTime()}.xlsx`);
     },
 
   },

src/views/purchase/purchase-order/column.js

@@ -642,6 +642,22 @@ export const TabColumns = [
         },
       },
       { 
+        item:{
+          key: "nitemdiscountrate", 
+          title: "折扣(%)", 
+          width:80, 
+        },
+        attr:{},
+       },
+      { 
+        item:{
+          key: "ntaxnetprice", 
+          title: "含税净价", 
+          width:80, 
+        },
+        attr:{},
+       },
+      { 
         item:{key: "arrivalQty", title: "已到货数量" , width:80,},
         attr:{
           // is: "el-computed-input-v2",

src/views/purchase/purchase-order/index.vue

@@ -62,6 +62,15 @@ export default {
         return this.dict.type;
       },
     },
+    tabHeight:{
+      get(){
+        return `${this.tabTableDatas['puOrderItemList'].length ? 
+                  (this.tabTableDatas['puOrderItemList'].length > 8 ? 500 :
+                   (this.tabTableDatas['puOrderItemList'].length *50) +100)
+                : 120}px`
+      },
+      set(){}
+    }
   },
   created() {
     if(this.$route.query.billCode) this.params.orderCode = this.$route.query.billCode 
@@ -778,7 +787,12 @@ export default {
           :label="column.title" 
           :name="column.key"
         >
-          <div style="height:580px;display:flex">
+          <div 
+            :style="{
+              height:tabHeight,
+              display:'flex'
+            }"
+          >
             <el-super-table
               v-model="tabTableDatas[column.key]"
               :ref="column.key"

src/views/purchase/task/columns.js

@@ -6,6 +6,7 @@ export default function useColumns() {
       attr: {
         is: "el-dict-tag",
         dictName: "purchase_task_status",
+
       },
     },
 
@@ -119,7 +120,8 @@ export default function useColumns() {
       },
       attr: { 
         is: "el-select", 
-        dictName: "sys_true_false" 
+        dictName: "sys_true_false" ,
+        clearable: true,
       },
     },
     // {
@@ -153,11 +155,14 @@ export default function useColumns() {
     },
     {
       item: {
-        key: "status",
+        // key: "status",
+        key: "statusList",
         title: "状态",
       },
       attr: {
         is: "el-select",
+        multiple:true,
+        collapseTags:true,
         dictName: "purchase_task_status",
         clearable: true,
       },

src/views/purchase/task/index.vue

@@ -33,6 +33,10 @@ export default {
   computed: {},
   watch: {},
   created() {
+    this.params = {
+      ...this.params,
+      statusList:['0','2','3']
+    }
     this.useQuery(this.params, this.page);
   },
   methods: {