Merge branch 'master' into develop

src/views/basic_data/dealer/dealer_deposit.vue

@@ -73,9 +73,9 @@
             <el-table-column align="left" label="押金" prop="amount" min-width="100" show-overflow-tooltip />
             <el-table-column align="left" label="状态" prop="currentStatus" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                <el-tag type="info" v-if="scope.row.currentStatus == '未开始'">未开始</el-tag>
-                <el-tag type="success" v-if="scope.row.currentStatus == '生效中'">生效中</el-tag>
-                <el-tag type="danger" v-if="scope.row.currentStatus == '已结束'">已结束</el-tag>
+                <el-tag size="mini" type="info" v-if="scope.row.currentStatus == '未开始'">未开始</el-tag>
+                <el-tag size="mini" type="success" v-if="scope.row.currentStatus == '生效中'">生效中</el-tag>
+                <el-tag size="mini" type="danger" v-if="scope.row.currentStatus == '已结束'">已结束</el-tag>
               </template>
             </el-table-column>
             <el-table-column align="left" label="开始时间" prop="startTime" min-width="160" show-overflow-tooltip />

src/views/basic_data/dealer/dealer_list.vue

@@ -45,8 +45,8 @@
             <el-table-column align="left" label="简称" prop="shortName" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column prop="forbidStatus" align="left" label="禁用状态" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                <el-tag type="success" v-if="scope.row.forbidStatus === 'A'">正常</el-tag>
-                <el-tag type="danger" v-else-if="scope.row.flag === 'B'">禁用</el-tag>
+                <el-tag size="mini" type="success" v-if="scope.row.forbidStatus === 'A'">正常</el-tag>
+                <el-tag size="mini" type="danger" v-else-if="scope.row.flag === 'B'">禁用</el-tag>
               </template>
             </el-table-column>
             <el-table-column align="left" label="使用组织" prop="useOrgName" min-width="160" show-overflow-tooltip></el-table-column>

src/views/finance/account_list.vue

@@ -65,7 +65,7 @@
             <el-table-column align="left" label="月份" prop="month" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="对账状态" prop="isReconciliation" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                <el-tag type="danger" v-if="scope.row.isReconciliation == false">未对账</el-tag>
+                <el-tag size="mini" type="danger" v-if="scope.row.isReconciliation == false">未对账</el-tag>
               </template>
             </el-table-column>
             <el-table-column align="left" label="客户编码" prop="customerCode" min-width="100" show-overflow-tooltip>

src/views/finance/change_apply.vue

@@ -45,10 +45,17 @@
       <div class="table">
         <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
           <el-table-column label="序号" type="index" align="left" width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
+          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <div v-if="scope.$index == 0">{{ searchForm.customerNumber }}</div>
+              <div v-if="scope.$index == 1">{{ scope.row.customerNumber }}</div>
+
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="经销商名称" prop="customerName" min-width="260" show-overflow-tooltip>
             <template slot-scope="scope">
               <div v-if="scope.$index == 0">{{ searchForm.customerName }}</div>
-              <el-select v-if="scope.$index == 1" filterable v-model="scope.row.customerId" placeholder="请选择">
+              <el-select size="mini" class='dateStyle' @change="changeCustomerFn1($event, scope.$index, scope.row)" v-if="scope.$index == 1" filterable v-model="scope.row.customerId" placeholder="请选择">
                 <el-option v-for="item in customerData" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
               </el-select>
@@ -56,7 +63,7 @@
           </el-table-column>
           <el-table-column align="left" label="返利类型" prop="name" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-select filterable v-model="scope.row.name" placeholder="请选择" @click.native="changeCustomerFn(scope.row, scope.$index)">
+              <el-select size="mini" filterable v-model="scope.row.name" placeholder="请选择" @click.native="changeCustomerFn(scope.row, scope.$index)">
                 <el-option v-for="item in scope.row.typeList" :key="item.customerWalletId" :label="item.name" :value="item.customerWalletId">
                 </el-option>
               </el-select>
@@ -64,12 +71,12 @@
           </el-table-column>
           <el-table-column align="left" label="返利金额" prop="" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input type="number" v-model="scope.row.money"></el-input>
+              <el-input size="mini" type="number" v-model="scope.row.money"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="left" label="备注" prop="" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.bz"></el-input>
+              <el-input size="mini" v-model="scope.row.bz"></el-input>
             </template>
           </el-table-column>
         </el-table>
@@ -102,12 +109,14 @@ export default {
       listLoading: false, // 列表加载loading
       dataList: [
         {
+          customerNumber: "",
           customerId: "",
           name: "",
           money: "",
           bz: "",
         },
         {
+          customerNumber: "",
           customerId: "",
           name: "",
           money: "",
@@ -141,6 +150,24 @@ export default {
     this.getCustomerData();
   },
   methods: {
+    //选择经销商名称事件
+    async changeCustomerFn1(v, index, value) {
+      // value.customerWalletId = "";
+      // console.log(v);
+
+      const res = await getWalletCustomerList({
+        customerId: v,
+        type: "REBATE",
+      });
+      // console.log(res, 7878);
+      const res2 = this.customerData.filter((i) => i.id == v);
+      // console.log(res2, 8888);
+
+      this.$set(this.dataList[1], "customerNumber", res2[0].number);
+      // this.$set(this.dataList[index], "customerName", res2[0].name);
+
+      // this.$set(this.dataList[index], "walletList", res.data);
+    },
     // func(arr, target) {
     //   var obj = {};
     //   for (var i = 0; i < arr.length; i++) {

src/views/finance/change_list.vue

@@ -52,6 +52,17 @@
         <div class="table">
           <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
             <el-table-column label="序号" align="left" width="100" type="index" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="状态" prop="examineStatus" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-tag size="mini" type="" v-show="scope.row.examineStatus == 'SAVE'">保存</el-tag>
+                <el-tag size="mini" type="warning" v-show="scope.row.examineStatus == 'WAIT'">待审核</el-tag>
+                <el-tag size="mini" type="success" v-show="scope.row.examineStatus == 'OK_ONE'">初审通过</el-tag>
+                <el-tag size="mini" type="danger" v-show="scope.row.examineStatus == 'FAIL_ONE'">初审不通过</el-tag>
+                <el-tag size="mini" type="success" v-show="scope.row.examineStatus == 'OK'">复核通过</el-tag>
+                <el-tag size="mini" type="danger" v-show="scope.row.examineStatus == 'FALL'">不通过</el-tag>
+                <el-tag size="mini" type="info" v-show="scope.row.examineStatus == 'CLOSE'">已关闭</el-tag>
+              </template>
+            </el-table-column>
             <el-table-column align="left" label="返利转账单号" prop="id" min-width="200" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.id" />
@@ -122,17 +133,7 @@
               min-width="160"
               show-overflow-tooltip
             ></el-table-column> -->
-            <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_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 == 'FALL'">不通过</el-tag>
-                <el-tag v-show="scope.row.examineStatus == 'CLOSE'">已关闭</el-tag>
-              </template>
-            </el-table-column>
+
             <el-table-column align="center" label="操作" min-width="200" show-overflow-tooltip fixed="right">
               <template slot-scope="scope">
                 <el-button @click="submitFn(scope.row.id)" v-if="

src/views/finance/components/account_list-detail.vue

@@ -64,7 +64,7 @@
           <el-table-column align="left" label="月份" prop="month" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="对账状态" prop="isReconciliation" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-tag type="success" v-if="scope.row.isReconciliation == true">已对账</el-tag>
+              <el-tag size="mini" type="success" v-if="scope.row.isReconciliation == true">已对账</el-tag>
             </template>
           </el-table-column>
           <el-table-column align="left" label="客户编码" prop="customerCode" min-width="100" show-overflow-tooltip>

src/views/finance/components/change_list-detail.vue

@@ -22,6 +22,18 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="单据状态" prop="">
+              <el-input v-if="detailList.examineStatus=='SAVE'" disabled placeholder="保存"></el-input>
+              <el-input v-if="detailList.examineStatus=='WAIT'" disabled placeholder="待审核"></el-input>
+              <el-input v-if="detailList.examineStatus=='OK_ONE'" disabled placeholder="初审通过"></el-input>
+              <el-input v-if="detailList.examineStatus=='FAIL_ONE'" disabled placeholder="初审不通过"></el-input>
+              <el-input v-if="detailList.examineStatus=='OK'" disabled placeholder="复核通过"></el-input>
+              <el-input v-if="detailList.examineStatus=='FALL'" disabled placeholder="复核不通过"></el-input>
+              <el-input v-if="detailList.examineStatus=='CLOSE'" disabled placeholder="已关闭"></el-input>
+
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="制单人" prop="">
               <el-input v-model="detailList.createBy" disabled placeholder=""></el-input>
             </el-form-item>

src/views/finance/finance_sum.vue

@@ -26,7 +26,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 show-summary :summary-method="$getSummaries">
-          <el-table-column align="left" label="品类" prop="mainName" min-width="160" show-overflow-tooltip></el-table-column>
+          <!-- <el-table-column align="left" label="品类" prop="mainName" min-width="160" show-overflow-tooltip></el-table-column> -->
           <el-table-column align="left" label="钱包名称" prop="name" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="更新时间" prop="theTime" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="余额" prop="totalAmount" min-width="160" show-overflow-tooltip>

src/views/finance/rebate_form.vue

@@ -69,12 +69,12 @@
           <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>
+              <el-input size="mini" 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>
             <template slot-scope="scope">
-              <el-select @change="changeCustomerFn($event, scope.$index, scope.row)" v-model="scope.row.customerId" placeholder="请选择" filterable>
+              <el-select size="mini" @change="changeCustomerFn($event, scope.$index, scope.row)" v-model="scope.row.customerId" placeholder="请选择" filterable>
                 <el-option v-for="item in customerData" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
               </el-select>
@@ -82,7 +82,7 @@
           </el-table-column>
           <el-table-column align="left" label="返利类型" prop="customerWalletId" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-select v-model="scope.row.customerWalletId" placeholder="请选择" filterable>
+              <el-select size="mini" v-model="scope.row.customerWalletId" placeholder="请选择" filterable>
                 <el-option v-for="item in scope.row.walletList" :key="item.customerWalletId" :label="item.name" :value="item.customerWalletId">
                 </el-option>
               </el-select>
@@ -90,62 +90,62 @@
           </el-table-column>
           <el-table-column align="right" label="返利总金额" prop="amount" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input class="mountclass" v-model.number="scope.row.amount"></el-input>
+              <el-input size="mini" class="mountclass" v-model.number="scope.row.amount"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="right" label="暂扣返利" prop="withholdAmount" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input class="mountclass" v-model.number="scope.row.withholdAmount"></el-input>
+              <el-input size="mini" class="mountclass" v-model.number="scope.row.withholdAmount"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="left" label="政策文件流水号" prop="policyFileNo" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.policyFileNo"></el-input>
+              <el-input size="mini" v-model="scope.row.policyFileNo"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="left" label="政策文号" prop="policyDocNo" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.policyDocNo"></el-input>
+              <el-input size="mini" v-model="scope.row.policyDocNo"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="left" label="政策年份" prop="policyYear" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.policyYear"></el-input>
+              <el-input size="mini" v-model="scope.row.policyYear"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="left" label="政策月份" prop="policyMonth" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.policyMonth"></el-input>
+              <el-input size="mini" v-model="scope.row.policyMonth"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="left" label="政策归属部门" prop="policyOrg" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.policyOrg"></el-input>
+              <el-input size="mini" v-model="scope.row.policyOrg"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="left" label="客户区域" prop="customerArea" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.customerArea"></el-input>
+              <el-input size="mini" v-model="scope.row.customerArea"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="left" label="客户属性" prop="customerAttr" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.customerAttr"></el-input>
+              <el-input size="mini" v-model="scope.row.customerAttr"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="left" label="建立实际归属客户" prop="rewardActualCustomers" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.rewardActualCustomers"></el-input>
+              <el-input size="mini" v-model="scope.row.rewardActualCustomers"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="left" label="备注1" prop="remark1" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.remark1"></el-input>
+              <el-input size="mini" v-model="scope.row.remark1"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="left" label="备注2" prop="remark2" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.remark2"></el-input>
+              <el-input size="mini" v-model="scope.row.remark2"></el-input>
             </template>
           </el-table-column>
         </el-table>
@@ -156,15 +156,15 @@
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fl">
-        <el-button type="primary" size="small" @click="addFn">保存</el-button>
-        <!-- <el-button type="primary" size="small" @click="submitFn"
+        <el-button type="primary" size="mini" @click="addFn">保存</el-button>
+        <!-- <el-button type="primary" size="mini" @click="submitFn"
           >提交审批</el-button
         > -->
-        <el-button type="primary" size="small" @click="cancelFn">重置</el-button>
+        <el-button type="primary" size="mini" @click="cancelFn">重置</el-button>
       </div>
       <div class="fr">
-        <el-button type="primary" size="small" @click="addRowFn">添加行</el-button>
-        <el-button type="primary" size="small" @click="delRowFn">删除行</el-button>
+        <el-button type="primary" size="mini" @click="addRowFn">添加行</el-button>
+        <el-button type="primary" size="mini" @click="delRowFn">删除行</el-button>
       </div>
     </div>
   </div>

src/views/finance/rebate_list.vue

@@ -71,13 +71,13 @@
             <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'" 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>
+                <el-tag size="mini" v-show="scope.row.examineStatus == 'SAVE'">保存</el-tag>
+                <el-tag size="mini" v-show="scope.row.examineStatus == 'WAIT'" type="warning">待审核</el-tag>
+                <el-tag size="mini" v-show="scope.row.examineStatus == 'OK_ONE'" type="success">初审通过</el-tag>
+                <el-tag size="mini" v-show="scope.row.examineStatus == 'FAIL_ONE'" type="danger">初审不通过</el-tag>
+                <el-tag size="mini" v-show="scope.row.examineStatus == 'OK'" type="success">复核通过</el-tag>
+                <el-tag size="mini" v-show="scope.row.examineStatus == 'FAIL'" type="danger">不通过</el-tag>
+                <el-tag size="mini" 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/receipt_list.vue

@@ -92,7 +92,14 @@
               min-width="160"
               show-overflow-tooltip
             ></el-table-column> -->
-
+            <el-table-column align="left" label="单据状态" prop="status" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-tag size="mini" v-show="scope.row.status == 'A'">保存</el-tag>
+                <el-tag size="mini" v-show="scope.row.status == 'B'" type="info">审核中</el-tag>
+                <el-tag size="mini" v-show="scope.row.status == 'C'" type="success">已审核</el-tag>
+                <el-tag size="mini" v-show="scope.row.status == 'D'" type="warning">重新审核</el-tag>
+              </template>
+            </el-table-column>
             <el-table-column align="left" label="钱包" prop="walletName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="表头·应收金额" prop="" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="往来单位" prop="wlCompanyName" min-width="260" show-overflow-tooltip>
@@ -133,14 +140,7 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="勾对" prop="" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="单据状态" prop="status" min-width="160" show-overflow-tooltip>
-              <template slot-scope="scope">
-                <el-tag v-show="scope.row.status == 'A'">保存</el-tag>
-                <el-tag v-show="scope.row.status == 'B'" type="info">审核中</el-tag>
-                <el-tag v-show="scope.row.status == 'C'" type="success">已审核</el-tag>
-                <el-tag v-show="scope.row.status == 'D'" type="warning">重新审核</el-tag>
-              </template>
-            </el-table-column>
+
             <el-table-column align="left" label="备注" prop="remark" 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">

src/views/finance/receivable_list.vue

@@ -96,11 +96,11 @@
 
             <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'" 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>
+                <el-tag size="mini" v-show="scope.row.examineStatus == 'SAVE'">保存</el-tag>
+                <el-tag size="mini" v-show="scope.row.examineStatus == 'WAIT'" type="warning">待审核</el-tag>
+                <el-tag size="mini" v-show="scope.row.examineStatus == 'OK'" type="success">通过</el-tag>
+                <el-tag size="mini" v-show="scope.row.examineStatus == 'FAIL'" type="danger">不通过</el-tag>
+                <el-tag size="mini" 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>