修改bug

src/util/calculate.js

@@ -4,7 +4,7 @@ export function shareAmountFees(num, num2, num3) {
   const val = Number(num ? num : 0)
   const val2 = Number(num2 ? num2 : 0)
   const val3 = Number(num3 ? num3 : 0)
-  const sum = _.multiply(_.add(val, val2),val3)
+  const sum = _.multiply(_.add(val, val2), val3)
   return Number(sum).toFixed(2)
 }
 //计算费用
@@ -12,7 +12,7 @@ export function calculationFees(num, num2, num3) {
   const val = Number(num ? num : 0)
   const val2 = Number(num2 ? num2 : 0)
   const val3 = Number(num3 ? num3 : 0)
-  const sum = _.multiply(_.add(val, val2),val3)
+  const sum = _.multiply(_.add(val, val2), val3)
   return Number(sum).toFixed(2)
 }
 //配件总价
@@ -36,13 +36,15 @@ export function sum(num, num2) {
   return Number(sum).toFixed(2)
 }
 //金额相乘
-export function multiply(num, num2) {
+export function multiply(num, num2,num3) {
   //最新价格
   const val = Number(num ? num : 0)
   const val2 = Number(num2 ? num2 : 0)
+  const val3 = Number(num3 ? num3 : 2)
   const multiply = _.multiply(val, val2)
-  return Number(multiply).toFixed(2)
+  return Number(multiply).toFixed(val3)
 }
+
 //原始成本=最新价格/(1+税率/100)
 export function costCal(num, num2) {
   //最新价格
@@ -162,7 +164,7 @@ export function addAllsalary2(num, num2, num3, num4) {
 }
 
 //销售=出厂价+分摊价格
-export function addPrice(num, num2,num3) {
+export function addPrice(num, num2, num3) {
   const Sum1 = Number(num ? num : 0)
   const Sum2 = Number(num2 ? num2 : 0)
   const Sum3 = Number(num3 ? num3 : 0)

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

@@ -18,9 +18,11 @@
                         船务询价
                     </el-button>
                     <el-button type="info" size="small" @click="cnameData">刷新基础资料</el-button>
-                    <el-button type="info" size="small" @click="calculate(1)" :disabled="detailData.status == 1">计算国内费用
+                    <el-button type="info" size="small" @click="calculate(1)" :disabled="detailData.status == 1"
+                        :loading="calculateLoading">计算国内费用
                     </el-button>
-                    <el-button type="info" size="small" @click="calculate(2)" :disabled="detailData.status == 1">计算国外费用
+                    <el-button type="info" size="small" @click="calculate(2)" :disabled="detailData.status == 1"
+                        :loading="calculateLoading">计算国外费用
                     </el-button>
                 </el-row>
             </template>
@@ -213,15 +215,13 @@
             </template>
             //分摊金额
             <template slot="shareAmountForm" slot-scope="{type,disabled}">
-                <el-input v-model="goodsForm.shareAmount" size="small"
-                    oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-                    @change="priceChange(goodsForm)"></el-input>
+                <el-input-number v-model="goodsForm.shareAmount" size="small" style="width:100%"
+                    @change="priceChange(goodsForm)" :controls="false" :precision="10"></el-input-number>
             </template>
             //分摊金额
             <template slot="internationalAmountForm" slot-scope="{type,disabled}">
-                <el-input v-model="goodsForm.internationalAmount" size="small"
-                    oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-                    @change="priceChange(goodsForm)"></el-input>
+                <el-input-number v-model="goodsForm.internationalAmount" size="small" style="width:100%"
+                    @change="priceChange(goodsForm)" :controls="false" :precision="10"></el-input-number>
             </template>
             //单价
             <template slot="priceForm" slot-scope="{type,disabled}">
@@ -327,6 +327,7 @@ export default {
     name: "customerInformation",
     data() {
         return {
+            calculateLoading: false,
             switchDialog: false,
             loading: false,
             itemtypeList: [],
@@ -776,28 +777,29 @@ export default {
                 e.sort = Number(index) + 1
                 this.form.totalValue = sum(multiply(e.outFactoryPrice, e.orderQuantity), this.form.totalValue)
             })
+            this.calculateLoading = true
             calculationDomesticFees({ ...this.form, domesticAbroad: val, orderItemsList: this.data, }).then(res => {
-                this.$confirm("总费用为:" + res.data.data.amount + ",单项运费为" + res.data.data.amountF + ",是否继续更新?", {
+                this.$confirm("总运费:" + res.data.data.amount + ",单价分摊运费:" + res.data.data.amountF + ",是否继续更新?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"
                 }).then(() => {
                     this.data.forEach(e => {
                         if (val == 1) {
-                            e.shareAmount = multiply(res.data.data.amountF, e.outFactoryPrice)
-                            e.price = addPrice(e.outFactoryPrice, multiply(res.data.data.amountF, e.outFactoryPrice), e.internationalAmount)
+                            e.shareAmount = multiply(res.data.data.amountF, e.outFactoryPrice, 10)
+                            e.price = addPrice(e.outFactoryPrice, multiply(res.data.data.amountF, e.outFactoryPrice, 10), e.internationalAmount)
                             e.amount = amountCal(
-                                addPrice(e.outFactoryPrice, res.data.data.amountF, e.internationalAmount),
+                                addPrice(e.outFactoryPrice, multiply(res.data.data.amountF, e.outFactoryPrice, 10), e.internationalAmount),
                                 e.orderQuantity,
                                 e.freight,
                                 e.insurance,
                                 e.discount
                             );
                         } else {
-                            e.internationalAmount = multiply(res.data.data.amountF, e.outFactoryPrice)
-                            e.price = addPrice(e.outFactoryPrice, multiply(res.data.data.amountF, e.outFactoryPrice), e.shareAmount)
+                            e.internationalAmount = multiply(res.data.data.amountF, e.outFactoryPrice, 10)
+                            e.price = addPrice(e.outFactoryPrice, multiply(res.data.data.amountF, e.outFactoryPrice, 10), e.shareAmount)
                             e.amount = amountCal(
-                                addPrice(e.outFactoryPrice, res.data.data.amountF, e.shareAmount),
+                                addPrice(e.outFactoryPrice, multiply(res.data.data.amountF, e.outFactoryPrice, 10), e.shareAmount),
                                 e.orderQuantity,
                                 e.freight,
                                 e.insurance,
@@ -811,13 +813,16 @@ export default {
                             this.form.exchangeRate
                         );
                     })
-                
+
                     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) })
+                        this.$emit('formGoodstoFees', { feesType: 2, ...e, corpId: this.form.corpId, corpName: this.form.corpsName, amount: multiply(e.price, e.quantity) })
                     })
                 });
             })
+                .finally(() => {
+                    this.calculateLoading = false;
+                });
         },
         khEdit(status) {
             if (status == 'cname') {

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

@@ -12,9 +12,11 @@
             :disabled="detailData.status == 1 || orderItemIds.length == 0" @click="getInvoice">生成发货单
           </el-button>
           <el-button type="info" size="small" @click="cnameData">刷新基础资料</el-button>
-          <el-button type="info" size="small" @click="calculate(1)" :disabled="detailData.status == 1">计算国内费用
+          <el-button type="info" size="small" @click="calculate(1)" :disabled="detailData.status == 1"
+            :loading="calculateLoading">计算国内费用
           </el-button>
-          <el-button type="info" size="small" @click="calculate(2)" :disabled="detailData.status == 1">计算国外费用
+          <el-button type="info" size="small" @click="calculate(2)" :disabled="detailData.status == 1"
+            :loading="calculateLoading">计算国外费用
           </el-button>
         </el-row>
       </template>
@@ -195,15 +197,13 @@
       </template>
       //分摊金额
       <template slot="shareAmountForm" slot-scope="{type,disabled}">
-        <el-input v-model="goodsForm.shareAmount" size="small"
-          oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-          @change="priceChange(goodsForm)"></el-input>
+        <el-input-number v-model="goodsForm.shareAmount" size="small" style="width:100%"
+          @change="priceChange(goodsForm)" :controls="false" :precision="10"></el-input-number>
       </template>
       //分摊金额
       <template slot="internationalAmountForm" slot-scope="{type,disabled}">
-        <el-input v-model="goodsForm.internationalAmount" size="small"
-          oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-          @change="priceChange(goodsForm)"></el-input>
+        <el-input-number v-model="goodsForm.internationalAmount" size="small" style="width:100%"
+          @change="priceChange(goodsForm)" :controls="false" :precision="10"></el-input-number>
       </template>
       //单价
       <template slot="priceForm" slot-scope="{type,disabled}">
@@ -307,6 +307,7 @@ export default {
   name: "customerInformation",
   data() {
     return {
+      calculateLoading: false,
       switchDialog: false,
       loading: false,
       itemtypeList: [],
@@ -756,28 +757,29 @@ export default {
         e.sort = Number(index) + 1
         this.form.totalValue = sum(multiply(e.outFactoryPrice, e.orderQuantity), this.form.totalValue)
       })
+      this.calculateLoading = true
       calculationDomesticFees({ ...this.form, domesticAbroad: val, orderItemsList: this.data, }).then(res => {
-        this.$confirm("总费用为:" + res.data.data.amount + ",单项运费为" + res.data.data.amountF + ",是否继续更新?", {
+        this.$confirm("总运费:" + res.data.data.amount + ",单价分摊运费:" + res.data.data.amountF + ",是否继续更新?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
           this.data.forEach(e => {
             if (val == 1) {
-              e.shareAmount = multiply(res.data.data.amountF, e.outFactoryPrice)
-              e.price = addPrice(e.outFactoryPrice, multiply(res.data.data.amountF, e.outFactoryPrice), e.internationalAmount)
+              e.shareAmount = multiply(res.data.data.amountF, e.outFactoryPrice, 10)
+              e.price = addPrice(e.outFactoryPrice, multiply(res.data.data.amountF, e.outFactoryPrice, 10), e.internationalAmount)
               e.amount = amountCal(
-                addPrice(e.outFactoryPrice, res.data.data.amountF, e.internationalAmount),
+                addPrice(e.outFactoryPrice, multiply(res.data.data.amountF, e.outFactoryPrice, 10), e.internationalAmount),
                 e.orderQuantity,
                 e.freight,
                 e.insurance,
                 e.discount
               );
             } else {
-              e.internationalAmount = multiply(res.data.data.amountF, e.outFactoryPrice)
-              e.price = addPrice(e.outFactoryPrice, multiply(res.data.data.amountF, e.outFactoryPrice), e.shareAmount)
+              e.internationalAmount = multiply(res.data.data.amountF, e.outFactoryPrice, 10)
+              e.price = addPrice(e.outFactoryPrice, multiply(res.data.data.amountF, e.outFactoryPrice, 10), e.shareAmount)
               e.amount = amountCal(
-                addPrice(e.outFactoryPrice, res.data.data.amountF, e.shareAmount),
+                addPrice(e.outFactoryPrice, multiply(res.data.data.amountF, e.outFactoryPrice, 10), e.shareAmount),
                 e.orderQuantity,
                 e.freight,
                 e.insurance,
@@ -793,10 +795,15 @@ export default {
           })
           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) })
+            if (e.price > 0) {
+              this.$emit('formGoodstoFees', { feesType: 2, ...e, corpId: this.form.corpId, corpName: this.form.corpsName, amount: multiply(e.price, e.quantity) })
+            }
           })
         });
       })
+        .finally(() => {
+          this.calculateLoading = false;
+        });
     },
     khEdit(status) {
       if (status == 'cname') {

src/views/financialManagement/incomeInvoice/incomeInvoiceDetailsPage.vue

@@ -479,13 +479,15 @@ export default {
       if (row) {
         this.billingList.forEach(e => {
           if (row == e.cname) {
-            this.form.bankNo = e.accountBank ? e.accountBank : '' + ':' + e.accountNo ? e.accountNo : ''
-            this.form.addressPhone = e.addr ? e.addr : '' + ';' + e.tel ? e.tel : ''
+            this.form.bankNo = (e.accountBank ? e.accountBank : '') + ':' + (e.accountNo ? e.accountNo : '')
+            this.form.addressPhone = (e.addr ? e.addr : '') + ';' + (e.tel ? e.tel : '')
+            this.form.taxpayerIdentificationNo = e.taxpayerDifferenceCode ? e.taxpayerDifferenceCode : ''
           }
         })
       } else {
         this.form.bankNo = ''
         this.form.addressPhone = ''
+        this.form.taxpayerIdentificationNo = ''
       }
     },
     handleClick(tab) {

src/views/financialManagement/outputInvoice/outputInvoiceDetailsPage.vue

@@ -491,13 +491,15 @@ export default {
       if (row) {
         this.billingList.forEach(e => {
           if (row == e.cname) {
-            this.form.bankNo = e.accountBank ? e.accountBank : '' + ':' + e.accountNo ? e.accountNo : ''
-            this.form.addressPhone = e.addr ? e.addr : '' + ';' + e.tel ? e.tel : ''
+            this.form.bankNo = (e.accountBank ? e.accountBank : '' )+ ':' + (e.accountNo ? e.accountNo : '')
+            this.form.addressPhone = (e.addr ? e.addr : '') + ';' + (e.tel ? e.tel : '')
+            this.form.taxpayerIdentificationNo=e.taxpayerDifferenceCode?e.taxpayerDifferenceCode:''
           }
         })
       } else {
         this.form.bankNo = ''
         this.form.addressPhone = ''
+        this.form.taxpayerIdentificationNo=''
       }
     },
     handleClick(tab) {

src/views/maintenance/portSurcharge/index.vue

@@ -12,6 +12,9 @@
         <template slot="outHarborNameSearch">
           <port-info v-model="search.outHarborName" />
         </template>
+        <template slot="objectiveNameSearch">
+          <port-info v-model="search.objectiveName" />
+        </template>
         <template slot-scope="{ row, index }" slot="menu">
           <el-button type="text" size="small" @click.stop="editOpen(row,2)">
             查看

src/views/maintenance/portSurcharge/js/optionList.js

@@ -24,7 +24,7 @@ export const option = {
         label: "dictValue",
         value: "dictValue"
       },
-      dicData:[],
+      dicData: [],
       overHidden: true,
       search: true
     },
@@ -35,6 +35,12 @@ export const option = {
       search: true
     },
     {
+      label: "目的港",
+      prop: "objectiveName",
+      overHidden: true,
+      search: true
+    },
+    {
       label: "备注",
       prop: "remarks",
       overHidden: true,

src/views/purchase/contract/config/mainList.json

@@ -3,7 +3,7 @@
   "tip": false,
   "simplePage": true,
   "searchShow": true,
-  "searchMenuSpan": 24,
+  "searchMenuSpan": 16,
   "dialogWidth": "60%",
   "align": "center",
   "searchSpan": 8,

src/views/purchase/rubberStock/config/mainList.json

@@ -33,164 +33,177 @@
   ],
   "column": [
     {
-      "label": "供应商",
-      "prop": "contractNumber",
-      "overHidden": true,
-      "index": 1,
-      "width": 150
-    },
-    {
-      "label": "品种",
-      "overHidden": true,
-      "prop": "billNo",
-      "index": 2,
-      "width": 150
-    },
-    {
-      "label": "采购公司",
-      "prop": "surplusRouteQuantity",
-      "overHidden": true,
-      "index": 3,
-      "width": 120
-    },
-    {
-      "label": "交货时间",
-      "prop": "inQuantity",
-      "overHidden": true,
-      "index": 4,
-      "width": 120
-    },
-    {
-      "label": "发货重量",
-      "prop": "inWeight",
-      "overHidden": true,
-      "index": 5,
-      "width": 120
-    },
-    {
-      "label": "单价",
-      "prop": "outQuantity",
-      "overHidden": true,
-      "index": 6,
-      "width": 120
-    },
-    {
-      "label": "合同金额",
-      "prop": "outWeight",
-      "overHidden": true,
-      "index": 7,
-      "width": 120
-    },
-    {
-      "label": "付款情况",
-      "prop": "balanceQuantity",
-      "overHidden": true,
-      "index": 8,
-      "width": 120
-    },
-    {
-      "label": "合同号",
-      "prop": "balanceWeight",
-      "overHidden": true,
-      "index": 9,
-      "width": 120
-    },
-    {
-      "label": "销售公司",
-      "overHidden": true,
-      "index": 10,
-      "width": 220,
-      "prop": "cname"
-    },
-    {
-      "label": "客户名称",
-      "prop": "cntrNo",
-      "index": 11,
-      "overHidden": true,
-      "width": 120
-    },
-    {
-      "label": "合同单价",
-      "prop": "stockName",
-      "index": 12,
-      "overHidden": true,
-      "width": 120
-    },
-    {
-      "label": "数量MT",
-      "prop": "createTime",
-      "overHidden": true,
-      "index": 13,
-      "width": 150
-    },
-    {
-      "label": "合同金额",
-      "prop": "isCntrON",
-      "overHidden": true,
-      "index": 14
-    },
-    {
-      "label": "收款情况",
-      "prop": "isCntrON",
-      "overHidden": true,
-      "index": 15,
-      "width": 150
-    },
-    {
-      "label": "业务结束日期",
-      "prop": "isCntrON",
-      "overHidden": true,
-      "index": 16,
-      "width": 150
-    },
-    {
-      "label": "提单号",
-      "prop": "isCntrON",
-      "overHidden": true,
-      "index": 16,
-      "width": 150
-    },
-    {
-      "label": "物流费用",
-      "prop": "isCntrON",
-      "overHidden": true,
-      "index": 16,
-      "width": 150
-    },
-    {
-      "label": "交货仓库",
-      "prop": "isCntrON",
-      "overHidden": true,
-      "index": 16,
-      "width": 150
-    },
-    {
-      "label": "业务员",
-      "prop": "isCntrON",
-      "overHidden": true,
-      "index": 16,
-      "width": 150
-    },
-    {
-      "label": "含税毛利",
-      "prop": "isCntrON",
-      "overHidden": true,
-      "index": 16,
-      "width": 150
-    },
-    {
-      "label": "不含税毛利",
-      "prop": "isCntrON",
-      "overHidden": true,
-      "index": 16,
-      "width": 150
-    },
-    {
-      "label": "备注",
-      "prop": "isCntrON",
-      "overHidden": true,
-      "index": 16,
-      "width": 150
+      "label": "采购明细",
+      "children": [
+        {
+          "label": "供应商",
+          "prop": "contractNumber",
+          "overHidden": true,
+          "index": 1,
+          "width": 150
+        },
+        {
+          "label": "品种",
+          "overHidden": true,
+          "prop": "billNo",
+          "index": 2,
+          "width": 150
+        },
+        {
+          "label": "采购公司",
+          "prop": "surplusRouteQuantity",
+          "overHidden": true,
+          "index": 3,
+          "width": 120
+        },
+        {
+          "label": "交货时间",
+          "prop": "inQuantity",
+          "overHidden": true,
+          "index": 4,
+          "width": 120
+        },
+        {
+          "label": "发货重量",
+          "prop": "inWeight",
+          "overHidden": true,
+          "index": 5,
+          "width": 120
+        },
+        {
+          "label": "单价",
+          "prop": "outQuantity",
+          "overHidden": true,
+          "index": 6,
+          "width": 120
+        },
+        {
+          "label": "合同金额",
+          "prop": "outWeight",
+          "overHidden": true,
+          "index": 7,
+          "width": 120
+        },
+        {
+          "label": "付款情况",
+          "prop": "balanceQuantity",
+          "overHidden": true,
+          "index": 8,
+          "width": 120
+        }
+      ]
+    },
+    {
+      "label": "销售明细",
+      "children": [
+        {
+          "label": "合同号",
+          "prop": "balanceWeight",
+          "overHidden": true,
+          "index": 9,
+          "width": 120
+        },
+        {
+          "label": "销售公司",
+          "overHidden": true,
+          "index": 10,
+          "width": 220,
+          "prop": "cname"
+        },
+        {
+          "label": "客户名称",
+          "prop": "cntrNo",
+          "index": 11,
+          "overHidden": true,
+          "width": 120
+        },
+        {
+          "label": "合同单价",
+          "prop": "stockName",
+          "index": 12,
+          "overHidden": true,
+          "width": 120
+        },
+        {
+          "label": "数量MT",
+          "prop": "createTime",
+          "overHidden": true,
+          "index": 13,
+          "width": 150
+        },
+        {
+          "label": "合同金额",
+          "prop": "isCntrON",
+          "overHidden": true,
+          "index": 14
+        },
+        {
+          "label": "收款情况",
+          "prop": "isCntrON",
+          "overHidden": true,
+          "index": 15,
+          "width": 150
+        },
+        {
+          "label": "业务结束日期",
+          "prop": "isCntrON",
+          "overHidden": true,
+          "index": 16,
+          "width": 150
+        }
+      ]
+    },
+    {
+      "label": "货物明细",
+      "children": [
+        {
+          "label": "提单号",
+          "prop": "isCntrON",
+          "overHidden": true,
+          "index": 17,
+          "width": 150
+        },
+        {
+          "label": "物流费用",
+          "prop": "isCntrON",
+          "overHidden": true,
+          "index": 18,
+          "width": 150
+        },
+        {
+          "label": "交货仓库",
+          "prop": "isCntrON",
+          "overHidden": true,
+          "index": 19,
+          "width": 150
+        }
+      ]
+    },
+    {
+      "label": "财务明细",
+      "children": [
+        {
+          "label": "业务员",
+          "prop": "isCntrON",
+          "overHidden": true,
+          "index": 20,
+          "width": 150
+        },
+        {
+          "label": "含税毛利",
+          "prop": "isCntrON",
+          "overHidden": true,
+          "index": 21,
+          "width": 150
+        },
+        {
+          "label": "不含税毛利",
+          "prop": "isCntrON",
+          "overHidden": true,
+          "index": 22,
+          "width": 150
+        }
+      ]
     }
   ]
-}
+}

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

@@ -3,7 +3,7 @@
   "tip": false,
   "simplePage": true,
   "searchShow": true,
-  "searchMenuSpan": 24,
+  "searchMenuSpan": 16,
   "searchSpan": 8,
   "height": "auto",
   "searchMenuPosition": "right",

src/views/statisticAnalysis/profit/config/mainList.json

@@ -3,7 +3,7 @@
   "tip": false,
   "simplePage": true,
   "searchShow": true,
-  "searchMenuSpan": 8,
+  "searchMenuSpan": 24,
   "dialogWidth": "60%",
   "align": "center",
   "searchSpan": 8,

src/views/statisticAnalysis/profit/index.vue

@@ -25,7 +25,7 @@ export default {
       exportLoading: false,
       form: {},
       search: {
-        orderType:'棉花'
+        orderType: '棉花'
       },
       show: true,
       detailData: {},
@@ -189,6 +189,10 @@ export default {
         option
       );
       if (inSave) {
+        this.getWorkDicts("contractType").then(res => {
+          this.findObject(this.option.column, "orderType").dicData =
+            res.data.data;
+        })
         this.$message.success("重置成功");
         this.option = option;
         //关闭窗口