Qukatie 6 месяцев назад
Родитель
Сommit
aaec26d567

+ 10 - 1
src/api/basicData/customerInquiry.js

@@ -132,9 +132,18 @@ export const getPricebank = (current, size, params) => {
   })
 }
 //所有价格库
+// export const getPricebankAll = (params) => {
+//   return request({
+//     url: '/api/blade-mocha-item/pricebank/pageListAll',
+//     method: 'get',
+//     params: {
+//       ...params
+//     }
+//   })
+// }
 export const getPricebankAll = (params) => {
   return request({
-    url: '/api/blade-mocha-item/pricebank/pageListAll',
+    url: '/api/blade-mocha-item/pricebank/pageListAllV1',
     method: 'get',
     params: {
       ...params

+ 24 - 2
src/util/date.js

@@ -230,10 +230,32 @@ function addZero(num) {
 //验证英文
 export function verifyEnglish(str) {
   const regex = /^[A-Za-z0-9\n .,!?:()|/+-_;'"$&@%*#,。!?:()——]+$/;
-  return regex.test(str?str:null);
+  return regex.test(str ? str : null);
 }
 //验证符号
 export function verifySymbol(str) {
   const regex = /^[A-Za-z0-9\n .,!?:()|/+-_;'"$&@%*#]+$/;
-  return regex.test(str?str:null);
+  return regex.test(str ? str : null);
+}
+// 匹配常见全角符号的正则表达式(包括标点、字母、数字等)
+export function checkFullWidthSymbols(text) {
+  const fullWidthRegex = /[\u3000-\u303F\uFF01-\uFF5E\uFFE0-\uFFE5]/g;
+  const matches = [];
+  let lines = text.split('\n')
+  let match;
+
+  lines.forEach((ln, index) => {
+    while ((match = fullWidthRegex.exec(ln)) !== null) {
+      matches.push({
+        row: index + 1,         // 行号
+        index: match.index,     // 符号的位置
+        symbol: match[0]        // 符号本身
+      });
+    }
+  })
+  return {
+    hasFullWidth: matches.length > 0, // 是否包含全角符号
+    positions: matches                // 符号的详细位置和内容
+  };
+
 }

+ 161 - 81
src/views/exportTrade/customerInquiry/components/goodsInfo.vue

@@ -107,12 +107,16 @@
             //产品名称
             <template slot="cnameForm" slot-scope="{type,disabled}">
                 <span style="display:flex">
-                    <el-select v-model="goodsForm.itemId" placeholder="请选择" size="small" filterable
+                    <!-- <el-select v-model="goodsForm.itemId" placeholder="请选择" size="small" filterable
                         @change="cnameChange(goodsForm)">
                         <el-option v-for="item in goodsoptions" :key="item.itemId" :label="item.cname"
                             :value="item.itemId">
                         </el-option>
-                    </el-select>
+                    </el-select> -->
+                    <dic-select v-model="goodsForm.cname" placeholder="产品名称" key="id" label="cname" res="records"
+                        :url="'/blade-mocha-item/pricebank/pageListAllV1?billType=CG&statusTime=' + statusTime"
+                        :filterable="true" :remote="true" dataName="cname"
+                        @selectChange="cnameChange('cname', $event)"></dic-select>
                     <el-button icon="el-icon-search" size="small" @click="pickGoods"></el-button>
                 </span>
             </template>
@@ -353,6 +357,7 @@ import reportDialog from "@/components/report-dialog/main";
 import partLibrary from "@/components/part-library/main";
 import priceLibrary from "@/components/price-Library/main";
 import propertyDialog from "@/components/property-dialog/main";
+import dicSelect from "@/components/dicSelect/main";
 import { dateFormat } from "@/util/date";
 import {
     delItem,
@@ -384,6 +389,7 @@ export default {
     name: "customerInformation",
     data() {
         return {
+            statusTime: dateFormat(new Date(), "yyyy-MM-dd"),
             priceAD: 0,
             visible: false,
             calculateLoading: false,
@@ -454,7 +460,8 @@ export default {
         partLibrary,
         propertyDialog,
         priceLibrary,
-        reportDialog
+        reportDialog,
+        dicSelect
     },
     filters: {
         decimalFormat2(num) {
@@ -615,85 +622,158 @@ export default {
             }
             this.$refs.crud.rowAdd()
         },
-        cnameChange(row) {
+        cnameChange(name,row) {
             this.upDataOption()
-            for (let e of this.goodsoptions) {
-                if (e.itemId == row.itemId) {
-                    row.itemId = e.itemId;
-                    row.code = e.code;
-                    row.cname = e.cname;
-                    row.ename = e.ename;
-                    row.priceCategory = e.goodsTypeName;
-                    row.purchaseCost = costCal(e.price, e.taxRate);
-                    row.purchaseAmount = e.purchaseAmount;
-                    row.itemProp = null;
-                    row.remarksOne = null;
-                    row.customTwo = null;
-                    row.customThree = null;
-                    row.customFour = null;
-                    row.customFive = null;
-                    row.customSix = null;
-                    row.customSeven = null;
-                    row.customEight = null;
-                    row.customNine = null;
-                    row.customTen = null;
-                    row.partsValveName = null;
-                    row.partsValveValue = null;
-                    row.partsValveCostPrice = 0;
-                    row.partsValveSalePrice = 0;
-                    row.partsCapName = null;
-                    row.partsCapValue = null;
-                    row.partsCapCostPrice = 0;
-                    row.partsCapSalePrice = 0;
-                    row.partsHandleName = null;
-                    row.partsHandleValue = null;
-                    row.partsHandleCostPrice = 0;
-                    row.partsHandleSalePrice = 0;
-                    row.partsColourName = null;
-                    row.partsColourValue = null;
-                    row.partsColourCostPrice = 0;
-                    row.partsColourSalePrice = 0;
-                    row.partsModeName = null;
-                    row.partsModeValue = null;
-                    row.partsModeCostPrice = 0;
-                    row.partsModeSalePrice = 0;
-                    row.partsAuthenticationName = null;
-                    row.partsAuthenticationValue = null;
-                    row.partsAuthenticationCostPrice = 0;
-                    row.partsAuthenticationSalePrice = 0;
-                    row.partsOtherName = null;
-                    row.partsOtherValue = null;
-                    row.partsOtherCostPrice = 0;
-                    row.partsOtherSalePrice = 0;
-                    row.partsCost = 0;
-                    row.corpId = e.corpId;
-                    row.corpName = e.corpCode;
-                    row.itemDescription = e.cnameDescription;
-                    row.partsPrice = 0;
-                    row.itemType = e.specs;
-                    row.tradeTerms = null;
-                    row.productPrice = productCal(e.purchaseAmount, 0, this.form.coefficient);
-                    row.outFactoryPrice = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate, 3);
-                    row.shareAmount = 0;
-                    row.internationalAmount = 0;
-                    row.orderQuantity = 1;
-                    row.insurance = 0;
-                    row.freight = 0;
-                    row.discount = null;
-                    row.price = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate);
-                    row.amount = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate);
-                    row.taxRate = 0;
-                    row.unit = e.unit;
-                    row.itemMargin = grossProfitCal(e.purchaseAmount, 0, sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate), this.form.exchangeRate);
-                    row.goodsGrossProfit = goodsGrossProfitCal(e.purchaseAmount, 0, sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate), this.form.exchangeRate);
-                    row.partsDescribe = null;
-                    row.remarks = null;
-                    row.exchangeRate = this.form.exchangeRate;
-                    row.productRemark = e.ename;
-                    row.attributeList = this.getAttribute(e.goodsSpecificationList);
-                    row.referrerReason = e.referrerReason
-                }
-            }
+            this.goodsForm.itemId = row.itemId;
+            this.goodsForm.code = row.code;
+            this.goodsForm.cname = row.cname;
+            this.goodsForm.ename = row.ename;
+            this.goodsForm.priceCategory = row.goodsTypeName;
+            this.goodsForm.purchaseCost = costCal(row.price, row.taxRate);
+            this.goodsForm.purchaseAmount = row.purchaseAmount;
+            this.goodsForm.itemProp = null;
+            this.goodsForm.remarksOne = null;
+            this.goodsForm.customTwo = null;
+            this.goodsForm.customThree = null;
+            this.goodsForm.customFour = null;
+            this.goodsForm.customFive = null;
+            this.goodsForm.customSix = null;
+            this.goodsForm.customSeven = null;
+            this.goodsForm.customEight = null;
+            this.goodsForm.customNine = null;
+            this.goodsForm.customTen = null;
+            this.goodsForm.partsValveName = null;
+            this.goodsForm.partsValveValue = null;
+            this.goodsForm.partsValveCostPrice = 0;
+            this.goodsForm.partsValveSalePrice = 0;
+            this.goodsForm.partsCapName = null;
+            this.goodsForm.partsCapValue = null;
+            this.goodsForm.partsCapCostPrice = 0;
+            this.goodsForm.partsCapSalePrice = 0;
+            this.goodsForm.partsHandleName = null;
+            this.goodsForm.partsHandleValue = null;
+            this.goodsForm.partsHandleCostPrice = 0;
+            this.goodsForm.partsHandleSalePrice = 0;
+            this.goodsForm.partsColourName = null;
+            this.goodsForm.partsColourValue = null;
+            this.goodsForm.partsColourCostPrice = 0;
+            this.goodsForm.partsColourSalePrice = 0;
+            this.goodsForm.partsModeName = null;
+            this.goodsForm.partsModeValue = null;
+            this.goodsForm.partsModeCostPrice = 0;
+            this.goodsForm.partsModeSalePrice = 0;
+            this.goodsForm.partsAuthenticationName = null;
+            this.goodsForm.partsAuthenticationValue = null;
+            this.goodsForm.partsAuthenticationCostPrice = 0;
+            this.goodsForm.partsAuthenticationSalePrice = 0;
+            this.goodsForm.partsOtherName = null;
+            this.goodsForm.partsOtherValue = null;
+            this.goodsForm.partsOtherCostPrice = 0;
+            this.goodsForm.partsOtherSalePrice = 0;
+            this.goodsForm.partsCost = 0;
+            this.goodsForm.corpId = row.corpId;
+            this.goodsForm.corpName = row.corpCode;
+            this.goodsForm.itemDescription = row.cnameDescription;
+            this.goodsForm.partsPrice = 0;
+            this.goodsForm.itemType = row.specs;
+            this.goodsForm.tradeTerms = null;
+            this.goodsForm.productPrice = productCal(row.purchaseAmount, 0, this.form.coefficient);
+            this.goodsForm.outFactoryPrice = sellingCal(productCal(row.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate, 3);
+            this.goodsForm.shareAmount = 0;
+            this.goodsForm.internationalAmount = 0;
+            this.goodsForm.orderQuantity = 1;
+            this.goodsForm.insurance = 0;
+            this.goodsForm.freight = 0;
+            this.goodsForm.discount = null;
+            this.goodsForm.price = sellingCal(productCal(row.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate);
+            this.goodsForm.amount = sellingCal(productCal(row.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate);
+            this.goodsForm.taxRate = 0;
+            this.goodsForm.unit = row.unit;
+            this.goodsForm.itemMargin = grossProfitCal(row.purchaseAmount, 0, sellingCal(productCal(row.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate), this.form.exchangeRate);
+            this.goodsForm.goodsGrossProfit = goodsGrossProfitCal(row.purchaseAmount, 0, sellingCal(productCal(row.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate), this.form.exchangeRate);
+            this.goodsForm.partsDescribe = null;
+            this.goodsForm.remarks = null;
+            this.goodsForm.exchangeRate = this.form.exchangeRate;
+            this.goodsForm.productRemark = row.ename;
+            this.goodsForm.attributeList = this.getAttribute(row.goodsSpecificationList);
+            this.goodsForm.referrerReason = row.referrerReason
+            // for (let e of this.goodsoptions) {
+            //     if (e.itemId == row.itemId) {
+            //         row.itemId = e.itemId;
+            //         row.code = e.code;
+            //         row.cname = e.cname;
+            //         row.ename = e.ename;
+            //         row.priceCategory = e.goodsTypeName;
+            //         row.purchaseCost = costCal(e.price, e.taxRate);
+            //         row.purchaseAmount = e.purchaseAmount;
+            //         row.itemProp = null;
+            //         row.remarksOne = null;
+            //         row.customTwo = null;
+            //         row.customThree = null;
+            //         row.customFour = null;
+            //         row.customFive = null;
+            //         row.customSix = null;
+            //         row.customSeven = null;
+            //         row.customEight = null;
+            //         row.customNine = null;
+            //         row.customTen = null;
+            //         row.partsValveName = null;
+            //         row.partsValveValue = null;
+            //         row.partsValveCostPrice = 0;
+            //         row.partsValveSalePrice = 0;
+            //         row.partsCapName = null;
+            //         row.partsCapValue = null;
+            //         row.partsCapCostPrice = 0;
+            //         row.partsCapSalePrice = 0;
+            //         row.partsHandleName = null;
+            //         row.partsHandleValue = null;
+            //         row.partsHandleCostPrice = 0;
+            //         row.partsHandleSalePrice = 0;
+            //         row.partsColourName = null;
+            //         row.partsColourValue = null;
+            //         row.partsColourCostPrice = 0;
+            //         row.partsColourSalePrice = 0;
+            //         row.partsModeName = null;
+            //         row.partsModeValue = null;
+            //         row.partsModeCostPrice = 0;
+            //         row.partsModeSalePrice = 0;
+            //         row.partsAuthenticationName = null;
+            //         row.partsAuthenticationValue = null;
+            //         row.partsAuthenticationCostPrice = 0;
+            //         row.partsAuthenticationSalePrice = 0;
+            //         row.partsOtherName = null;
+            //         row.partsOtherValue = null;
+            //         row.partsOtherCostPrice = 0;
+            //         row.partsOtherSalePrice = 0;
+            //         row.partsCost = 0;
+            //         row.corpId = e.corpId;
+            //         row.corpName = e.corpCode;
+            //         row.itemDescription = e.cnameDescription;
+            //         row.partsPrice = 0;
+            //         row.itemType = e.specs;
+            //         row.tradeTerms = null;
+            //         row.productPrice = productCal(e.purchaseAmount, 0, this.form.coefficient);
+            //         row.outFactoryPrice = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate, 3);
+            //         row.shareAmount = 0;
+            //         row.internationalAmount = 0;
+            //         row.orderQuantity = 1;
+            //         row.insurance = 0;
+            //         row.freight = 0;
+            //         row.discount = null;
+            //         row.price = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate);
+            //         row.amount = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate);
+            //         row.taxRate = 0;
+            //         row.unit = e.unit;
+            //         row.itemMargin = grossProfitCal(e.purchaseAmount, 0, sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate), this.form.exchangeRate);
+            //         row.goodsGrossProfit = goodsGrossProfitCal(e.purchaseAmount, 0, sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate), this.form.exchangeRate);
+            //         row.partsDescribe = null;
+            //         row.remarks = null;
+            //         row.exchangeRate = this.form.exchangeRate;
+            //         row.productRemark = e.ename;
+            //         row.attributeList = this.getAttribute(e.goodsSpecificationList);
+            //         row.referrerReason = e.referrerReason
+            //     }
+            // }
         },
         importLibray(rows) {
             this.upDataOption()

+ 0 - 0
src/views/exportTrade/customerInquiry/components/index.js


+ 180 - 91
src/views/exportTrade/salesContract/components/goodsInfo.vue

@@ -104,11 +104,14 @@
       //产品名称
       <template slot="cnameForm" slot-scope="{type,disabled}">
         <span style="display:flex">
-          <el-select v-model="goodsForm.itemId" placeholder="请选择" size="small" filterable
+          <!-- <el-select v-model="goodsForm.itemId" placeholder="请选择" size="small" filterable
             @change="cnameChange(goodsForm)">
             <el-option v-for="item in goodsoptions" :key="item.itemId" :label="item.cname" :value="item.itemId">
             </el-option>
-          </el-select>
+          </el-select> -->
+          <dic-select v-model="goodsForm.cname" placeholder="产品名称" key="id" label="cname" res="records"
+            :url="'/blade-mocha-item/pricebank/pageListAllV1?billType=CG&statusTime='+statusTime" :filterable="true" :remote="true" dataName="cname"
+            @selectChange="cnameChange('cname', $event)"></dic-select>
           <el-button icon="el-icon-search" size="small" @click="pickGoods"></el-button>
         </span>
       </template>
@@ -349,6 +352,7 @@ import reportDialog from "@/components/report-dialog/main";
 import partLibrary from "@/components/part-library/main";
 import priceLibrary from "@/components/price-Library/main";
 import propertyDialog from "@/components/property-dialog/main";
+import dicSelect from "@/components/dicSelect/main";
 import {
   dateFormat
 } from "@/util/date";
@@ -382,6 +386,7 @@ export default {
   name: "customerInformation",
   data() {
     return {
+      statusTime: dateFormat(new Date(), "yyyy-MM-dd"),
       priceAD: 0,
       visible: false,
       fudaSatus: null,
@@ -456,7 +461,8 @@ export default {
     partLibrary,
     propertyDialog,
     priceLibrary,
-    reportDialog
+    reportDialog,
+    dicSelect
   },
   filters: {
     decimalFormat2(num) {
@@ -630,95 +636,178 @@ export default {
       }
       this.$refs.crud.rowAdd()
     },
-    cnameChange(row) {
+    cnameChange(name, row) {
       this.upDataOption()
-      this.goodsoptions.forEach(e => {
-        if (e.itemId == row.itemId) {
-          row.itemId = e.itemId;
-          row.code = e.code;
-          row.cname = e.cname;
-          row.ename = e.ename;
-          row.priceCategory = e.goodsTypeName;
-          row.purchaseCost = costCal(e.price, e.taxRate);
-          row.purchaseAmount = e.purchaseAmount;
-          row.itemProp = null;
-          row.remarksOne = null;
-          row.customTwo = null;
-          row.customThree = null;
-          row.customFour = null;
-          row.customFive = null;
-          row.customSix = null;
-          row.customSeven = null;
-          row.customEight = null;
-          row.customNine = null;
-          row.customTen = null;
-          row.partsValveName = null;
-          row.partsValveValue = null;
-          row.partsValveCostPrice = 0;
-          row.partsValveSalePrice = 0;
-          row.partsCapName = null;
-          row.partsCapValue = null;
-          row.partsCapCostPrice = 0;
-          row.partsCapSalePrice = 0;
-          row.partsHandleName = null;
-          row.partsHandleValue = null;
-          row.partsHandleCostPrice = 0;
-          row.partsHandleSalePrice = 0;
-          row.partsColourName = null;
-          row.partsColourValue = null;
-          row.partsColourCostPrice = 0;
-          row.partsColourSalePrice = 0;
-          row.partsModeName = null;
-          row.partsModeValue = null;
-          row.partsModeCostPrice = 0;
-          row.partsModeSalePrice = 0;
-          row.partsAuthenticationName = null;
-          row.partsAuthenticationValue = null;
-          row.partsAuthenticationCostPrice = 0;
-          row.partsAuthenticationSalePrice = 0;
-          row.partsOtherName = null;
-          row.partsOtherValue = null;
-          row.partsOtherCostPrice = 0;
-          row.partsOtherSalePrice = 0;
-          row.partsCost = 0;
-          row.corpId = e.corpId;
-          row.corpName = e.corpCode;
-          row.itemDescription = e.cnameDescription;
-          row.partsPrice = 0;
-          row.itemType = e.specs;
-          row.tradeTerms = null;
-          row.productPrice = productCal(e.purchaseAmount, 0, this.form.coefficient);
-          row.outFactoryPrice = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate, 3);
-          row.shareAmount = 0;
-          row.internationalAmount = 0;
-          row.totalValue = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate);
-          row.orderQuantity = 1;
-          row.insurance = 0;
-          row.freight = 0;
-          row.discount = null;
-          row.price = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate);
-          row.amount = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate);
-          row.taxRate = 0;
-          row.unit = e.unit;
-          row.itemMargin = grossProfitCal(e.purchaseAmount, 0, sellingCal(productCal(e.purchaseAmount, 0, this
-            .form.coefficient), this.form.exchangeRate), this.form.exchangeRate);
-          row.goodsGrossProfit = goodsGrossProfitCal(e.purchaseAmount, 0, sellingCal(productCal(e.purchaseAmount, 0, this
-            .form.coefficient), this.form.exchangeRate), this.form.exchangeRate);
-          row.partsDescribe = null;
-          row.remarks = null;
-          row.exchangeRate = this.form.exchangeRate;
-          row.productRemark = e.ename;
-          row.attributeList = this.getAttribute(e.goodsSpecificationList),
-            row.referrerReason = e.referrerReason
-          // 处理单品毛利率是 -00.00 的问题
-          if (Number(row.itemMargin) === 0) {
-            row.itemMargin = Number(row.itemMargin) + ''
-          }
-          if (Number(row.goodsGrossProfit) == 0) {
-            row.goodsGrossProfit = Number(row.goodsGrossProfit)
-          }
-        }
-      })
+      this.goodsForm.itemId = row.itemId;
+      this.goodsForm.code = row.code;
+      this.goodsForm.cname = row.cname;
+      this.goodsForm.ename = row.ename;
+      this.goodsForm.priceCategory = row.goodsTypeName;
+      this.goodsForm.purchaseCost = costCal(row.price, row.taxRate);
+      this.goodsForm.purchaseAmount = row.purchaseAmount;
+      this.goodsForm.itemProp = null;
+      this.goodsForm.remarksOne = null;
+      this.goodsForm.customTwo = null;
+      this.goodsForm.customThree = null;
+      this.goodsForm.customFour = null;
+      this.goodsForm.customFive = null;
+      this.goodsForm.customSix = null;
+      this.goodsForm.customSeven = null;
+      this.goodsForm.customEight = null;
+      this.goodsForm.customNine = null;
+      this.goodsForm.customTen = null;
+      this.goodsForm.partsValveName = null;
+      this.goodsForm.partsValveValue = null;
+      this.goodsForm.partsValveCostPrice = 0;
+      this.goodsForm.partsValveSalePrice = 0;
+      this.goodsForm.partsCapName = null;
+      this.goodsForm.partsCapValue = null;
+      this.goodsForm.partsCapCostPrice = 0;
+      this.goodsForm.partsCapSalePrice = 0;
+      this.goodsForm.partsHandleName = null;
+      this.goodsForm.partsHandleValue = null;
+      this.goodsForm.partsHandleCostPrice = 0;
+      this.goodsForm.partsHandleSalePrice = 0;
+      this.goodsForm.partsColourName = null;
+      this.goodsForm.partsColourValue = null;
+      this.goodsForm.partsColourCostPrice = 0;
+      this.goodsForm.partsColourSalePrice = 0;
+      this.goodsForm.partsModeName = null;
+      this.goodsForm.partsModeValue = null;
+      this.goodsForm.partsModeCostPrice = 0;
+      this.goodsForm.partsModeSalePrice = 0;
+      this.goodsForm.partsAuthenticationName = null;
+      this.goodsForm.partsAuthenticationValue = null;
+      this.goodsForm.partsAuthenticationCostPrice = 0;
+      this.goodsForm.partsAuthenticationSalePrice = 0;
+      this.goodsForm.partsOtherName = null;
+      this.goodsForm.partsOtherValue = null;
+      this.goodsForm.partsOtherCostPrice = 0;
+      this.goodsForm.partsOtherSalePrice = 0;
+      this.goodsForm.partsCost = 0;
+      this.goodsForm.corpId = row.corpId;
+      this.goodsForm.corpName = row.corpCode;
+      this.goodsForm.itemDescription = row.cnameDescription;
+      this.goodsForm.partsPrice = 0;
+      this.goodsForm.itemType = row.specs;
+      this.goodsForm.tradeTerms = null;
+      this.goodsForm.productPrice = productCal(row.purchaseAmount, 0, this.form.coefficient);
+      this.goodsForm.outFactoryPrice = sellingCal(productCal(row.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate, 3);
+      this.goodsForm.shareAmount = 0;
+      this.goodsForm.internationalAmount = 0;
+      this.goodsForm.totalValue = sellingCal(productCal(row.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate);
+      this.goodsForm.orderQuantity = 1;
+      this.goodsForm.insurance = 0;
+      this.goodsForm.freight = 0;
+      this.goodsForm.discount = null;
+      this.goodsForm.price = sellingCal(productCal(row.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate);
+      this.goodsForm.amount = sellingCal(productCal(row.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate);
+      this.goodsForm.taxRate = 0;
+      this.goodsForm.unit = row.unit;
+      this.goodsForm.itemMargin = grossProfitCal(row.purchaseAmount, 0, sellingCal(productCal(row.purchaseAmount, 0, this
+        .form.coefficient), this.form.exchangeRate), this.form.exchangeRate);
+      this.goodsForm.goodsGrossProfit = goodsGrossProfitCal(row.purchaseAmount, 0, sellingCal(productCal(row.purchaseAmount, 0, this
+        .form.coefficient), this.form.exchangeRate), this.form.exchangeRate);
+      this.goodsForm.partsDescribe = null;
+      this.goodsForm.remarks = null;
+      this.goodsForm.exchangeRate = this.form.exchangeRate;
+      this.goodsForm.productRemark = row.ename;
+      this.goodsForm.attributeList = this.getAttribute(row.goodsSpecificationList),
+        this.goodsForm.referrerReason = row.referrerReason
+      // 处理单品毛利率是 -00.00 的问题
+      if (Number(this.goodsForm.itemMargin) === 0) {
+        this.goodsForm.itemMargin = Number(this.goodsForm.itemMargin) + ''
+      }
+      if (Number(this.goodsForm.goodsGrossProfit) == 0) {
+        this.goodsForm.goodsGrossProfit = Number(this.goodsForm.goodsGrossProfit)
+      }
+      // this.goodsoptions.forEach(e => {
+      //   if (e.itemId == row.itemId) {
+      //     row.itemId = e.itemId;
+      //     row.code = e.code;
+      //     row.cname = e.cname;
+      //     row.ename = e.ename;
+      //     row.priceCategory = e.goodsTypeName;
+      //     row.purchaseCost = costCal(e.price, e.taxRate);
+      //     row.purchaseAmount = e.purchaseAmount;
+      //     row.itemProp = null;
+      //     row.remarksOne = null;
+      //     row.customTwo = null;
+      //     row.customThree = null;
+      //     row.customFour = null;
+      //     row.customFive = null;
+      //     row.customSix = null;
+      //     row.customSeven = null;
+      //     row.customEight = null;
+      //     row.customNine = null;
+      //     row.customTen = null;
+      //     row.partsValveName = null;
+      //     row.partsValveValue = null;
+      //     row.partsValveCostPrice = 0;
+      //     row.partsValveSalePrice = 0;
+      //     row.partsCapName = null;
+      //     row.partsCapValue = null;
+      //     row.partsCapCostPrice = 0;
+      //     row.partsCapSalePrice = 0;
+      //     row.partsHandleName = null;
+      //     row.partsHandleValue = null;
+      //     row.partsHandleCostPrice = 0;
+      //     row.partsHandleSalePrice = 0;
+      //     row.partsColourName = null;
+      //     row.partsColourValue = null;
+      //     row.partsColourCostPrice = 0;
+      //     row.partsColourSalePrice = 0;
+      //     row.partsModeName = null;
+      //     row.partsModeValue = null;
+      //     row.partsModeCostPrice = 0;
+      //     row.partsModeSalePrice = 0;
+      //     row.partsAuthenticationName = null;
+      //     row.partsAuthenticationValue = null;
+      //     row.partsAuthenticationCostPrice = 0;
+      //     row.partsAuthenticationSalePrice = 0;
+      //     row.partsOtherName = null;
+      //     row.partsOtherValue = null;
+      //     row.partsOtherCostPrice = 0;
+      //     row.partsOtherSalePrice = 0;
+      //     row.partsCost = 0;
+      //     row.corpId = e.corpId;
+      //     row.corpName = e.corpCode;
+      //     row.itemDescription = e.cnameDescription;
+      //     row.partsPrice = 0;
+      //     row.itemType = e.specs;
+      //     row.tradeTerms = null;
+      //     row.productPrice = productCal(e.purchaseAmount, 0, this.form.coefficient);
+      //     row.outFactoryPrice = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate, 3);
+      //     row.shareAmount = 0;
+      //     row.internationalAmount = 0;
+      //     row.totalValue = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate);
+      //     row.orderQuantity = 1;
+      //     row.insurance = 0;
+      //     row.freight = 0;
+      //     row.discount = null;
+      //     row.price = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate);
+      //     row.amount = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate);
+      //     row.taxRate = 0;
+      //     row.unit = e.unit;
+      //     row.itemMargin = grossProfitCal(e.purchaseAmount, 0, sellingCal(productCal(e.purchaseAmount, 0, this
+      //       .form.coefficient), this.form.exchangeRate), this.form.exchangeRate);
+      //     row.goodsGrossProfit = goodsGrossProfitCal(e.purchaseAmount, 0, sellingCal(productCal(e.purchaseAmount, 0, this
+      //       .form.coefficient), this.form.exchangeRate), this.form.exchangeRate);
+      //     row.partsDescribe = null;
+      //     row.remarks = null;
+      //     row.exchangeRate = this.form.exchangeRate;
+      //     row.productRemark = e.ename;
+      //     row.attributeList = this.getAttribute(e.goodsSpecificationList),
+      //       row.referrerReason = e.referrerReason
+      //     // 处理单品毛利率是 -00.00 的问题
+      //     if (Number(row.itemMargin) === 0) {
+      //       row.itemMargin = Number(row.itemMargin) + ''
+      //     }
+      //     if (Number(row.goodsGrossProfit) == 0) {
+      //       row.goodsGrossProfit = Number(row.goodsGrossProfit)
+      //     }
+      //   }
+      // })
     },
     importLibray(rows) {
       this.upDataOption()

+ 10 - 8
src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -332,7 +332,7 @@ import businessReports from "@/views/iosBasicData/SeafreightExportF/bills/assemb
 import { popupReminder } from "@/util/messageReminder";
 import editypes from "@/views/iosBasicData/editypes/index.vue";
 import { editypesList } from "@/api/iosBasicData/editypes";
-import { verifyEnglish, verifySymbol } from "@/util/date";
+import { verifyEnglish, verifySymbol, checkFullWidthSymbols } from "@/util/date";
 import { contrastObj, contrastList } from "@/util/contrastData";
 import { selectListLos } from "@/api/approval/processConfig";
 import _ from "lodash";
@@ -928,7 +928,7 @@ export default {
                 },
                 callback: (res) => {
                     res.done()
-                    this.billsCopyBillsfun(this.form.id,res.data.checkbox)
+                    this.billsCopyBillsfun(this.form.id, res.data.checkbox)
                     res.close()
                 }
             })
@@ -992,6 +992,8 @@ export default {
         editypesSendingEdifun(row) {
             row.billId = this.form.id
             let msgsList = []
+            //     console.log( checkFullWidthSymbols(this.form.detail.hshipperDetails))
+            //    return
             if (!verifyEnglish(this.form.detail.hshipperDetails)) {
                 msgsList.push('发货人')
             }
@@ -1955,7 +1957,7 @@ export default {
             })
         },
         // 复制单据接口
-        billsCopyBillsfun(id,type) {
+        billsCopyBillsfun(id, type) {
             const loading = this.$loading({
                 lock: true,
                 text: '加载中',
@@ -1963,12 +1965,12 @@ export default {
                 background: 'rgba(255,255,255,0.7)'
             });
             billsCopyBills({ id }).then(res => {
-                if (type == '复制费用'||type == '') {
-                    res.data.data.preContainersList=[]
+                if (type == '复制费用' || type == '') {
+                    res.data.data.preContainersList = []
                 }
-                if (type == '复制箱型箱量'||type == '') {
-                    res.data.data.feeCenterListD=[]
-                    res.data.data.feeCenterListC=[]
+                if (type == '复制箱型箱量' || type == '') {
+                    res.data.data.feeCenterListD = []
+                    res.data.data.feeCenterListC = []
                 }
                 this.form = res.data.data;
                 this.pageLoading = false

+ 1 - 1
src/views/tirePartsMall/basicData/sharedSales/index.vue

@@ -378,7 +378,7 @@ export default {
       }
       config.params.bsType = 'GX'
       const routeData = this.$router.resolve({
-        path: '/api/blade-sales-part/order/listExport',      //跳转目标下载地址
+        path: '/api/blade-sales-part/shareSales/listExport',      //跳转目标下载地址
         query: {
           ...config.params    //括号内是要传递给新窗口的参数
         }