国内贸易修改

src/page/index/tags.vue

@@ -323,7 +323,7 @@ export default {
           this.$store.commit("SE_OUT_DETAIL");
         }
         if (tag.label == "销售订单(N)") {
-          this.$store.commit("SE_OUT_DETAIL");
+          this.$store.commit("DOMXS_OUT_DETAIL");
         }
         this.$store.commit("DEL_TAG", tag);
         if (tag.value === this.tag.value) {

src/store/getters.js

@@ -36,6 +36,7 @@ const getters = {
   paySettle: state => state.ifdetail.paySettle,
   receiptSettle: state => state.ifdetail.receiptSettle,
   mainItemStatus: state => state.ifdetail.mainItemStatus,
-  settleStatus: state => state.ifdetail.settleStatus
+  settleStatus: state => state.ifdetail.settleStatus,
+  domSaleStatus: state => state.ifdetail.domSaleStatus,
 }
 export default getters

src/store/modules/ifdetail.js

@@ -110,6 +110,14 @@ const ifdetail = {
     SE_OUT_DETAIL(state) {
       state.settleStatus = false;
     },
+    // 打开国内销售订单
+    DOMXS_IN_DETAIL(state) {
+      state.domSaleStatus = false;
+    },
+    //关闭国内销售订单
+    DOMXS_OUT_DETAIL(state) {
+      state.domSaleStatus = false;
+    },
     //关闭所有
     DEL_ALL_DETAIL(state) {
       for (let item in state) {
@@ -154,6 +162,9 @@ const ifdetail = {
       if (tag.label == '结算') {
         state.settleStatus = true;
       }
+      if (tag.label == '销售订单(N)') {
+        state.domSaleStatus = true
+      }
     }
   }
 

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -722,18 +722,20 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '预估运费',
-            prop: 'predictOceanFreight',
-            type: 'number',
-            rules: [
-              {
-                required: false,
-                message: ' ',
-                trigger: 'blur'
-              }
-            ]
-          }, {
+          },
+          // {
+          //   label: '预估运费',
+          //   prop: 'predictOceanFreight',
+          //   type: 'number',
+          //   rules: [
+          //     {
+          //       required: false,
+          //       message: ' ',
+          //       trigger: 'blur'
+          //     }
+          //   ]
+          // },
+          {
             label: '要求到货日期',
             prop: 'requiredArrivalDate',
             type: 'datetime',

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -165,21 +165,13 @@
                                 value-format="yyyy-MM-dd HH:mm:ss"
                                 :disabled="detailData.seeDisabled || browse"/>
                 <el-input
-                  v-else-if="(item.prop === 'advancePayment') || (item.prop === 'orderAmount') || (item.prop === 'settlmentAmount')"
+                  v-else-if="(item.prop === 'advancePayment') || (item.prop === 'orderAmount') ||
+                  (item.prop === 'settlmentAmount') || (item.prop === 'caseOverPayment') || (item.prop === 'thisUsedProfit')"
                   v-model.trim="form[item.prop]" size="small" autocomplete="off"
                   @change="computedCost"
                   :disabled="detailData.seeDisabled || item.disabled || browse"
                   v-input-limit="2"
                 ></el-input>
-                <span v-else-if="item.prop === 'caseOverPayment'">
-                  <el-input
-                    v-model="form['caseOverPayment']"
-                    size="small"
-                    autocomplete="off"
-                    @change="computedCost"
-                    :disabled="detailData.seeDisabled || browse"
-                    v-input-limit="2"></el-input>
-                </span>
                 <el-select v-else-if="item.prop === 'orderStatus'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled || item.disabled || browse">
                   <el-option v-for="(item,index) in statusOption" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
@@ -1256,7 +1248,7 @@ export default {
               {
                 required: true,
                 message: ' ',
-                trigger: 'blur'
+                trigger: 'change'
               }
             ]
           }, {
@@ -1266,7 +1258,7 @@ export default {
               {
                 required: true,
                 message: ' ',
-                trigger: 'blur'
+                trigger: 'change'
               }
             ]
           }, {
@@ -1277,7 +1269,7 @@ export default {
               {
                 required: true,
                 message: ' ',
-                trigger: 'blur'
+                trigger: 'change'
               }
             ]
           },
@@ -1289,7 +1281,7 @@ export default {
               {
                 required: true,
                 message: ' ',
-                trigger: 'blur'
+                trigger: 'change'
               }
             ]
           }, {
@@ -1300,7 +1292,7 @@ export default {
               {
                 required: true,
                 message: ' ',
-                trigger: 'blur'
+                trigger: 'change'
               }
             ]
           }, {
@@ -1311,7 +1303,7 @@ export default {
               {
                 required: true,
                 message: ' ',
-                trigger: 'blur'
+                trigger: 'change'
               }
             ]
           }, {
@@ -1341,7 +1333,7 @@ export default {
               {
                 required: true,
                 message: ' ',
-                trigger: 'blur'
+                trigger: 'change'
               }
             ]
           }, {
@@ -1351,7 +1343,7 @@ export default {
               {
                 required: false,
                 message: ' ',
-                trigger: 'blur'
+                trigger: 'change'
               }
             ]
           }, {
@@ -1504,6 +1496,7 @@ export default {
     this.$set(this.form, 'predictOceanFreight', 0)
     this.$set(this.form, 'presenterIntegral' , 0)
     this.$set(this.form, 'convertIntegral' , 0)
+    this.$set(this.form, 'profit' , 0)
     this.$set(this.form, 'paymentType', '预付')
     let date = new Date();
     let year = date.getFullYear();
@@ -2748,26 +2741,32 @@ export default {
     // 计算应收未收款
     computedCost() {
       if (Number(this.form.caseOverPayment) > Number(this.form.overPayment)) {
-        this.$message.error('本次使用的溢付款不能超过总溢付款')
         this.form.caseOverPayment = 0;
+        return this.$message.error('本次使用的溢付款不能超过总溢付款')
+      }
+      if (Number(this.form.thisUsedProfit) > Number(this.form.profit)) {
+        this.form.thisUsedProfit = 0;
+        return this.$message.error('本次使用的返利不能超过返利余额')
       }
       // 销售金额
-      let orderAmount = 0;
+      let orderAmount = this.form.orderAmount? this.form.orderAmount: 0
       // 已收款
-      let settlmentAmount = 0;
+      let settlmentAmount = this.form.settlmentAmount? this.form.settlmentAmount: 0
       // 本次溢付款
-      let caseOverPayment = 0
-      if (this.form.orderAmount) {
-        orderAmount = this.form.orderAmount
-      }
-      if (this.form.settlmentAmount) {
-        settlmentAmount = this.form.settlmentAmount
-      }
-      if (this.form.caseOverPayment) {
-        caseOverPayment = this.form.caseOverPayment
-      }
-      this.$set(this.form, "balanceAmount", (Number(orderAmount) - Number(caseOverPayment) - Number(settlmentAmount)).toFixed(2));
-      this.$set(this.form, 'debitAmount', ((Number(orderAmount) - Number(caseOverPayment)).toFixed(2)))
+      let caseOverPayment = this.form.caseOverPayment? this.form.caseOverPayment: 0
+      // 本次试用返利
+      let thisUsedProfit = this.form.thisUsedProfit? this.form.thisUsedProfit: 0
+      // if (this.form.orderAmount) {
+      //   orderAmount = this.form.orderAmount
+      // }
+      // if (this.form.settlmentAmount) {
+      //   settlmentAmount = this.form.settlmentAmount
+      // }
+      // if (this.form.caseOverPayment) {
+      //   caseOverPayment = this.form.caseOverPayment
+      // }
+      this.$set(this.form, 'debitAmount', ((Number(orderAmount) - Number(caseOverPayment) - Number(thisUsedProfit)).toFixed(2)))
+      this.$set(this.form, "balanceAmount", (Number(this.form.debitAmount) - Number(settlmentAmount)).toFixed(2));
     },
     quantityChange(row) {
       if (!row.orderQuantity) {

src/views/businessManagement/salesOrder/index.vue

@@ -82,6 +82,7 @@
             icon="el-icon-delete"
             size="small"
             @click.stop="rowDel(scope.row,scope.index)"
+            :disabled="scope.row.status > 0"
           >删除
           </el-button>
         </template>
@@ -264,6 +265,7 @@ export default {
         seeDisabled: true,
       };
       this.isShow = false;
+      this.$store.commit("DOMXS_IN_DETAIL");
     },
     //新增跳转页面
     beforeOpen(row, index) {
@@ -271,12 +273,14 @@ export default {
         id: row.id,
       };
       this.isShow = false;
+      this.$store.commit("DOMXS_IN_DETAIL");
     },
     editOpen(row, index) {
       this.detailData = {
         id: row.id,
       };
       this.isShow = false;
+      this.$store.commit("DOMXS_IN_DETAIL");
     },
     // 复制新单
     copyOrder() {
@@ -285,6 +289,7 @@ export default {
         copyId: id,
       };
       this.isShow = false;
+      this.$store.commit("DOMXS_IN_DETAIL");
     },
     //点击新增时触发
     beforeClose(done) {