Merge branch 'company' of http://120.46.155.214:3000/xiaodai2022/order-ui-pc into company

src/views/netOrderEntry/netOrderEnter/importTemplateModal.vue

@@ -65,7 +65,6 @@ export default {
         const field = header[index]
         const importField = importHeader[index]
         if (field !== importField) {
-          console.log(field, importField)
           isHeaderOk = false
           break
         }
@@ -120,12 +119,12 @@ export default {
       })
       return verification
     },
-    /* 校验导入的税率、数量、单价、采购毛利率是否为数字 **/
+    /* 校验导入的税率、数量、采购单价、销售单价是否为数字 **/
     validateNumberField(numberFields) {
-      const verification = createFieldVerification('税率、数量、单价、采购毛利率不能为空且必须是数字')
-      const { tax, goodNum, goodPrice, cgd_tax } = numberFields
+      const verification = createFieldVerification('税率、数量、销售单价、采购单价不能为空且必须是数字')
+      const { tax, goodNum, goodPrice, cgdPrice } = numberFields
       tax.forEach((_, index) => {
-        const values = [tax[index], goodNum[index], goodPrice[index], cgd_tax[index]]
+        const values = [tax[index], goodNum[index], goodPrice[index], cgdPrice[index]]
         const valuesIsNumber = values.every(value => isnumber(value))
         if (!valuesIsNumber) {
           verification.isValid = false
@@ -209,8 +208,8 @@ export default {
       }
 
       return this.handleNotValidFields(
-        this.validateKhNo(mapTableFieldToTableData.khNo),
         this.validateCompanyNo(mapTableFieldToTableData.companyNo),
+        this.validateKhNo(mapTableFieldToTableData.khNo),
         this.validateSupplierNo(mapTableFieldToTableData.supplierNo),
         this.validateMobile(mapTableFieldToTableData.mobile),
         this.validateRequiredField({
@@ -225,9 +224,9 @@ export default {
         }),
         this.validateNumberField({
           tax: mapTableFieldToTableData.tax,
-          cgd_tax: mapTableFieldToTableData.cgd_tax,
           goodNum: mapTableFieldToTableData.goodNum,
-          goodPrice: mapTableFieldToTableData.goodPrice
+          goodPrice: mapTableFieldToTableData.goodPrice,
+          cgdPrice: mapTableFieldToTableData.cgdPrice
         })
       )
     },

src/views/netOrderEntry/netOrderEnter/template.js

@@ -100,8 +100,13 @@ export const columns = [
     width: '140px'
   },
   {
-    prop: getTableProperty('单价'),
-    label: '单价',
+    prop: getTableProperty('销售单价'),
+    label: '销售单价',
+    'width': '150px'
+  },
+  {
+    prop: getTableProperty('采购单价'),
+    label: '采购单价',
     'width': '150px'
   },
   {
@@ -110,8 +115,8 @@ export const columns = [
     'width': '150px'
   },
   {
-    prop: getTableProperty('货款总额'),
-    label: '货款总额',
+    prop: getTableProperty('销售总额'),
+    label: '销售总额',
     'width': '150px'
   },
   {
@@ -176,7 +181,8 @@ export const requsetFields = [
   getTableProperty('单位'),
   getTableProperty('税率'),
   getTableProperty('数量'),
-  getTableProperty('单价'),
+  getTableProperty('销售单价'),
+  getTableProperty('采购单价'),
   getTableProperty('采购毛利率'),
   getTableProperty('收货人'),
   getTableProperty('联系电话'),