Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/finance/charge/index.vue

@@ -226,7 +226,7 @@
             style="width: 200px"
             @keyup.enter.native="handleQuery"
             :remote-method="corpsRemoteMethod"
-            :disabled="notChange"
+            :disabled="doNot"
             placeholder="请输入结算单位"
           >
             <el-option
@@ -364,6 +364,7 @@
               clearable
               size="small"
               style="width: 200px"
+              :disabled="doNot"
               @keyup.enter.native="handleQuery"
               :remote-method="corpsRemoteMethod"
               placeholder="请输入结算单位"
@@ -508,7 +509,7 @@
         </el-table>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="confirmImport">确 定</el-button>
-          <el-button @click="innerVisible = false">取 消</el-button>
+          <el-button @click="signOut">取 消</el-button>
         </div>
       </el-dialog>
     </el-dialog>
@@ -582,6 +583,7 @@ export default {
   name: 'Charge',
   data() {
     return {
+      doNot:false,
       Lander:'',
       Operator:'',
       approve:false,
@@ -736,6 +738,16 @@ export default {
     this.adoPt()
   },
   methods: {
+    //财务主取消
+    signOut(){
+      if(this.increase_s.length == 0){
+        this.doNot = false
+      }else{
+        this.doNot = true
+      }
+      this.innerVisible = false
+      this.feeList = []
+    },
     //收费页面合计
     listTotal(param){
       const { columns, data } = param
@@ -1024,6 +1036,9 @@ export default {
       this.chargeList_s = []
       // this.queryParameter.fToCorpid = this.queryParams.fCorpid
       this.innerVisible = true
+      if(this.queryParams.fCorpid){
+        this.doNot = true
+      }
     },
     getSum(param){
       const {columns,data} = param;
@@ -1083,6 +1098,7 @@ export default {
     },
     //确认导入
     confirmImport() {
+      this.doNot = true
       this.hide = true
       for (let item in this.selection) {
         this.pass.fAmtcr += Number(this.selection[item].fAmt)
@@ -1340,6 +1356,11 @@ export default {
         this.fMblnoOptions = response.data.corps
         this.open = true
         this.title = '修改收费列表'
+        if(this.DzfeeList){
+          this.doNot = true
+        }else{
+          this.doNot = false
+        }
       })
     },
     /** 提交按钮 */
@@ -1431,6 +1452,12 @@ export default {
         this.queryParams.fAmtcr += this.increase_s[item].fAmt
         this.queryParams.fAmtdr += this.increase_s[item].fAmtdr
       }
+      if(this.increase_s == 0){
+        console.log("111")
+        this.doNot = false
+      }else{
+        this.doNot = true
+      }
     }
   }
 }

src/views/finance/payment/index.vue

@@ -226,7 +226,7 @@
             style="width: 200px"
             @keyup.enter.native="handleQuery"
             :remote-method="corpsRemoteMethod"
-            :disabled="notChange"
+            :disabled="doNot"
             placeholder="请输入结算单位"
           >
             <el-option
@@ -362,6 +362,7 @@
               remote
               clearable
               size="small"
+              :disabled="doNot"
               style="width: 200px"
               @keyup.enter.native="handleQuery"
               :remote-method="corpsRemoteMethod"
@@ -507,7 +508,7 @@
         </el-table>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="confirmImport">确 定</el-button>
-          <el-button @click="innerVisible = false">取 消</el-button>
+          <el-button @click="signOut">取 消</el-button>
         </div>
       </el-dialog>
     </el-dialog>
@@ -580,6 +581,7 @@ export default {
   name: 'Charge',
   data() {
     return {
+      doNot:false,
       Lander:'',
       Operator:'',
       approve:false,
@@ -731,6 +733,16 @@ export default {
     this.adoPt()
   },
   methods: {
+    //财务主取消
+    signOut(){
+      if(this.increase_s == 0){
+        this.doNot = false
+      }else{
+        this.doNot = true
+      }
+      this.innerVisible = false
+      this.feeList = []
+    },
     //付费页面合计
     listTotal(param){
       const { columns, data } = param
@@ -1019,6 +1031,9 @@ export default {
       this.chargeList_s = []
       // this.queryParameter.fToCorpid = this.queryParams.fCorpid
       this.innerVisible = true
+      if(this.queryParams.fCorpid){
+        this.doNot = true
+      }
     },
     getSum(param){
       const {columns,data} = param;
@@ -1078,6 +1093,7 @@ export default {
     },
     //确认导入
     confirmImport() {
+      this.doNot = true
       this.hide = true
       for (let item in this.selection) {
         this.pass.fAmtcr += Number(this.selection[item].fAmt.toFixed(2))
@@ -1437,6 +1453,11 @@ export default {
         this.queryParams.fAmtcr += this.increase_s[item].fAmt
         this.queryParams.fAmtdr += this.increase_s[item].fAmtdr
       }
+      if(this.increase_s == 0){
+        this.doNot = false
+      }else{
+        this.doNot = true
+      }
     }
   }
 }