【修改】bug

src/views/engin_deposit/components/deposit_list-detail.vue

@@ -50,18 +50,18 @@
               <div class="value">{{ details.refTel }}</div>
             </el-col>
 
-<!--            <el-col :xs="24" :sm="24" :lg="16" class="item">-->
-<!--              <div class="label">厂工程编码</div>-->
-<!--              <div class="value">-->
-<!--                <el-form-item prop="refFactoryNo">-->
-<!--                  <el-input-->
-<!--                    v-model="details.refFactoryNo"-->
-<!--                    placeholder="厂工程编码"-->
-<!--                    size="small"-->
-<!--                  />-->
-<!--                </el-form-item>-->
-<!--              </div>-->
-<!--            </el-col>-->
+            <!--            <el-col :xs="24" :sm="24" :lg="16" class="item">-->
+            <!--              <div class="label">厂工程编码</div>-->
+            <!--              <div class="value">-->
+            <!--                <el-form-item prop="refFactoryNo">-->
+            <!--                  <el-input-->
+            <!--                    v-model="details.refFactoryNo"-->
+            <!--                    placeholder="厂工程编码"-->
+            <!--                    size="small"-->
+            <!--                  />-->
+            <!--                </el-form-item>-->
+            <!--              </div>-->
+            <!--            </el-col>-->
 
             <el-col :xs="24" :sm="24" :lg="8" class="item">
               <div class="label">移动电话</div>
@@ -496,7 +496,7 @@
         <div class="table">
           <el-table
             v-loading="listLoading"
-            :data="goodsList"
+            :data="projectList"
             element-loading-text="Loading"
             border
             fit
@@ -555,7 +555,7 @@
               <template slot-scope="scope">
                 {{
                   (scope.row.refundableQty || 0) *
-                    (scope.row.singleDepositAmount || 0)
+                  (scope.row.singleDepositAmount || 0)
                 }}
               </template>
             </el-table-column>
@@ -566,7 +566,7 @@
     <div v-show="engineering == '直调发货'" class="zd">
       <div class="table" style="margin-top: 20px">
         <el-table
-          :data="projectList"
+          :data="goodsList"
           element-loading-text="Loading"
           border
           fit
@@ -576,14 +576,14 @@
           <el-table-column
             align="center"
             label="发货单"
-            prop="deliverNo"
+            prop="id"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
             align="center"
             label="发货申请日期"
-            prop="deliverDate"
+            prop="orderTime"
             min-width="160"
             show-overflow-tooltip
           />
@@ -611,7 +611,7 @@
           <el-table-column
             align="center"
             label="数量"
-            prop="qty"
+            prop="refundableQty"
             min-width="160"
             show-overflow-tooltip
           />
@@ -625,7 +625,7 @@
             <template slot-scope="scope">
               {{
                 (scope.row.qty || 0) *
-                  (scope.row.singleDepositAmount || 0)
+                (scope.row.singleDepositAmount || 0)
               }}
             </template>
           </el-table-column>
@@ -704,7 +704,7 @@ export default {
         }).then((res) => {
           this.dataList = res.data
         })
-      } else if (this.engineering == '工程发货信息') {
+      } else if (this.engineering == '直调发货') {
         getList({
           pageSize: -1,
           pageNum: 1,

src/views/sales_policy/codealer_list.vue

@@ -109,24 +109,24 @@
     <!-- 分页 -->
     <div class="fr">
       <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
         :current-page="currentPage"
-        :page-sizes="[10, 20, 30, 50]"
+        :page-sizes="[10, 20, 30, 50,500]"
         :page-size="10"
         layout="total, sizes, prev, pager, next, jumper"
         :total="listTotal"
-      >
-      </el-pagination>
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
     </div>
   </el-container>
   <Distributor v-else :cid="id" />
 </template>
 
 <script>
-import { getCustomerlist, getPolicyDetail } from "@/api/policy_list";
-import Minxin from "@/mixin";
-import Distributor from "./components/Distributor";
+import { getCustomerlist } from '@/api/policy_list'
+import Minxin from '@/mixin'
+import Distributor from './components/Distributor'
+
 export default {
   mixins: [Minxin],
   data() {

src/views/sales_policy/components/Distributor.vue

@@ -216,10 +216,10 @@
 </template>
 
 <script>
-import Pagination from "./Pagination";
-import Transfer from "./Transfer";
-import { getPolicyDetail, getCustomerList, eidtBatch } from "@/api/policy_list";
-import Minxin from "@/mixin";
+import Pagination from './Pagination'
+import Transfer from './Transfer'
+import { eidtBatch, getCustomerList, getPolicyDetail } from '@/api/policy_list'
+import Minxin from '@/mixin'
 
 export default {
   mixins: [Minxin],
@@ -276,13 +276,15 @@ export default {
         };
         getCustomerList(params).then((res) => {
           this.dataList = res.data.records;
+          this.listTotal = res.data.total
           this.listLoading = false;
         });
         getPolicyDetail({ policyId: this.cid }).then((res) => {
           this.details = res.data;
+          this.listLoading = false;
         });
 
-        this.listLoading = false;
+
       }
     },
     handleEdit() {

src/views/supply/policy/policy_list.vue

@@ -306,16 +306,15 @@
               align="center"
               label="返利金额"
               sortable
-              prop="payRebateAmount"
+              prop="rebateAmount"
               min-width="100"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
                 <div>{{ scope.row.rebateAmount | numToFixed }}</div>
-<!--                <div>(实际：{{ scope.row.payRebateAmount | numToFixed }})</div>-->
               </template>
             </el-table-column>
-       
+
             <el-table-column
               align="center"
               label="格力折扣"