Merge remote-tracking branch 'origin/dev' into dev

src/api/basicData/configuration.js

@@ -23,10 +23,10 @@ export function detail(data) {
         method: 'get'
     })
 }
-//客户资料列表删除
+//国内销售列表删除
 export function deleteDetails(data) {
     return request({
-        url: '/api/blade-client/corpsdesc/update',
+        url: '/api/blade-purchase-sales/order/update',
         method: 'post',
         data: {
             id:data

src/views/exportTrade/salesContract/config/advantageProject.json

@@ -92,7 +92,7 @@
       "cell": true,
       "rules": [
         {
-          "required": true,
+          "required": false,
           "message": "请输入排序",
           "trigger": "blur"
         }
@@ -105,7 +105,7 @@
       "cell": true,
       "rules": [
         {
-          "required": true,
+          "required": false,
           "message": "请输入备注",
           "trigger": "blur"
         }

src/views/exportTrade/salesContract/config/commodity.json

@@ -0,0 +1,125 @@
+
+{
+  "height": "auto",
+  "calcHeight": 80,
+  "tip": false,
+  "addBtn": false,
+  "searchShow": false,
+  "searchShowBtn": false,
+  "menu": false,
+  "searchMenuSpan": 6,
+  "border": true,
+  "index": true,
+  "selection": true,
+  "viewBtn": true,
+  "dialogClickModal": false,
+  "column": [
+    {
+      "label": "商品编码",
+      "prop": "code",
+      "search": true,
+      "width": 100,
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "商品名称",
+      "prop": "cname",
+      "slot": true,
+      "width": 100,
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "商品类别",
+      "prop": "goodsTypeId",
+      "dicData": [],
+      "type": "tree",
+      "hide": true,
+      "addDisabled": false,
+      "multiple": true,
+      "props": {
+        "label": "title"
+      },
+      "rules": [{
+        "required": true,
+        "message": " ",
+        "trigger": "click"
+      }]
+    },
+    {
+      "label": "规格编码",
+      "prop": "typeno",
+      "search": true
+    },
+    {
+      "label": "品牌",
+      "prop": "brand",
+      "slot": true
+    },
+    {
+      "label": "花纹",
+      "prop": "brandItem",
+      "slot": true
+    },
+    {
+      "label": "规格尺寸",
+      "prop": "specs",
+      "slot": true
+    },
+    {
+      "label": "产品类别",
+      "prop": "category",
+      "slot": true
+    },
+    {
+      "label": "产品分类",
+      "prop": "categoryitem",
+      "slot": true
+    },
+    {
+      "label": "供应商",
+      "prop": "providers",
+      "slot": true
+    },
+    {
+      "label": "计量单位",
+      "prop": "unit",
+      "slot": true
+    },
+    {
+      "label": "包装单位",
+      "prop": "packgeunit",
+      "slot": true
+    },
+    {
+      "label": "商品图片",
+      "prop": "url",
+      "type": "upload",
+      "listType": "picture-img",
+      "dataType": "string",
+      "action": "/api/blade-resource/oss/endpoint/put-file",
+      "propsHttp": {
+        "res": "data",
+        "url": "link"
+      },
+      "hide": true,
+      "span": 24
+    },
+    {
+      "label": "备注",
+      "prop": "remarks",
+      "slot": true
+    }
+  ]
+}

src/views/exportTrade/salesContract/config/importInventory.json

@@ -20,36 +20,36 @@
   "column":[
     {
       "label": "提单号",
-      "prop": "a",
+      "prop": "billNo",
       "index": 1,
       "width":100,
-      "cell": false,
+      "cell": true,
       "rules": [
         {
-          "required": true,
+          "required": false,
           "message": "请输入提单号",
           "trigger": "blur"
         }
       ]
     },{
       "label": "合同号",
-      "prop": "b",
+      "prop": "orgOrderNo",
       "index": 2,
       "width":100,
-      "cell": false,
+      "cell": true,
       "rules": [
         {
-          "required": true,
+          "required": false,
           "message": "请输入合同号",
           "trigger": "blur"
         }
       ]
     },{
       "label": "货物品种",
-      "prop": "c",
+      "prop": "priceCategory",
       "index": 3,
       "width":100,
-      "cell": true,
+      "cell": false,
       "rules": [
         {
           "required": false,
@@ -59,10 +59,10 @@
       ]
     },{
       "label": "货物详情",
-      "prop": "d",
+      "prop": "cname",
       "index": 4,
       "width":100,
-      "cell": true,
+      "cell": false,
       "rules": [
         {
           "required": false,
@@ -72,7 +72,7 @@
       ]
     },{
       "label": "件数",
-      "prop": "e",
+      "prop": "actualQuantity",
       "index": 5,
       "width":100,
       "cell": true,
@@ -85,65 +85,65 @@
       ]
     },{
       "label": "发票净重(吨)",
-      "prop": "f",
+      "prop": "invoiceWeight",
       "index": 6,
       "width":100,
       "cell": true,
       "rules": [
         {
-          "required": true,
+          "required": false,
           "message": "请输入发票净重(吨)",
           "trigger": "blur"
         }
       ]
     },{
       "label": "码单重量(吨)",
-      "prop": "g",
+      "prop": "billWeight",
       "index": 7,
       "width":100,
       "cell": true,
       "rules": [
         {
-          "required": true,
+          "required": false,
           "message": "请输入码单重量(吨)",
           "trigger": "blur"
         }
       ]
     },{
       "label": "单价",
-      "prop": "h",
+      "prop": "price",
       "index": 8,
       "width":100,
       "cell": true,
       "rules": [
         {
-          "required": true,
+          "required": false,
           "message": "请输入单价",
           "trigger": "blur"
         }
       ]
     },{
       "label": "合同金额",
-      "prop": "i",
+      "prop": "amount",
       "index": 9,
       "width":100,
       "cell": true,
       "rules": [
         {
-          "required": true,
+          "required": false,
           "message": "请输入合同金额",
           "trigger": "blur"
         }
       ]
     },{
       "label": "税率",
-      "prop": "j",
+      "prop": "taxRate",
       "index": 10,
       "width":100,
       "cell": true,
       "rules": [
         {
-          "required": true,
+          "required": false,
           "message": "请输入税率",
           "trigger": "blur"
         }
@@ -156,7 +156,7 @@
       "cell": true,
       "rules": [
         {
-          "required": true,
+          "required": false,
           "message": "请输入备注",
           "trigger": "blur"
         }

src/views/exportTrade/salesContract/config/mainList.json

@@ -1,91 +1,91 @@
 {
-    "lazy": true,
-    "tip": false,
-    "simplePage": true,
-    "searchShow": true,
-    "searchMenuSpan": 6,
-    "dialogWidth": "60%",
-    "tree": true,
-    "border": true,
-    "index": true,
-    "selection": true,
-    "viewBtn": false,
-    "editBtn": false,
-    "delBtn": false,
-    "menuWidth": 300,
-    "dialogClickModal": false,
-    "searchLabelWidth": 100,
-    "addBtnText": "新单",
-    "expand": true,
-    "rowKey": "id",
-    "column":[
-        {
-            "label": "合同日期",
-            "prop": "businessDate",
-            "search": true,
-            "index": 1,
-            "width":100
-        },
-        {
-            "label": "合同号",
-            "prop": "orderNo",
-            "search": true,
-            "index": 2,
-            "width":100
-        },{
-            "label": "销售公司",
-            "prop": "corpId",
-            "search": true,
-            "index": 3,
-            "width":100
-        },{
-            "label": "工厂/贸易商名称",
-            "prop": "purchaserId",
-            "search": true,
-            "index": 4,
-            "width":100
-        },{
-            "label": "合同金额",
-            "prop": "orderAmount",
-            "search": false,
-            "index": 5,
-            "width":100
-        },{
-            "label": "币别",
-            "prop": "currency",
-            "search": false,
-            "index": 6,
-            "width":100
-        },{
-          "label": "汇率",
-          "prop": "exchangeRate",
-          "search": false,
-          "index": 6,
-          "width":100
-        },{
-            "label": "是否全部发货",
-            "prop": "Order_amount",
-            "search": false,
-            "index": 7,
-            "width":100
-        },{
-            "label": "业务员",
-            "prop": "salesName",
-            "search": true,
-            "index": 8,
-            "width":100
-        },{
-            "label": "单据状态",
-            "prop": "status",
-            "search": false,
-            "index": 8,
-            "width":100
-        },{
-            "label": "备注",
-            "prop": "remark",
-            "search": false,
-            "index": 8,
-            "width":100
-        }
-    ]
+  "lazy": true,
+  "tip": false,
+  "simplePage": true,
+  "searchShow": true,
+  "searchMenuSpan": 6,
+  "dialogWidth": "60%",
+  "tree": true,
+  "border": true,
+  "index": true,
+  "selection": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "menuWidth": 300,
+  "dialogClickModal": false,
+  "searchLabelWidth": 100,
+  "addBtnText": "新单",
+  "expand": true,
+  "rowKey": "id",
+  "column":[
+    {
+      "label": "合同日期",
+      "prop": "businessDate",
+      "search": true,
+      "index": 1,
+      "width":100
+    },
+    {
+      "label": "合同号",
+      "prop": "orderNo",
+      "search": true,
+      "index": 2,
+      "width":100
+    },{
+      "label": "销售公司",
+      "prop": "belongToCorpId",
+      "search": true,
+      "index": 3,
+      "width":100
+    },{
+      "label": "工厂/贸易商名称",
+      "prop": "corpId",
+      "search": true,
+      "index": 4,
+      "width":100
+    },{
+      "label": "合同金额",
+      "prop": "orderAmount",
+      "search": false,
+      "index": 5,
+      "width":100
+    },{
+      "label": "币别",
+      "prop": "currency",
+      "search": false,
+      "index": 6,
+      "width":100
+    },{
+      "label": "汇率",
+      "prop": "exChangeRate",
+      "search": false,
+      "index": 6,
+      "width":100
+    },{
+      "label": "是否全部发货",
+      "prop": "arrival",
+      "search": false,
+      "index": 7,
+      "width":100
+    },{
+      "label": "业务员",
+      "prop": "salesName",
+      "search": true,
+      "index": 8,
+      "width":100
+    },{
+      "label": "单据状态",
+      "prop": "status",
+      "search": false,
+      "index": 8,
+      "width":100
+    },{
+      "label": "备注",
+      "prop": "orderRemark",
+      "search": false,
+      "index": 8,
+      "width":100
+    }
+  ]
 }

src/views/exportTrade/salesContract/index.vue

@@ -35,6 +35,10 @@
           <el-table-column  label="付款金额" prop="amount" align="center" show-overflow-tooltip width="100"></el-table-column>
         </el-table>
       </template>
+      <template slot="menuLeft" slot-scope="{size}">
+        <el-button type="success" :size="size">复制新单</el-button>
+        <el-button type="info" :size="size">导出报表</el-button>
+      </template>
       <template slot-scope="scope" slot="menu">
         <el-button
           type="text"