Browse Source

feature:bug修复

chenqilong 2 năm trước cách đây
mục cha
commit
89be8374f6

+ 1 - 0
src/views/basic_data/taker/taker_list.vue

@@ -9,6 +9,7 @@
     :tableAttributes="tableAttributes"
     :tableEvents="tableEvents"
     :operationColumnWidth="200"
+    :replaceOrNotMap="false"
   >
     <!-- 弹窗 -->
     <el-dialog

+ 3 - 4
src/views/finance/components/receivable_list-add.vue

@@ -261,7 +261,7 @@
     </div>
 
     <!-- 提示 -->
-    <el-dialog title="提示" :visible.sync="dialogVisible" width="30%">
+    <el-dialog title="提示" append-to-body :visible.sync="dialogVisible" width="30%">
       <ul class="ulStyle" v-for="(v, i) in messageList" :key="i">
         <li>{{ v }},现金钱包余额不足,请确认是否继续提交此单据</li>
       </ul>
@@ -399,8 +399,7 @@ export default {
       const res = await getFinanceOtherReceList({ pageSize: 1, pageNum: 1 })
       await getFinanceOtherReceApply({ id: res.data.records[0].id })
       this.$message.success('提审成功')
-      this.$emit('updateList')
-      this.$parent.showPage = 1
+      this.goBack()
       this.resetFn()
     },
     // // 不含税金额改变事件
@@ -496,8 +495,8 @@ export default {
         const res = await getFinanceOtherReceList({ pageSize: 1, pageNum: 1 })
         await getFinanceOtherReceApply({ id: res.data.records[0].id })
         this.$message.success('提审成功')
-        this.goBack()
         this.resetFn()
+        this.goBack()
       }
     },
     //选择经销商名称事件

+ 1 - 2
src/views/finance/components/receivable_list-approval.vue

@@ -252,9 +252,8 @@ export default {
         examineRemark: this.examineRemark,
         examineStatus: this.examineStatus
       })
-      this.$emit('updateList')
-      this.$parent.showPage = 1
       this.$message.success('审核成功')
+      this.goBack()
     },
     async getDataList() {
       const res = await getFinanceOtherReceDetail({ id: this.approvalId })

+ 2 - 1
src/views/finance/components/receivable_list-detail.vue

@@ -387,7 +387,8 @@ export default {
         code: this.searchForm.code
       })
       this.$message.success('编辑成功')
-      this.$parent.showPage = 1
+      // this.$parent.showPage = 1
+      this.goBack()
     },
     //选择经销商名称事件
     async changeCustomerFn(v, index) {

+ 2 - 3
src/views/finance/receivable_list.vue

@@ -163,8 +163,8 @@ export default {
                 打印
               </el-button>
             ) : null}
-            {row.examineStatus == 'WAIT' ||
-            (row.examineStatus == 'FAIL' && this.$checkBtnRole('examine', this.$route.meta.roles)) ? (
+            {(row.examineStatus == 'WAIT' || row.examineStatus == 'FAIL') &&
+            this.$checkBtnRole('examine', this.$route.meta.roles) ? (
               <el-button type="text" onClick={() => this.approvalFn(row.id)}>
                 审批
               </el-button>
@@ -198,7 +198,6 @@ export default {
         this.showPage = 1
       })()
       this.$refs.pageRef.refreshList()
-
     },
     //获取经销商列表
     async getCustomerDataList() {