Browse Source

bug 修复

lilei 3 years ago
parent
commit
0dfb26ad24

+ 9 - 1
src/views/common/settleAccount.js

@@ -49,6 +49,8 @@ const SettleAccount = {
     settleStyleSn(a,b){
       if(a){
         this.getList()
+      }else{
+        this.clearVal()
       }
     }
   },
@@ -67,7 +69,7 @@ const SettleAccount = {
       this.defaultVal = value;
       const accountName = this.list.find(item => item[this.defValKey] == value).accountName
       this.$emit('input', value);
-      this.$emit('change', this.value, accountName);
+      this.$emit('change', value, accountName);
     },
     // 列表数据
     getList () {
@@ -80,6 +82,12 @@ const SettleAccount = {
         }
       })
     },
+    clearVal(){
+      this.list = []
+      this.defaultVal = undefined
+      this.$emit('input', undefined);
+      this.$emit('change', undefined, undefined);
+    }
   },
 };
 

+ 4 - 1
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -285,7 +285,10 @@ export default {
     },
     // 选择结算方式
     settleStyleChange (v, name) {
-      this.form.settleStyleName = name.dispName
+      console.log(name)
+      if (name) {
+        this.form.settleStyleName = name.dispName
+      }
     },
     settleAccountChange (v, name) {
       this.form.settleAccountName = name

+ 8 - 1
src/views/financialManagement/expenseManagement/edit.vue

@@ -121,7 +121,10 @@ export default {
     ...mapActions(['GetSettleAccountState']),
     // 选择结算方式
     settleStyleChange (v, name) {
-      this.form.settleStyleName = name.dispName
+      console.log(name)
+      if (name) {
+        this.form.settleStyleName = name.dispName
+      }
     },
     //  递归函数
     recursionFun (data) {
@@ -154,6 +157,7 @@ export default {
     },
     //  详情
     getDetail () {
+      this.spinning = true
       findExpenseDetail({ id: this.$route.params.id }).then(res => {
         if (res.status == 200) {
           this.form = Object.assign({}, this.form, res.data)
@@ -161,6 +165,9 @@ export default {
         } else {
           this.$refs.ruleForm.resetFields()
         }
+        setTimeout(() => {
+          this.spinning = false
+        }, 1000)
       })
     },
     //  保存

+ 11 - 9
src/views/financialManagement/fundAccountManagement/addModal.vue

@@ -17,14 +17,14 @@
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol" >
         <a-form-model-item label="账户类型" prop="settleStyleSn">
-		  <v-select
-		  code="SETTLE_STYLE" 
-		  id="fundAount-settleStyleSn" 
-		  v-model="form.settleStyleSn" 
-		  @change="settleStyleChange"
-		  allowClear 
-		  placeholder="请选择账户类型" 
-		  ></v-select>
+          <v-select
+            code="SETTLE_STYLE"
+            id="fundAount-settleStyleSn"
+            v-model="form.settleStyleSn"
+            @change="settleStyleChange"
+            allowClear
+            placeholder="请选择账户类型"
+          ></v-select>
         </a-form-model-item>
         <a-form-model-item label="账户名称" prop="accountName">
           <a-input
@@ -106,7 +106,9 @@ export default {
       this.isEdit = false
     },
     settleStyleChange (v, name) {
-      this.form.settleStyleName = name.dispName
+		 if (name) {
+        this.form.settleStyleName = name.dispName
+      }
     },
     //  保存
     handleSubmit (e) {

+ 3 - 1
src/views/financialManagement/settleModal/settleModal.vue

@@ -102,7 +102,9 @@ export default {
       }
     },
     settleStyleChange (v, name) {
-      this.form.settleStyleName = name.dispName
+      if (name) {
+        this.form.settleStyleName = name.dispName
+      }
     },
     //  保存
     handleSubmit (e) {