内贸修改

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -177,7 +177,6 @@
                 type="warning"
                 icon="el-icon-refresh"
                 size="small"
-                :disabled="detailData.seeDisabled || arrivalDisabled || deliverDisabled"
                 @click="resetStock"
               >库存刷新</el-button>
             </template>

src/views/businessManagement/purchaseOrder/index.vue

@@ -233,6 +233,9 @@ export default {
       this.isShow = false;
       this.$store.commit("DOMCG_IN_DETAIL");
     }
+    if (this.$route.query.params) {
+      this.beforeOpenPage({id: this.$route.query.params})
+    }
   },
   methods: {
     //删除列表后面的删除按钮触发触发(row, index, done)

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -37,7 +37,7 @@
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item
-              :disabled="detailData.seeDisabled"
+              :disabled="detailData.seeDisabled || form.status != 3"
               @click.native="applySettlement('收费')">生成账单
             </el-dropdown-item>
 <!--            <el-dropdown-item-->
@@ -60,7 +60,7 @@
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item
-              :disabled="detailData.seeDisabled || form.status == 3"
+              :disabled="detailData.seeDisabled || form.status != 3"
               @click.native="saveSell">生成采购
             </el-dropdown-item>
             <el-dropdown-item
@@ -358,7 +358,7 @@
                          icon="el-icon-plus"
                          size="small"
                          :disabled="selection.length < 1 || detailData.seeDisabled || !form.status || form.status < 3
-                         || (Number(form.debitAmount) !== Number(form.settlmentAmount))"
+                         || (Number(form.debitAmount) < Number(form.settlmentAmount))"
                          @click="getShipmentD"
                          v-show="goodsActives == 'goods'">生成客户确认
               </el-button>
@@ -2099,7 +2099,7 @@ export default {
         tradeType: 'GN',
         optionType: 'GN',
         chargeMember: this.form.chargeMember,
-        amount: this.form.orderAmount
+        amount: this.form.balanceAmount
       }
       if(bool){ //申请货款
         this.billData.srcId = -1

src/views/businessManagement/salesOrder/index.vue

@@ -187,20 +187,25 @@ export default {
     })
   },
   activated() {
-    if (this.$route.query.id) {
-      this.isShow = true
-      this.beforeOpenPage({id: this.$route.query.id})
-    }
-    if (this.$route.query.check) {
-      this.isShow = true
-      // this.beforeOpenPage({id: this.$route.query.check.billId})
-      this.detailData = {
-        id: this.$route.query.check.billId,
-        check: this.$route.query.check,
-      };
-      this.isShow = false;
-      this.$store.commit("DOMXS_IN_DETAIL");
-    }
+    setTimeout(() => {
+      if (this.$route.query.id) {
+        this.isShow = true
+        this.beforeOpenPage({id: this.$route.query.id})
+      }
+      if (this.$route.query.check) {
+        this.isShow = true
+        // this.beforeOpenPage({id: this.$route.query.check.billId})
+        this.detailData = {
+          id: this.$route.query.check.billId,
+          check: this.$route.query.check,
+        };
+        this.isShow = false;
+        this.$store.commit("DOMXS_IN_DETAIL");
+      }
+      if (this.$route.query.params) {
+        this.beforeOpenPage({id: this.$route.query.params})
+      }
+    }, 100)
   },
   methods: {
     tableRowClassName({row, column, rowIndex, columnIndex}) {