Browse Source

中心仓调整

liyuan 3 days ago
parent
commit
e6b505ff0e

+ 0 - 30
src/views/storehouse/configuration/commodity.json

@@ -55,42 +55,12 @@
       }]
     },
     {
-      "label": "批次号",
-      "prop": "dot",
-      "cell":true,
-      "width": "150",
-      "type": "select",
-      "disabled": true,
-      "allowCreate": true,
-      "filterable": true,
-      "dicData": [],
-      "props": {
-        "label": "dot",
-        "value": "dot"
-      },
-      "dicUrl": "/api/blade-sales-part/stockDesc/dotList",
-      "overHidden": true
-    },
-    {
-      "label": "返利后单价",
-      "prop": "rebatePrice",
-      "overHidden": true,
-      "width": 120,
-      "cell": true
-    },
-    {
       "label": "库存",
       "prop": "inventory",
       "multiple": true,
       "overHidden": true
     },
     {
-      "label": "商品分类",
-      "prop": "goodsTypeName",
-      "slot": true,
-      "overHidden": true
-    },
-    {
       "label": "品牌",
       "prop": "brandName",
       "slot": true,

File diff suppressed because it is too large
+ 335 - 428
src/views/storehouse/inStockManage/inStockPlan/detailsPage.vue


+ 14 - 67
src/views/storehouse/inStockManage/inStockPlan/index.vue

@@ -105,16 +105,7 @@ export default {
             label: '商品名称',
             prop: 'goodsId',
             width: 200,
-            // disabled: false,
-            // remote: true,
             overHidden: true,
-            // type: 'select',
-            // // dicData: [],
-            // props: {
-            //   label: 'cname',
-            //   value: 'id'
-            // },
-            // dicUrl: "/api/blade-sales-part/goodsDesc/goodsListAll"
           }, {
             label: '数量',
             prop: 'goodsNum',
@@ -185,19 +176,6 @@ export default {
             disabled: false,
             width: 100
           },
-          // {
-          //   label: '品牌',
-          //   prop: 'brandId',
-          //   disabled: false,
-          //   width: 100,
-          //   overHidden: true,
-          //   type: 'select',
-          //   props: {
-          //     label: 'cname',
-          //     value: 'id'
-          //   },
-          //   dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP'
-          // },
           {
             label: '品牌',
             prop: 'brandName',
@@ -274,44 +252,26 @@ export default {
           search: true,
           overHidden: true,
         },
-        //  {
-        //   label: '来源单号',
-        //   prop: "srcOrdNo",
-        //   search: true,
-        //   overHidden: true,
-        // },
-        // {
-        //   label: "业务来源",
-        //   prop: "businessSource",
-        //   overHidden: true,
-        //   search: true,
-        //   type: 'select',
-        //   dicUrl: "/api/blade-system/dict-biz/dictionary?code=business_Source",
-        //   props: {
-        //     label: "dictValue",
-        //     value: "dictKey"
-        //   }
-        // },
         {
           label: '所属公司',
           prop: "salesCompanyName",
           overHidden: true,
         }, {
-          label: '业务对象',
+          label: '货主',
           prop: "customerName",
-          // type: 'select',
+          type: 'select',
           search: true,
           overHidden: true,
           cell: true,
           width: 140,
-          // filterable:true,
-          // remote:true,
-          // props: {
-          //   label: 'cname',
-          //   value: 'cname',
-          //   res: 'data.records'
-          // },
-          // dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
+          filterable:true,
+          remote:true,
+          props: {
+            label: 'cname',
+            value: 'cname',
+            res: 'data.records'
+          },
+          dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
         },
         {
           label: '显示已完成',
@@ -339,17 +299,8 @@ export default {
         }, {
           label: '商品名称',
           prop: "goodsNameJoin",
-          search: true,
+          search: false,
           overHidden: true,
-          // filterable: true,
-          // remote:true,
-          // type: 'select',
-          // props: {
-          //   label: 'cname',
-          //   value: 'cname',
-          //   res: 'data.records'
-          // },
-          // dicUrl: "/api/blade-sales-part/goodsDesc/list?current=1&size=20&cname={{key}}"
         }, {
           label: '数量',
           prop: "goodsTotalNum",
@@ -359,7 +310,7 @@ export default {
         //   label: '金额',
         //   prop: "totalMoney",
         //   overHidden: true,
-        // }, 
+        // },
         {
           label: '已付金额',
           prop: "paymentAmountTl",
@@ -387,15 +338,11 @@ export default {
           dicData: [
             {
               label: "待付款",
-              value: 1,
+              value: 1
             },
             {
               label: "已付款",
-              value: 2,
-            },
-            {
-              label: "尾款",
-              value: 3,
+              value: 2
             }
           ],
           // dicUrl: "/api/blade-system/dict-biz/dictionary?code=settlement_Status",

Some files were not shown because too many files changed in this diff