Bläddra i källkod

feature:bug修复

chenqilong 2 år sedan
förälder
incheckning
8d4ec8447b
3 ändrade filer med 11 tillägg och 8 borttagningar
  1. 3 1
      src/utils/common.js
  2. 6 6
      src/views/finance/rebate_list.vue
  3. 2 1
      src/views/supply/sales/sales_list.vue

+ 3 - 1
src/utils/common.js

@@ -32,8 +32,10 @@ export const warningNotify = msg => {
  * @returns
  */
 export const checkBtnRole = (value, btnRole) => {
+  // console.log(btnRole)
+  // let condition = btnRole === undefined ? [] : btnRole
   if (!btnRole) {
-    return true
+    return false
   }
   let index = btnRole.indexOf(value)
   return index >= 0

+ 6 - 6
src/views/finance/rebate_list.vue

@@ -13,22 +13,22 @@
       :replaceOrNotMap="false"
     >
     </template-page>
-    <div class="app-container"  v-show="showPage == 2">
+    <div class="app-container" v-if="showPage == 2">
       <RebateListApply :detailId="detailId" />
     </div>
-    <div class="app-container"  v-show="showPage == 3">
+    <div class="app-container" v-if="showPage == 3">
       <RebateListExamine @updateList="updateList" :detailId="detailId" />
     </div>
-    <div class="app-container"  v-show="showPage == 4">
+    <div class="app-container" v-if="showPage == 4">
       <RebateListReview @updateList="updateList" :detailId="detailId" />
     </div>
-    <div class="app-container"  v-show="showPage == 5">
+    <div class="app-container" v-if="showPage == 5">
       <RebateListDetail :detailId="detailId" />
     </div>
-    <div class="app-container"  v-show="showPage == 6">
+    <div class="app-container" v-if="showPage == 6">
       <RebateListConfirm @updateList="updateList" :detailId="detailId" :isShow="isShow" />
     </div>
-    <div class="app-container"  v-show="showPage == 7">
+    <div class="app-container" v-if="showPage == 7">
       <RebateListEdit @updateList="updateList" :detailId="detailId" />
     </div>
     <ExamineDialog :isShow.sync="isShowExamineDialog" :examineForm.sync="examineForm" />

+ 2 - 1
src/views/supply/sales/sales_list.vue

@@ -10,7 +10,7 @@
     :columnParsing="columnParsing"
     :replaceOrNotMap="false"
   >
-    <ExamineDialog :is-show.sync="isShowExamineDialog" :examine-form.sync="examineForm"  @submit="submitExamineForm"/>
+    <ExamineDialog :is-show.sync="isShowExamineDialog" :examine-form.sync="examineForm" @submit="submitExamineForm" />
     <Popu v-if="isShowDetail || isShowExamine || isShowReturnForm">
       <SalesDetail v-if="isShowDetail" :list-item="queryItem" :edit="edit" @close="handleClose" />
       <SalesExamine v-if="isShowExamine" :list-item="queryItem" @close="handleClose" />
@@ -226,6 +226,7 @@ export default {
         this.isShowExamine = false
         this.isShowReturnForm = false
       })()
+      this.$refs.pageRef.refreshList()
     },
 
     // 获取仓库列表