Finish Hotfix-zh-59

src/views/sales_policy/components/AddCondition.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-container>
+  <el-container class="app-container">
     <el-header height="50px" class="header">
       <el-page-header @back="handleBack" :content="!id ? '新增' : '详情页面'">
       </el-page-header>

src/views/sales_policy/components/AddPolicy.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="app-container">
     <div v-show="isCondition == 0">
       <el-header height="50px" class="header">
         <el-page-header
@@ -7,7 +7,7 @@
           @back="($parent.isShow = 1), ($parent.isFlag = '')"
         />
       </el-header>
-      <div class="app-container">
+      <div >
         <div class="screen-container">
           <h4>销售政策信息</h4>
           <el-divider />

src/views/sales_policy/components/EditCondition.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-container>
+  <el-container class="app-container">
     <el-header height="50px" class="header">
       <el-page-header @back="handleBack" content="编辑"> </el-page-header>
     </el-header>
@@ -387,17 +387,16 @@
 
 <script>
 import {
-  getId,
   addPoliyCondition,
-  getConditionMaterialList,
-  getMaterialList,
   getConditionMaterialDetail,
-} from "@/api/policy_list";
-import TabelTransfer from "./TabelTransfer.vue";
+  getConditionMaterialList,
+  getMaterialList
+} from '@/api/policy_list'
+import TabelTransfer from './TabelTransfer.vue'
 
-import { mapState } from "vuex";
-import AddModel from "./AddModel";
-import Minxin from "@/mixin";
+import { mapState } from 'vuex'
+import AddModel from './AddModel'
+import Minxin from '@/mixin'
 
 export default {
   mixins: [Minxin],

src/views/sales_policy/components/Examine.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="app-container">
     <div v-if="isEdit == 1">
       <el-header height="50px" class="header">
         <el-page-header
@@ -7,7 +7,7 @@
           @back="($parent.isShow = 1), ($parent.id = '')"
         />
       </el-header>
-      <div class="app-container">
+      <div >
         <div class="diy-table-1">
           <el-row>
             <el-col :span="8" class="item">

src/views/sales_policy/components/editPolicy.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="app-container">
     <div v-show="isCondition == 0">
       <el-header height="50px" class="header">
         <el-page-header
@@ -7,7 +7,7 @@
           @back="($parent.isShow = 1), ($parent.isFlag = '')"
         />
       </el-header>
-      <div class="app-container">
+      <div >
         <div class="screen-container">
           <h4>销售政策信息</h4>
           <el-divider />

src/views/sales_policy/policy_list.vue

@@ -172,7 +172,8 @@
               @click="(isShow = 5), (id = scope.row.id)"
             >编辑</el-button>
             <el-button
-              type="text"
+              v-if="scope.row.examineStatus !== 'OK'"
+            type="text"
               size="small"
               @click="
                 (isShow = 4), (id = scope.row.id), (code = scope.row.code)
@@ -207,7 +208,7 @@
               >提审</el-button>
             </el-popconfirm>
             <el-popconfirm
-              v-if="scope.row.endTime || (scope.row.endTime && scope.row.startTime)"
+              v-if="scope.row.endTime || (scope.row.endTime && scope.row.startTime) && scope.row.examineStatus === 'OK' "
               style="margin-left: 10px"
               title="作废？"
               @onConfirm="handleNullify(scope.row)"
@@ -219,7 +220,7 @@
               >作废</el-button>
             </el-popconfirm>
             <el-popconfirm
-              v-if="$checkBtnRole('examine', $route.meta.roles)"
+              v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK' "
               style="margin-left: 10px"
               title="克隆？"
               @onConfirm="handleClone(scope.row)"

src/views/sales_rebate/rebate_list.vue

@@ -200,6 +200,7 @@
             <el-select
               v-model="dialogForm.walletRebateId"
               :disabled="type == 3"
+              filterable
               placeholder="请选择钱包"
             >
               <el-option
@@ -271,22 +272,17 @@
 </template>
 
 <script>
-import Mixin from "@/mixin/index";
-import Pagination from "@/components/Pagination";
+import Mixin from '@/mixin/index'
+import Pagination from '@/components/Pagination'
 import {
-  addWallet,
   getDictList,
   getTypeList,
-  updateWallet,
-  getWalletList,
-  getWalletDetail,
-  getProductList,
-  getWalletRebateSaletypelist,
   getWalletRebateList,
   getWalletRebateSaletypeAdd,
   getWalletRebateSaletypeDelete,
-  getWalletRebateSaletypeUpdate,
-} from "@/api/policy_list";
+  getWalletRebateSaletypelist,
+  getWalletRebateSaletypeUpdate
+} from '@/api/policy_list'
 
 export default {
   mixins: [Mixin],
@@ -452,7 +448,7 @@ export default {
       if (Number(e) < 0) {
         this.dialogForm.rebateRate = '';
         this.$errorMsg('不能小于0，输入数值0至1之间')
-        return
+
       } else if (Number(e) > 1) {
         this.dialogForm.rebateRate = '';
            this.$errorMsg('不能大于1，输入数值0至1之间')
@@ -496,7 +492,7 @@ export default {
       });
       const params = {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: -1,
         saleCode: "",
         saleName: "",
         status: "",