修改bug

src/api/basicData/salesContract.js

@@ -155,4 +155,16 @@ export function getCode(query) {
     method: 'get',
     params:query
   })
+}
+//价格库列表页
+export const getPricebank = (current, size, params) => {
+  return request({
+    url: '/api/blade-mocha-item/pricebank/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
 }

src/components/part-library/main.vue

@@ -34,7 +34,7 @@
       </span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="visible = false">取 消</el-button>
-        <el-button type="primary" @click="importData" :disabled="pickData.length == 0">确 定</el-button>
+        <el-button type="primary" @click="importData">确 定</el-button>
       </span>
     </el-dialog>
   </div>

src/config/website.js

@@ -45,5 +45,5 @@ export default {
   // 流程设计器地址
   flowDesignUrl: 'http://192.168.1.177:9999',
   // 报表设计器地址(cloud端口为8108,boot端口为80)
-  reportUrl: 'https://trade.tubaosoft.com/ureport',
+  reportUrl: 'http://121.37.83.47:80/ureport',
 }

src/views/exportTrade/customerInquiry/config/customerContact.json

@@ -12,7 +12,30 @@
     "refreshBtn": false,
     "showSummary": true,
     "indexSlot": true,
-    "dialogDrag":true,
+    "dialogDrag": true,
+    "summaryText": "合计",
+    "sumColumnList": [
+        {
+            "name": "orderQuantity",
+            "type": "sum"
+        },
+        {
+            "name": "amount",
+            "type": "sum"
+        },
+        {
+            "name": "partsCost",
+            "type": "sum"
+        },
+        {
+            "name": "partsPrice",
+            "type": "sum"
+        },
+        {
+            "name": "productPrice",
+            "type": "sum"
+        }
+    ],
     "column": [
         {
             "label": "产品名称",

src/views/exportTrade/salesContract/components/goodsInfo.vue

@@ -244,7 +244,7 @@
                 <el-button type="primary" @click="importGoods" :disabled="selectionList.length !=1">导入</el-button>
             </span>
         </el-dialog> -->
-    <report-dialog :switchDialog="switchDialog" :reportId="form.id" reportName="报价单明细(E)" @onClose="onClose()">
+    <report-dialog :switchDialog="switchDialog" :reportId="form.id" reportName="销售明细(E)" @onClose="onClose()">
     </report-dialog>
     <part-library ref="partLibrary" @importPart="importPart"></part-library>
     <price-library ref="library" @importLibray="importLibray" />

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

@@ -14,6 +14,33 @@
   "selection": true,
   "indexSlot":true,
   "tip": false,
+  "summaryText": "合计",
+  "sumColumnList": [
+      {
+          "name": "orderQuantity",
+          "type": "sum"
+      },
+      {
+          "name": "amount",
+          "type": "sum"
+      },
+      {
+          "name": "partsCost",
+          "type": "sum"
+      },
+      {
+          "name": "partsPrice",
+          "type": "sum"
+      },
+      {
+          "name": "productPrice",
+          "type": "sum"
+      },
+      {
+          "name": "actualQuantity",
+          "type": "sum"
+      }
+  ],
   "column": [
     {
         "label": "产品名称",
@@ -42,9 +69,25 @@
         "overHidden": true
     },
     {
+        "label": "英文名称",
+        "prop": "ename",
+        "index": 4,
+        "width": 200,
+        "span": 12,
+        "overHidden": true
+    },
+    {
+        "label": "产品描述",
+        "prop": "itemDescription",
+        "index": 5,
+        "width": 100,
+        "span": 12,
+        "overHidden": true
+    },
+    {
         "label": "螺纹",
         "prop": "remarksOne",
-        "index": 4,
+        "index": 6,
         "width": 100,
         "span": 6,
         "disabled": true,
@@ -53,7 +96,7 @@
     {
         "label": "介质",
         "prop": "customTwo",
-        "index": 5,
+        "index": 7,
         "width": 100,
         "span": 6,
         "disabled": true,
@@ -62,7 +105,7 @@
     {
         "label": "颜色",
         "prop": "customThree",
-        "index": 6,
+        "index": 8,
         "width": 100,
         "span": 6,
         "disabled": true,
@@ -71,7 +114,7 @@
     {
         "label": "电压",
         "prop": "customFour",
-        "index": 7,
+        "index": 9,
         "width": 100,
         "span": 6,
         "disabled": true,
@@ -80,7 +123,7 @@
     {
         "label": "产品属性",
         "prop": "itemProp",
-        "index": 8,
+        "index": 10,
         "width": 200,
         "span": 24,
         "overHidden": true
@@ -88,7 +131,7 @@
     {
         "label": "阀门配件",
         "prop": "partsValveName",
-        "index": 9,
+        "index": 11,
         "width": 200,
         "span": 6,
         "disabled": true,
@@ -97,7 +140,7 @@
     {
         "label": "瓶帽配件",
         "prop": "partsCapName",
-        "index": 10,
+        "index": 12,
         "width": 200,
         "span": 6,
         "disabled": true,
@@ -106,7 +149,7 @@
     {
         "label": "特殊处理",
         "prop": "partsHandleName",
-        "index": 11,
+        "index": 13,
         "width": 200,
         "span": 6,
         "disabled": true,
@@ -115,7 +158,7 @@
     {
         "label": "包装方式",
         "prop": "partsColourName",
-        "index": 12,
+        "index": 14,
         "width": 200,
         "span": 6,
         "disabled": true,
@@ -124,7 +167,7 @@
     {
         "label": "特殊颜色",
         "prop": "partsModeName",
-        "index": 13,
+        "index": 15,
         "width": 200,
         "span": 6,
         "disabled": true,
@@ -133,7 +176,7 @@
     {
         "label": "认证",
         "prop": "partsAuthenticationName",
-        "index": 14,
+        "index": 16,
         "width": 200,
         "span": 6,
         "disabled": true,
@@ -142,7 +185,7 @@
     {
         "label": "其他",
         "prop": "partsOtherName",
-        "index": 15,
+        "index": 17,
         "width": 200,
         "span": 6,
         "disabled": true,
@@ -151,31 +194,25 @@
     {
         "label": "配件信息",
         "prop": "partsDescribe",
-        "index": 16,
+        "index": 18,
         "width": 200,
         "span": 24,
         "overHidden": true
     },
     {
-        "label": "英文名称",
-        "prop": "ename",
-        "index": 17,
-        "width": 200,
-        "span": 12,
-        "overHidden": true
-    },
-    {
-        "label": "产品描述",
-        "prop": "itemDescription",
-        "index": 18,
+        "label": "商品信息",
+        "prop": "productRemark",
+        "type": "textarea",
+        "index": 19,
         "width": 100,
-        "span": 12,
-        "overHidden": true
+        "overHidden": true,
+        "minRows": 2,
+        "span": 24
     },
     {
         "label": "数量",
         "prop": "orderQuantity",
-        "index": 19,
+        "index": 20,
         "width": 100,
         "align": "right",
         "span": 6,
@@ -184,7 +221,7 @@
     {
         "label": "计价单位",
         "prop": "unit",
-        "index": 20,
+        "index": 21,
         "width": 100,
         "overHidden": true,
         "span": 6,
@@ -198,7 +235,7 @@
     {
         "label": "销售价",
         "prop": "price",
-        "index": 21,
+        "index": 22,
         "width": 100,
         "span": 6,
         "align": "right",
@@ -207,23 +244,13 @@
     {
         "label": "金额",
         "prop": "amount",
-        "index": 22,
+        "index": 23,
         "width": 100,
         "span": 6,
         "align": "right",
         "overHidden": true
     },
     {
-        "label": "商品信息",
-        "prop": "productRemark",
-        "type": "textarea",
-        "index": 23,
-        "width": 100,
-        "overHidden": true,
-        "minRows": 2,
-        "span": 24
-    },
-    {
         "label": "产品型号",
         "prop": "itemType",
         "index": 24,