Merge tag 'Hotfix-zh-68' into develop

Finish Hotfix-zh-68

src/components/Common/examine-dialog.vue

@@ -53,12 +53,14 @@ export default {
   methods: {
     cancelForm() {
       this.$emit('update:isShow', false);
+      this.$refs.examineForm.resetFields()
     },
 
     submitForm() {
       this.$refs.examineForm.validate((valid) => {
         if (valid) {
           this.$parent.submitExamineForm();
+          this.$refs.examineForm.resetFields()
         }
       })
     }
@@ -68,4 +70,4 @@ export default {
 
 <style>
 
-</style>
+</style>

src/views/basic_data/logistics/logistics_list.vue

@@ -6,7 +6,7 @@
         ref="screenForm"
         :model="screenForm"
         label-width="120px"
-        size="small"
+        size="mini"
         label-position="left"
       >
         <el-row :gutter="20">
@@ -28,8 +28,8 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="12" class="tr">
             <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm"
+              <el-button size="mini" @click="resetScreenForm">清空</el-button>
+              <el-button size="mini" type="primary" @click="submitScreenForm"
                 >搜索</el-button
               >
             </el-form-item>
@@ -40,7 +40,7 @@
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fl">
-        <el-button type="primary" icon="el-icon-plus" size="small" @click="hanleAdd" v-if="$checkBtnRole('add', $route.meta.roles)"
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="hanleAdd" v-if="$checkBtnRole('add', $route.meta.roles)"
           >新增</el-button
         >
         <el-popconfirm
@@ -54,7 +54,7 @@
         >
           <el-button
             type="primary"
-            size="small"
+            size="mini"
             slot="reference"
             class="el-popover-left"
             >删除</el-button
@@ -64,10 +64,10 @@
       <div class="fr">
         <!-- <ExportButton :exUrl="'/logistics/export'" :exParams="exParams" /> -->
 
-        <el-button type="primary" size="small" @click="handleExport"
+        <el-button type="primary" size="mini" @click="handleExport"
           >导出</el-button
         >
-        <!-- <el-button type="primary" size="small" @click="hanlePrint"
+        <!-- <el-button type="primary" size="mini" @click="hanlePrint"
           >打印</el-button
         > -->
       </div>
@@ -252,14 +252,10 @@
 </template>
 
 <script>
-import Mixin from "@/mixin/index";
-import {
-  getLogisticsList,
-  addInof,
-  updateInfo,
-  deleteInfo,
-} from "@/api/basic_data/logistics";
-import { downloadFiles ,importFileList} from "@/utils/util";
+import Mixin from '@/mixin/index'
+import { addInof, deleteInfo, getLogisticsList, updateInfo } from '@/api/basic_data/logistics'
+import { downloadFiles } from '@/utils/util'
+
 export default {
   mixins: [Mixin],
   data() {

src/views/basic_data/material/category_list.vue

@@ -4,7 +4,7 @@
       <!-- 筛选条件 -->
       <div>
         <el-form  ref="screenForm"
-          :model="screenForm" label-width="70px" size="small" label-position="left">
+          :model="screenForm" label-width="70px" size="mini" label-position="left">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="名称" prop="keyword">
@@ -13,10 +13,10 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm"
+                <el-button size="mini" @click="resetScreenForm"
                   >清空</el-button
                 >
-                <el-button size="small" type="primary" @click="submitScreenForm"
+                <el-button size="mini" type="primary" @click="submitScreenForm"
                   >搜索</el-button
                 >
               </el-form-item>
@@ -78,11 +78,11 @@
               <template slot-scope="scope">
                 <el-tag
                   type="success"
-                  size="small"
+                  size="mini"
                   v-if="scope.row.forbidStatus == 'A'"
                   >正常</el-tag
                 >
-                <el-tag type="danger" size="small" v-else>禁用</el-tag>
+                <el-tag type="danger" size="mini" v-else>禁用</el-tag>
               </template>
             </el-table-column>
             <el-table-column

src/views/basic_data/material/machine_list.vue

@@ -6,7 +6,7 @@
         ref="screenForm"
         :model="screenForm"
         label-width="70px"
-        size="small"
+        size="mini"
         label-position="left"
       >
         <el-row :gutter="20">
@@ -46,8 +46,8 @@
 
           <el-col :xs="24" :sm="24" :lg="24" class="tr">
             <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm"
+              <el-button size="mini" @click="resetScreenForm">清空</el-button>
+              <el-button size="mini" type="primary" @click="submitScreenForm"
                 >搜索</el-button
               >
             </el-form-item>
@@ -61,7 +61,7 @@
         <el-button
           v-if="$checkBtnRole('add', $route.meta.roles)"
           type="primary"
-          size="small"
+          size="mini"
           icon="el-icon-plus"
           @click="(showDialogForm = true), (type = 1)"
           >新增</el-button
@@ -80,7 +80,7 @@
             slot="reference"
             type="primary"
             icon="el-icon-delete"
-            size="small"
+            size="mini"
             class="textColor el-popover-left"
             >删除</el-button
           >
@@ -94,14 +94,14 @@
           :file-list="importFileList"
           :show-file-list="false"
         >
-          <el-button type="primary" size="small">导入</el-button>
+          <el-button type="primary" size="mini">导入</el-button>
         </el-upload> -->
-        <el-button type="primary" size="small" @click="handleExport"
+        <el-button type="primary" size="mini" @click="handleExport"
           >导出</el-button
         >
         <!-- <el-button
           type="primary"
-          size="small"
+          size="mini"
           icon="el-icon-printer"
           v-print="printObj"
           >打 印</el-button
@@ -254,7 +254,7 @@
         :model="diaLogForm"
         label-width="70px"
         :rules="rules"
-        size="small"
+      
         label-position="left"
       >
         <el-form-item label="类型" prop="type">

src/views/basic_data/material/material_list.vue

@@ -7,7 +7,7 @@
           ref="screenForm"
           :model="screenForm"
           label-width="70px"
-          size="small"
+          size="mini"
           label-position="left"
         >
           <el-row :gutter="20">
@@ -38,10 +38,10 @@
 
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm"
+                <el-button size="mini" @click="resetScreenForm"
                   >清空</el-button
                 >
-                <el-button size="small" type="primary" @click="submitScreenForm"
+                <el-button size="mini" type="primary" @click="submitScreenForm"
                   >搜索</el-button
                 >
               </el-form-item>
@@ -116,10 +116,10 @@
               min-width="100"
             >
               <template slot-scope="scope">
-                <el-tag v-if="scope.row.forbidStatus == 'A'" type="success"
+                <el-tag size="mini" v-if="scope.row.forbidStatus == 'A'" type="success"
                   >正常</el-tag
                 >
-                <el-tag v-else type="danger">禁用</el-tag>
+                <el-tag size="mini" v-else type="danger">禁用</el-tag>
               </template>
             </el-table-column>
             <el-table-column

src/views/basic_data/material/modify_list.vue

@@ -8,7 +8,7 @@
             ref="screenForm"
             :model="screenForm"
             label-width="70px"
-            size="small"
+            size="mini"
             label-position="left"
           >
             <el-row :gutter="20">
@@ -102,8 +102,8 @@
 
               <el-col :xs="24" :sm="24" :lg="24" class="tr">
                 <el-form-item label="">
-                  <el-button size="small" @click="resetScreenForm">清空</el-button>
-                  <el-button size="small" type="primary" @click="submitScreenForm"
+                  <el-button size="mini" @click="resetScreenForm">清空</el-button>
+                  <el-button size="mini" type="primary" @click="submitScreenForm"
                   >搜索</el-button
                   >
                 </el-form-item>
@@ -115,8 +115,8 @@
       <!-- 按钮 -->
       <div class="btn-group clearfix">
         <div class="fl">
-          <el-button type="primary"  v-if="$checkBtnRole('add', $route.meta.roles)"  icon="el-icon-plus" size="small" @click="addFn">新增</el-button>
-          <!-- <el-button type="primary" size="small">编辑</el-button> -->
+          <el-button type="primary"  v-if="$checkBtnRole('add', $route.meta.roles)"  icon="el-icon-plus" size="mini" @click="addFn">新增</el-button>
+          <!-- <el-button type="primary" size="mini">编辑</el-button> -->
           <el-popconfirm
            v-if="$checkBtnRole('del', $route.meta.roles)"
             confirm-button-text="好的"
@@ -128,7 +128,7 @@
           >
             <el-button
               type="primary"
-              size="small"
+              size="mini"
                 icon="el-icon-delete"
               slot="reference"
               class="el-popover-left"
@@ -138,9 +138,9 @@
         </div>
         <div class="fr">
             <ExportButton :exUrl="'/product-upd-price/export'" :exParams="exParams" />
-          <!-- <el-button type="primary" size="small">导入</el-button>
-          <el-button type="primary" size="small">导出</el-button>
-          <el-button type="primary" size="small">打印</el-button> -->
+          <!-- <el-button type="primary" size="mini">导入</el-button>
+          <el-button type="primary" size="mini">导出</el-button>
+          <el-button type="primary" size="mini">打印</el-button> -->
         </div>
       </div>
       <div class="mymain-container">
@@ -296,8 +296,8 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <el-tag type="success" v-if="scope.row.isPromote">是</el-tag>
-                <el-tag type="danger" v-else>否</el-tag>
+                <el-tag size="mini" type="success" v-if="scope.row.isPromote">是</el-tag>
+                <el-tag size="mini" type="danger" v-else>否</el-tag>
               </template>
             </el-table-column>
             <el-table-column
@@ -313,7 +313,7 @@
                         <el-tag
                   type="success"
                   style="margin: 0 10px"
-                  size="small"
+                  size="mini"
 
                   :key="index"
                   >
@@ -339,7 +339,7 @@
                    <el-tag
                   type="success"
                   style="margin: 0 10px"
-                  size="small"
+                  size="mini"
 
                   :key="index"
                 >
@@ -394,25 +394,28 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <el-tag type="success" v-if="scope.row.examineStatus == 'SAVE'"
+                <el-tag size="mini" type="success" v-if="scope.row.examineStatus == 'SAVE'"
                   >保存</el-tag
                 >
                 <el-tag
+                  size="mini"
                   type="danger"
                   v-else-if="scope.row.examineStatus == 'WAIT'"
                   >待审核</el-tag
                 >
                 <el-tag
+                  size="mini"
                   type="danger"
                   v-else-if="scope.row.examineStatus == 'OK'"
                   >通过</el-tag
                 >
                 <el-tag
+                  size="mini"
                   type="danger"
                   v-else-if="scope.row.examineStatus == 'FAIL'"
                   >不通过</el-tag
                 >
-                <el-tag type="danger" v-else>审核</el-tag>
+                <el-tag size="mini" type="danger" v-else>审核</el-tag>
               </template>
             </el-table-column>
             <el-table-column

src/views/basic_data/material/price_list.vue

@@ -6,7 +6,7 @@
         ref="screenForm"
         :model="screenForm"
         label-width="70px"
-        size="small"
+        size="mini"
         label-position="left"
       >
         <el-row :gutter="20">
@@ -100,9 +100,9 @@
 
           <el-col :xs="24" :sm="24" :lg="24" class="tr">
             <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
+              <el-button size="mini" @click="resetScreenForm">清空</el-button>
               <el-button
-                size="small"
+                size="mini"
                 type="primary"
                 @click="submitScreenForm"
               >搜索</el-button>
@@ -114,8 +114,8 @@
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fr">
-<!--        <el-button type="primary" size="small">导出</el-button>-->
-        <!-- <el-button type="primary" size="small">打印</el-button> -->
+<!--        <el-button type="primary" size="mini">导出</el-button>-->
+        <!-- <el-button type="primary" size="mini">打印</el-button> -->
       </div>
     </div>
     <div class="mymain-container">
@@ -222,7 +222,7 @@
                     :key="index"
                     type="success"
                     style="margin: 0 10px"
-                    size="small"
+                    size="mini"
                   >
                     {{ item.walletName }}
                   </el-tag>
@@ -244,7 +244,7 @@
                     :key="index"
                     type="success"
                     style="margin: 0 10px"
-                    size="small"
+                    size="mini"
                   >
                     {{ item.walletName }}
                   </el-tag>
@@ -275,8 +275,8 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.isPromote" type="success">是</el-tag>
-              <el-tag v-else type="danger">否</el-tag>
+              <el-tag size="mini" v-if="scope.row.isPromote" type="success">是</el-tag>
+              <el-tag size="mini" v-else type="danger">否</el-tag>
             </template>
           </el-table-column>
           <el-table-column
@@ -287,8 +287,8 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.isRevoke" type="success">是</el-tag>
-              <el-tag v-else type="danger">否</el-tag>
+              <el-tag size="mini" v-if="scope.row.isRevoke" type="success">是</el-tag>
+              <el-tag size="mini" v-else type="danger">否</el-tag>
             </template>
           </el-table-column>
           <el-table-column
@@ -321,13 +321,13 @@
             <template slot-scope="scope">
               <el-button
                 type="text"
-                size="small"
+                size="mini"
                 @click="handleRevoke(scope.row.id)"
               >作废</el-button>
               <el-button
                 v-if="$checkBtnRole('del', $route.meta.roles)"
                 type="text"
-                size="small"
+                size="mini"
                 @click="handleDelete(scope.row.id)"
               >删除</el-button>
             </template>

src/views/basic_data/material/relation_list.vue

@@ -6,7 +6,7 @@
         ref="screenForm"
         :model="screenForm"
         label-width="70px"
-        size="small"
+        size="mini"
         label-position="left"
       >
         <el-row :gutter="20">
@@ -103,8 +103,8 @@
 
           <el-col :xs="24" :sm="24" :lg="12" class="tr">
             <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm"
+              <el-button size="mini" @click="resetScreenForm">清空</el-button>
+              <el-button size="mini" type="primary" @click="submitScreenForm"
                 >搜索</el-button
               >
             </el-form-item>
@@ -119,7 +119,7 @@
          v-if="$checkBtnRole('add', $route.meta.roles)"
           type="primary"
              icon="el-icon-plus"
-          size="small"
+          size="mini"
           @click="(showDialogForm = true), (type = 1), hanleMachine()"
           >新增</el-button
         >
@@ -135,7 +135,7 @@
         >
           <el-button
             type="primary"
-            size="small"
+            size="mini"
                icon="el-icon-delete"
             slot="reference"
             class="el-popover-left"
@@ -144,11 +144,11 @@
         </el-popconfirm>
       </div>
       <div class="fr">
-        <el-button type="primary" size="small">导入</el-button>
-        <el-button type="primary" size="small" @click="handleExport"
+        <el-button type="primary" size="mini">导入</el-button>
+        <el-button type="primary" size="mini" @click="handleExport"
           >导出</el-button
         >
-        <!-- <el-button type="primary" @click="hanlePrint" size="small"
+        <!-- <el-button type="primary" @click="hanlePrint" size="mini"
           >打印</el-button
         > -->
       </div>

src/views/basic_data/warehouse/warehouse_book.vue

@@ -6,17 +6,17 @@
           v-if="$checkBtnRole('add', $route.meta.roles)"
           type="primary"
           icon="el-icon-plus"
-          size="small"
+          size="mini"
           @click="dialogVisible=true;type=1"
         >新增</el-button>
       </div>
     </div>
-    <el-card class="box-card">
+    <el-card class="box-card mymain-container">
       <div slot="header" class="clearfix">
         <span>仓库每天预约提货设置</span>
       </div>
       <!-- 列表 -->
-      <div class="">
+      <div class="table">
         <el-table
           v-loading="listLoading"
           :data="dataList"
@@ -55,7 +55,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-input class="yinput" v-model.number="scope.row.number" type="number" :disabled="scope.row.isDisabled" />
+              <el-input size="mini" class="yinput" v-model.number="scope.row.number" type="number" :disabled="scope.row.isDisabled" />
             </template>
           </el-table-column>
           <el-table-column
@@ -66,7 +66,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-input class="yinput" v-model.number="scope.row.towerNum" type="number" :disabled="scope.row.isDisabled" />
+              <el-input size="mini" class="yinput" v-model.number="scope.row.towerNum" type="number" :disabled="scope.row.isDisabled" />
             </template>
           </el-table-column>
 
@@ -96,7 +96,7 @@
       :close-on-click-modal="false"
       @close="resetForm"
     >
-      <el-form ref="ruleForm" :rules="rulue" :model="ruleForm" status-icon label-width="100px" class="demo-ruleForm" size="small">
+      <el-form ref="ruleForm" :rules="rulue" :model="ruleForm" status-icon label-width="100px" class="demo-ruleForm" >
         <el-form-item label="仓库" prop="correspondId">
           <el-select v-model="ruleForm.correspondId" filterable placeholder="请选择仓库" class="select" @change="handleStock">
             <el-option

src/views/basic_data/warehouse/warehouse_cost.vue

@@ -6,7 +6,7 @@
         ref="screenForm"
         :model="screenForm"
         label-width="70px"
-        size="small"
+        size="mini"
         label-position="left"
       >
         <el-row :gutter="20">
@@ -21,8 +21,8 @@
 
           <el-col :xs="24" :sm="12" :lg="18" class="tr">
             <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm"
+              <el-button size="mini" @click="resetScreenForm">清空</el-button>
+              <el-button size="mini" type="primary" @click="submitScreenForm"
                 >搜索</el-button
               >
             </el-form-item>
@@ -35,7 +35,7 @@
       <div class="fl">
         <el-button
           type="primary"
-          size="small"
+          size="mini"
            v-if="$checkBtnRole('add', $route.meta.roles)"
           icon="el-icon-plus"
           @click="(showDialog = true), (type = 1)"
@@ -53,7 +53,7 @@
         >
           <el-button
             type="primary"
-            size="small"
+            size="mini"
             icon="el-icon-delete"
             slot="reference"
             class="el-popover-left"
@@ -68,12 +68,12 @@
           :http-request="handleImport"
           :file-list="importFileList"
         >
-          <el-button type="primary" size="small">导入</el-button>
+          <el-button type="primary" size="mini">导入</el-button>
         </el-upload>
-        <el-button type="primary" size="small" @click="handleExport"
+        <el-button type="primary" size="mini" @click="handleExport"
           >导出</el-button
         >
-        <!-- <el-button type="primary" size="small" @click="hanlePrint"
+        <!-- <el-button type="primary" size="mini" @click="hanlePrint"
           >打印</el-button
         > -->
       </div>

src/views/basic_data/warehouse/warehouse_list.vue

@@ -7,7 +7,7 @@
           ref="screenForm"
           :model="screenForm"
           label-width="70px"
-          size="small"
+          size="mini"
           label-position="left"
         >
           <el-row :gutter="20">
@@ -21,10 +21,10 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm"
+                <el-button size="mini" @click="resetScreenForm"
                   >清空</el-button
                 >
-                <el-button size="small" type="primary" @click="submitScreenForm"
+                <el-button size="mini" type="primary" @click="submitScreenForm"
                   >搜索</el-button
                 >
               </el-form-item>
@@ -108,11 +108,12 @@
             >
               <template slot-scope="scope">
                 <el-tag
+                  size="mini"
                   type="success"
                   v-if="scope.row.allowMinusQty !== 'false'"
                   >是</el-tag
                 >
-                <el-tag type="danger" v-else>否</el-tag>
+                <el-tag size="mini" type="danger" v-else>否</el-tag>
               </template>
             </el-table-column>
             <el-table-column
@@ -123,10 +124,10 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <el-tag type="success" v-if="scope.row.openLocation !== 'false'"
+                <el-tag size="mini" type="success" v-if="scope.row.openLocation !== 'false'"
                   >是</el-tag
                 >
-                <el-tag type="danger" v-else>否</el-tag>
+                <el-tag size="mini" type="danger" v-else>否</el-tag>
               </template>
             </el-table-column>
             <el-table-column
@@ -137,10 +138,10 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <el-tag type="success" v-if="scope.row.notExpQty !== 'false'"
+                <el-tag size="mini" type="success" v-if="scope.row.notExpQty !== 'false'"
                   >是</el-tag
                 >
-                <el-tag type="danger" v-else>否</el-tag>
+                <el-tag size="mini" type="danger" v-else>否</el-tag>
               </template>
             </el-table-column>
             <el-table-column
@@ -151,12 +152,12 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <el-tag
+                <el-tag size="mini"
                   type="success"
                   v-if="scope.row.availableAlert !== 'false'"
                   >是</el-tag
                 >
-                <el-tag type="danger" v-else>否</el-tag>
+                <el-tag size="mini" type="danger" v-else>否</el-tag>
               </template>
             </el-table-column>
             <el-table-column

src/views/basic_data/warehouse/warehouse_site.vue

@@ -6,7 +6,7 @@
         ref="screenForm"
         :model="screenForm"
         label-width="70px"
-        size="small"
+        size="mini"
         label-position="left"
       >
         <el-row :gutter="20">
@@ -29,8 +29,8 @@
 
           <el-col :xs="24" :sm="12" :lg="12" class="tr">
             <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm"
+              <el-button size="mini" @click="resetScreenForm">清空</el-button>
+              <el-button size="mini" type="primary" @click="submitScreenForm"
                 >搜索</el-button
               >
             </el-form-item>
@@ -41,7 +41,7 @@
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fl">
-        <el-button type="primary" icon="el-icon-plus" size="small" @click="newData(), (type = 1)" v-if="$checkBtnRole('add', $route.meta.roles)"
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="newData(), (type = 1)" v-if="$checkBtnRole('add', $route.meta.roles)"
           >新增</el-button
         >
   <el-popconfirm
@@ -57,7 +57,7 @@
                   slot="reference"
                     type="primary"
                         icon="el-icon-delete"
-                   size="small"
+                   size="mini"
                   class="textColor el-popover-left"
                   >批量删除</el-button
                 >
@@ -100,6 +100,7 @@
             <template slot-scope="scope">
               <template v-if="scope.row.kingDeeStocks.length > 0">
                 <el-tag
+                  size="mini"
                   type="danger"
                   style="margin-right: 10px"
                   v-for="item in scope.row.kingDeeStocks"

src/views/engin_deposit/deposit_list.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div v-if="showPage == 1">
-      <el-radio-group v-model="deduction" size="" @change="handleRadio">
+      <el-radio-group v-model="deduction" size="mini" @change="handleRadio">
         <el-radio-button label="全部" />
         <el-radio-button label="已退押" />
       </el-radio-group>
@@ -12,7 +12,7 @@
           ref="screenForm"
           :model="screenForm"
           label-width="120px"
-          size="small"
+          size="mini"
           label-position="left"
         >
           <el-row :gutter="20">
@@ -71,11 +71,11 @@
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item label="" class="fr">
                 <el-button
-                  size="small"
+                  size="mini"
                   @click="resetScreenForm"
                 >清空</el-button>
                 <el-button
-                  size="small"
+                  size="mini"
                   type="primary"
                   @click="submitScreenForm"
                 >搜索</el-button>
@@ -88,7 +88,7 @@
       <div class="btn-group clearfix" style="display: flex">
         <el-button
           type="primary"
-          size="small"
+          size="mini"
           @click="hanleDownloadFiles"
         >导出</el-button>
         <el-upload
@@ -99,7 +99,7 @@
           :file-list="importFileList"
           :show-file-list="false"
         >
-          <el-button size="small">导入</el-button>
+          <el-button size="mini">导入</el-button>
         </el-upload>
       </div>
       <!-- 列表 -->
@@ -141,8 +141,8 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.customerNumber" />
-                <span>{{scope.row.customerNumber}}</span>
+                <CopyButton :copy-text="scope.row.customerNumber" />
+                <span>{{ scope.row.customerNumber }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -153,8 +153,8 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.customerName" />
-                <span>{{scope.row.customerName}}</span>
+                <CopyButton :copy-text="scope.row.customerName" />
+                <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
             <!-- <el-table-column
@@ -222,7 +222,7 @@
                 <el-tag
                   v-if="scope.row.examineStatus == 'OK'"
                   type="warning"
-                  size="small"
+                  size="mini"
                 >通过</el-tag>
                 <el-tag
                   v-if="scope.row.examineStatus == 'FAIL'"
@@ -261,6 +261,7 @@
                 <el-button
                   type="text"
                   class="textColor"
+                  size="mini"
                   @click="detailFn(scope.row)"
                 >详情</el-button>
                 <el-button
@@ -282,13 +283,13 @@
         <!-- 分页 -->
         <div class="fr">
           <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-sizes="[10, 20, 30, 50]"
             :page-size="10"
             layout="total, sizes, prev, pager, next, jumper"
             :total="listTotal"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
           />
         </div>
       </div>

src/views/sales_policy/codealer_list.vue

@@ -1,8 +1,8 @@
 <template>
   <el-container v-if="isShow">
-    <el-header height="100%" class="mg">
+    <el-header  class="mg">
       <el-form
-        size="small"
+        size="mini"
         :model="screenForm"
         ref="screenForm"
         :inline="false"
@@ -11,7 +11,7 @@
           <el-col :xs="24" :sm="8" :lg="8">
             <el-form-item prop="code">
               <el-input
-                size="small"
+                size="mini"
                 v-model="screenForm.code"
                 placeholder="销售政策编号"
               ></el-input>
@@ -20,7 +20,7 @@
           <el-col :xs="24" :sm="8" :lg="8">
             <el-form-item prop="remark">
               <el-input
-                size="small"
+                size="mini"
                 v-model="screenForm.remark"
                 placeholder="销售政策说明"
               ></el-input>
@@ -29,7 +29,7 @@
           <el-col :xs="24" :sm="8" :lg="8">
             <el-form-item prop="title">
               <el-input
-                size="small"
+                size="mini"
                 v-model="screenForm.title"
                 placeholder="表头备注"
               ></el-input>
@@ -38,23 +38,24 @@
         </el-row>
 
         <el-row class="mg">
-          <el-button type="primary" size="small" @click="submitScreenForm"
+          <el-button type="primary" size="mini" @click="submitScreenForm"
             >查询</el-button
           >
-          <el-button type="primary" size="small" @click="resetScreenForm"
+          <el-button type="primary" size="mini" @click="resetScreenForm"
             >重置</el-button
           >
-          <el-button type="primary" size="small" @click="">导出</el-button>
+          <el-button type="primary" size="mini" @click="">导出</el-button>
         </el-row>
       </el-form>
     </el-header>
-    <el-main>
+    <el-main class="mymain-container">
+      <div class="table">
       <el-table :data="dataList" border style="width: 100%">
         <el-table-column prop="name" label="操作" width="120" align="center">
           <template slot-scope="scope">
             <el-button
               type="text"
-              size="small"
+              size="mini"
               @click="(id = scope.row.id), (isShow = false)"
               >详情</el-button
             >
@@ -62,10 +63,10 @@
         </el-table-column>
         <el-table-column prop="status" label="状态" width="120" align="left">
           <template slot-scope="scope">
-            <el-tag type="success" size="small" v-if="scope.row.status == 1"
+            <el-tag type="success" size="mini" v-if="scope.row.status == 1"
               >已生效</el-tag
             >
-            <el-tag type="danger" size="small" v-else>未生效</el-tag>
+            <el-tag type="danger" size="mini" v-else>未生效</el-tag>
           </template>
         </el-table-column>
         <el-table-column
@@ -117,19 +118,22 @@
                            min-width="200" prop="createTime" label="制表日期" align="left">
         </el-table-column>
       </el-table>
+      </div>
+      <!-- 分页 -->
+      <div class="fr">
+        <el-pagination
+
+          :current-page="currentPage"
+          :page-sizes="[10, 20, 30, 50,500]"
+          :page-size="10"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="listTotal"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
     </el-main>
-    <!-- 分页 -->
-    <div class="fr">
-      <el-pagination
-        :current-page="currentPage"
-        :page-sizes="[10, 20, 30, 50,500]"
-        :page-size="10"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="listTotal"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
+
   </el-container>
   <Distributor v-else :cid="id" />
 </template>

src/views/sales_policy/components/AddCondition.vue

@@ -1,7 +1,7 @@
 <template>
   <el-container class="app-container">
     <el-header height="50px" class="header">
-      <el-page-header @back="handleBack" :content="!id ? '新增' : '详情页面'">
+      <el-page-header @back="handleBack" :content="!id ? !edit? '新增':'编辑' : '详情页面'">
       </el-page-header>
     </el-header>
     <div class="line">
@@ -10,8 +10,8 @@
       <el-divider></el-divider>
     </div>
     <el-main v-if="!id">
-      <el-row>
-        <el-row :gutter="50">
+      <el-row v-if="conditionBox.length">
+        <el-row :gutter="50" >
           <el-col
             :xs="24"
             :sm="24"
@@ -295,7 +295,7 @@
                         <el-table-column
                           prop="specification"
                           label="产品型号"
-                          min-width="160"
+                          min-width="300"
                           show-overflow-tooltip
                           align="left"
                         >
@@ -416,7 +416,7 @@
                         <el-table-column
                           prop="specification"
                           label="产品型号"
-                          min-width="160"
+                          min-width="300"
                           show-overflow-tooltip
                           align="left"
                         >
@@ -520,6 +520,7 @@ export default {
       fang: false,
       newConditionBox: [],
       currentPage: 1,
+      edit:''
     };
   },
   created() {
@@ -554,11 +555,14 @@ export default {
       // 页面刷新后该函数会执行 N 次进行判断(N 为表格行数)
       // 如果没有返回值则默认返回false(全部无法选中)
     },
-    async getCommonApi() {
-      if (this.id) {
-        const res = await getConditionMaterialDetail({ id: this.policyId });
+    async getCommonApi(policyId) {
+      if (this.id || policyId) {
+        this.edit = 'eidt'
+
+        const res = await getConditionMaterialDetail({ id: this.policyId || policyId });
         this.pop = res.data.pop;
         let pop = res.data.pop.split(":");
+          this.conditionBox = []
         for (let i = 0; i < pop.length; i++) {
           if (i == 0) {
             this.limit = pop[i];
@@ -573,8 +577,12 @@ export default {
             policyConditionId: res.data.id,
             popType: k + 1,
           });
+          if (policyId){
+            this.conditionBox.push(data.records);
+          }else {
+            this.conditionBoxs.push(data.records);
+          }
 
-          this.conditionBoxs.push(data.records);
         }
       }
     },
@@ -685,7 +693,9 @@ export default {
         let datas = [];
         for (let j = 0; j < this.conditionBox.length; j++) {
           datas = [...datas, ...this.conditionBox[j]];
+
         }
+
         /**
          * @value newConditionBox 首页保存的所有选中者，即条件1
          * @value res.data.records，this.conditList 每次点击添加获取的最新数据
@@ -693,6 +703,7 @@ export default {
          * 如：上一个或者所有条件中已经存在disabled
          */
         if (this.newConditionBox.length) {
+
           this.conditList = res.data.records;
           if (this.conditionBox[index].length) {
             for (let n = 0; n < this.newConditionBox.length; n++) {
@@ -727,6 +738,7 @@ export default {
           }
           this.conditList = res.data.records;
         } else {
+          console.log(datas,'4455454' ,res.data.records)
           const newData = datas;
           if (newData.length) {
             for (let i = 0; i < res.data.records.length; i++) {

src/views/sales_policy/components/AddPolicy.vue

@@ -136,8 +136,11 @@
                 <el-button
                   type="primary"
                   size="small"
-                >导出</el-button
+                  @click="exportGoods"
+                >导出货品</el-button
                 >
+
+
               </el-col>
             </el-row>
             <el-divider />
@@ -201,7 +204,7 @@
             </el-table-column>
             <el-table-column
 
-              min-width="150"
+              min-width="300"
               prop="specification"
               label="规格型号"
               align="left"
@@ -311,7 +314,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              label="支付钱包"
+              label="现金钱包"
               align="left"
               show-overflow-tooltip
               min-width="150"
@@ -609,6 +612,9 @@ export default {
     hanleDownloadFiles() {
       downloadFiles("/policy/download");
     },
+    exportGoods(){
+      downloadFiles("/policy/material/export",{policyId: this.searchForm.code});
+    },
     handleCondition(id, index) {
       deleteCondition({ id }).then((res) => {
         this.conditionList.splice(index, 1);
@@ -973,7 +979,7 @@ export default {
           return;
         }
         if (!this.dataList[i].walletIds.length) {
-          this.$errorMsg("请选择支付钱包");
+          this.$errorMsg("请选择现金钱包");
           return;
         }
       }

src/views/sales_policy/components/EditCondition.vue

@@ -1,7 +1,7 @@
 <template>
   <el-container class="app-container">
     <el-header height="50px" class="header">
-      <el-page-header @back="handleBack" content="编辑"> </el-page-header>
+      <el-page-header content="编辑" @back="handleBack"> </el-page-header>
     </el-header>
     <div class="line">
       <el-divider></el-divider>

src/views/sales_policy/components/Examine.vue

@@ -148,6 +148,9 @@
                 <h4 style="display: inline-block; margin-right: 20px">
                   货品信息
                 </h4>
+                <ExportButton v-if="$parent.isShow ===4" style="display: inline-block" :exUrl="'/policy/material/export'"  exText="导出货品"
+                              :ex-params="{policyId: detail.code}"></ExportButton>
+
                 <el-upload
                   v-if="$parent.isShow == 5"
                   class="import-btn"
@@ -210,7 +213,7 @@
             <el-table-column
               prop="specification"
               label="规格型号"
-              min-width="160"
+              min-width="300"
               show-overflow-tooltip
               align="left"
             >
@@ -234,7 +237,7 @@
             />
             <el-table-column prop="discAmount" label="格力折扣" align="right" />
             <el-table-column prop="price" label="单价" align="right" />
-            <el-table-column label="支付钱包" align="left"     min-width="160"
+            <el-table-column label="返利钱包" align="left"     min-width="160"
                              show-overflow-tooltip>
               <template slot-scope="scope">
                 <template  v-for="item in scope.row.walletRelaList">
@@ -247,7 +250,7 @@
                 </template>
               </template>
             </el-table-column>
-            <el-table-column label="支付钱包" align="left"     min-width="160"
+            <el-table-column label="现金钱包" align="left"     min-width="160"
                              show-overflow-tooltip>
               <template slot-scope="scope">
                 <template  v-for="item in scope.row.walletRelaList">
@@ -304,6 +307,7 @@
                 <h4 style="display: inline-block; margin-right: 20px">
                   条件信息
                 </h4>
+
               </el-col>
             </el-row>
             <el-divider />
@@ -369,6 +373,9 @@
                 <h4 style="display: inline-block; margin-right: 20px">
                   经销商使用范围
                 </h4>
+
+                <ExportButton style="display: inline-block"  v-if="$parent.isShow ===4" :exUrl="'/policy/customer/export'"  exText="导出经销商"
+                              :ex-params="{policyId:detail.code}"></ExportButton>
               </el-col>
             </el-row>
             <el-divider />

src/views/sales_policy/components/TabelTransfer.vue

@@ -24,22 +24,18 @@
           size="small"
           @click="hanleDownloadFiles"
         >下载模板</el-button>
-        <el-button
-          type="primary"
-          size="small"
-        >导出已选</el-button
-        >
+      
       </el-row>
       <el-row type="flex">
-        <el-col>
+        <el-col :xs="24" :sm="12" :lg="14">
           <el-input
             v-model="keyword"
             placeholder="查找经销商"
             size="small"
           />
         </el-col>
-        <el-col style="margin-left: 10px"><el-button size="small" @click="submitScreenForm">确定</el-button></el-col>
-        <el-col style="margin-left: 10px"><el-button size="small" @click="resetScreenForm">重置</el-button></el-col>
+        <el-col :xs="24" :sm="1" :lg="1" style="margin-left: 10px"><el-button size="small" @click="submitScreenForm">确定</el-button></el-col>
+        <el-col :xs="24" :sm="1" :lg="1" style="margin-left: 20px"><el-button size="small" @click="resetScreenForm">重置</el-button></el-col>
       </el-row>
     </slot>
     <el-row :gutter="20">

src/views/sales_policy/components/editPolicy.vue

@@ -194,7 +194,7 @@
             </el-table-column>
             <el-table-column
 
-              min-width="150"
+              min-width="300"
               prop="specification"
               label="规格型号"
               align="left"
@@ -291,7 +291,7 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="支付钱包" align="left"  show-overflow-tooltip
+            <el-table-column label="现金钱包" align="left"  show-overflow-tooltip
                              min-width="150">
               <template slot-scope="scope">
                 <el-select
@@ -454,6 +454,7 @@
       </div>
     </div>
     <AddCondition
+      ref="comDom"
       v-show="isCondition === 1"
       @handleSubmitCon="handleSubmitCon"
     />
@@ -475,7 +476,8 @@ import {
   getWalletRebateList,
   savePolicy,
   updateCondition,
-  updatePolicy
+  updatePolicy,
+  getConditionMaterialDetail
 } from '@/api/policy_list'
 import { downloadFiles, handleImport } from '@/utils/util'
 // import Transfer from './Transfer'
@@ -595,9 +597,7 @@ export default {
     },
     addCondition() {
       this.isCondition = 1
-       this.cid = this.conditionList[0].id
-      this.cpolicyId = this.conditionList[0].policyId
-      console.log(this.cid,this.cpolicyId)
+      this.$refs.comDom.getCommonApi(this.conditionList[0].id)
       this.$store.commit('sales/setId', this.searchForm.code)
     },
     loadmore() {
@@ -725,6 +725,7 @@ export default {
           res.data[i].fang = true
         }
         this.conditionList = res.data
+        Object.assign( this.$refs.comDom.$data,this.$refs.comDom.$options.data())
       })
     },
     // 视图部分已注释，废弃的功能 fucn
@@ -967,7 +968,7 @@ export default {
           return
         }
         if (!this.dataList[i].walletIds.length) {
-          this.$errorMsg('请选择支付钱包')
+          this.$errorMsg('请选择现金钱包')
           return
         }
       }

src/views/sales_policy/policy_list.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="isShow === 1" class="app-container">
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" :inline="false">
+      <el-form ref="screenForm" size="mini" :model="screenForm" :inline="false">
         <el-row>
           <el-row :gutter="20">
             <el-col :xs="24" :ms="6" :lg="6">
@@ -9,7 +9,7 @@
                 <el-input
                   v-model="screenForm.code"
                   placeholder="销售政策编号"
-                  size="small"
+                  size="mini"
                 />
               </el-form-item>
             </el-col>
@@ -19,7 +19,7 @@
                 <el-input
                   v-model="screenForm.title"
                   placeholder="销售政策说明"
-                  size="small"
+                  size="mini"
                 />
               </el-form-item>
             </el-col>
@@ -29,7 +29,7 @@
                 <el-input
                   v-model="screenForm.remark"
                   placeholder="表头备注"
-                  size="small"
+                  size="mini"
                 />
               </el-form-item>
             </el-col>
@@ -39,7 +39,7 @@
                 <el-date-picker
                   v-model="screenForm.startTime1"
                   type="datetime"
-                  size="small"
+                  size="mini"
                   placeholder="生效日期"
                   value-format="yyyy-MM-dd HH:mm:ss"
                 />
@@ -52,7 +52,7 @@
                 <el-date-picker
                   v-model="screenForm.endTime1"
                   type="datetime"
-                  size="small"
+                  size="mini"
                   placeholder="结束日期"
                   value-format="yyyy-MM-dd HH:mm:ss"
                 />
@@ -64,7 +64,7 @@
                 <el-date-picker
                   v-model="screenForm.startCreateTime"
                   type="datetime"
-                  size="small"
+                  size="mini"
                   placeholder="制表日期"
                   value-format="yyyy-MM-dd HH:mm:ss"
                 />
@@ -76,7 +76,7 @@
                 <el-input
                   v-model="screenForm.createBy"
                   placeholder="制表人"
-                  size="small"
+                  size="mini"
                 />
               </el-form-item>
             </el-col>
@@ -86,7 +86,7 @@
                 <el-input
                   v-model="screenForm.examineBy"
                   placeholder="审核人"
-                  size="small"
+                  size="mini"
                 />
               </el-form-item>
             </el-col>
@@ -96,7 +96,7 @@
               <el-form-item label="" prop="status">
                 <el-select
                   v-model="screenForm.status"
-                  size="small"
+                  size="mini"
                   placeholder="状态"
                   class="select_height"
                 >
@@ -114,7 +114,7 @@
               <el-form-item label="" prop="type">
                 <el-select
                   v-model="screenForm.type"
-                  size="small"
+                  size="mini"
                   placeholder="销售政策类型"
                   class="select_height"
                 >
@@ -127,16 +127,34 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :ms="6" :lg="6" />
-            <el-col :xs="24" :ms="6" :lg="12" class="tr">
+            <el-col :xs="24" :ms="6" :lg="6" >
+              <el-form-item label="" prop="customerId">
+                <el-select
+                  v-model="screenForm.customerId"
+                  size="mini"
+                  filterable
+                  placeholder="经销商名称"
+                  class="select_height"
+                >
+                  <el-option label="全部" :value="null"></el-option>
+                  <el-option
+                    v-for="item in CrList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :ms="6" :lg="6" class="tr">
               <el-form-item>
                 <el-button
                   type="primary"
-                  size="small"
+                  size="mini"
                   @click="submitScreenForm"
                 >查询</el-button>
                 <el-button
-                  size="small"
+                  size="mini"
                   @click="resetScreenForm"
                 >重置</el-button>
               </el-form-item>
@@ -149,7 +167,7 @@
       <el-row type="flex">
         <el-button
           v-if="$checkBtnRole('add', $route.meta.roles)"
-          size="small"
+          size="mini"
           type="primary"
           icon="el-icon-plus"
           @click="hanlenewInfo"
@@ -157,23 +175,24 @@
       </el-row>
     </div>
     <div class="mymain-container">
-      <el-table :data="dataList" border style="width: 100%">
+      <div class="table">
+      <el-table :data="dataList" border style="width: 100%" class="table">
         <el-table-column
           fixed="left"
           label="操作"
-          min-width="150"
+          min-width="250"
           align="center"
         >
           <template slot-scope="scope">
             <el-button
               v-if="scope.row.examineStatus == 'SAVE'"
               type="text"
-              size="small"
+              size="mini"
               @click="(isShow = 5), (id = scope.row.id)"
             >编辑</el-button>
             <el-button
             type="text"
-              size="small"
+              size="mini"
               @click="
                 (isShow = 4), (id = scope.row.id), (code = scope.row.code)
               "
@@ -185,7 +204,7 @@
                   $checkBtnRole('examine', $route.meta.roles)
               "
               type="text"
-              size="small"
+              size="mini"
               @click="
                 (isShow = 8),
                 (id = scope.row.id),
@@ -203,7 +222,7 @@
               <el-button
                 slot="reference"
                 type="text"
-                size="small"
+                size="mini"
               >提审</el-button>
             </el-popconfirm>
             <el-popconfirm
@@ -215,7 +234,7 @@
               <el-button
                 slot="reference"
                 type="text"
-                size="small"
+                size="mini"
               >作废</el-button>
             </el-popconfirm>
             <el-popconfirm
@@ -228,7 +247,7 @@
               <el-button
                 slot="reference"
                 type="text"
-                size="small"
+                size="mini"
               >克隆</el-button>
             </el-popconfirm>
             <el-popconfirm
@@ -240,26 +259,26 @@
               <el-button
                 slot="reference"
                 type="text"
-                size="small"
+                size="mini"
               >删除</el-button>
             </el-popconfirm>
           </template>
         </el-table-column>
         <el-table-column label="状态" width="120" align="left">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.status == '1'">已生效</el-tag>
-            <el-tag v-else-if="scope.row.status == '0'">未生效 </el-tag>
+            <el-tag size="mini" v-if="scope.row.status == '1'">已生效</el-tag>
+            <el-tag  size="mini" v-else-if="scope.row.status == '0'">未生效 </el-tag>
           </template>
         </el-table-column>
         <el-table-column label="审核状态" width="120" align="left">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.examineStatus == 'SAVE'">保存</el-tag>
-            <el-tag
+            <el-tag size="mini" v-if="scope.row.examineStatus == 'SAVE'">保存</el-tag>
+            <el-tag size="mini"
               v-else-if="scope.row.examineStatus == 'WAIT'"
             >待审核
             </el-tag>
-            <el-tag v-else-if="scope.row.examineStatus == 'OK'">通过 </el-tag>
-            <el-tag v-else>不通过 </el-tag>
+            <el-tag size="mini" v-else-if="scope.row.examineStatus == 'OK'">通过 </el-tag>
+            <el-tag size="mini" v-else>不通过 </el-tag>
           </template>
         </el-table-column>
         <el-table-column
@@ -313,19 +332,21 @@
           align="left"
         />
       </el-table>
-      <!-- 分页 -->
-      <div class="fr">
-        <el-pagination
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-        />
+        <!-- 分页 -->
+        <div class="fr">
+          <el-pagination
+            :current-page="currentPage"
+            :page-sizes="[10, 20, 30, 50]"
+            :page-size="10"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="listTotal"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div>
       </div>
-    </div>
+      </div>
+
 
   </div>
   <AddPolicy v-else-if="isShow === 2" />
@@ -339,6 +360,7 @@ import {
   cancelPolicy,
   cloneList,
   deletePolicy,
+  getCrList,
   getId,
   getList,
   getpolicySubmit,
@@ -364,7 +386,7 @@ export default {
       codeId: '',
       listLoading: false,
       policyId: '',
-
+      CrList:[],
       isShow: 1,
       dataList: [],
       screenForm: {
@@ -380,7 +402,8 @@ export default {
         startTime2: '',
         status: '',
         title: '',
-        type: ''
+        type: '',
+        customerId:''
       },
       fileList: [],
       statusOptions: [
@@ -418,6 +441,20 @@ export default {
       isFlag: ''
     }
   },
+  created() {
+
+      const customerParams = {
+        pageNum: 1,
+        pageSize: -1,
+        keyword: '',
+        region: ''
+      }
+      // 获取经销商列表
+      getCrList(customerParams).then((res) => {
+        this.CrList = res.data.records
+      })
+
+  },
   computed: mapState({
     comCode: (state) => state.sales.code
   }),
@@ -452,7 +489,8 @@ export default {
         startTime1: this.screenForm.startTime1,
         startTime2: this.screenForm.startTime2,
         status: this.screenForm.status,
-        title: this.screenForm.title
+        title: this.screenForm.title,
+        customerId:this.screenForm.customerId
       }
       getList(params).then((res) => {
         this.dataList = res.data.records

src/views/sales_rebate/rebate_list.vue

@@ -1,30 +1,30 @@
 <template>
   <div class="app-container">
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" size="small" label-position="left">
+      <el-form ref="screenForm" :model="screenForm" size="mini" label-position="left">
         <el-row :gutter="20">
           <!-- <el-col :xs="24" :ms="6" :lg="6">
             <el-form-item label="" prop="mainName">
               <el-input
                 v-model="screenForm.mainName"
                 placeholder="返利品类"
-                size="small"
+                size="mini"
               ></el-input>
             </el-form-item>
           </el-col> -->
           <el-col :xs="24" :ms="6" :lg="6">
             <el-form-item label="" prop="saleTypeCode">
-              <el-input v-model="screenForm.saleTypeCode" placeholder="销售类型编码" size="small"></el-input>
+              <el-input v-model="screenForm.saleTypeCode" placeholder="销售类型编码" size="mini"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :ms="6" :lg="6">
             <el-form-item label="" prop="saleTypeName">
-              <el-input v-model="screenForm.saleTypeName" placeholder="销售类型名称" size="small"></el-input>
+              <el-input v-model="screenForm.saleTypeName" placeholder="销售类型名称" size="mini"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :ms="6" :lg="6">
             <el-form-item prop="status">
-              <el-select v-model="screenForm.status" placeholder="请选择" size="small">
+              <el-select v-model="screenForm.status" placeholder="请选择" size="mini">
                 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -33,16 +33,16 @@
 
           <el-col :xs="24" :ms="18" :lg="18">
             <el-form-item>
-              <el-button type="primary" size="small" icon="el-icon-plus" v-if="$checkBtnRole('add', $route.meta.roles)" @click="(dialogVisible = true), (type = 1), getDictList()">新增</el-button>
+              <el-button type="primary" size="mini" icon="el-icon-plus" v-if="$checkBtnRole('add', $route.meta.roles)" @click="(dialogVisible = true), (type = 1), getDictList()">新增</el-button>
 
-              <!-- <el-button type="primary" size="small" @click="delfn"
+              <!-- <el-button type="primary" size="mini" @click="delfn"
                 >批量删除</el-button
               > -->
               <el-popconfirm v-if="$checkBtnRole('del', $route.meta.roles)" class="delClass" @onConfirm="delfn" title="这是一段内容确定删除吗？">
-                <el-button :disabled="ids.length < 1" slot="reference" type="danger" icon="el-icon-minus" size="small">批量删除</el-button>
+                <el-button :disabled="ids.length < 1" slot="reference" type="danger" icon="el-icon-minus" size="mini">批量删除</el-button>
               </el-popconfirm>
-              <el-button icon="el-icon-search" type="primary" size="small" @click="submitScreenForm">查询</el-button>
-              <el-button type="primary" size="small" @click="resetScreenForm">重置</el-button>
+              <el-button icon="el-icon-search" type="primary" size="mini" @click="submitScreenForm">查询</el-button>
+              <el-button type="primary" size="mini" @click="resetScreenForm">重置</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -50,6 +50,7 @@
     </div>
 
     <div class="mymain-container">
+      <div class="table">
       <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe @selection-change="selectionhangeFn">
         <!-- <div v-for="(col, i) in columns" :key="i"> -->
         <el-table-column type="selection" width="55" align="center">
@@ -68,12 +69,13 @@
 
         <el-table-column align="center" fixed="right" label="操作" min-width="160">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="hanleDateil(scope.row)">查看</el-button>
-            <el-button type="text" size="small" @click="hanleEdit(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles)">编辑</el-button>
-            <!-- <el-button type="text" size="small">编辑</el-button> -->
+            <el-button type="text" size="mini" @click="hanleDateil(scope.row)">查看</el-button>
+            <el-button type="text" size="mini" @click="hanleEdit(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles)">编辑</el-button>
+            <!-- <el-button type="text" size="mini">编辑</el-button> -->
           </template>
         </el-table-column>
       </el-table>
+      </div>
       <!-- 分页 -->
       <div class="fr">
         <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="10" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
@@ -130,8 +132,8 @@
 </template>
 
 <script>
-import Mixin from "@/mixin/index";
-import Pagination from "@/components/Pagination";
+import Mixin from '@/mixin/index'
+import Pagination from '@/components/Pagination'
 import {
   getDictList,
   getTypeList,
@@ -139,8 +141,8 @@ import {
   getWalletRebateSaletypeAdd,
   getWalletRebateSaletypeDelete,
   getWalletRebateSaletypelist,
-  getWalletRebateSaletypeUpdate,
-} from "@/api/policy_list";
+  getWalletRebateSaletypeUpdate
+} from '@/api/policy_list'
 
 export default {
   mixins: [Mixin],

src/views/sales_rebate/rebate_list_type.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="app-container">
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" size="small" label-width="100px" label-position="left">
+      <el-form ref="screenForm" :model="screenForm" size="mini" label-width="100px" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :ms="6" :lg="6">
             <el-form-item label="返利类型" prop="name">
-              <el-input v-model="screenForm.name" placeholder="请输入返利类型" size="small"></el-input>
+              <el-input v-model="screenForm.name" placeholder="请输入返利类型" size="mini"></el-input>
             </el-form-item>
           </el-col>
 
@@ -28,10 +28,10 @@
           </el-col> -->
           <el-col :xs="24" :ms="18" :lg="24">
             <el-form-item>
-              <el-button type="primary" size="small" icon="el-icon-plus" v-if="$checkBtnRole('add', $route.meta.roles)" @click="(dialogVisible = true), (type = 1), getDictList()">新增</el-button>
+              <el-button type="primary" size="mini" icon="el-icon-plus" v-if="$checkBtnRole('add', $route.meta.roles)" @click="(dialogVisible = true), (type = 1), getDictList()">新增</el-button>
 
-              <el-button type="primary" size="small" icon="el-icon-search" @click="submitScreenForm">查询</el-button>
-              <el-button type="primary" size="small" @click="resetScreenForm">重置</el-button>
+              <el-button type="primary" size="mini" icon="el-icon-search" @click="submitScreenForm">查询</el-button>
+              <el-button type="primary" size="mini" @click="resetScreenForm">重置</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -39,6 +39,7 @@
     </div>
 
     <div class="mymain-container">
+      <div class="table">
       <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
         <el-table-column type="selection" width="55" align="center">
         </el-table-column>
@@ -61,6 +62,7 @@
           </template>
         </el-table-column>
       </el-table>
+      </div>
       <!-- 分页 -->
       <div class="fr">
         <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="10" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
@@ -87,7 +89,7 @@
               v-model.number="dialogForm.rebateRate"
             ></el-input>
           </el-form-item> -->
-          <!-- 
+          <!--
           <el-form-item label="状态" prop="status">
             <el-switch
               v-model="dialogForm.status"
@@ -111,17 +113,9 @@
 </template>
 
 <script>
-import Mixin from "@/mixin/index";
-import Pagination from "@/components/Pagination";
-import {
-  addWallet,
-  getDictList,
-  getTypeList,
-  updateWallet,
-  getWalletList,
-  getWalletDetail,
-  getProductList,
-} from "@/api/policy_list";
+import Mixin from '@/mixin/index'
+import Pagination from '@/components/Pagination'
+import { addWallet, getDictList, getTypeList, getWalletList, updateWallet } from '@/api/policy_list'
 
 export default {
   mixins: [Mixin],

src/views/sales_rebate/salestype_list.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" size="small" label-position="left">
+      <el-form ref="screenForm" :model="screenForm" size="mini" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :ms="6" :lg="6">
             <el-form-item prop="saleCode">
@@ -23,18 +23,19 @@
           </el-col>
           <el-col :xs="24" :ms="6" :lg="6" class="tr">
             <el-form-item>
-              <el-button type="primary" size="small" @click="submitScreenForm">查询</el-button>
-              <el-button type="primary" size="small" @click="resetScreenForm">重置</el-button>
+              <el-button type="primary" size="mini" @click="submitScreenForm">查询</el-button>
+              <el-button type="primary" size="mini" @click="resetScreenForm">重置</el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </div>
     <div class="btn-group">
-      <el-button type="primary" size="small" v-if="$checkBtnRole('add', $route.meta.roles)" @click="(dialogVisible = true), (type = 1)">新增</el-button>
+      <el-button type="primary" size="mini" v-if="$checkBtnRole('add', $route.meta.roles)" @click="(dialogVisible = true), (type = 1)">新增</el-button>
     </div>
     <div class="mymain-container">
-      <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+      <div class="table">
+      <el-table v-loading="listLoading"  :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
         <el-table-column type="selection" width="55" align="center">
         </el-table-column>
         <template v-for="col in columns">
@@ -60,6 +61,7 @@
           </template>
         </el-table-column>
       </el-table>
+      </div>
       <!-- 分页 -->
       <div style="margin: 20px 0">
         <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="10" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
@@ -103,16 +105,9 @@
 </template>
 
 <script>
-import Mixin from "@/mixin/index";
-import Pagination from "@/components/Pagination";
-import {
-  getTypeList,
-  delTypeData,
-  addData,
-  updateType,
-  getDetail,
-  getProductList,
-} from "@/api/policy_list";
+import Mixin from '@/mixin/index'
+import Pagination from '@/components/Pagination'
+import { addData, delTypeData, getProductList, getTypeList, updateType } from '@/api/policy_list'
 
 export default {
   mixins: [Mixin],

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

@@ -960,10 +960,11 @@ export default {
 </script>
 
 <style scoped lang="scss">
+
 .detail-container {
   width: 100%;
   height: 100%;
-  margin-bottom: 50px;
+  margin-bottom: 80px;
 }
 .main-title {
   display: flex;

src/views/supply/policy/components/retail_examine.vue

@@ -35,7 +35,22 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">业务员</div>
-          <div class="value">{{ detailData.serviceName }}</div>
+          <div class="value">
+            <el-select
+              v-model="detailData.k3ServiceName"
+              placeholder="选择业务员"
+
+              style="width: 100%"
+              @change="handleUser"
+            >
+              <el-option
+                v-for="item in userList"
+                :key="item.adminUserId"
+                :label="item.nickName"
+                :value="item.adminUserId"
+              />
+            </el-select>
+          </div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">制单人</div>
@@ -283,7 +298,7 @@
 </template>
 
 <script>
-import { examineData, getDetail } from '@/api/supply/policy'
+import { examineData, getDetail, getUserList } from '@/api/supply/policy'
 
 export default {
   name: "RetailExamine",
@@ -305,7 +320,7 @@ export default {
     return {
       detailData: {},
       userName: JSON.parse(localStorage.getItem("supply_user")).nickName,
-
+      userList:[],
       formLoading: false,
       mainForm: {
         status: true,
@@ -342,16 +357,35 @@ export default {
       getDetail({ id: this.listItem.id }).then((res) => {
         this.detailData = res.data;
       });
+      getUserList({
+        pageNum: 1,
+        pageSize: -1,
+        adminWebsitId: '',
+        isCustomer: 0,
+        roleId: '',
+        status: true,
+        userName: ''
+      }).then((res) => {
+        this.userList = res.data.records
+      })
+    },
+    handleUser(e) {
+      const user = this.userList.filter(k => {
+        return k.adminUserId === e
+      })[0]
+      this.detailData.k3ServiceId = user.adminUserId
+      this.detailData.k3ServiceName = user.nickName
     },
-
     // 提交审批
     clickSubmitForm() {
+
       this.formLoading = true;
       examineData({
         id: this.listItem.id,
         examineStatus: this.mainForm.status ? "OK" : "FAIL",
         examineRemark: this.mainForm.remark,
-        theTime:this.detailData.theTime
+        theTime:this.detailData.theTime,
+        serviceId:this.detailData.k3ServiceId
       })
         .then((res) => {
           this.$successMsg("审批成功");
@@ -391,6 +425,7 @@ export default {
 .detail-container {
   width: 100%;
   height: 100%;
+  margin-bottom: 30px;
 }
 .main-title {
   display: flex;

src/views/supply/policy/policy_list.vue

@@ -9,7 +9,7 @@
           ref="screenForm"
           :model="screenForm"
           label-width="100px"
-          size="small"
+          size="mini"
           label-position="left"
         >
           <el-row :gutter="20">
@@ -17,7 +17,7 @@
               <el-form-item prop="status" label-width="0">
                 <el-radio-group
                   v-model="screenForm.status"
-                  size="medium"
+                  size="mini"
                   @change="getList()"
                 >
                   <el-radio-button label="">全部</el-radio-button>
@@ -110,14 +110,37 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="24" :lg="24" class="tr">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="是否直调" prop="isDirectTransfer">
+                <el-select v-model="screenForm.isDirectTransfer" placeholder="选择是否直" size="small"   style="width: 100%">
+                  <el-option :value="null" label="默认"></el-option>
+                  <el-option
+                    v-for="item in transfer"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="规格型号
+" prop="specification">
+                <el-input
+                  v-model="screenForm.specification"
+                  placeholder="请输入规格型号
+"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="12" class="tr">
               <el-form-item label="">
                 <el-button
-                  size="small"
+                  size="mini"
                   @click="resetScreenForm"
                 >清空</el-button>
                 <el-button
-                  size="small"
+                  size="mini"
                   type="primary"
                   @click="submitScreenForm"
                 >搜索</el-button>
@@ -131,11 +154,12 @@
           <div class="fl">
             <el-button
               v-if="$checkBtnRole('add', $route.meta.roles)"
-              size="small"
+              size="mini"
               type="primary"
               icon="el-icon-plus"
               @click="toForm()"
             >新增</el-button>
+            <el-button size="mini" type="warning" icon="el-icon-finished" @click="batchExamine"  v-if="$checkBtnRole('examine', $route.meta.roles)">批量审批</el-button>
           </div>
           <div class="fr">
             <ExportButton :ex-url="'retail/export'" :ex-params="exParams" />
@@ -152,7 +176,8 @@
             stripe
             show-summary
             :summary-method="$getSummaries"
-
+            @select-all="handleSelectionAllChange"
+            @selection-change="handleSelectionAllChange"
           >
             <!-- <el-table-column
               align="center"
@@ -165,6 +190,7 @@
                 <el-progress :percentage="scope.row.thjd || 0"></el-progress>
               </template>
             </el-table-column> -->
+            <el-table-column align="left" type="selection" width="55" />
             <el-table-column
               align="left"
               label="订单号"
@@ -526,16 +552,27 @@
       :is-show.sync="isShowEditDateDialog"
       :date-form.sync="dateForm"
     />
+    <ExamineDialog :isShow.sync="isShowExamineDialog" :examineForm.sync="examineForm" />
   </div>
 </template>
 
 <script>
-import { abandonData, closeData, deleteList, editData, getList, submitCancel, submitData } from '@/api/supply/policy'
+import {
+  abandonData,
+  closeData,
+  deleteList,
+  editData,
+  examineData,
+  getList,
+  submitCancel,
+  submitData
+} from '@/api/supply/policy'
 import RetailDetail from './components/retail_detail'
 import RetailForm from './components/retail_form'
 import RetailExamine from './components/retail_examine'
 import RetailReturn from './components/retail_return'
 import EditDateDialog from '@/components/Common/edit-date-dialog'
+import ExamineDialog from '@/components/Common/examine-dialog'
 import { getSalesmanList } from '@/api/common'
 
 let that
@@ -545,7 +582,8 @@ export default {
     RetailForm,
     RetailExamine,
     RetailReturn,
-    EditDateDialog
+    EditDateDialog,
+    ExamineDialog
   },
   filters: {
     statusFilter(val) {
@@ -570,8 +608,14 @@ export default {
         zbMan: '',
         shMan: '',
         status: '',
-        salesMan:''
+        salesMan:'',
+        isDirectTransfer:null,
+        specification:''
       },
+      transfer:[
+        {label:'是',value:true},
+        {label:'否',value:false}
+      ],
       statusList: [
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
@@ -587,7 +631,13 @@ export default {
       dateForm: {
         date: ''
       },
-      salesmanList:[]
+      salesmanList:[],
+      selectData:[],
+      isShowExamineDialog: false,
+      examineForm: {
+        status: 'OK',
+        remark: '',
+      },
     }
   },
   computed: {
@@ -628,7 +678,35 @@ export default {
         this.salesmanList = res.data.records;
       })
     },
-
+    handleSelectionAllChange(e) {
+      this.selectData = e
+    },
+    // 打开 批量审批
+    batchExamine() {
+      if (this.selectData.length) {
+        this.isShowExamineDialog = true;
+        return
+      }
+      this.$errorMsg('请选择审核项')
+    },
+    // 提交 批量审批
+    submitExamineForm() {
+      let ids = this.selectData.map(item => {
+        return item.id;
+      });
+      ids = [...new Set(ids)]
+      examineData({
+        id: ids.join(','),
+        examineStatus: this.examineForm.status,
+        examineRemark: this.examineForm.remark,
+        serviceId:''
+      })
+        .then((res) => {
+          this.isShowEditDateDialog = false;
+          this.$successMsg("修改成功");
+          this.getList();
+        })
+    },
     // 查询按钮权限
     checkBtnRole(value) {
       // let btnRole = this.$route.meta.roles;
@@ -659,6 +737,8 @@ export default {
         status: true,
         examineBy: this.screenForm.shMan,
         serviceId:this.screenForm.salesMan,
+        isDirectTransfer: this.screenForm.isDirectTransfer,
+        specification:this.screenForm.specification,
         type: 2 // 1:普通零售单，2:政策零售单
       }
       getList(params).then((res) => {