Finish Hotfix-47

src/styles/index.scss

@@ -82,6 +82,10 @@ div:focus {
   -webkit-box-orient: vertical;
 }
 
+//多选框未选中样式
+.el-checkbox__inner {
+  border: 1px solid #409EFF;
+}
 // 筛选区域样式
 .screen-container {
   background: #ffffff;

src/views/basic_data/dealer/dealer_stock.vue

@@ -39,7 +39,7 @@
       <!-- 列表 -->
       <div class="table">
         <el-table v-loading="listLoading" :data="dataList" @select="hanleSelect" @select-all="hanleSelect" element-loading-text="Loading" border fit highlight-current-row stripe>
-          <el-table-column type="selection" align="center" min-width="100"></el-table-column>
+          <el-table-column type="selection" align="center" min-width="51"></el-table-column>
           <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerNumber" />

src/views/basic_data/taker/taker_car.vue

@@ -41,7 +41,7 @@
     <div class="mymain-container">
       <div class="table">
         <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" @select="hanleSelect" @select-all="hanleSelect" border fit highlight-current-row stripe>
-          <el-table-column type="selection" align="center" min-width="100"></el-table-column>
+          <el-table-column type="selection" align="center" min-width="51"></el-table-column>
           <el-table-column align="left" label="经销商名称" prop="customerName" min-width="260" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerName" />
@@ -55,9 +55,9 @@
           <el-table-column align="left" label="更新时间" prop="updateTime" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip fixed="right">
             <template slot-scope="scope">
-              <el-button type="text" class="textColor" v-if="$checkBtnRole('edit', $route.meta.roles)" @click="editFn(scope.row)">编辑</el-button>
+              <el-button type="text" v-if="$checkBtnRole('edit', $route.meta.roles)" @click="editFn(scope.row)">编辑</el-button>
               <el-popconfirm @onConfirm="delFn(scope.row.id)" v-if="$checkBtnRole('del', $route.meta.roles)" title="这是一段内容确定删除吗？">
-                <el-button type="text" class="textColor" slot="reference">删除</el-button>
+                <el-button type="text" slot="reference">删除</el-button>
               </el-popconfirm>
             </template>
           </el-table-column>

src/views/finance/components/rebate_list-confirm.vue

@@ -64,12 +64,12 @@
           </el-table-column>
           <el-table-column align="right" label="返利金额" prop="" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model.number="scope.row.rebateAmount"></el-input>
+              <el-input class="mountclass" :disabled='isShow' v-model.number="scope.row.rebateAmount"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="right" label="折让金额" prop="" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model.number="scope.row.allowanceAmount"></el-input>
+              <el-input class="mountclass" :disabled='isShow' v-model.number="scope.row.allowanceAmount"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="left" label="备注" prop="policyDocNo" min-width="160" show-overflow-tooltip></el-table-column>
@@ -206,4 +206,10 @@ export default {
 };
 </script>
 
-<style></style>
+<style lang="scss" scoped>
+::v-deep .mountclass {
+  input {
+    text-align: right;
+  }
+}
+</style>

src/views/finance/components/rebate_list-edit.vue

@@ -39,7 +39,7 @@
           <el-table-column align="left" label="序号" type="index" width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column align="left" label="经销商名称" prop="customerName" min-width="200" show-overflow-tooltip>
+          <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
           </el-table-column>
           <el-table-column align="left" label="返利类型" prop="walletName" min-width="160" show-overflow-tooltip>
           </el-table-column>
@@ -89,7 +89,7 @@
               <el-input disabled v-model="scope.row.customerNumber"></el-input>
             </template>
           </el-table-column>
-          <el-table-column align="left" label="经销商名称" prop="customerName" min-width="200" show-overflow-tooltip>
+          <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
             <template slot-scope="scope">
               <el-select @change="changeCustomerFn($event, scope.$index, scope.row)" v-model="scope.row.customerId" placeholder="请选择">
                 <el-option v-for="item in customerData" :key="item.id" :label="item.name" :value="item.id">

src/views/finance/rebate_form.vue

@@ -66,7 +66,7 @@
     <div class="mymain-container">
       <div class="table">
         <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe :row-class-name="rouClassNameFn" @row-click="onRowClick" @selection-change="selectionChange" show-summary :summary-method="getSummaries">
-          <el-table-column align="center" type="selection" width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" type="selection" width="51" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
               <el-input disabled v-model="scope.row.customerNumber"></el-input>

src/views/finance/rebate_list.vue

@@ -68,16 +68,16 @@
       <div class="mymain-container">
         <div class="table">
           <el-table @selection-change="selectionChangeFn" v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
-            <el-table-column :selectable='selectableFn' align="center" type="selection" width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column v-if="$checkBtnRole('del', $route.meta.roles)" :selectable='selectableFn' align="center" type="selection" width="51" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="状态" prop="examineStatus" min-width="160" show-overflow-tooltip v-if="!isCustomer">
               <template slot-scope="scope">
                 <el-tag v-show="scope.row.examineStatus == 'SAVE'">保存</el-tag>
-                <el-tag v-show="scope.row.examineStatus == 'WAIT'">待审核</el-tag>
-                <el-tag v-show="scope.row.examineStatus == 'OK_ONE'">初审通过</el-tag>
-                <el-tag v-show="scope.row.examineStatus == 'FAIL_ONE'">初审不通过</el-tag>
-                <el-tag v-show="scope.row.examineStatus == 'OK'">复核通过</el-tag>
-                <el-tag v-show="scope.row.examineStatus == 'FAIL'">不通过</el-tag>
-                <el-tag v-show="scope.row.examineStatus == 'CLOSE'">已关闭</el-tag>
+                <el-tag v-show="scope.row.examineStatus == 'WAIT'" type="warning">待审核</el-tag>
+                <el-tag v-show="scope.row.examineStatus == 'OK_ONE'" type="success">初审通过</el-tag>
+                <el-tag v-show="scope.row.examineStatus == 'FAIL_ONE'" type="danger">初审不通过</el-tag>
+                <el-tag v-show="scope.row.examineStatus == 'OK'" type="success">复核通过</el-tag>
+                <el-tag v-show="scope.row.examineStatus == 'FAIL'" type="danger">不通过</el-tag>
+                <el-tag v-show="scope.row.examineStatus == 'CLOSE'" type="info">已关闭</el-tag>
               </template>
             </el-table-column>
             <el-table-column v-if="isCustomer" align="left" label="是否确认" prop="customerIsConfirm" min-width="160" show-overflow-tooltip>

src/views/finance/receivable_list.vue

@@ -70,7 +70,7 @@
       <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="selectionChangeFn" show-summary :summary-method="$getSummaries">
-            <el-table-column align="center" type="selection" width="100">
+            <el-table-column align="center" type="selection" width="51">
             </el-table-column>
             <el-table-column align="left" label="单据类型" prop="billType" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="单据来源" prop="source" min-width="100" show-overflow-tooltip></el-table-column>
@@ -97,10 +97,10 @@
             <el-table-column align="left" label="单据状态" prop="examineStatus" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-tag v-show="scope.row.examineStatus == 'SAVE'">保存</el-tag>
-                <el-tag v-show="scope.row.examineStatus == 'WAIT'">待审核</el-tag>
-                <el-tag v-show="scope.row.examineStatus == 'OK'">通过</el-tag>
-                <el-tag v-show="scope.row.examineStatus == 'FAIL'">不通过</el-tag>
-                <el-tag v-show="scope.row.examineStatus == 'CLOSE'">已关闭</el-tag>
+                <el-tag v-show="scope.row.examineStatus == 'WAIT'" type="warning">待审核</el-tag>
+                <el-tag v-show="scope.row.examineStatus == 'OK'" type="success">通过</el-tag>
+                <el-tag v-show="scope.row.examineStatus == 'FAIL'" type="danger">不通过</el-tag>
+                <el-tag v-show="scope.row.examineStatus == 'CLOSE'" type="info">已关闭</el-tag>
               </template>
             </el-table-column>
             <el-table-column align="right" label="总金额" prop="totalAmount" min-width="120" show-overflow-tooltip>