lilei 3 anni fa
parent
commit
af142c9563

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "1.1.1",
+    "version": "1.1.2",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 2 - 2
src/views/expenseManagement/expenseReimbursement/epenseCdfModal.vue

@@ -7,7 +7,7 @@
           <a-table
             class="sTable fixPagination"
             ref="table"
-            :scroll="{ y: 500 }"
+            :scroll="{ y: 300 }"
             size="small"
             :rowKey="(record,index) => 'cdfTable-'+index"
             :columns="columns"
@@ -214,7 +214,7 @@ export default {
       } else {
         ret.map(item => {
           if (item.splitObjType == 'DEPARTMENT') {
-            const al = item.childDetailSplitList.filter(a => !a.splitObjSn && a.splitAmount)
+            const al = item.childDetailSplitList.filter(a => !a.splitObjSn && a.splitAmount > 0)
             if (al.length) {
               hasError = 3
             } else {

+ 12 - 3
src/views/expenseManagement/expenseReimbursement/epenseDetailModal.vue

@@ -206,13 +206,16 @@ export default {
     },
     // 省
     provinceChange (v, row) {
-      console.log(v, !v)
-      this.form.provinceName = !v ? row.name : undefined
+      console.log(v, row)
+      this.form.provinceName = row ? row.name : ''
+      this.form.provinceSn = v || ''
       this.form.citySn = undefined
+      this.form.cityName = ''
     },
     // 市
     cityChange (v, row) {
-      this.form.cityName = !v ? row.name : undefined
+      this.form.cityName = row ? row.name : ''
+      this.form.citySn = v || ''
     },
     // 详情
     getExpenseAccountDetail () {
@@ -220,6 +223,8 @@ export default {
       expenseAcctDetailFindBySn({ detailSn: this.expenseAccountDetailSn }).then(res => {
         this.$nextTick(() => {
           this.form = Object.assign(this.form, res.data || {})
+          this.form.provinceSn = this.form.provinceSn ? this.form.provinceSn : undefined
+          this.form.citySn = this.form.citySn ? this.form.citySn : undefined
           setTimeout(() => {
             this.form.accountNameSn = res.data.accountNameSn
             if (res.data.accountType == 'CUSTOMER') {
@@ -261,6 +266,10 @@ export default {
           }
           // 获取承担人列表数据
           form.detailSplitList = cdfList[1]
+          form.provinceName = form.provinceName ? form.provinceName : ''
+          form.provinceSn = form.provinceSn ? form.provinceSn : ''
+          form.citySn = form.citySn ? form.citySn : ''
+          form.cityName = form.cityName ? form.cityName : ''
           console.log(form)
           delete form.subareaNames
           delete form.subareaSns