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

src/api/basicData/client.js

@@ -0,0 +1,20 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+    return request({
+      url: '/api/blade-client/partsCorps/page',
+      method: 'get',
+      params: {
+        ...params,
+        current,
+        size,
+      }
+    })
+  }
+  
+export const getCorpsAll = () => {
+    return request({
+      url: '/api/blade-client/partsCorps/getCorpsAll',
+      method: 'get',
+    })
+  }

src/components/fee-info/main.vue

@@ -377,9 +377,24 @@ export default {
     }
   },
   methods: {
-    async imporData(row) {
+    async imporData(rows, type) {
       await this.tabs2()
-      this.$refs.feeCrud.rowCellAdd(row)
+      await this.allDel(type)
+      rows.forEach(row => {
+        this.$refs.feeCrud.rowCellAdd(row)
+      })
+
+    },
+    async allDel(type) {
+      this.feeData.forEach(e => {
+        if (type == e.srcType) {
+          if (e.id) {
+            delItem(e.id, this.feeUrl)
+          }
+        }
+      })
+      let newData = this.feeData.filter(e => e.srcType != type)
+      this.feeData = newData
     },
     async tabs2() {
       this.activeName = 'second'
@@ -552,13 +567,13 @@ export default {
     rowAdd() {
       if (this.inCropId) {
         let corpName = ''
-        if (this.corpId){
+        if (this.corpId) {
           corpName = this.corpList.find(item => this.corpId == item.id).cname;
         }
         const params = {
           feesType: this.selectTab,
-          corpId: this.corpId?this.corpId:'',
-          corpName:this.corpId?corpName:''
+          corpId: this.corpId ? this.corpId : '',
+          corpName: this.corpId ? corpName : ''
         };
         if (this.typeName === "wood") params.corpId = this.corpId
         this.$refs.feeCrud.rowCellAdd(params);

src/views/basicData/client/detailsPage.vue

@@ -84,7 +84,7 @@ export default {
         column: [
           {
             label: "客户名称",
-            prop: "a",
+            prop: "id",
             type: "select",
             rules: [
               {
@@ -97,7 +97,7 @@ export default {
           },
           {
             label: "客户分类",
-            prop: "b",
+            prop: "corpsTypeId",
             type: "select",
             span: 8,
           },
@@ -108,7 +108,7 @@ export default {
           },
           {
             label: "电话",
-            prop: "d",
+            prop: "tel",
             span: 8,
           },
           {

src/views/basicData/client/index.vue

@@ -1,175 +1,176 @@
 <template>
-    <div>
-
-      <basic-container v-show="show" class="page-crad">
-        <avue-crud ref="crud" :option="option" :data="dataList" :page.sync="page" :search.sync="search"
-          @search-change="searchChange" @current-change="currentChange" @size-change="sizeChange"
-          @refresh-change="refreshChange" @on-load="onLoad" :table-loading="loading" @saveColumn="saveColumn"
-          @resetColumn="resetColumn" :cell-style="cellStyle" @search-criteria-switch="searchCriteriaSwitch">
-          <template slot="menuLeft">
-            <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="newAdd()">新增
-            </el-button>
-          </template>
-          <template slot-scope="{ row, index }" slot="menu">
-            <el-button type="text" size="small" @click.stop="editOpen(row,2)">
-              查看
-            </el-button>
-            <el-button type="text" size="small" @click.stop="rowDel(row, index)">
-              删除
-            </el-button>
-          </template>
-        </avue-crud>
-      </basic-container>
-      <details-page v-if="!show" @goBack="backToList" :detailData="detailData" />
-    </div>
-  </template>
+  <div>
+    <basic-container v-show="show" class="page-crad">
+      <avue-crud ref="crud" :option="option" :data="dataList" :page.sync="page" :search.sync="search"
+        @search-change="searchChange" @current-change="currentChange" @size-change="sizeChange"
+        @refresh-change="refreshChange" @on-load="onLoad" :table-loading="loading" @saveColumn="saveColumn"
+        @resetColumn="resetColumn" :cell-style="cellStyle" @search-criteria-switch="searchCriteriaSwitch">
+        <template slot="menuLeft">
+          <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="newAdd()">新增
+          </el-button>
+        </template>
+        <template slot-scope="{ row, index }" slot="menu">
+          <el-button type="text" size="small" @click.stop="editOpen(row,2)">
+            查看
+          </el-button>
+          <el-button type="text" size="small" @click.stop="rowDel(row, index)">
+            删除
+          </el-button>
+        </template>
+      </avue-crud>
+    </basic-container>
+    <details-page v-if="!show" @goBack="backToList" :detailData="detailData" />
+  </div>
+</template>
   
-  <script>
-  import detailsPage from "./detailsPage";
-  import { option } from "./js/optionList";
-  import { getList, remove } from "@/api/maintenance/landFreight";
-  import { areaTypeTree } from "@/api/basicData/customerInformation";
-  export default {
-    name: "index",
-    data() {
-      return {
-        show: true,
-        loading: false,
-        form: {},
-        search: {},
-        detailData: {},
-        dataList: [],
-        selectionList: [],
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0,
-          pageSizes: [10, 50, 100, 200, 300, 400, 500]
-        },
-        option: {},
+<script>
+import detailsPage from "./detailsPage";
+import { option } from "./js/optionList";
+import { getList, getCorpsAll } from "@/api/basicData/client";
+export default {
+  name: "index",
+  data() {
+    return {
+      show: true,
+      loading: false,
+      form: {},
+      search: { },
+      detailData: {},
+      dataList: [],
+      selectionList: [],
+      page: {
+        pageSize: 20,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
+      },
+      option: {},
+    };
+  },
+  components: {
+    detailsPage
+  },
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(207), option);
+    this.option.height = window.innerHeight - 210;
+    this.getAllWorkDicts()
+  },
+  methods: {
+    getAllWorkDicts() {
+      getCorpsAll().then(res => {
+        this.findObject(this.option.column, "ids").dicData = res.data.data;
+      })
+      this.$refs.crud.init();
+    },
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 46;
+      } else {
+        this.option.height = this.option.height + 46;
+      }
+      this.$refs.crud.getTableHeight();
+    },
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.search);
+    },
+    newAdd() {
+      this.show = false;
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      let data = this.deepClone(Object.assign(params, this.search));
+      getList(
+        page.currentPage,
+        page.pageSize,
+        data
+      )
+        .then(res => {
+          this.dataList = res.data.data.records ? res.data.data.records : [];
+          this.page.total = res.data.data.total;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    editOpen(row, status) {
+      this.detailData = {
+        id: row.id,
+        status: status
       };
+      this.show = false;
     },
-    components: {
-      detailsPage
+    currentChange(val) {
+      this.page.currentPage = val;
     },
-    async created() {
-      this.option = await this.getColumnData(this.getColumnName(207), option);
-      this.option.height = window.innerHeight - 210;
-      this.getAllWorkDicts()
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
     },
-    methods: {
-      getAllWorkDicts() {
-        this.$refs.crud.init();
-      },
-      searchCriteriaSwitch(type) {
-        if (type) {
-          this.option.height = this.option.height - 97;
-        } else {
-          this.option.height = this.option.height + 97;
-        }
-        this.$refs.crud.getTableHeight();
-      },
-      cellStyle() {
-        return "padding:0;height:40px;";
-      },
-      //点击搜索按钮触发
-      searchChange(params, done) {
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.search);
-      },
-      newAdd() {
-        this.show = false;
-      },
-      onLoad(page, params={}) {
-        // this.loading = true;
-        let data = this.deepClone(Object.assign(params, this.search));
-        // getList(
-        //   page.currentPage,
-        //   page.pageSize,
-        //   data
-        // )
-        //   .then(res => {
-        //     this.dataList = res.data.data.records ? res.data.data.records : [];
-        //     this.page.total = res.data.data.total;
-        //   })
-        //   .finally(() => {
-        //     this.loading = false;
-        //   });
-      },
-      editOpen(row, status) {
-        this.detailData = {
-          id: row.id,
-          status: status
-        };
-        this.show = false;
-      },
-      currentChange(val) {
-        this.page.currentPage = val;
-      },
-      sizeChange(val) {
-        this.page.currentPage = 1;
-        this.page.pageSize = val;
-      },
-      rowDel(row, index, done) {
-        this.$confirm("确定删除数据?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          remove(row.id).then(res => {
-            if (res.data.code == 200) {
-              this.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-              this.onLoad(this.page, this.search);
-            }
-          });
+    rowDel(row, index, done) {
+      this.$confirm("确定删除数据?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        // remove(row.id).then(res => {
+        //   if (res.data.code == 200) {
+        //     this.$message({
+        //       type: "success",
+        //       message: "删除成功!"
+        //     });
+        //     this.onLoad(this.page, this.search);
+        //   }
+        // });
+      });
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(207),
+        this.option
+      );
+      if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout();
         });
-      },
-      async saveColumn() {
-        const inSave = await this.saveColumnData(
-          this.getColumnName(207),
-          this.option
-        );
-        if (inSave) {
-          this.$nextTick(() => {
-            this.$refs.crud.doLayout();
-          });
-          this.$message.success("保存成功");
-          //关闭窗口
-          this.$refs.crud.$refs.dialogColumn.columnBox = false;
-        }
-      },
-      async resetColumn() {
-        this.option = option;
-        const inSave = await this.delColumnData(this.getColumnName(207), option);
-        if (inSave) {
-          this.$nextTick(() => {
-            this.$refs.crud.doLayout();
-          });
-          this.getAllWorkDicts()
-          this.$message.success("重置成功");
-          this.$refs.crud.$refs.dialogColumn.columnBox = false;
-        }
-      },
-      //返回列表
-      backToList() {
-        this.detailData = this.$options.data().detailData;
-        this.show = true;
-        this.onLoad(this.page, this.search);
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    async resetColumn() {
+      this.option = option;
+      const inSave = await this.delColumnData(this.getColumnName(207), option);
+      if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout();
+        });
+        this.getAllWorkDicts()
+        this.$message.success("重置成功");
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
+    },
+    //返回列表
+    backToList() {
+      this.detailData = this.$options.data().detailData;
+      this.show = true;
+      this.onLoad(this.page, this.search);
     }
-  };
-  </script>
-  
-  <style scoped>
-  .page-crad ::v-deep .basic-container__card {
-    height: 94.2vh;
   }
-  </style>
+};
+</script>
+  
+<style scoped>
+.page-crad ::v-deep .basic-container__card {
+  height: 94.2vh;
+}
+</style>
   

src/views/basicData/client/js/optionList.js

@@ -2,7 +2,7 @@ import { number } from "echarts"
 
 export const option = {
   searchShow: true,
-  searchMenuSpan: 24,
+  searchMenuSpan: 8,
   align: "center",
   searchSpan: 8,
   tip: false,
@@ -18,75 +18,82 @@ export const option = {
   column: [
     {
       label: "客户名称",
-      prop: "corpName",
+      prop: "ids",
       type: 'select',
+      props: {
+        label: 'label',
+        value: 'value'
+      },
+      dicData: [],
       overHidden: true,
-      search: true
+      search: true,
+      index:1
     },
     {
       label: "电话",
-      prop: "1",
+      prop: "tel",
       overHidden: true,
-      search: true
+      search: true,
+      index:2
     },
     {
       label: "合同金额",
-      prop: "2",
+      prop: "debitAmount",
       overHidden: true,
+      index:3
     },
     {
       label: "已送货",
-      prop: "3",
+      prop: "deliveringAmount",
       overHidden: true,
+      index:4
     },
     {
       label: "预收款",
-      prop: "4",
+      prop: "advancePayment",
       overHidden: true,
+      index:5
     },
     {
       label: "未收款",
-      prop: "5",
+      prop: "balanceAmount",
       overHidden: true,
+      index:6
     },
     {
       label: "已收款",
-      prop: "6",
+      prop: "settlmentAmount",
       overHidden: true,
+      index:7
     },
     {
       label: "状态",
-      prop: "7",
+      prop: "status",
       type: 'select',
       hide: true,
       search: true,
       showColumn: false,
       overHidden: true,
+      index:8
     },
     {
       label: "客户分类",
-      prop: "8",
+      prop: "corpsTypeId",
       type: 'select',
       hide: true,
       search: true,
       showColumn: false,
       overHidden: true,
+      index:9
     },
     {
       label: "日期",
-      prop: "9",
-      hide: true,
-      search: true,
-      showColumn: false,
-      overHidden: true,
-    },
-    {
-      label: "附件",
-      prop: "10",
+      prop: "data",
       hide: true,
       search: true,
       showColumn: false,
       overHidden: true,
+      index:10
     }
   ]
 }

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

@@ -813,11 +813,12 @@ export default {
                             this.form.exchangeRate
                         );
                     })
-
+                    let arr = []
                     res.data.data.fees.forEach(e => {
                         // this.orderFeesList.push({ feesType: 2, ...e, corpId: this.form.corpId, corpName: this.form.corpsName, amount: multiply(e.price, e.quantity) })
-                        this.$emit('formGoodstoFees', { feesType: 2, ...e, corpId: this.form.corpId, corpName: this.form.corpsName, amount: multiply(e.price, e.quantity) })
+                        arr.push({ feesType: 2, ...e, corpId: this.form.corpId, corpName: this.form.corpsName, amount: multiply(e.price, e.quantity), srcType: val == 1 ? '国内费用' : '国外费用' })
                     })
+                    this.$emit('formGoodstoFees', arr, val == 1 ? '国内费用' : '国外费用')
                 });
             })
                 .finally(() => {
@@ -1093,17 +1094,15 @@ export default {
                 this.goodsForm.outFactoryPrice,
                 this.form.exchangeRate
             );
-            const names = [this.goodsForm.partsValveName, this.goodsForm.partsCapName, this.goodsForm.partsHandleName, this.goodsForm.partsColourName, this.goodsForm.partsModeName, this.goodsForm.partsAuthenticationName, this.goodsForm.partsOtherName];
+            const names = [this.goodsForm.partsModeName, this.goodsForm.partsHandleName, this.goodsForm.partsCapName, this.goodsForm.partsValveName, this.goodsForm.partsColourName, this.goodsForm.partsAuthenticationName, this.goodsForm.partsOtherName];
             const name = []
             names.forEach(e => {
                 if (e) {
                     name.push(e)
                 }
             })
-            this.goodsForm.partsDescribe = name.join(";");
-            // this.data[index].partsPriceDescribe = namePrices.join(";");
+            this.goodsForm.partsDescribe = name.join("; ");
             this.goodsForm.productRemark = this.getproductRemark(this.goodsForm)
-            this.priceChange(this.goodsForm);
         },
         propsChange(row) {
             const data = {
@@ -1124,27 +1123,23 @@ export default {
                     arr.push(row[key]);
                 }
             }
-            this.goodsForm.itemProp = arr.join(' ')
+            this.goodsForm.itemProp = arr.join(', ')
+            this.goodsForm.productRemark = this.getproductRemark(this.goodsForm)
         },
         editChange(row) {
             row.productRemark = this.getproductRemark(row)
         },
         getproductRemark(row) {
-            console.log(row)
             const ename = row.ename ? row.ename : "";
             const itemDescription = row.itemDescription
                 ? row.itemDescription
                 : "";
-            const itemProp = row.itemProp ? row.itemProp : "";
-            const partsDescribe = row.partsDescribe ? (' ' + row.partsDescribe) : "";
+            const itemProp = row.itemProp ? row.itemProp : ''
+            const partsDescribe = row.partsDescribe ? row.partsDescribe : ''
             const productRemark =
-                ename +
-                "\n" +
-                itemProp +
-                " " +
-                itemDescription +
-                " " +
-                partsDescribe;
+                ename + " " + itemDescription + "\n" +
+                itemProp + "\n" +
+                partsDescribe
             return productRemark
         },
         beforeClose(done) {

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

@@ -37,7 +37,7 @@
             "type": "sum"
         }
     ],
-    "column": [
+    "column":[
         {
             "label": "产品名称",
             "prop": "cname",
@@ -125,8 +125,8 @@
             "overHidden": true
         },
         {
-            "label": "阀门配件",
-            "prop": "partsValveName",
+            "label": "特殊颜色",
+            "prop": "partsModeName",
             "index": 11,
             "width": 200,
             "span": 6,
@@ -134,8 +134,8 @@
             "overHidden": true
         },
         {
-            "label": "瓶帽配件",
-            "prop": "partsCapName",
+            "label": "特殊处理",
+            "prop": "partsHandleName",
             "index": 12,
             "width": 200,
             "span": 6,
@@ -143,8 +143,8 @@
             "overHidden": true
         },
         {
-            "label": "特殊处理",
-            "prop": "partsHandleName",
+            "label": "瓶帽配件",
+            "prop": "partsCapName",
             "index": 13,
             "width": 200,
             "span": 6,
@@ -152,8 +152,8 @@
             "overHidden": true
         },
         {
-            "label": "包装方式",
-            "prop": "partsColourName",
+            "label": "阀门配件",
+            "prop": "partsValveName",
             "index": 14,
             "width": 200,
             "span": 6,
@@ -161,8 +161,8 @@
             "overHidden": true
         },
         {
-            "label": "特殊颜色",
-            "prop": "partsModeName",
+            "label": "包装方式",
+            "prop": "partsColourName",
             "index": 15,
             "width": 200,
             "span": 6,
@@ -249,7 +249,7 @@
         {
             "label": "国外分摊费用",
             "prop": "internationalAmount",
-            "index": 23,
+            "index": 24,
             "width": 100,
             "align": "right",
             "span": 6,
@@ -258,7 +258,7 @@
         {
             "label": "销售价",
             "prop": "price",
-            "index": 24,
+            "index": 25,
             "width": 100,
             "span": 6,
             "align": "right",
@@ -267,7 +267,7 @@
         {
             "label": "金额",
             "prop": "amount",
-            "index": 25,
+            "index": 26,
             "width": 100,
             "span": 6,
             "align": "right",
@@ -276,7 +276,7 @@
         {
             "label": "产品型号",
             "prop": "itemType",
-            "index": 26,
+            "index": 27,
             "width": 100,
             "span": 6,
             "overHidden": true
@@ -284,43 +284,43 @@
         {
             "label": "采购成本",
             "prop": "purchaseCost",
-            "index": 27,
+            "index": 28,
             "width": 100,
             "align": "right",
             "span": 6,
             "disabled": true,
-            "display":false,
-            "hide":true,
+            "display": false,
+            "hide": true,
             "overHidden": true
         },
         {
             "label": "采购单价",
             "prop": "purchaseAmount",
-            "index": 28,
+            "index": 29,
             "width": 100,
             "align": "right",
             "span": 6,
             "disabled": true,
-            "display":false,
-            "hide":true,
+            "display": false,
+            "hide": true,
             "overHidden": true
         },
         {
             "label": "配件成本",
             "prop": "partsCost",
-            "index": 29,
+            "index": 30,
             "width": 100,
             "align": "right",
             "span": 6,
             "disabled": true,
-            "display":false,
-            "hide":true,
+            "display": false,
+            "hide": true,
             "overHidden": true
         },
         {
             "label": "配件价格",
             "prop": "partsPrice",
-            "index": 30,
+            "index": 31,
             "width": 100,
             "align": "right",
             "span": 6,
@@ -330,7 +330,7 @@
         {
             "label": "配件价格描述",
             "prop": "partsPriceDescribe",
-            "index": 31,
+            "index": 32,
             "width": 120,
             "span": 6,
             "disabled": true,
@@ -339,18 +339,18 @@
         {
             "label": "供应商",
             "prop": "corpName",
-            "index": 32,
+            "index": 33,
             "width": 200,
             "span": 6,
             "disabled": true,
-            "display":false,
-            "hide":true,
+            "display": false,
+            "hide": true,
             "overHidden": true
         },
         {
             "label": "重点推荐",
             "prop": "priorityReferrer",
-            "index": 33,
+            "index": 34,
             "width": 100,
             "span": 6,
             "overHidden": true
@@ -358,7 +358,7 @@
         {
             "label": "推荐理由",
             "prop": "referrerReason",
-            "index": 34,
+            "index": 35,
             "width": 100,
             "overHidden": true,
             "span": 6
@@ -366,7 +366,7 @@
         {
             "label": "产品价格",
             "prop": "productPrice",
-            "index": 35,
+            "index": 36,
             "width": 100,
             "align": "right",
             "span": 6,
@@ -376,7 +376,7 @@
         {
             "label": "单品毛利率",
             "prop": "itemMargin",
-            "index": 36,
+            "index": 37,
             "width": 100,
             "align": "right",
             "span": 6,
@@ -386,7 +386,7 @@
         {
             "label": "折扣",
             "prop": "discount",
-            "index": 37,
+            "index": 38,
             "width": 100,
             "align": "right",
             "span": 6,
@@ -395,7 +395,7 @@
         {
             "label": "税率",
             "prop": "taxRate",
-            "index": 38,
+            "index": 39,
             "width": 100,
             "align": "right",
             "span": 6,
@@ -406,7 +406,7 @@
             "prop": "remarks",
             "type": "textarea",
             "minRows": 2,
-            "index": 39,
+            "index": 40,
             "width": 100,
             "overHidden": true,
             "span": 12

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -981,8 +981,8 @@ export default {
     cellStyle() {
       return "padding:0;height:40px;";
     },
-    formGoodstoFees(row){
-      this.$refs.feeInfo.imporData(row)
+    formGoodstoFees(rows,type){
+      this.$refs.feeInfo.imporData(rows,type)
     },
     khEdit(staus) {
       if (staus == 'KH') {

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

@@ -793,12 +793,12 @@ export default {
               this.form.exchangeRate
             );
           })
+          let arr = []
           res.data.data.fees.forEach(e => {
             // this.orderFeesList.push({ feesType: 2, ...e, corpId: this.form.corpId, corpName: this.form.corpsName, amount: multiply(e.price, e.quantity) })
-            if (e.price > 0) {
-              this.$emit('formGoodstoFees', { feesType: 2, ...e, corpId: this.form.corpId, corpName: this.form.corpsName, amount: multiply(e.price, e.quantity) })
-            }
+            arr.push({ feesType: 2, ...e, corpId: this.form.corpId, corpName: this.form.corpsName, amount: multiply(e.price, e.quantity), srcType: val == 1 ? '国内费用' : '国外费用' })
           })
+          this.$emit('formGoodstoFees', arr, val == 1 ? '国内费用' : '国外费用')
         });
       })
         .finally(() => {
@@ -972,8 +972,7 @@ export default {
         let names = []
         rows.forEach(e => {
           names.push(e.goodName)
-          this.goodsForm.partsValveCostPrice = sum(this.goodsForm.partsValveCostPrice, multiply(e.partsCost, e
-            .goodNumber));
+          this.goodsForm.partsValveCostPrice = sum(this.goodsForm.partsValveCostPrice, multiply(e.partsCost, e.goodNumber));
           this.goodsForm.partsValveSalePrice = sum(this.goodsForm.partsValveSalePrice, e.amout);
         })
         this.goodsForm.partsValveName = names.join(" ")
@@ -985,8 +984,7 @@ export default {
         let names = []
         rows.forEach(e => {
           names.push(e.goodName)
-          this.goodsForm.partsCapCostPrice = sum(this.goodsForm.partsCapCostPrice, multiply(e.partsCost, e
-            .goodNumber));
+          this.goodsForm.partsCapCostPrice = sum(this.goodsForm.partsCapCostPrice, multiply(e.partsCost, e.goodNumber));
           this.goodsForm.partsCapSalePrice = sum(this.goodsForm.partsCapSalePrice, e.amout);
         })
         this.goodsForm.partsCapName = names.join(" ")
@@ -998,8 +996,7 @@ export default {
         let names = []
         rows.forEach(e => {
           names.push(e.goodName)
-          this.goodsForm.partsHandleCostPrice = sum(this.goodsForm.partsHandleCostPrice, multiply(e.partsCost, e
-            .goodNumber));
+          this.goodsForm.partsHandleCostPrice = sum(this.goodsForm.partsHandleCostPrice, multiply(e.partsCost, e.goodNumber));
           this.goodsForm.partsHandleSalePrice = sum(this.goodsForm.partsHandleSalePrice, e.amout);
         })
         this.goodsForm.partsHandleName = names.join(" ")
@@ -1011,8 +1008,7 @@ export default {
         let names = []
         rows.forEach(e => {
           names.push(e.goodName)
-          this.goodsForm.partsColourCostPrice = sum(this.goodsForm.partsColourCostPrice, multiply(e.partsCost, e
-            .goodNumber));
+          this.goodsForm.partsColourCostPrice = sum(this.goodsForm.partsColourCostPrice, multiply(e.partsCost, e.goodNumber));
           this.goodsForm.partsColourSalePrice = sum(this.goodsForm.partsColourSalePrice, e.amout);
         })
         this.goodsForm.partsColourName = names.join(" ")
@@ -1024,8 +1020,7 @@ export default {
         let names = []
         rows.forEach(e => {
           names.push(e.goodName)
-          this.goodsForm.partsModeCostPrice = sum(this.goodsForm.partsModeCostPrice, multiply(e.partsCost, e
-            .goodNumber));
+          this.goodsForm.partsModeCostPrice = sum(this.goodsForm.partsModeCostPrice, multiply(e.partsCost, e.goodNumber));
           this.goodsForm.partsModeSalePrice = sum(this.goodsForm.partsModeSalePrice, e.amout);
         })
         this.goodsForm.partsModeName = names.join(" ")
@@ -1037,8 +1032,7 @@ export default {
         let names = []
         rows.forEach(e => {
           names.push(e.goodName)
-          this.goodsForm.partsAuthenticationCostPrice = sum(this.goodsForm.partsAuthenticationCostPrice, multiply(
-            e.partsCost, e.goodNumber));
+          this.goodsForm.partsAuthenticationCostPrice = sum(this.goodsForm.partsAuthenticationCostPrice, multiply(e.partsCost, e.goodNumber));
           this.goodsForm.partsAuthenticationSalePrice = sum(this.goodsForm.partsAuthenticationSalePrice, e.amout);
         })
         this.goodsForm.partsAuthenticationName = names.join(" ")
@@ -1050,19 +1044,14 @@ export default {
         let names = []
         rows.forEach(e => {
           names.push(e.goodName)
-          this.goodsForm.partsOtherCostPrice = sum(this.goodsForm.partsOtherCostPrice, multiply(e.partsCost, e
-            .goodNumber));
+          this.goodsForm.partsOtherCostPrice = sum(this.goodsForm.partsOtherCostPrice, multiply(e.partsCost, e.goodNumber));
           this.goodsForm.partsOtherSalePrice = sum(this.goodsForm.partsOtherSalePrice, e.amout);
         })
         this.goodsForm.partsOtherName = names.join(" ")
         this.goodsForm.partsOtherValue = JSON.stringify(rows)
       }
-      this.goodsForm.partsCost = partSum(this.goodsForm.partsValveCostPrice, this.goodsForm.partsCapCostPrice, this
-        .goodsForm.partsHandleCostPrice, this.goodsForm.partsColourCostPrice, this.goodsForm.partsModeCostPrice,
-        this.goodsForm.partsAuthenticationCostPrice, this.goodsForm.partsOtherCostPrice)
-      this.goodsForm.partsPrice = partSum(this.goodsForm.partsValveSalePrice, this.goodsForm.partsCapSalePrice, this
-        .goodsForm.partsHandleSalePrice, this.goodsForm.partsColourSalePrice, this.goodsForm.partsModeSalePrice,
-        this.goodsForm.partsAuthenticationSalePrice, this.goodsForm.partsOtherSalePrice)
+      this.goodsForm.partsCost = partSum(this.goodsForm.partsValveCostPrice, this.goodsForm.partsCapCostPrice, this.goodsForm.partsHandleCostPrice, this.goodsForm.partsColourCostPrice, this.goodsForm.partsModeCostPrice, this.goodsForm.partsAuthenticationCostPrice, this.goodsForm.partsOtherCostPrice)
+      this.goodsForm.partsPrice = partSum(this.goodsForm.partsValveSalePrice, this.goodsForm.partsCapSalePrice, this.goodsForm.partsHandleSalePrice, this.goodsForm.partsColourSalePrice, this.goodsForm.partsModeSalePrice, this.goodsForm.partsAuthenticationSalePrice, this.goodsForm.partsOtherSalePrice)
       // 销售价=（配件采购价格+产品价格）/汇率 *（1+客户FOB系数/100）
       this.goodsForm.productPrice = productCal(
         this.goodsForm.purchaseAmount,
@@ -1073,10 +1062,6 @@ export default {
         this.goodsForm.productPrice,
         this.form.exchangeRate
       );
-      this.goodsForm.totalValue = sellingCal(
-        this.goodsForm.outFactoryPrice,
-        this.goodsForm.orderQuantity,
-      );
       this.goodsForm.price = addPrice(
         this.goodsForm.outFactoryPrice,
         this.goodsForm.shareAmount,
@@ -1095,20 +1080,15 @@ export default {
         this.goodsForm.outFactoryPrice,
         this.form.exchangeRate
       );
-      const names = [this.goodsForm.partsValveName, this.goodsForm.partsCapName, this.goodsForm.partsHandleName, this
-        .goodsForm.partsColourName, this.goodsForm.partsModeName, this.goodsForm.partsAuthenticationName, this
-          .goodsForm.partsOtherName
-      ];
+      const names = [this.goodsForm.partsModeName, this.goodsForm.partsHandleName, this.goodsForm.partsCapName, this.goodsForm.partsValveName, this.goodsForm.partsColourName, this.goodsForm.partsAuthenticationName, this.goodsForm.partsOtherName];
       const name = []
       names.forEach(e => {
         if (e) {
           name.push(e)
         }
       })
-      this.goodsForm.partsDescribe = name.join(" ");
-      // this.data[index].partsPriceDescribe = namePrices.join(";");
+      this.goodsForm.partsDescribe = name.join("; ");
       this.goodsForm.productRemark = this.getproductRemark(this.goodsForm)
-      this.priceChange(this.goodsForm);
     },
     propsChange(row) {
       const data = {
@@ -1129,27 +1109,23 @@ export default {
           arr.push(row[key]);
         }
       }
-      this.goodsForm.itemProp = arr.join(' ')
+      this.goodsForm.itemProp = arr.join(', ')
+      this.goodsForm.productRemark = this.getproductRemark(this.goodsForm)
     },
     editChange(row) {
       row.productRemark = this.getproductRemark(row)
     },
     getproductRemark(row) {
-      console.log(row)
       const ename = row.ename ? row.ename : "";
-      const itemDescription = row.itemDescription ?
-        row.itemDescription :
-        "";
-      const itemProp = row.itemProp ? row.itemProp : "";
-      const partsDescribe = row.partsDescribe ? (' ' + row.partsDescribe) : "";
+      const itemDescription = row.itemDescription
+        ? row.itemDescription
+        : "";
+      const itemProp = row.itemProp ? row.itemProp : ''
+      const partsDescribe = row.partsDescribe ? row.partsDescribe : ''
       const productRemark =
-        ename +
-        "\n" +
-        itemProp +
-        " " +
-        itemDescription +
-        " " +
-        partsDescribe;
+        ename + " " + itemDescription + "\n" +
+        itemProp + "\n" +
+        partsDescribe
       return productRemark
     },
     beforeClose(done) {

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

@@ -1,430 +1,428 @@
 {
-    "searchShow": true,
-    "searchMenuSpan": 6,
-    "border": true,
-    "index": true,
-    "viewBtn": false,
-    "editBtn": false,
-    "addBtn": false,
-    "delBtn": false,
-    "headerAlign": "center",
-    "menuWidth": 150,
-    "refreshBtn": false,
-    "showSummary": true,
-    "selection": true,
-    "indexSlot": true,
-    "tip": false,
-    "summaryText": "合计",
-    "dialogWidth":"80%",
-    "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": "产品名称",
-            "prop": "cname",
-            "index": 1,
-            "width": 200,
-            "span": 8,
-            "overHidden": true
-        },
-        {
-            "label": "产品编号",
-            "prop": "code",
-            "index": 2,
-            "width": 100,
-            "span": 8,
-            "disabled": true,
-            "overHidden": true
-        },
-        {
-            "label": "产品类别",
-            "prop": "priceCategory",
-            "index": 3,
-            "width": 100,
-            "span": 8,
-            "disabled": true,
-            "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": 6,
-            "width": 100,
-            "span": 6,
-            "disabled": true,
-            "overHidden": true
-        },
-        {
-            "label": "介质",
-            "prop": "customTwo",
-            "index": 7,
-            "width": 100,
-            "span": 6,
-            "disabled": true,
-            "overHidden": true
-        },
-        {
-            "label": "颜色",
-            "prop": "customThree",
-            "index": 8,
-            "width": 100,
-            "span": 6,
-            "disabled": true,
-            "overHidden": true
-        },
-        {
-            "label": "电压",
-            "prop": "customFour",
-            "index": 9,
-            "width": 100,
-            "span": 6,
-            "disabled": true,
-            "overHidden": true
-        },
-        {
-            "label": "产品属性",
-            "prop": "itemProp",
-            "index": 10,
-            "width": 200,
-            "span": 24,
-            "overHidden": true
-        },
-        {
-            "label": "阀门配件",
-            "prop": "partsValveName",
-            "index": 11,
-            "width": 200,
-            "span": 6,
-            "disabled": true,
-            "overHidden": true
-        },
-        {
-            "label": "瓶帽配件",
-            "prop": "partsCapName",
-            "index": 12,
-            "width": 200,
-            "span": 6,
-            "disabled": true,
-            "overHidden": true
-        },
-        {
-            "label": "特殊处理",
-            "prop": "partsHandleName",
-            "index": 13,
-            "width": 200,
-            "span": 6,
-            "disabled": true,
-            "overHidden": true
-        },
-        {
-            "label": "包装方式",
-            "prop": "partsColourName",
-            "index": 14,
-            "width": 200,
-            "span": 6,
-            "disabled": true,
-            "overHidden": true
-        },
-        {
-            "label": "特殊颜色",
-            "prop": "partsModeName",
-            "index": 15,
-            "width": 200,
-            "span": 6,
-            "disabled": true,
-            "overHidden": true
-        },
-        {
-            "label": "认证",
-            "prop": "partsAuthenticationName",
-            "index": 16,
-            "width": 200,
-            "span": 6,
-            "disabled": true,
-            "overHidden": true
-        },
-        {
-            "label": "其他",
-            "prop": "partsOtherName",
-            "index": 17,
-            "width": 200,
-            "span": 6,
-            "disabled": true,
-            "overHidden": true
-        },
-        {
-            "label": "配件信息",
-            "prop": "partsDescribe",
-            "index": 18,
-            "width": 200,
-            "span": 24,
-            "overHidden": true
-        },
-        {
-            "label": "商品信息",
-            "prop": "productRemark",
-            "type": "textarea",
-            "index": 19,
-            "width": 100,
-            "overHidden": true,
-            "minRows": 2,
-            "span": 24
-        },
-        {
-            "label": "数量",
-            "prop": "orderQuantity",
-            "index": 20,
-            "width": 100,
-            "align": "right",
-            "span": 6,
-            "overHidden": true
-        },
-        {
-            "label": "计价单位",
-            "prop": "unit",
-            "index": 21,
-            "width": 100,
-            "overHidden": true,
-            "span": 6,
-            "type": "select",
-            "dicData": [],
-            "props": {
-                "label": "dictValue",
-                "value": "dictValue"
-            }
-        },
-        {
-            "label": "出厂价格",
-            "prop": "outFactoryPrice",
-            "index": 22,
-            "width": 100,
-            "align": "right",
-            "span": 6,
-            "overHidden": true
-        },
-        {
-            "label": "国内分摊费用",
-            "prop": "shareAmount",
-            "index": 23,
-            "width": 100,
-            "align": "right",
-            "span": 6,
-            "overHidden": true
-        },
-        {
-            "label": "国外分摊费用",
-            "prop": "internationalAmount",
-            "index": 23,
-            "width": 100,
-            "align": "right",
-            "span": 6,
-            "overHidden": true
-        },
-        {
-            "label": "销售价",
-            "prop": "price",
-            "index": 24,
-            "width": 100,
-            "span": 6,
-            "align": "right",
-            "overHidden": true
-        },
-        {
-            "label": "金额",
-            "prop": "amount",
-            "index": 25,
-            "width": 100,
-            "span": 6,
-            "align": "right",
-            "overHidden": true
-        },
-        {
-            "label": "产品型号",
-            "prop": "itemType",
-            "index": 26,
-            "width": 100,
-            "span": 6,
-            "overHidden": true
-        },
-        {
-            "label": "采购成本",
-            "prop": "purchaseCost",
-            "index": 27,
-            "width": 100,
-            "align": "right",
-            "span": 6,
-            "disabled": true,
-            "display":false,
-            "hide":true,
-            "overHidden": true
-        },
-        {
-            "label": "采购单价",
-            "prop": "purchaseAmount",
-            "index": 28,
-            "width": 100,
-            "align": "right",
-            "span": 6,
-            "disabled": true,
-            "display":false,
-            "hide":true,
-            "overHidden": true
-        },
-        {
-            "label": "配件成本",
-            "prop": "partsCost",
-            "index": 29,
-            "width": 100,
-            "align": "right",
-            "span": 6,
-            "disabled": true,
-            "display":false,
-            "hide":true,
-            "overHidden": true
-        },
-        {
-            "label": "配件价格",
-            "prop": "partsPrice",
-            "index": 30,
-            "width": 100,
-            "align": "right",
-            "span": 6,
-            "disabled": true,
-            "overHidden": true
-        },
-        {
-            "label": "配件价格描述",
-            "prop": "partsPriceDescribe",
-            "index": 31,
-            "width": 120,
-            "span": 6,
-            "disabled": true,
-            "overHidden": true
-        },
-        {
-            "label": "供应商",
-            "prop": "corpName",
-            "index": 32,
-            "width": 200,
-            "span": 6,
-            "disabled": true,
-            "display":false,
-            "hide":true,
-            "overHidden": true
-        },
-        {
-            "label": "重点推荐",
-            "prop": "priorityReferrer",
-            "index": 33,
-            "width": 100,
-            "span": 6,
-            "overHidden": true
-        },
-        {
-            "label": "推荐理由",
-            "prop": "referrerReason",
-            "index": 34,
-            "width": 100,
-            "overHidden": true,
-            "span": 6
-        },
-        {
-            "label": "产品价格",
-            "prop": "productPrice",
-            "index": 35,
-            "width": 100,
-            "align": "right",
-            "span": 6,
-            "disabled": true,
-            "overHidden": true
-        },
-        {
-            "label": "单品毛利率",
-            "prop": "itemMargin",
-            "index": 36,
-            "width": 100,
-            "align": "right",
-            "span": 6,
-            "disabled": true,
-            "overHidden": true
-        },
-        {
-            "label": "发货数量",
-            "prop": "actualQuantity",
-            "index": 37,
-            "width": 100,
-            "align": "right",
-            "span": 6,
-            "disabled": true,
-            "overHidden": true
-        },
-        {
-            "label": "折扣",
-            "prop": "discount",
-            "index": 38,
-            "width": 100,
-            "align": "right",
-            "span": 6,
-            "overHidden": true
-        },
-        {
-            "label": "税率",
-            "prop": "taxRate",
-            "index": 39,
-            "width": 100,
-            "align": "right",
-            "span": 6,
-            "overHidden": true
-        },
-        {
-            "label": "备注",
-            "prop": "remarks",
-            "type": "textarea",
-            "minRows": 2,
-            "index": 40,
-            "width": 100,
-            "overHidden": true,
-            "span": 12
-        }
-    ]
-}
+  "searchShow": true,
+  "searchMenuSpan": 6,
+  "border": true,
+  "index": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "addBtn": false,
+  "delBtn": false,
+  "headerAlign": "center",
+  "menuWidth": 150,
+  "refreshBtn": false,
+  "showSummary": true,
+  "selection": true,
+  "indexSlot": true,
+  "tip": false,
+  "summaryText": "合计",
+  "dialogWidth": "80%",
+  "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": "产品名称",
+      "prop": "cname",
+      "index": 1,
+      "width": 200,
+      "span": 8,
+      "overHidden": true
+    },
+    {
+      "label": "产品编号",
+      "prop": "code",
+      "index": 2,
+      "width": 100,
+      "span": 8,
+      "disabled": true,
+      "overHidden": true
+    },
+    {
+      "label": "产品类别",
+      "prop": "priceCategory",
+      "index": 3,
+      "width": 100,
+      "span": 8,
+      "disabled": true,
+      "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": 6,
+      "width": 100,
+      "span": 6,
+      "disabled": true,
+      "overHidden": true
+    },
+    {
+      "label": "介质",
+      "prop": "customTwo",
+      "index": 7,
+      "width": 100,
+      "span": 6,
+      "disabled": true,
+      "overHidden": true
+    },
+    {
+      "label": "颜色",
+      "prop": "customThree",
+      "index": 8,
+      "width": 100,
+      "span": 6,
+      "disabled": true,
+      "overHidden": true
+    },
+    {
+      "label": "电压",
+      "prop": "customFour",
+      "index": 9,
+      "width": 100,
+      "span": 6,
+      "disabled": true,
+      "overHidden": true
+    },
+    {
+      "label": "产品属性",
+      "prop": "itemProp",
+      "index": 10,
+      "width": 200,
+      "span": 24,
+      "overHidden": true
+    },
+    {
+      "label": "特殊颜色",
+      "prop": "partsModeName",
+      "index": 11,
+      "width": 200,
+      "span": 6,
+      "disabled": true,
+      "overHidden": true
+    },
+    {
+      "label": "特殊处理",
+      "prop": "partsHandleName",
+      "index": 12,
+      "width": 200,
+      "span": 6,
+      "disabled": true,
+      "overHidden": true
+    },
+    {
+      "label": "瓶帽配件",
+      "prop": "partsCapName",
+      "index": 13,
+      "width": 200,
+      "span": 6,
+      "disabled": true,
+      "overHidden": true
+    },
+    {
+      "label": "阀门配件",
+      "prop": "partsValveName",
+      "index": 14,
+      "width": 200,
+      "span": 6,
+      "disabled": true,
+      "overHidden": true
+    },
+    {
+      "label": "包装方式",
+      "prop": "partsColourName",
+      "index": 15,
+      "width": 200,
+      "span": 6,
+      "disabled": true,
+      "overHidden": true
+    },
+    {
+      "label": "认证",
+      "prop": "partsAuthenticationName",
+      "index": 16,
+      "width": 200,
+      "span": 6,
+      "disabled": true,
+      "overHidden": true
+    },
+    {
+      "label": "其他",
+      "prop": "partsOtherName",
+      "index": 17,
+      "width": 200,
+      "span": 6,
+      "disabled": true,
+      "overHidden": true
+    },
+    {
+      "label": "配件信息",
+      "prop": "partsDescribe",
+      "index": 18,
+      "width": 200,
+      "span": 24,
+      "overHidden": true
+    },
+    {
+      "label": "商品信息",
+      "prop": "productRemark",
+      "type": "textarea",
+      "index": 19,
+      "width": 100,
+      "overHidden": true,
+      "minRows": 2,
+      "span": 24
+    },
+    {
+      "label": "数量",
+      "prop": "orderQuantity",
+      "index": 20,
+      "width": 100,
+      "align": "right",
+      "span": 6,
+      "overHidden": true
+    },
+    {
+      "label": "计价单位",
+      "prop": "unit",
+      "index": 21,
+      "width": 100,
+      "overHidden": true,
+      "span": 6,
+      "type": "select",
+      "dicData": [],
+      "props": {
+        "label": "dictValue",
+        "value": "dictValue"
+      }
+    },
+    {
+      "label": "出厂价格",
+      "prop": "outFactoryPrice",
+      "index": 22,
+      "width": 100,
+      "align": "right",
+      "span": 6,
+      "overHidden": true
+    },
+    {
+      "label": "国内分摊费用",
+      "prop": "shareAmount",
+      "index": 23,
+      "width": 100,
+      "align": "right",
+      "span": 6,
+      "overHidden": true
+    },
+    {
+      "label": "国外分摊费用",
+      "prop": "internationalAmount",
+      "index": 23,
+      "width": 100,
+      "align": "right",
+      "span": 6,
+      "overHidden": true
+    },
+    {
+      "label": "销售价",
+      "prop": "price",
+      "index": 24,
+      "width": 100,
+      "span": 6,
+      "align": "right",
+      "overHidden": true
+    },
+    {
+      "label": "金额",
+      "prop": "amount",
+      "index": 25,
+      "width": 100,
+      "span": 6,
+      "align": "right",
+      "overHidden": true
+    },
+    {
+      "label": "产品型号",
+      "prop": "itemType",
+      "index": 26,
+      "width": 100,
+      "span": 6,
+      "overHidden": true
+    },
+    {
+      "label": "采购成本",
+      "prop": "purchaseCost",
+      "index": 27,
+      "width": 100,
+      "align": "right",
+      "span": 6,
+      "disabled": true,
+      "display": false,
+      "hide": true,
+      "overHidden": true
+    },
+    {
+      "label": "采购单价",
+      "prop": "purchaseAmount",
+      "index": 28,
+      "width": 100,
+      "align": "right",
+      "span": 6,
+      "disabled": true,
+      "display": false,
+      "hide": true,
+      "overHidden": true
+    },
+    {
+      "label": "配件成本",
+      "prop": "partsCost",
+      "index": 29,
+      "width": 100,
+      "align": "right",
+      "span": 6,
+      "disabled": true,
+      "display": false,
+      "hide": true,
+      "overHidden": true
+    },
+    {
+      "label": "配件价格",
+      "prop": "partsPrice",
+      "index": 30,
+      "width": 100,
+      "align": "right",
+      "span": 6,
+      "disabled": true,
+      "overHidden": true
+    },
+    {
+      "label": "配件价格描述",
+      "prop": "partsPriceDescribe",
+      "index": 31,
+      "width": 120,
+      "span": 6,
+      "disabled": true,
+      "overHidden": true
+    },
+    {
+      "label": "供应商",
+      "prop": "corpName",
+      "index": 32,
+      "width": 200,
+      "span": 6,
+      "disabled": true,
+      "display": false,
+      "hide": true,
+      "overHidden": true
+    },
+    {
+      "label": "重点推荐",
+      "prop": "priorityReferrer",
+      "index": 33,
+      "width": 100,
+      "span": 6,
+      "overHidden": true
+    },
+    {
+      "label": "推荐理由",
+      "prop": "referrerReason",
+      "index": 34,
+      "width": 100,
+      "overHidden": true,
+      "span": 6
+    },
+    {
+      "label": "产品价格",
+      "prop": "productPrice",
+      "index": 35,
+      "width": 100,
+      "align": "right",
+      "span": 6,
+      "disabled": true,
+      "overHidden": true
+    },
+    {
+      "label": "单品毛利率",
+      "prop": "itemMargin",
+      "index": 36,
+      "width": 100,
+      "align": "right",
+      "span": 6,
+      "disabled": true,
+      "overHidden": true
+    },
+    {
+      "label": "发货数量",
+      "prop": "actualQuantity",
+      "index": 37,
+      "width": 100,
+      "align": "right",
+      "span": 6,
+      "disabled": true,
+      "overHidden": true
+    },
+    {
+      "label": "折扣",
+      "prop": "discount",
+      "index": 38,
+      "width": 100,
+      "align": "right",
+      "span": 6,
+      "overHidden": true
+    },
+    {
+      "label": "税率",
+      "prop": "taxRate",
+      "index": 39,
+      "width": 100,
+      "align": "right",
+      "span": 6,
+      "overHidden": true
+    },
+    {
+      "label": "备注",
+      "prop": "remarks",
+      "type": "textarea",
+      "minRows": 2,
+      "index": 40,
+      "width": 100,
+      "overHidden": true,
+      "span": 12
+    }
+  ]
+}

src/views/exportTrade/salesContract/detailsPage.vue

@@ -1098,8 +1098,8 @@ export default {
     cellStyle() {
       return "padding:0;height:40px;";
     },
-    formGoodstoFees(row) {
-      this.$refs.feeInfo.imporData(row)
+    formGoodstoFees(rows,type){
+      this.$refs.feeInfo.imporData(rows,type)
     },
     khEdit(staus) {
       if (status == 'kh') {