Merge branch 'purchaseDev' into 'dev'

Purchase dev

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

src/views/material/requisition/add.vue

@@ -991,10 +991,10 @@
         }
       } else if (this.pageStu == 'edit') {
         // alert('修改页面')
-        console.log('页面状态', this.pageStu)
-        console.log('数据', this.row)
+        // console.log('页面状态', this.pageStu)
+        // console.log('数据', this.row)
         this.getDetails(this.row)
-        console.log('修改页面-批号库存管理状态', this.row.isInventoryStatus)
+        // console.log('修改页面-批号库存管理状态', this.row.isInventoryStatus)
         this.stockControl(this.row.isInventoryStatus)
         // 控制效期单位后面的是否可填写
         if (this.row.expiryDateManagerment == '0') {
@@ -1159,7 +1159,9 @@
       },
       // 用于回显四级分类树形选择
       getTreeDetails(id) {
+        console.log(id,'用于回显四级分类树形选择');
         getDetail(id).then(res => {
+          console.log(res,'用于回显四级分类树形选择');
           if (res.code === 200) {
             this.testOptions.push(res.data)
             this.basicForm.oneClass = res.data.oneClass

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/add/index.vue

@@ -538,7 +538,7 @@ export default {
     
     async handleTemDownload(){
 
-      this.download('/pu/order/downloadFailData',{}, `物料信息模板.xlsx`);
+      this.download('/pu/order/downloadFailData',{}, `物料信息模板${new Date().getTime()}.xlsx`);
     },
 
 

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,80 +1131,95 @@ export const SearchColumns = [
   },
   {
     item:{
-      key: "status",
-      title: "单据状态",
+      key: "puOrgIds",
+      title: "采购组织",
+    },
+    attr: {
+      clearable:true,
+      is: "el-popover-multiple-select-v2",
+      valueKey: "id",
+      referName: "ORG_PARAM",
+    },
+  },
+  {
+    item:{
+      key: "source",
+      title: "订单来源",  
     },
     attr:{
       clearable:true,
       is: "el-select",
-      dictName: "documents_status",
+      dictName: "order_source",
     },
   },
   { 
     item:{
-      key: "supplierName", 
-      title: "供应商", 
+      key: "erpOrderCode",
+      title: "ERP订单号", 
     },
     attr: {
       clearable:true,
-      is: "el-popover-select-v2",
-      valueKey: "name",
-      referName: "SUPPLIER_PARAM",
+      is: "el-input",
     },
   },
-  {
+  { 
     item:{
-      key: "puOrgIds",
-      title: "采购组织",
+      key: "supplierName", 
+      title: "供应商", 
     },
     attr: {
       clearable:true,
-      is: "el-popover-multiple-select-v2",
-      valueKey: "id",
-      referName: "ORG_PARAM",
+      is: "el-popover-select-v2",
+      valueKey: "name",
+      referName: "SUPPLIER_PARAM",
     },
   },
   {
     item:{
-      key: "materialCode",
-      title: "物料编码",
-    },
-    attr: {
-      clearable:true,
-      is: "el-input",
-      placeholder:'请输入物料编码，多个使用,隔开',
-      // is: "el-popover-multiple-select-v2",
-      // valueKey: "code",
-      // referName: "MATERIAL_PARAM",
+      key: "customerName",
+      title: "收货客户",
     },
+    attr:{
+      // clearable:true,
+      is: "el-popover-select-v2",
+      valueKey: "name",
+      referName: "CUSTOMER_PARAM",
+      dataMapping: {
+        customer: 'id',
+        customerName: 'name'
+      },
+    }
   },
+
+  // 物料分类
+
   {
     item:{
-      key: "materialName",
-      title: "物料名称",
+      key: "status",
+      title: "单据状态",
     },
-    attr: {
+    attr:{
       clearable:true,
-      is: "el-popover-select-v2",
-      valueKey: "name",
-      referName: "MATERIAL_PARAM",
+      is: "el-select",
+      dictName: "documents_status",
     },
   },
   { 
     item:{
-      key: "deliveryStatus",
-      title: "erp发送状态", 
+      key: "demandCode",
+      title: "采购需求单号", 
     },
-    attr:{
+    attr: {
       clearable:true,
-      is: "el-select",
-      dictName: "order_delivery_status",
+      is: "el-input",
+      placeholder:'请输入采购需求单号，多个使用,隔开',
     },
   },
   { 
+    // 生产厂家
     item:{
-      key: "contractNo",
-      title: "合同号", 
+      key: "manufacturerName",
+      title: "生产厂家代理人",
     },
     attr: {
       clearable:true,
@@ -1208,14 +1228,14 @@ export const SearchColumns = [
   },
   {
     item:{
-      key: "projectNowName",
-      title: "在建工程项目",
+      key: "createByName",
+      title: "制单人",
     },
     attr: {
       clearable:true,
       is: "el-popover-select-v2",
+      referName: "CONTACTS_PARAM",
       valueKey: "name",
-      referName: "PROJECT_PARAM",
     },
   },
   {
@@ -1230,51 +1250,80 @@ export const SearchColumns = [
       valueKey: "code",
     },
   },
-  {
-    item:{
-      key: "billTypes",
-      title: "订单类型",
-    },
-    attr:{
-      is: "el-select",
-      multiple:true,
-      tags:true,
-      clearable:true,
-      dictName: "sys_order_type",
-    },
-  },
-  { 
-    item:{
-      key: "demandCode",
-      title: "采购需求单号", 
-    },
-    attr: {
-      clearable:true,
-      is: "el-input",
-      placeholder:'请输入采购需求单号，多个使用,隔开',
-    },
-  },
   { 
     item:{
-      key: "isDrug",
-      title: "物料药品属性", 
+      key: "deliveryStatus",
+      title: "erp发送状态", 
     },
-    attr: {
+    attr:{
       clearable:true,
       is: "el-select",
-      dictName: "sys_yes_no",
-    },
-  },
-  { 
-    item:{
-      key: "erpOrderCode",
-      title: "erp订单号", 
-    },
-    attr: {
-      clearable:true,
-      is: "el-input",
+      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/edit/index.vue

@@ -516,7 +516,7 @@ export default {
 
     async handleTemDownload(){
 
-      this.download('/pu/order/downloadFailData',{}, `物料信息模板.xlsx`);
+      this.download('/pu/order/downloadFailData',{}, `物料信息模板${new Date().getTime()}.xlsx`);
     },
   },
   created() {},

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,