Merge tag 'Hotfix-49' into develop

Finish Hotfix-49

src/views/dashboard/index.vue

@@ -7,14 +7,8 @@
     </el-row>
 
     <!-- 弹窗 -->
-    <el-dialog
-      title="消息"
-      :visible.sync="showMessages"
-      width="50%"
-      :show-close="false"
-      :close-on-click-modal="false"
-    >
-      <el-radio-group v-model="type" @change="checkFn" size="">
+    <el-dialog title="消息" :visible.sync="showMessages" width="50%" :show-close="false" :close-on-click-modal="false">
+      <el-radio-group v-model="type" @change="checkFn" size="mini">
         <el-radio-button label="1">系统通知</el-radio-button>
         <el-radio-button label="2">文件下发</el-radio-button>
         <el-radio-button label="3">返利确认单</el-radio-button>
@@ -22,166 +16,43 @@
       <br />
       <br />
       <!-- 系统通知 -->
-      <div v-show="type == '1'">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column
-            align="center"
-            type="index"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="标题"
-            prop="title"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="来源"
-            prop="source"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="时间"
-            prop="issueTime"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label=""
-            min-width="160"
-            show-overflow-tooltip
-          >
+      <div v-show="type == '1'" class="table">
+        <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+          <el-table-column align="center" type="index" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="标题" prop="title" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="来源" prop="source" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="时间" prop="issueTime" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-button
-                type="text"
-                class="textColor"
-                @click="lookInDialog(scope.row.id)"
-                >查看</el-button
-              >
+              <el-button type="text" class="textColor" @click="lookInDialog(scope.row.id)">查看</el-button>
             </template>
           </el-table-column>
         </el-table>
       </div>
       <!-- 文件下发 -->
       <div v-show="type == '2'">
-        <el-table
-          v-loading="listLoading"
-          :data="fileList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column
-            align="center"
-            type="index"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="标题"
-            prop="title"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="来源"
-            prop="operatorNickName"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="时间"
-            prop="createTime"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="操作"
-            min-width="160"
-            show-overflow-tooltip
-          >
+        <el-table v-loading="listLoading" :data="fileList" element-loading-text="Loading" border fit highlight-current-row stripe>
+          <el-table-column align="center" type="index" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="标题" prop="title" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="来源" prop="operatorNickName" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="时间" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-button
-                type="text"
-                class="textColor"
-                @click="downloadFn(scope.row.id)"
-                >下载</el-button
-              >
+              <el-button type="text" class="textColor" @click="downloadFn(scope.row.id)">下载</el-button>
             </template>
           </el-table-column>
         </el-table>
       </div>
       <!-- 返利确认单 -->
       <div v-show="type == '3'">
-        <el-table
-          v-loading="listLoading"
-          :data="rebateList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column
-            align="center"
-            type="index"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="经销商名称"
-            prop="customerName"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="确认人"
-            prop="examineBy"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="确认时间"
-            prop="examineTime"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label=""
-            min-width="160"
-            show-overflow-tooltip
-          >
+        <el-table v-loading="listLoading" :data="rebateList" element-loading-text="Loading" border fit highlight-current-row stripe>
+          <el-table-column align="center" type="index" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="确认人" prop="examineBy" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="确认时间" prop="examineTime" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-button
-                type="text"
-                class="textColor"
-                @click="secondFn(scope.row.rebateOrderId)"
-                >{{ isCustomer ? "确认" : "复核" }}</el-button
-              >
+              <el-button type="text" class="textColor" @click="secondFn(scope.row.rebateOrderId)">{{ isCustomer ? "确认" : "复核" }}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -191,25 +62,12 @@
       <br />
       <!-- 分页 -->
       <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"
-        >
+        <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">
         </el-pagination>
       </div>
       <br /><br />
       <!-- 内层弹窗 -->
-      <el-dialog
-        width="40%"
-        title="消息标题"
-        :visible.sync="inDialog"
-        append-to-body
-      >
+      <el-dialog width="40%" title="消息标题" :visible.sync="inDialog" append-to-body>
         <div class="detail-container">
           <div class="title">{{ detailData.title }}</div>
           <div class="text">
@@ -220,43 +78,17 @@
           </div>
           <el-divider></el-divider>
           <div class="content">{{ detailData.content }}</div>
-          <el-divider
-            v-if="detailData.files && detailData.files.length > 0"
-          ></el-divider>
-          <div
-            class="file"
-            v-if="detailData.files && detailData.files.length > 0"
-          >
+          <el-divider v-if="detailData.files && detailData.files.length > 0"></el-divider>
+          <div class="file" v-if="detailData.files && detailData.files.length > 0">
             <div>附件：</div>
             <div class="file-list">
-              <div
-                v-for="(item, index) in detailData.files"
-                :key="index"
-                class="item"
-              >
-                <el-image
-                  v-if="checkFileType(item.url) == 'image'"
-                  class="img"
-                  :src="imageURL + item.url"
-                  :preview-src-list="[imageURL + item.url]"
-                ></el-image>
+              <div v-for="(item, index) in detailData.files" :key="index" class="item">
+                <el-image v-if="checkFileType(item.url) == 'image'" class="img" :src="imageURL + item.url" :preview-src-list="[imageURL + item.url]"></el-image>
                 <div v-else class="box2" @click="openLink(item.url)">
-                  <img
-                    src="@/assets/common/word.png"
-                    v-if="checkFileType(item.url) == 'word'"
-                  />
-                  <img
-                    src="@/assets/common/excel.png"
-                    v-if="checkFileType(item.url) == 'excel'"
-                  />
-                  <img
-                    src="@/assets/common/ppt.png"
-                    v-if="checkFileType(item.url) == 'ppt'"
-                  />
-                  <img
-                    src="@/assets/common/pdf.png"
-                    v-if="checkFileType(item.url) == 'pdf'"
-                  />
+                  <img src="@/assets/common/word.png" v-if="checkFileType(item.url) == 'word'" />
+                  <img src="@/assets/common/excel.png" v-if="checkFileType(item.url) == 'excel'" />
+                  <img src="@/assets/common/ppt.png" v-if="checkFileType(item.url) == 'ppt'" />
+                  <img src="@/assets/common/pdf.png" v-if="checkFileType(item.url) == 'pdf'" />
                   <div class="name ellipsis-3">{{ item.name }}</div>
                 </div>
               </div>
@@ -264,14 +96,12 @@
           </div>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="confirmCheck(detailData.noticeId)"
-            >确认接收</el-button
-          >
-          <el-button @click="inDialog = false">关 闭</el-button>
+          <el-button size="mini" type="primary" @click="confirmCheck(detailData.noticeId)">确认接收</el-button>
+          <el-button size="mini" @click="inDialog = false">关 闭</el-button>
         </div>
       </el-dialog>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="closeFn">关闭</el-button>
+        <el-button type="primary" size="mini" @click="closeFn">关闭</el-button>
       </div>
     </el-dialog>
   </div>

src/views/finance/change_list.vue

@@ -141,7 +141,7 @@
                     isCustomer &&
                     scope.row.examineStatus == 'SAVE'
                   " type="text" class="textColor" slot="reference">提审</el-button>
-                <el-button v-if="isCustomer && scope.row.examineStatus == 'WAIT'" type="text" class="textColor" slot="reference" @click="withdrawFn">撤回</el-button>
+                <!-- <el-button v-if="isCustomer && scope.row.examineStatus == 'WAIT'" type="text" class="textColor" slot="reference" @click="withdrawFn">撤回</el-button> -->
                 <el-button v-if="
                     scope.row.examineStatus == 'WAIT' &&
                     !isCustomer &&

src/views/finance/finance_sum.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <!-- 筛选条件 -->
+    <!-- 筛选条件
     <div>
       <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
         <el-row :gutter="20">
@@ -21,7 +21,7 @@
           </el-col>
         </el-row>
       </el-form>
-    </div>
+    </div> -->
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">