소스 검색

修改bug

QuKatie 3 년 전
부모
커밋
e0c451ab09
2개의 변경된 파일66개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      src/components/customer-dialog/main.vue
  2. 65 1
      src/views/exportTrade/purchaseInquiry/detailsPage.vue

+ 1 - 1
src/components/customer-dialog/main.vue

@@ -90,7 +90,7 @@ export default {
         lazy: true,
         treeLoad: function(node, resolve) {
           const parentId = node.level === 0 ? 0 : node.data.id;
-          getDeptLazyTree(parentId).then(res => {
+          getDeptLazyTree({parentId:parentId,corpType:"KH"}).then(res => {
             resolve(
               res.data.data.map(item => {
                 return {

+ 65 - 1
src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -180,6 +180,12 @@
               :cropIndex="index"
               @getcorpId="getcorpId"
             ></customer-dialog>
+             <!-- <select-component
+                v-if="row.$cellEdit"
+              v-model="form.corpId"
+              :configuration="configuration"
+              :disabled="detailData.status == 1"
+            ></select-component> -->
             <span v-else>{{ row.corpName }}</span>
           </template>
           <template slot="purchaseAmount" slot-scope="{ row }">
@@ -499,7 +505,7 @@ export default {
     this.getWorkDicts("currency").then(res => {
       this.currencyList = res.data.data;
     });
-    getGoods(1,500).then(res => {
+    getGoods(1, 500).then(res => {
       this.goodsoptions = res.data.data.records;
     });
   },
@@ -645,6 +651,13 @@ export default {
                 item.taxRate = this.reData.taxRate;
                 item.unit = e.unit;
                 item.remarks = this.reData.remarks;
+                item.coefficient = this.reData.coefficient;
+                item.purchaseAmount = this.reData.purchaseAmount;
+                item.exchangeRate = this.reData.exchangeRate;
+                item.currency = this.reData.currency;
+                item.greenback = this.reData.greenback;
+                item.taxRate = this.reData.taxRate;
+                item.corpId = this.reData.corpId;
                 item.$cellEdit = true;
               }
             });
@@ -659,6 +672,7 @@ export default {
             priceCategory: e.goodsTypeName,
             itemUrl: e.url,
             itemProp: null,
+            corpId: null,
             itemDescription: e.cnameDescription,
             itemType: null,
             tradeTerms: null,
@@ -669,6 +683,10 @@ export default {
             discount: null,
             amount: 0,
             coefficient: 0,
+            purchaseAmount: 0,
+            exchangeRate: null,
+            currency: null,
+            greenback: null,
             taxRate: 0,
             unit: e.unit,
             remarks: null,
@@ -745,6 +763,52 @@ export default {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
+          if (this.data) {
+            for (let i = 0; i < this.data.length; i++) {
+              if (!this.data[i].price) {
+                return this.$message.error(
+                  "第" + (Number(i) + 1) + "行的单价不能为空"
+                );
+              }
+              if (!this.data[i].taxRate) {
+                return this.$message.error(
+                  "第" + (Number(i) + 1) + "行的税率不能为空"
+                );
+              }
+              if (!this.data[i].coefficient) {
+                return this.$message.error(
+                  "第" + (Number(i) + 1) + "行的FOB系数不能为空"
+                );
+              }
+              if (!this.data[i].corpId) {
+                return this.$message.error(
+                  "第" + (Number(i) + 1) + "行的供应商不能为空"
+                );
+              }
+              if (!this.data[i].purchaseAmount) {
+                return this.$message.error(
+                  "第" + (Number(i) + 1) + "行的采购价不能为空"
+                );
+              }
+              if (!this.data[i].currency) {
+                return this.$message.error(
+                  "第" + (Number(i) + 1) + "行的币别不能为空"
+                );
+              }
+
+              if (!this.data[i].exchangeRate) {
+                return this.$message.error(
+                  "第" + (Number(i) + 1) + "行的汇率不能为空"
+                );
+              }
+              if (!this.data[i].greenback) {
+                return this.$message.error(
+                  "第" + (Number(i) + 1) + "行的美元价格不能为空"
+                );
+              }
+            }
+          }
+
           if (status == "save") {
             this.subLoading = true;
             submit({