瀏覽代碼

1.新增必填字段要求
2.将采购员、代理人取code
3.取消部分参照id展示

002390 2 年之前
父節點
當前提交
a2319b9560

+ 6 - 6
src/components/popover-select/components/ALLOCATION_PARAM.js

@@ -1,12 +1,12 @@
 // 货位
 export default [
   // 树
-  {
-    key: "id",
-    title: "ID",
-    type: "Input",
-    search: true,
-  },
+  // {
+  //   key: "id",
+  //   title: "ID",
+  //   type: "Input",
+  //   search: true,
+  // },
   {
     key: "code",
     title: "编码",

+ 6 - 6
src/components/popover-select/components/BALATYPE_PARAM.js

@@ -1,11 +1,11 @@
 // 结算方式
 export default [
-  {
-    key: "id",
-    title: "结算方式ID",
-    type: "Input",
-    search: true,
-  },
+  // {
+  //   key: "id",
+  //   title: "结算方式ID",
+  //   type: "Input",
+  //   search: true,
+  // },
   {
     key: "code",
     title: "编码",

+ 6 - 6
src/components/popover-select/components/CUSTOMERDEPT_PARAM.js

@@ -1,11 +1,11 @@
 // 客户部门
 export default [
-  {
-    key: "id",
-    title: "客户部门ID",
-    type: "Input",
-    search: true,
-  },
+  // {
+  //   key: "id",
+  //   title: "客户部门ID",
+  //   type: "Input",
+  //   search: true,
+  // },
   {
     key: "code",
     title: "客户部门编码",

+ 6 - 6
src/components/popover-select/components/CUSTOMER_PARAM.js

@@ -1,11 +1,11 @@
 // 收货客户
 export default [
-  {
-    key: "id",
-    title: "收货客户ID",
-    type: "Input",
-    search: true,
-  },
+  // {
+  //   key: "id",
+  //   title: "收货客户ID",
+  //   type: "Input",
+  //   search: true,
+  // },
   {
     key: "code",
     title: "收货客户编码",

+ 6 - 6
src/components/popover-select/components/OPERATING_PARAM.js

@@ -1,11 +1,11 @@
 // 经营性项目
 export default [
-  {
-    key: "id",
-    title: "经营性项目ID",
-    type: "Input",
-    search: true,
-  },
+  // {
+  //   key: "id",
+  //   title: "经营性项目ID",
+  //   type: "Input",
+  //   search: true,
+  // },
   {
     key: "code",
     title: "经营性项目编码",

+ 6 - 6
src/components/popover-select/components/PROJECT_PARAM.js

@@ -1,11 +1,11 @@
 // 在建工程项目
 export default [
-  {
-    key: "id",
-    title: "在建工程项目ID",
-    type: "Input",
-    search: true,
-  },
+  // {
+  //   key: "id",
+  //   title: "在建工程项目ID",
+  //   type: "Input",
+  //   search: true,
+  // },
   {
     key: "code",
     title: "在建工程项目编码",

+ 6 - 6
src/components/popover-select/components/RETREASON_PARAM.js

@@ -1,11 +1,11 @@
 // 退换原因
 export default [
-  {
-    key: "id",
-    title: "退换原因ID",
-    type: "Input",
-    search: true,
-  },
+  // {
+  //   key: "id",
+  //   title: "退换原因ID",
+  //   type: "Input",
+  //   search: true,
+  // },
   {
     key: "code",
     title: "退换原因编码",

+ 6 - 6
src/components/popover-select/components/SUPPLIERCONTACTS_PARAM.js

@@ -1,11 +1,11 @@
 // 供应商联系人
 export default [
-  {
-    key: "id",
-    title: "ID",
-    type: "Input",
-    search: true,
-  },
+  // {
+  //   key: "id",
+  //   title: "ID",
+  //   type: "Input",
+  //   search: true,
+  // },
   {
     key: "code",
     title: "编码",

+ 6 - 6
src/components/popover-select/components/TAX_RATE_PARAM.js

@@ -1,10 +1,10 @@
 export default [
-  {
-    key: "id",
-    title: "ID",
-    type: "Input",
-    search: true,
-  },
+  // {
+  //   key: "id",
+  //   title: "ID",
+  //   type: "Input",
+  //   search: true,
+  // },
   {
     key: "code",
     title: "编码",

+ 6 - 6
src/components/popover-select/components/UNIT_PARAM.js

@@ -1,12 +1,12 @@
 // 货位
 export default [
   // 树
-  {
-    key: "id",
-    title: "ID",
-    type: "Input",
-    search: true,
-  },
+  // {
+  //   key: "id",
+  //   title: "ID",
+  //   type: "Input",
+  //   search: true,
+  // },
   {
     key: "code",
     title: "编码",

+ 6 - 6
src/components/popover-select/components/WAREHOUSE_PARAM.js

@@ -1,11 +1,11 @@
 // 收货仓库
 export default [
-  {
-    key: "id",
-    title: "仓库ID",
-    type: "Input",
-    search: true,
-  },
+  // {
+  //   key: "id",
+  //   title: "仓库ID",
+  //   type: "Input",
+  //   search: true,
+  // },
   {
     key: "code",
     title: "仓库编码",

+ 8 - 6
src/views/purchase/purchase-order/add/column.js

@@ -64,6 +64,7 @@ export const Columns = [
     },
     queryParams: () => ({}),
     isShow:true,
+    require: true,
   },
   {
     key: "finalTypeName",
@@ -82,10 +83,10 @@ export const Columns = [
     key: "buyerName",
     title: "采购员",
     inputType: "PopoverSelect",
-    valueKey: "id",
+    valueKey: "code",
     referName: "CONTACTS_PARAM",
     dataMapping: {
-      buyer: 'id',
+      buyer: 'code',
       buyerName: 'name'
     },
     queryParams: () => ({}),
@@ -163,6 +164,7 @@ export const Columns = [
       pkOrg: params.puOrg,
     }),
     isShow:true,
+    require: true,
   },
   {
     key: "goodsAllocationName",
@@ -175,6 +177,7 @@ export const Columns = [
       goodsAllocationName: 'name'
     },
      isShow:true,
+     require: true,
     queryParams: (params) => ({
       stordocId: params.warehouse,
     }),
@@ -188,14 +191,12 @@ export const Columns = [
     title: "订单使用返利金额", 
     inputType: "Input",
     isShow:true, 
-    require: true,
   },
   { 
     key: "deductionMoney", 
     title: "订单抵扣余款金额", 
     inputType: "Input",
     isShow:true, 
-    require: true,
   },
   { 
     key: "goodsWarehouseName",
@@ -203,6 +204,7 @@ export const Columns = [
     inputType: "Input",
     isShow:true,
     disabled:true,
+    require: true,
   },
   { 
     key: "address",
@@ -275,10 +277,10 @@ export const Columns = [
     key: "agentName",
     title: "代理人",
     inputType: "PopoverSelect",
-    valueKey: "id",
+    valueKey: "code",
     referName: "CONTACTS_PARAM",
     dataMapping: {
-      agent: 'id',
+      agent: 'code',
       agentName: 'name'
     },
      isShow:true,

+ 1 - 0
src/views/purchase/purchase-order/add/index.vue

@@ -252,6 +252,7 @@ export default {
     },
     // 保存
      handleSava() {
+     console.log(this.params,'this.params---------');
       this.judgeSaveCondition(async()=>{
         try {
             this.loading = true;

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

@@ -54,7 +54,7 @@ export default {
       try {
         this.loading = true;
         params['isAsc'] = 'desc';
-        params['orderByColumn'] = 'createTime';
+        params['orderByColumn'] = 'updateTime';
         
         const { code, msg, rows, total } = await orderApi.list(data, params);
         if (code === 200) {