update

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

@@ -62,6 +62,8 @@ export const Columns = [
     dataMapping: {
       supplier: "id",
       supplierName: "name",
+      paymentAgreement: 'paymentId',
+      paymentAgreementName: 'paymentName',
     },
     queryParams: () => ({}),
     require: true,
@@ -79,6 +81,7 @@ export const Columns = [
     },
     queryParams: () => ({}),
     isShow:true,
+    disabled:true,
     require: true,
   },
   {

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

@@ -471,6 +471,8 @@ export const TableColumns = [
 }));
 
 export const TabColumns = [
+
+
   {
     title: '物料信息',
     key: 'puOrderItemList',
@@ -1086,24 +1088,27 @@ export const TabColumns = [
 export const SearchColumns = [
   {
     item:{
-      key: "source",
-      title: "订单来源",  
+      key: "orderCode",
+      title: "订单编号",  
     },
-    attr:{
+    attr: {
       clearable:true,
-      is: "el-select",
-      dictName: "order_source",
+      is: "el-input",
+      placeholder:'请输入订单编号，多个使用,隔开',
     },
   },
   {
     item:{
-      key: "orderCode",
-      title: "订单编号",  
+      key: "materialCode",
+      title: "物料编码",
     },
     attr: {
       clearable:true,
       is: "el-input",
-      placeholder:'请输入订单编号，多个使用,隔开',
+      placeholder:'请输入物料编码，多个使用,隔开',
+      // is: "el-popover-multiple-select-v2",
+      // valueKey: "code",
+      // referName: "MATERIAL_PARAM",
     },
   },
   {
@@ -1126,29 +1131,6 @@ export const SearchColumns = [
   },
   {
     item:{
-      key: "status",
-      title: "单据状态",
-    },
-    attr:{
-      clearable:true,
-      is: "el-select",
-      dictName: "documents_status",
-    },
-  },
-  { 
-    item:{
-      key: "supplierName", 
-      title: "供应商", 
-    },
-    attr: {
-      clearable:true,
-      is: "el-popover-select-v2",
-      valueKey: "name",
-      referName: "SUPPLIER_PARAM",
-    },
-  },
-  {
-    item:{
       key: "puOrgIds",
       title: "采购组织",
     },
@@ -1161,86 +1143,65 @@ export const SearchColumns = [
   },
   {
     item:{
-      key: "materialCode",
-      title: "物料编码",
-    },
-    attr: {
-      clearable:true,
-      is: "el-input",
-      placeholder:'请输入物料编码，多个使用,隔开',
-      // is: "el-popover-multiple-select-v2",
-      // valueKey: "code",
-      // referName: "MATERIAL_PARAM",
-    },
-  },
-  {
-    item:{
-      key: "materialName",
-      title: "物料名称",
-    },
-    attr: {
-      clearable:true,
-      is: "el-popover-select-v2",
-      valueKey: "name",
-      referName: "MATERIAL_PARAM",
-    },
-  },
-  { 
-    item:{
-      key: "deliveryStatus",
-      title: "erp发送状态", 
+      key: "source",
+      title: "订单来源",  
     },
     attr:{
       clearable:true,
       is: "el-select",
-      dictName: "order_delivery_status",
+      dictName: "order_source",
     },
   },
   { 
     item:{
-      key: "contractNo",
-      title: "合同号", 
+      key: "erpOrderCode",
+      title: "ERP订单号", 
     },
     attr: {
       clearable:true,
       is: "el-input",
     },
   },
-  {
+  { 
     item:{
-      key: "projectNowName",
-      title: "在建工程项目",
+      key: "supplierName", 
+      title: "供应商", 
     },
     attr: {
       clearable:true,
       is: "el-popover-select-v2",
       valueKey: "name",
-      referName: "PROJECT_PARAM",
+      referName: "SUPPLIER_PARAM",
     },
   },
   {
     item:{
-      key: "buyers",
-      title: "采购员",
-    },
-    attr: {
-      clearable:true,
-      is: "el-popover-multiple-select-v2",
-      referName: "CONTACTS_PARAM",
-      valueKey: "code",
+      key: "customerName",
+      title: "收货客户",
     },
+    attr:{
+      // clearable:true,
+      is: "el-popover-select-v2",
+      valueKey: "name",
+      referName: "CUSTOMER_PARAM",
+      dataMapping: {
+        customer: 'id',
+        customerName: 'name'
+      },
+    }
   },
+
+  // 物料分类
+
   {
     item:{
-      key: "billTypes",
-      title: "订单类型",
+      key: "status",
+      title: "单据状态",
     },
     attr:{
-      is: "el-select",
-      multiple:true,
-      tags:true,
       clearable:true,
-      dictName: "sys_order_type",
+      is: "el-select",
+      dictName: "documents_status",
     },
   },
   { 
@@ -1254,27 +1215,105 @@ export const SearchColumns = [
       placeholder:'请输入采购需求单号，多个使用,隔开',
     },
   },
+  // 生产厂家
   { 
     item:{
-      key: "isDrug",
-      title: "物料药品属性", 
+      key: "manufacturerName",
+      title: "生产厂家代理人",
     },
     attr: {
       clearable:true,
-      is: "el-select",
-      dictName: "sys_yes_no",
+      is: "el-input",
     },
   },
-  { 
+  // 制单人
+
+  {
     item:{
-      key: "erpOrderCode",
-      title: "erp订单号", 
+      key: "buyers",
+      title: "采购员",
     },
     attr: {
       clearable:true,
-      is: "el-input",
+      is: "el-popover-multiple-select-v2",
+      referName: "CONTACTS_PARAM",
+      valueKey: "code",
+    },
+  },
+  { 
+    item:{
+      key: "deliveryStatus",
+      title: "erp发送状态", 
+    },
+    attr:{
+      clearable:true,
+      is: "el-select",
+      dictName: "order_delivery_status",
     },
   },
+  
+  // {
+  //   item:{
+  //     key: "materialName",
+  //     title: "物料名称",
+  //   },
+  //   attr: {
+  //     clearable:true,
+  //     is: "el-popover-select-v2",
+  //     valueKey: "name",
+  //     referName: "MATERIAL_PARAM",
+  //   },
+  // },
+  
+  // { 
+  //   item:{
+  //     key: "contractNo",
+  //     title: "合同号", 
+  //   },
+  //   attr: {
+  //     clearable:true,
+  //     is: "el-input",
+  //   },
+  // },
+  // {
+  //   item:{
+  //     key: "projectNowName",
+  //     title: "在建工程项目",
+  //   },
+  //   attr: {
+  //     clearable:true,
+  //     is: "el-popover-select-v2",
+  //     valueKey: "name",
+  //     referName: "PROJECT_PARAM",
+  //   },
+  // },
+ 
+  // {
+  //   item:{
+  //     key: "billTypes",
+  //     title: "订单类型",
+  //   },
+  //   attr:{
+  //     is: "el-select",
+  //     multiple:true,
+  //     tags:true,
+  //     clearable:true,
+  //     dictName: "sys_order_type",
+  //   },
+  // },
+ 
+  // { 
+  //   item:{
+  //     key: "isDrug",
+  //     title: "物料药品属性", 
+  //   },
+  //   attr: {
+  //     clearable:true,
+  //     is: "el-select",
+  //     dictName: "sys_yes_no",
+  //   },
+  // },
+ 
 ].map(({ item, attr }) => ({
   attr,
   item: { ...item, hidden: true, span: item.span || 6 },

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

@@ -35,7 +35,7 @@ export default {
     return {
       loading: false,
       tabLoading:false,
-      page: { pageNum: 1, pageSize: 100, total: 0 },
+      page: { pageNum: 1, pageSize: 10, total: 0 },
       searchColumns: SearchColumns,
       params: initParams(SearchColumns),
       tableColumns: TableColumns,