Merge branch 'dev_v2' of https://gogs.zfire.top/zfire-front/supply-front into dev_v2

src/utils/common.js

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

src/views/finance/rebate_list.vue

@@ -10,25 +10,25 @@
       :tableAttributes="tableAttributes"
       :tableEvents="tableEvents"
       :columnParsing="columnParsing"
-      :replaceOrNotMap="false"
+      :replaceOrNotMap="true"
     >
     </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" />

src/views/supply/retail/components/retail_detail.vue

@@ -15,7 +15,9 @@
       </div>
 
       <div class="main-title">
-        <div class="title">订单信息 <span style="margin-left: 20px">经销商名称：{{detailData.customerName}}</span></div>
+        <div class="title">
+          订单信息 <span style="margin-left: 20px">经销商名称：{{ detailData.customerName }}</span>
+        </div>
       </div>
 
       <div class="diy-table-1">
@@ -268,7 +270,7 @@
       </div>
     </div>
 
-    <el-dialog title="直调发货" :visible.sync="isShowDeliverDialog" width="80%">
+    <el-dialog title="直调发货" append-to-body :visible.sync="isShowDeliverDialog" width="80%">
       <el-form
         ref="deliverForm"
         :model="deliverForm"
@@ -421,7 +423,7 @@
       </span>
     </el-dialog>
 
-    <el-dialog title="直接调拨单（提前开票）" :visible.sync="isShowDirectDialog" width="80%">
+    <el-dialog title="直接调拨单（提前开票）" append-to-body :visible.sync="isShowDirectDialog" width="80%">
       <el-form
         ref="directForm"
         :model="directForm"

src/views/supply/retail/retail_list.vue

@@ -6,10 +6,10 @@
     :operation="operation()"
     :optionsEvensGroup="optionsEvensGroup"
     :columnParsing="columnParsing"
+    :operationColumnWidth="200"
   >
     <Popu v-if="isShowDetail || isShowForm || isShowExamine || isShowReturn">
       <EditDateDialog :isShow.sync="isShowEditDateDialog" :dateForm.sync="dateForm" />
-
       <RetailDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
       <RetailForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />
       <RetailExamine :listItem="queryItem" v-if="isShowExamine" @backListFormDetail="backList" />
@@ -181,7 +181,7 @@ export default {
               </el-button>
             ) : null}
             {this.$checkBtnRole('edit', this.$route.meta.roles) && row.examineStatus === statusData['SAVE'] ? (
-              <el-button type="text" onClick={() => toForm(row)}>
+              <el-button type="text" onClick={() => this.toForm(row)}>
                 编辑
               </el-button>
             ) : null}

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()
     },
 
     // 获取仓库列表