Merge branch 'purchaseDev' into 'dev'

Purchase dev

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

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

@@ -159,6 +159,7 @@ export default function useColumns(){
               dosageFromName:'dosageFromName',
               maintenanceType:'curingType',
               medicalDevices:'medicalInstruments',
+              leadTime:'deliveryPeriod',
             },
 
             
@@ -271,24 +272,36 @@ export default function useColumns(){
         },
         {
           item:{
-            key:'diCode',
-            title:'DI码',
+            key:'leadTime',
+            title:'交货周期',
           },
           attr:{
-            is: "el-input",
+            is: "el-input-number",
+            controlsPosition:"right",
+            min:0
           },
          
         },
-        {
-          item:{
-            key:'remark',
-            title:'备注',
-          },
-          attr:{
-            is: "el-input",
-          },
+        // {
+        //   item:{
+        //     key:'diCode',
+        //     title:'DI码',
+        //   },
+        //   attr:{
+        //     is: "el-input",
+        //   },
          
-        },
+        // },
+        // {
+        //   item:{
+        //     key:'remark',
+        //     title:'备注',
+        //   },
+        //   attr:{
+        //     is: "el-input",
+        //   },
+         
+        // },
         {
           item:{
             key:'oneClass',

src/views/purchase/contract/add/index.vue

@@ -155,8 +155,8 @@ export default {
             orgName: puOrgName,
           },
         } = this.$store.state;
-        this.params.puOrg = puOrg;
-        this.params.puOrgName = puOrgName;
+        // this.params.puOrg = puOrg;
+        // this.params.puOrgName = puOrgName;
         this.params.buyer = buyer;
         this.params.buyerName = buyerName;
         this.params.puDept = puDept;

src/views/purchase/contract/columns.js

@@ -266,13 +266,113 @@ export default function useColumns() {
       },
       attr: {
         is: "el-input",
+        clearable: true,
       },
     },
+   
+    {
+      item: { key: "buyerName", title: "采购员", width: 100 },
+      attr: {
+        is: "el-popover-select-v2",
+        valueKey: "name",
+        referName: "CONTACTS_PARAM",
+        dataMapping: {
+          buyer: "code",
+          buyerName: "name",
+        },
+      },
+    },
+    {
+      item: { 
+        key: "puOrgName", 
+        title: "采购组织", 
+      },
+      attr: {
+        is: "el-popover-select-v2",
+        valueKey: "name",
+        referName: "ORG_PARAM",
+        dataMapping: {
+          puOrg: "code",
+          puOrgName: "name",
+        },
+      },
+    },
+    {
+      item:{
+        key: "materialName",
+        title: "物料名称",  
+      },
+      attr:{
+        clearable:true,
+        is: "el-popover-select-v2",
+        valueKey: "name",
+        referName: "MATERIAL_PARAM",
+        // dataMapping: {
+        //   material: "code",
+        // }
+      },
+    },
+    
+    {
+      item: { width: 100, key: "contractType", title: "合同类型" },
+      attr: {
+        is: "el-select",
+        dictName: "puarchase_contract_contract_type",
+        clearable: true,
+      },
+    },
+    {
+      item: { width: 100, key: "approveFlow", title: "审批流程" },
+      attr: {
+        is: "el-select",
+        dictName: "puarchase_contract_approve_flow",
+        clearable: true,
+      },
+    },
+    {
+      item: { width: 100, key: "status", title: "合同号" },
+      attr: {
+        is: "el-input",
+      },
+    },
+    {
+      item: {
+        key: "supplierName",
+        title: "供应商",
+      },
+      attr: {
+        is: "el-popover-select-v2",
+        valueKey: "name",
+        referName: "SUPPLIER_PARAM",
+        dataMapping: {
+          supplier: "code",
+          supplierName: "name",
+        },
+      },
+    },
+    {
+      item:{
+        key: "beginAndEndTimeList",
+        title: "合同创建日期",
+        span:12,
+      },
+      attr: {
+        clearable:true,
+        is: "el-date-wrapper",
+      },
+    },
+
+
+
+
+
+
     {
       item: { width: 100, key: "status", title: "状态" },
       attr: {
         is: "el-select",
         dictName: "documents_status",
+        clearable: true,
       },
     },
     {