价格&调价列表添加搜索字段。。、

src/views/basic_data/material/modify_list.vue

@@ -3,60 +3,114 @@
     <div v-if="show === 1">
       <!-- 筛选条件 -->
       <div>
-        <el-form
-          ref="screenForm"
-          :model="screenForm"
-          label-width="70px"
-          size="small"
-          label-position="left"
-        >
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="存货编码" prop="materialNumber">
-                <el-input
-                  placeholder="请输入存货编码"
-                  v-model="screenForm.materialNumber"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="存货名称" prop="materialName">
-                <el-input
-                  placeholder="请输入存货名称"
-                  v-model="screenForm.materialName"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="存货代码" prop="account">
-                <el-input placeholder="请输入存货代码" v-model="screenForm.account"></el-input>
-              </el-form-item>
-            </el-col> -->
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="生效日期" prop="startDate">
-                <el-date-picker
-                  v-model="screenForm.startDate"
-                  type="datetime"
-                  placeholder="请输入生效日期"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
-                </el-date-picker>
-                <!-- <el-input placeholder="请输入生效日期"  v-model="screenForm.startDate"></el-input> -->
-              </el-form-item>
-            </el-col>
+        <div>
+          <el-form
+            ref="screenForm"
+            :model="screenForm"
+            label-width="70px"
+            size="small"
+            label-position="left"
+          >
+            <el-row :gutter="20">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="存货编码" prop="materialNumber">
+                  <el-input
+                    placeholder="请输入存货编码"
+                    v-model="screenForm.materialNumber"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="存货名称" prop="materialName">
+                  <el-input
+                    placeholder="请输入存货名称"
+                    v-model="screenForm.materialName"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="金蝶编码" prop="materialOldNumber">
+                  <el-input
+                    placeholder="请输入金蝶编码"
+                    v-model="screenForm.materialOldNumber"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+<!--              <el-col :xs="24" :sm="12" :lg="6">-->
+<!--                <el-form-item label="生效日期" prop="startDate">-->
+<!--                  <el-date-picker-->
+<!--                    v-model="screenForm.startDate"-->
+<!--                    type="datetime"-->
+<!--                    placeholder="请输入生效日期"-->
+<!--                    value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                  >-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
+<!--              <el-col :xs="24" :sm="12" :lg="6">-->
+<!--                <el-form-item label="失效日期" prop="endDate">-->
+<!--                  <el-date-picker-->
+<!--                    v-model="screenForm.endDate"-->
+<!--                    type="datetime"-->
+<!--                    placeholder="请输入生效日期"-->
+<!--                    value-format="yyyy-MM-dd HH:mm:ss "-->
+<!--                  >-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="销售类型" prop="saleTypeId">
+                  <el-select
+                    v-model="screenForm.saleTypeId"
+                    filterable
+                    placeholder="选择销售类型"
+                    style="width: 100%"
+                  >
+                    <el-option label="全部" value=""></el-option>
+                    <el-option
+                      v-for="item in typeList"
+                      :key="item.id"
+                      :label="item.saleName"
+                      :value="item.id"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="产品品类" prop="categoryId">
+                  <el-select
+                    placeholder="请选择产品品类"
+                    v-model="screenForm.mainId"
+                  >
+                    <el-option label="全部" value=""></el-option>
+                    <el-option
+                      v-for="item in dictList"
+                      :label="item.dictValue"
+                      :value="item.dictCode"
+                    ></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
+                    placeholder="请输入规格型号"
+                    v-model="screenForm.specification"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
 
-            <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-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
-                >
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+                  >
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+      </div>
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix">
@@ -392,18 +446,20 @@
 </template>
 
 <script>
-import ModifyListApply from "./components/modify_list-apply.vue";
-import ModifyListApproval from "./components/modify_list-approval.vue";
-import ModifyListDetail from "./components/modify_list-detail.vue";
-import Mixin from "@/mixin/index";
+import ModifyListApply from './components/modify_list-apply.vue'
+import ModifyListApproval from './components/modify_list-approval.vue'
+import ModifyListDetail from './components/modify_list-detail.vue'
+import Mixin from '@/mixin/index'
 import {
+  getPriceSubmit,
+  getProductRricedel,
   getProductRriceDetail,
   getProductRriceList,
-  getProductRricedel,
-  getTypeList,
-  getPriceSubmit,
-} from "@/api/basic_data/material";
-import { downloadFiles } from "@/utils/util";
+  getTypeList
+} from '@/api/basic_data/material'
+import { downloadFiles } from '@/utils/util'
+import { getDictList } from '@/api/common'
+
 export default {
   mixins: [Mixin],
   data() {
@@ -438,6 +494,10 @@ export default {
         materialName: "",
         materialNumber: "",
         startDate: "",
+        materialOldNumber:'',
+        saleTypeId:'',
+        mainId:'',
+        specification:''
       },
       liDetail: {},
       detail: {},
@@ -463,6 +523,7 @@ export default {
       },
       cid:'',
       typeList: [],
+      dictList:[]
     };
   },
   components: {
@@ -490,6 +551,10 @@ export default {
     getTypeList(params).then((res) => {
       this.typeList = res.data.records;
     });
+    getDictList({ sysDictEnum: "PRODUCT_TYPE" }).then((res) => {
+      this.dictList = res.data;
+      console.log(this.dictList)
+    });
   },
   methods: {
     formatterType(row) {
@@ -541,6 +606,10 @@ export default {
         materialName: this.screenForm.materialName,
         materialNumber: this.screenForm.materialNumber,
         startDate: this.screenForm.startDate,
+        materialOldNumber:this.screenForm.materialOldNumber,
+        saleTypeId:this.screenForm.saleTypeId,
+        mainId:this.screenForm.mainId,
+        specification:this.screenForm.specification
       };
       getProductRriceList(params).then((res) => {
         this.dataList = res.data.records;

src/views/basic_data/material/price_list.vue

@@ -27,27 +27,35 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="生效日期" prop="startDate">
-              <el-date-picker
-                v-model="screenForm.startDate"
-                type="datetime"
-                placeholder="请输入生效日期"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="失效日期" prop="endDate">
-              <el-date-picker
-                v-model="screenForm.endDate"
-                type="datetime"
-                placeholder="请输入生效日期"
-                value-format="yyyy-MM-dd HH:mm:ss "
-              >
-              </el-date-picker>
+            <el-form-item label="金蝶编码" prop="materialOldNumber">
+              <el-input
+                placeholder="请输入金蝶编码"
+                v-model="screenForm.materialOldNumber"
+              ></el-input>
             </el-form-item>
           </el-col>
+<!--          <el-col :xs="24" :sm="12" :lg="6">-->
+<!--            <el-form-item label="生效日期" prop="startDate">-->
+<!--              <el-date-picker-->
+<!--                v-model="screenForm.startDate"-->
+<!--                type="datetime"-->
+<!--                placeholder="请输入生效日期"-->
+<!--                value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--              >-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :xs="24" :sm="12" :lg="6">-->
+<!--            <el-form-item label="失效日期" prop="endDate">-->
+<!--              <el-date-picker-->
+<!--                v-model="screenForm.endDate"-->
+<!--                type="datetime"-->
+<!--                placeholder="请输入生效日期"-->
+<!--                value-format="yyyy-MM-dd HH:mm:ss "-->
+<!--              >-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="销售类型" prop="saleTypeId">
               <el-select
@@ -66,20 +74,21 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!-- <el-col :xs="24" :sm="12" :lg="6">
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品品类" prop="categoryId">
               <el-select
                 placeholder="请选择产品品类"
-                v-model="screenForm.categoryId"
+                v-model="screenForm.mainId"
               >
+                <el-option label="全部" value=""></el-option>
                 <el-option
                   v-for="item in dictList"
                   :label="item.dictValue"
-                  :value="item.sysDictId"
+                  :value="item.dictCode"
                 ></el-option>
               </el-select>
             </el-form-item>
-          </el-col> -->
+          </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="规格型号" prop="specification">
               <el-input
@@ -314,15 +323,10 @@
 </template>
 
 <script>
-import Mixin from "@/mixin/index";
-import {
-  getProductPriceList,
-  handlePriceRevoke,
-  getProductDelete,
-  getTypeList,
-} from "@/api/basic_data/material";
-import { getDictList } from "@/api/common";
-import { downloadFiles, parseTime } from "@/utils/util";
+import Mixin from '@/mixin/index'
+import { getProductDelete, getProductPriceList, getTypeList, handlePriceRevoke } from '@/api/basic_data/material'
+import { getDictList } from '@/api/common'
+
 export default {
   mixins: [Mixin],
   data() {
@@ -332,7 +336,7 @@ export default {
       listTotal: 0, // 列表总数
       dataList: [],
       screenForm: {
-        categoryId: "",
+        mainId: "",
         endDate: "",
         materialName: "",
         materialNumber: "",
@@ -347,6 +351,7 @@ export default {
   mounted() {
     getDictList({ sysDictEnum: "PRODUCT_TYPE" }).then((res) => {
       this.dictList = res.data;
+      console.log(this.dictList)
     });
   },
   methods: {
@@ -366,7 +371,7 @@ export default {
       let params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        categoryId: this.screenForm.categoryId,
+        mainId: this.screenForm.mainId,
         endDate: this.screenForm.endDate,
         materialName: this.screenForm.materialName,
         materialNumber: this.screenForm.materialNumber,

src/views/engin_deposit/deposit_list.vue

@@ -2,10 +2,10 @@
   <div class="app-container">
     <div v-if="showPage == 1">
       <el-radio-group v-model="deduction" size="" @change="handleRadio">
-        <el-radio-button label="全部"></el-radio-button>
-        <el-radio-button label="已退押"></el-radio-button>
+        <el-radio-button label="全部" />
+        <el-radio-button label="已退押" />
       </el-radio-group>
-      <br /><br />
+      <br><br>
       <!-- 筛选条件 -->
       <div>
         <el-form
@@ -21,7 +21,7 @@
                 <el-input
                   v-model="screenForm.refEnginRecordNo"
                   placeholder="请输入"
-                ></el-input>
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -29,7 +29,7 @@
                 <el-input
                   v-model="screenForm.customerKeyword"
                   placeholder="请输入"
-                ></el-input>
+                />
               </el-form-item>
             </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
@@ -45,7 +45,7 @@
                 <el-input
                   v-model="screenForm.refProjectName"
                   placeholder="请输入"
-                ></el-input>
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -55,8 +55,7 @@
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
-                >
-                </el-date-picker>
+                />
               </el-form-item>
             </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
@@ -71,12 +70,15 @@
             </el-col> -->
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item label="" class="fr">
-                <el-button size="small" @click="resetScreenForm"
-                  >清空</el-button
-                >
-                <el-button size="small" type="primary" @click="submitScreenForm"
-                  >搜索</el-button
-                >
+                <el-button
+                  size="small"
+                  @click="resetScreenForm"
+                >清空</el-button>
+                <el-button
+                  size="small"
+                  type="primary"
+                  @click="submitScreenForm"
+                >搜索</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -84,9 +86,11 @@
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix" style="display: flex">
-        <el-button type="primary" size="small" @click="hanleDownloadFiles"
-          >导出</el-button
-        >
+        <el-button
+          type="primary"
+          size="small"
+          @click="hanleDownloadFiles"
+        >导出</el-button>
         <el-upload
           v-if="$checkBtnRole('import', $route.meta.roles)"
           class="import-btn"
@@ -112,36 +116,35 @@
             @select-all="handleSelectionAllChange"
             @selection-change="handleSelectionAllChange"
           >
-            <el-table-column align="center" type="selection" width="55">
-            </el-table-column>
+            <el-table-column align="center" type="selection" width="55" />
             <el-table-column
               align="center"
               label="工程登录编码"
               prop="refEnginRecordNo"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="center"
               label="使用单位"
               prop="refUseUnit"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="center"
               label="经销商编码"
               prop="customerId"
               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="是否免扣"
@@ -158,12 +161,11 @@
             >
               <template slot-scope="scope">
                 <el-tag
+                  v-if="scope.row.isRefundDeposit"
                   type="success"
                   size="small"
-                  v-if="scope.row.isRefundDeposit"
-                  >是</el-tag
-                >
-                <el-tag type="warning" size="small" v-else>否</el-tag>
+                >是</el-tag>
+                <el-tag v-else type="warning" size="small">否</el-tag>
               </template>
             </el-table-column>
             <!-- <el-table-column
@@ -179,7 +181,7 @@
               prop="depositAmount"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="center"
               label="状态"
@@ -189,35 +191,32 @@
             >
               <template slot-scope="scope">
                 <el-tag
+                  v-if="scope.row.examineStatus == 'SAVE'"
                   type="success"
                   size="small"
-                  v-if="scope.row.examineStatus == 'SAVE'"
-                  >保存
+                >保存
                 </el-tag>
                 <el-tag
+                  v-if="scope.row.examineStatus == 'WAIT'"
                   type="warning"
                   size="small"
-                  v-if="scope.row.examineStatus == 'WAIT'"
-                  >待审核
+                >待审核
                 </el-tag>
                 <el-tag
+                  v-if="scope.row.examineStatus == 'OK'"
                   type="warning"
                   size="small"
-                  v-if="scope.row.examineStatus == 'OK'"
-                  >通过</el-tag
-                >
+                >通过</el-tag>
                 <el-tag
+                  v-if="scope.row.examineStatus == 'FAIL'"
                   type="warning"
                   size="small"
-                  v-if="scope.row.examineStatus == 'FAIL'"
-                  >不通过</el-tag
-                >
+                >不通过</el-tag>
                 <el-tag
+                  v-if="scope.row.examineStatus == 'CLOSE'"
                   type="warning"
                   size="small"
-                  v-if="scope.row.examineStatus == 'CLOSE'"
-                  >关闭</el-tag
-                >
+                >关闭</el-tag>
               </template>
             </el-table-column>
             <el-table-column
@@ -226,7 +225,7 @@
               prop="qty"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <!-- <el-table-column
               align="center"
               label="是否已发货"
@@ -238,7 +237,7 @@
               align="center"
               label="操作"
               min-width="160"
-               fixed="right"
+              fixed="right"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
@@ -246,18 +245,16 @@
                   type="text"
                   class="textColor"
                   @click="detailFn(scope.row)"
-                  >详情</el-button
-                >
+                >详情</el-button>
                 <el-button
-                  type="text"
-                  class="textColor"
                   v-if="
                     scope.row.examineStatus == 'SAVE' &&
-                    $checkBtnRole('apply', $route.meta.roles)
+                      $checkBtnRole('apply', $route.meta.roles)
                   "
+                  type="text"
+                  class="textColor"
                   @click="surrenderFn(scope.row)"
-                  >申请退押</el-button
-                >
+                >申请退押</el-button>
                 <!-- <el-button type="text" class="textColor" slot="reference"
                   >免扣退押</el-button
                 > -->
@@ -273,8 +270,7 @@
             :page-size="10"
             layout="total, sizes, prev, pager, next, jumper"
             :total="listTotal"
-          >
-          </el-pagination>
+          />
         </div>
       </div>
     </div>
@@ -293,12 +289,12 @@ import { getList } from '@/api/engin_deposit.js'
 import Mixin from '@/mixin'
 
 export default {
-  mixins: [Mixin],
   components: {
     DepositListDetail,
     DepositApplyDeduction,
-    DepositApplySurrender,
+    DepositApplySurrender
   },
+  mixins: [Mixin],
   data() {
     return {
       currentPage: 1, // 当前页码
@@ -306,97 +302,98 @@ export default {
       listTotal: 0, // 列表总数
       dataList: [], // 列表数据
       screenForm: {
-        confirmName: "", //审核人
-        createName: "", //创建人
-        customerKeyword: "", //客户编码/客户名称
-        endDeliverTime: "", //发货申请日期-结束
-        enginOrderNo: "", //工程订单编号
-        enginOrderType: "", //工程订单类型
-        examineStatus: "", //状态
-        refEnginRecordNo: "", //登录单号
-        refProjectName: "", //项目名称
-        refUseUnit: "", //使用单位
-        startDeliverTime: "", //发货申请日期-开始
-      }, //搜索表单
+        confirmName: '', // 审核人
+        createName: '', // 创建人
+        customerKeyword: '', // 客户编码/客户名称
+        endDeliverTime: '', // 发货申请日期-结束
+        enginOrderNo: '', // 工程订单编号
+        enginOrderType: '', // 工程订单类型
+        examineStatus: '', // 状态
+        refEnginRecordNo: '', // 登录单号
+        refProjectName: '', // 项目名称
+        refUseUnit: '', // 使用单位
+        startDeliverTime: '' // 发货申请日期-开始
+      }, // 搜索表单
       listLoading: false, // 列表加载loading
-      deduction: "全部",
+      deduction: '全部',
       showPage: 1,
       importFileList: [],
       selectData: [],
-      baseURL: "",
-    };
+      baseURL: ''
+    }
   },
 
   methods: {
-    //免扣申请
+    // 免扣申请
     deductionFn() {
-      this.showPage = 3;
+      this.showPage = 3
     },
-    //申请退押
+    // 申请退押
     surrenderFn(row) {
-      this.depositManageId = row.depositManageId;
-      this.showPage = 4;
+      this.depositManageId = row.depositManageId
+      this.showPage = 4
     },
     detailFn(row) {
-      this.depositManageId = row.depositManageId;
-      this.refEnginRecordNo = row.refEnginRecordNo;
-      this.showPage = 2;
+      this.depositManageId = row.depositManageId
+      this.refEnginRecordNo = row.refEnginRecordNo
+      this.showPage = 2
     },
     getList() {
-      this.listLoading = true;
+      this.listLoading = true
       const params = {
         pageSize: this.pageSize,
         pageNum: this.currentPage,
-        ...this.screenForm,
-      };
+        isRefundDeposit: this.deduction !=='全部',
+        ...this.screenForm
+      }
       getList(params).then((res) => {
-        this.dataList = res.data.records;
-        this.listLoading = false;
-        this.listTotal = res.data.total;
-      });
+        this.dataList = res.data.records
+        this.listLoading = false
+        this.listTotal = res.data.total
+      })
     },
     handleRadio() {
-      this.getList();
+      this.getList()
     },
     hanleDownloadFiles() {
       if (this.selectData.length) {
-        const arr = [];
+        const arr = []
         for (let i = 0; i < this.selectData.length; i++) {
-          arr.push(this.selectData[i].depositManageId);
+          arr.push(this.selectData[i].depositManageId)
         }
-        downloadFiles("/deposit-manage/export", { id: arr });
+        downloadFiles('/deposit-manage/export', { id: arr })
       } else {
-        this.$errorMsg("请选择押金项");
+        this.$errorMsg('请选择押金项')
       }
     },
     // 导入
     async handleImport(param) {
-      this.importLoading = true;
-      const file = param.file;
-      console.log(file, 123);
-      const formData = new FormData();
-      formData.append("file", file);
+      this.importLoading = true
+      const file = param.file
+      console.log(file, 123)
+      const formData = new FormData()
+      formData.append('file', file)
       // formData.append("policyId", this.screenForm.code);
-      let result = await handleImport("deposit-manage/import", formData);
-      this.importLoading = false;
-      this.importFileList = [];
+      const result = await handleImport('deposit-manage/import', formData)
+      this.importLoading = false
+      this.importFileList = []
       if (result.code == 200) {
-        this.$alert(result.message, "导入成功", {
-          confirmButtonText: "确定",
-        });
+        this.$alert(result.message, '导入成功', {
+          confirmButtonText: '确定'
+        })
 
-        this.handletwoList();
+        this.handletwoList()
       } else {
-        this.$alert(result.message, "导入失败", {
-          confirmButtonText: "确定",
-        });
+        this.$alert(result.message, '导入失败', {
+          confirmButtonText: '确定'
+        })
       }
     },
     handleSelectionAllChange(e) {
-      this.selectData = e;
-    },
-  },
-};
+      this.selectData = e
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/sales_policy/components/editPolicy.vue

@@ -339,15 +339,15 @@
                 @click="handleSave"
               >保存</el-button>
             </div>
-<!--            <el-pagination-->
-<!--              :current-page="dcurrentPage"-->
-<!--              :page-sizes="pageSizeArr"-->
-<!--              :page-size="size"-->
-<!--              layout="total, sizes, prev, pager, next, jumper"-->
-<!--              :total="listTotal"-->
-<!--              @size-change="handleSizeChange2"-->
-<!--              @current-change="handleCurrentChange2"-->
-<!--            />-->
+            <!--            <el-pagination-->
+            <!--              :current-page="dcurrentPage"-->
+            <!--              :page-sizes="pageSizeArr"-->
+            <!--              :page-size="size"-->
+            <!--              layout="total, sizes, prev, pager, next, jumper"-->
+            <!--              :total="listTotal"-->
+            <!--              @size-change="handleSizeChange2"-->
+            <!--              @current-change="handleCurrentChange2"-->
+            <!--            />-->
           </div>
 
           <el-row>
@@ -529,8 +529,8 @@ export default {
       sleectBox: { currentPage: 1 },
       dpageSize: 10,
       dcurrentPage: 1,
-      detail:{},
-      rebateList:[]
+      detail: {},
+      rebateList: []
     }
   },
   computed: {
@@ -664,8 +664,8 @@ export default {
           }
         })
       })
-      if (rebateList.length){
-        this.$set(row,'rebateWalletIds',[...new Set([...row.rebateWalletIds,rebateList[0].walletRebateId])])
+      if (rebateList.length) {
+        this.$set(row, 'rebateWalletIds', [...new Set([...row.rebateWalletIds, rebateList[0].walletRebateId])])
       }
       this.$set(row, 'saleTypeCode', item.saleCode)
       this.$set(row, 'saleTypeName', item.saleName)
@@ -792,12 +792,11 @@ export default {
         policyId: this.searchForm.code,
         saleTypeCode: ''
       }
-
       getMaterialList(paramss)
         .then((result) => {
           result.data.records.forEach((k) => {
             k.walletIds = []
-            k.rebateWalletIds =[]
+            k.rebateWalletIds = []
             if (!k.specification) {
               k.materialNumber = k.materialId
               k.specification = k.materialId
@@ -806,9 +805,9 @@ export default {
             k.walletRelaList.forEach((l) => {
               l.id = l.walletId
               l.name = l.walletName
-              if (l.type==='REBATE'){
+              if (l.type === 'REBATE') {
                 k.rebateWalletIds = [...k.rebateWalletIds, l.walletId]
-              }else {
+              } else {
                 k.walletIds = [...k.walletIds, l.walletId]
               }
             })
@@ -950,7 +949,7 @@ export default {
       const item = this.k3List.filter((k) => {
         return k.id == e
       })[0]
-      this.$set(row,'materialNumber',item.number)
+      this.$set(row, 'materialNumber', item.number)
       this.$set(row, 'materialName', item.name)
       this.$set(row, 'specification', item.specification)
       this.$set(row, 'materialId', item.id)

src/views/supply/policy/policy_list.vue

@@ -152,6 +152,7 @@
             stripe
             show-summary
             :summary-method="$getSummaries"
+            :default-sort = "{prop: 'payAmount',order:'descending'}"
           >
             <!-- <el-table-column
               align="center"
@@ -254,6 +255,7 @@
             <el-table-column
               align="center"
               label="总数量"
+
               prop="qty"
               min-width="100"
               show-overflow-tooltip
@@ -272,7 +274,8 @@
             </el-table-column>
             <el-table-column
               align="center"
-              label="金额"
+              label="实付金额"
+              sortable
               prop="payAmount"
               min-width="100"
               show-overflow-tooltip
@@ -302,6 +305,7 @@
             <el-table-column
               align="center"
               label="返利金额"
+              sortable
               prop="payRebateAmount"
               min-width="100"
               show-overflow-tooltip
@@ -314,6 +318,7 @@
             <el-table-column
               align="center"
               label="格力折扣"
+              sortable
               prop="totalDiscAmount"
               min-width="100"
               show-overflow-tooltip
@@ -464,7 +469,7 @@
         <div class="fr">
           <el-pagination
             :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"