فهرست منبع

Merge branch 'develop_fybx02' of jianguan-web/jg-ocs-html into pre-release

李磊 3 سال پیش
والد
کامیت
a177f54392

+ 3 - 0
src/views/common/area.js

@@ -96,6 +96,9 @@ const Area = {
         }
       })
     },
+    clearData(){
+      this.list = []
+    }
   },
 };
 

+ 4 - 4
src/views/expenseManagement/expenseReimbursement/chooseImportModal.vue

@@ -171,7 +171,7 @@ export default {
       const ret = []
       list.map(item => {
         // 有承担人员
-        if (item.childDetailSplitList) {
+        if (item.childDetailSplitList && item.childDetailSplitList.length) {
           item.childDetailSplitList.map(k => {
             ret.push({
               splitObjName: item.importSplitObjName,
@@ -214,7 +214,7 @@ export default {
     // 确认导入
     handleSubmit () {
       if (this.paramsData.rightList.length == 0) {
-        this.$message.warning('无可导入费用明细!')
+        this.$message.warning('没有可导入的费用明细!')
       } else {
         const data = this.paramsData.rightList
         data.map(item => {
@@ -229,11 +229,11 @@ export default {
     handleError () {
       const _this = this
       if (_this.paramsData.errorList.length < 1) {
-        _this.$message.info('暂无可导出错误项~')
+        _this.$message.info('暂无错误项!')
         return
       }
       _this.spinning = true
-      hdExportExcel(expenseFailExcel, _this.paramsData.errorList, '费用明细导错误项', function () {
+      hdExportExcel(expenseFailExcel, _this.paramsData.errorList, '费用明细导错误项', function () {
         _this.spinning = false
       })
     }

+ 7 - 0
src/views/expenseManagement/expenseReimbursement/epenseDetailModal.vue

@@ -69,6 +69,7 @@
                 <a-form-model-item label="所属城市" prop="citySn">
                   <Area
                     id="epenseDetailModal-area"
+                    ref="city"
                     @change="cityChange"
                     placeholder="请选择所属城市"
                     leve="city"
@@ -211,6 +212,7 @@ export default {
       this.form.provinceSn = v || ''
       this.form.citySn = undefined
       this.form.cityName = ''
+      this.$refs.city.clearData()
     },
     // 市
     cityChange (v, row) {
@@ -293,6 +295,7 @@ export default {
     resetForm () {
       this.$nextTick(() => {
         this.$refs.ruleForm.resetFields()
+        this.$refs.city.clearData()
       })
       this.form = {
         id: undefined,
@@ -311,6 +314,10 @@ export default {
         expenseAccountDetailSn: '', // 报销明细sn
         detailSplitList: []
       }
+      this.form.provinceSn = undefined
+      this.form.provinceName = ''
+      this.form.citySn = undefined
+      this.form.cityName = ''
       this.form.expenseAccountSn = this.expenseAccountSn
       this.form.expenseAccountNo = this.expenseAccountNo
     }