修改国内贸易

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -166,9 +166,9 @@
             </template>
             <template slot="menuLeft" slot-scope="{size}">
               <el-tabs v-model="goodsActives" @tab-click="handleClick">
-                <el-tab-pane label="商品" name="goods" :key="'first'" :disabled="goodsDisabled || goodsActives == 'goods'">
+                <el-tab-pane label="商品" name="goods" :key="'first'" :disabled="goodsDisabled">
                 </el-tab-pane>
-                <el-tab-pane label="赠品" name="gift" :key="'second'" :disabled="goodsDisabled || goodsActives == 'gift'">
+                <el-tab-pane label="赠品" name="gift" :key="'second'" :disabled="goodsDisabled">
                 </el-tab-pane>
               </el-tabs>
               <el-button type="primary"
@@ -1654,6 +1654,7 @@ export default {
               this.form.corpsTypeId = this.form.corpsTypeId.join(",")
             }
             this.pageLoading = true
+            this.saveActives = ''
             sendOutGoods(this.form).then(res => {
               this.$message.success('发货成功')
               this.queryData(res.data.data.id)
@@ -1682,6 +1683,7 @@ export default {
             this.form.corpsTypeId = this.form.corpsTypeId.join(",")
           }
           this.pageLoading = true
+          this.saveActives = ''
           revokeOutGoods(this.form).then(res => {
             this.$message.success('撤销成功')
             this.queryData(res.data.data.id)
@@ -1716,6 +1718,7 @@ export default {
           this.form.deliveryItemsList = this.goodsShowData.concat(this.giftData)
         }
         this.pageLoading = true
+        this.saveActives = ''
         confirmArrival(this.form).then(res => {
           this.$message.success('已确认到货')
           this.queryData(this.form.id)
@@ -1732,6 +1735,7 @@ export default {
         this.form.deliveryItemsList = this.goodsShowData.concat(this.giftData)
       }
       this.pageLoading = true
+      this.saveActives = ''
       cancelArrival(this.form).then(res => {
         this.$message.success('撤销到货成功')
         this.queryData(this.form.id)
@@ -1821,10 +1825,9 @@ export default {
           storageId: this.form.storageId
         }).then(res => {
           item.inventoryNumber = res.data.data
-        }).finally(() => {
-          this.$message.success('刷新成功')
         })
       })
+      this.$message.success('刷新成功')
     },
     // 商品信息标签页切换
     handleClick(data) {

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -953,17 +953,6 @@ export default {
               }
             ]
           }, {
-            label: '其他费用',
-            prop: 'otherAmount',
-            type: 'number',
-            rules: [
-              {
-                required: false,
-                message: ' ',
-                trigger: 'blur'
-              }
-            ]
-          }, {
             label: '本次溢付款',
             prop: 'caseOverPayment',
             rules: [
@@ -1018,18 +1007,18 @@ export default {
                 trigger: 'blur'
               }
             ]
+          },{
+            label: '其他费用',
+            prop: 'otherAmount',
+            type: 'number',
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
           },
-          // {
-          //   label: '应收预付款',
-          //   prop: 'advancePayment',
-          //   rules: [
-          //     {
-          //       required: false,
-          //       message: ' ',
-          //       trigger: 'blur'
-          //     }
-          //   ]
-          // },
           {
             label: '保证金',
             prop: 'deposit',
@@ -1075,8 +1064,9 @@ export default {
               }
             ]
           }, {
-            label: '毛利率',
-            prop: 'grossProfitRate',
+            label: '到货日期',
+            prop: 'arrivalDate',
+            type: 'datetime',
             rules: [
               {
                 required: false,
@@ -1085,9 +1075,8 @@ export default {
               }
             ]
           }, {
-            label: '毛利额',
-            prop: 'grossProfit',
-            type: 'number',
+            label: '毛利率',
+            prop: 'grossProfitRate',
             rules: [
               {
                 required: false,
@@ -1096,8 +1085,8 @@ export default {
               }
             ]
           }, {
-            label: '历史运费(元/条)',
-            prop: 'freightAmountHistory',
+            label: '毛利额',
+            prop: 'grossProfit',
             type: 'number',
             rules: [
               {
@@ -1107,9 +1096,9 @@ export default {
               }
             ]
           }, {
-            label: '到货日期',
-            prop: 'arrivalDate',
-            type: 'datetime',
+            label: '历史运费(元/条)',
+            prop: 'freightAmountHistory',
+            type: 'number',
             rules: [
               {
                 required: false,
@@ -1129,8 +1118,9 @@ export default {
               }
             ]
           }, {
-            label: '积分余额',
-            prop: 'pointMutiple',
+            label: '特价占比',
+            prop: 'specialOfferOf',
+            disabled: false,
             rules: [
               {
                 required: false,
@@ -1138,7 +1128,7 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
+          },{
             label: '单据状态',
             prop: 'orderStatus',
             disabled: true,
@@ -1150,9 +1140,9 @@ export default {
               }
             ]
           },{
-            label: '特价占比',
-            prop: 'specialOfferOf',
-            disabled: false,
+            label: '积分余额',
+            prop: 'pointMutiple',
+            disabled: true,
             rules: [
               {
                 required: false,
@@ -1160,7 +1150,7 @@ export default {
                 trigger: 'blur'
               }
             ]
-          },{
+          }, {
             label: '赠送积分',
             prop: 'presenterIntegral',
             disabled: true,
@@ -2386,9 +2376,12 @@ export default {
             this.goodsShowData.splice(index, 1);
             if (this.goodsActives == 'goods') {
               this.form.presenterIntegral = 0;
+              this.form.orderAmount = 0;
               this.goodsShowData.forEach(item => {
+                this.form.orderAmount = (Number(this.form.orderAmount) + Number(item.amount)).toFixed(2)
                 this.form.presenterIntegral = (Number(this.form.presenterIntegral) + Number(item.integral)).toFixed(2)
               })
+              this.computedCost()
             } else {
               this.form.convertIntegral = 0;
               this.goodsShowData.forEach(item => {
@@ -2404,9 +2397,12 @@ export default {
           this.goodsShowData.splice(index, 1);
           if (this.goodsActives == 'goods') {
             this.form.presenterIntegral = 0;
+            this.form.orderAmount = 0;
             this.goodsShowData.forEach(item => {
+              this.form.orderAmount = (Number(this.form.orderAmount) + Number(item.amount)).toFixed(2)
               this.form.presenterIntegral = (Number(this.form.presenterIntegral) + Number(item.integral)).toFixed(2)
             })
+            this.computedCost()
           } else {
             this.form.convertIntegral = 0;
             this.goodsShowData.forEach(item => {
@@ -2564,7 +2560,8 @@ export default {
           this.form.orderFeesList = this.$refs.feeInfo.submitData()
           let packFee;
           if (this.form.packageRemarks) {
-            packFee = this.form.orderFeesList.findIndex(item => item.feeName == '包装费')
+            let arr = this.form.orderFeesList.filter(item => item.feesType == 1)
+            packFee = arr.findIndex(item => item.feeName == '包装费')
           }
           if (packFee == -1) {
             return this.$message.error('费用明细未有包装费')
@@ -2699,6 +2696,7 @@ export default {
           this.form.orderAmount = (Number(this.form.orderAmount) + Number(item.amount)).toFixed(2)
           this.form.presenterIntegral = (Number(this.form.presenterIntegral) + Number(item.integral)).toFixed(2)
         })
+        this.computedCost()
       } else {
         this.form.convertIntegral = 0;
         this.goodsShowData.forEach(item => {
@@ -2718,6 +2716,7 @@ export default {
         this.goodsShowData.forEach(item => {
           this.form.orderAmount = (Number(this.form.orderAmount) + Number(item.amount)).toFixed(2)
         })
+        this.computedCost()
       }
     },
     //返回列表