Merge branch 'feature/Feature-sticky' into develop

src/layout/components/AppMain.vue

@@ -29,7 +29,7 @@ export default {
   min-height: calc(100vh - 50px);
   width: 100%;
   position: relative;
-  /*overflow: inherit;*/
+  overflow: hidden;
 }
 .fixed-header + .app-main {
   /* padding-top: 50px; */

src/utils/table-sticky.js

@@ -190,7 +190,7 @@ export default {
             width: getComputedStyle(this.fixedRightDom[0]).width,
             scrollLeft: fixedRightHeaderDom.scrollWidth
           })
-          fixedRightBox.style.top = 0
+          fixedRightBox.style.top = 83 + 'px'
         }
         // 左侧固定
         if (fixedLeftHeaderDom) {
@@ -200,13 +200,13 @@ export default {
             width: getComputedStyle(this.fixedLeftDom[0]).width,
             scrollLeft: 0
           })
-          fixedLeftBox.style.top = 0
+          fixedLeftBox.style.top = 83 + 'px'
         }
         dom.classList.add('fixed') //加一个固定标识
         this.updateWidth()
         dom.style.position = 'fixed'
         dom.style.zIndex = '2000'
-        dom.style.top = 0 + 'px'
+        dom.style.top = 83 + 'px'
         dom.style.overflow = 'hidden'
       } else {
         this.clearFixedStyle()
@@ -217,7 +217,7 @@ export default {
       let { dom, scrollLeft, width, left } = data
       dom.style.zIndex = '2000'
       dom.style.position = 'fixed'
-      dom.style.top = '0'
+      dom.style.top = 83 + 'px'
       dom.scrollLeft = scrollLeft
       dom.style.width = width
       dom.style.overflow = 'hidden'

src/views/finance/change_apply.vue

@@ -228,14 +228,15 @@ export default {
 
     resetFn() {
       // this.searchForm.theTime = null;
-      this.dataList.forEach(v => {
-        v.money = ''
-        v.bz = ''
-        v.name = ''
-      })
-      this.dataList[1].customerId = ''
-      this.dataList[1].customerNumber = ''
-      this.dataList[1].allowanceAmount = ''
+      // this.dataList.forEach(v => {
+      //   v.money = ''
+      //   v.bz = ''
+      //   v.name = ''
+      // })
+      // this.dataList[1].customerId = ''
+      // this.dataList[1].customerNumber = ''
+      // this.dataList[1].allowanceAmount = ''
+      Object.assign(this.$data, this.$options.data())
     },
 
     // //返利类型数据

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

@@ -91,17 +91,17 @@
               <el-input class="mountclass" :disabled="show" type="number" v-model="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
-                class="mountclass"
-                :disabled="show"
-                type="number"
-                @mousewheel.native.prevent
-                v-model="scope.row.allowanceAmount"
-              ></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-->
+          <!--                class="mountclass"-->
+          <!--                :disabled="show"-->
+          <!--                type="number"-->
+          <!--                @mousewheel.native.prevent-->
+          <!--                v-model="scope.row.allowanceAmount"-->
+          <!--              ></el-input>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
           <el-table-column
             align="left"
             label="备注"
@@ -219,11 +219,14 @@ export default {
       // console.log(this.dataList);
       const res = this.dataList.map(v => {
         return {
-          allowanceAmount: v.allowanceAmount,
+          // allowanceAmount: v.allowanceAmount,
+          allowanceAmount: 0,
           rebateAmount: v.rebateAmount,
           itemId: v.id
         }
       })
+      console.log(774)
+      return
       // console.log(res, 888);
       if (this.state == 1) {
         await getRebateOrderAclUpdate(res)

src/views/finance/rebate_form.vue

@@ -417,8 +417,9 @@ export default {
       //   remark: '',
       //   createBy: ''
       // }
-      this.searchForm.remark = ''
-      this.dataList = []
+      // this.searchForm.remark = ''
+      // this.dataList = []
+      Object.assign(this.$data, this.$options.data())
     },
     rouClassNameFn({ row, rowIndex }) {
       // 把每一行的索引放进row

src/views/finance/rebate_list.vue

@@ -261,17 +261,17 @@
                 {{ scope.row.withholdAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="折让金额"
-              prop="allowanceAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                {{ scope.row.allowanceAmount | numToFixed }}
-              </template>
-            </el-table-column>
+            <!--            <el-table-column-->
+            <!--              align="right"-->
+            <!--              label="折让金额"-->
+            <!--              prop="allowanceAmount"-->
+            <!--              min-width="160"-->
+            <!--              show-overflow-tooltip-->
+            <!--            >-->
+            <!--              <template slot-scope="scope">-->
+            <!--                {{ scope.row.allowanceAmount | numToFixed }}-->
+            <!--              </template>-->
+            <!--            </el-table-column>-->
             <el-table-column
               v-if="!isCustomer"
               align="left"

src/views/finance/standbook_list.vue

@@ -461,8 +461,9 @@
 import { getWalletCustomerList } from '@/api/finance/change_apply'
 import { getAmountCount, getCustomerList, getStandbookList } from '@/api/finance/standbook_list'
 import { numToFixed } from '@/filters'
-
+import sticky from '@/utils/table-sticky'
 export default {
+  mixins: [sticky],
   data() {
     return {
       isShow: false,
@@ -476,6 +477,7 @@ export default {
       dataList: [],
       isCollapse: true,
       walletList: [],
+      parent: 'mymain-container',
       // dictList: [],
       customerName: '',
       customerNumber: '',
@@ -1213,7 +1215,12 @@ export default {
   }
 }
 </script>
-
+<style>
+.main-container {
+  height: 100vh !important;
+  overflow: auto;
+}
+</style>
 <style lang="scss" scoped>
 ::v-deep .ulStyle {
   //position: sticky;

src/views/sales_policy/components/AddPolicy.vue

@@ -224,6 +224,17 @@
                 />
               </template>
             </pl-table-column>
+
+            <pl-table-column prop="orgPrice" label="原供价" align="right" min-width="150">
+              <template slot-scope="scope">
+                {{ scope.row.orgPrice }}
+              </template>
+            </pl-table-column>
+            <pl-table-column prop="priceType" label="价格类型" align="left" min-width="150">
+              <template slot-scope="scope">
+                {{ scope.row.priceType }}
+              </template>
+            </pl-table-column>
             <pl-table-column prop="price" label="单价" align="right" show-overflow-tooltip min-width="150">
               <template slot-scope="scope">
                 <template v-if="scope.row.fang">
@@ -241,7 +252,7 @@
                 />
               </template>
             </pl-table-column>
-            <pl-table-column label="返利钱包" align="left" show-overflow-tooltip min-width="150">
+            <pl-table-column label="返利钱包" align="left" show-overflow-tooltip min-width="200">
               <template slot-scope="scope">
                 <template v-if="scope.row.fang">
                   <template v-for="(item, index) in scope.row.walletRelaList">
@@ -267,7 +278,7 @@
                 </el-select>
               </template>
             </pl-table-column>
-            <pl-table-column label="现金钱包" align="left" show-overflow-tooltip min-width="150">
+            <pl-table-column label="现金钱包" align="left" show-overflow-tooltip min-width="200">
               <template slot-scope="scope">
                 <template v-if="scope.row.fang">
                   <template v-for="(item, index) in scope.row.walletRelaList">

src/views/sales_policy/components/Examine.vue

@@ -216,7 +216,17 @@
             <el-table-column prop="saleTypeName" label="销售类型" min-width="160" show-overflow-tooltip align="left" />
             <el-table-column prop="discAmount" label="格力折扣" align="right" />
             <el-table-column prop="price" label="单价" align="right" />
-            <el-table-column label="返利钱包" align="left" min-width="160" show-overflow-tooltip>
+            <el-table-column prop="orgPrice" label="原供价" align="right" min-width="150">
+              <template slot-scope="scope">
+                {{ scope.row.orgPrice }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="priceType" label="价格类型" align="left" min-width="150">
+              <template slot-scope="scope">
+                {{ scope.row.priceType }}
+              </template>
+            </el-table-column>
+            <el-table-column label="返利钱包" align="left" min-width="200" show-overflow-tooltip>
               <template slot-scope="scope">
                 <template v-for="item in scope.row.walletRelaList">
                   <el-tag v-if="item.type === 'REBATE'" style="margin: 5px" type="success" size="small">{{
@@ -225,7 +235,7 @@
                 </template>
               </template>
             </el-table-column>
-            <el-table-column label="现金钱包" align="left" min-width="160" show-overflow-tooltip>
+            <el-table-column label="现金钱包" align="left" min-width="200" show-overflow-tooltip>
               <template slot-scope="scope">
                 <template v-for="item in scope.row.walletRelaList">
                   <el-tag v-if="item.type === 'COMMONLY'" style="margin: 5px" type="success" size="small">{{

src/views/sales_policy/components/details.vue

@@ -221,7 +221,17 @@
               />
               <el-table-column prop="discAmount" label="格力折扣" align="right" />
               <el-table-column prop="price" label="单价" align="right" />
-              <el-table-column label="返利钱包" align="left" min-width="160" show-overflow-tooltip>
+              <el-table-column prop="orgPrice" label="原供价" align="right" min-width="150">
+                <template slot-scope="scope">
+                  {{ scope.row.orgPrice }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="priceType" label="价格类型" align="left" min-width="150">
+                <template slot-scope="scope">
+                  {{ scope.row.priceType }}
+                </template>
+              </el-table-column>
+              <el-table-column label="返利钱包" align="left" min-width="200" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <template v-for="item in scope.row.walletRelaList">
                     <el-tag v-if="item.type === 'REBATE'" style="margin: 5px" type="success" size="mini">{{
@@ -230,7 +240,7 @@
                   </template>
                 </template>
               </el-table-column>
-              <el-table-column label="现金钱包" align="left" min-width="160" show-overflow-tooltip>
+              <el-table-column label="现金钱包" align="left" min-width="200" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <template v-for="item in scope.row.walletRelaList">
                     <el-tag v-if="item.type === 'COMMONLY'" style="margin: 5px" type="success" size="mini">{{

src/views/sales_policy/components/editPolicy.vue

@@ -227,6 +227,16 @@
                   />
                 </template>
               </pl-table-column>
+              <pl-table-column prop="orgPrice" label="原供价" align="right" min-width="150">
+                <template slot-scope="scope">
+                  {{ scope.row.orgPrice }}
+                </template>
+              </pl-table-column>
+              <pl-table-column prop="priceType" label="价格类型" align="left" min-width="150">
+                <template slot-scope="scope">
+                  {{ scope.row.priceType }}
+                </template>
+              </pl-table-column>
               <pl-table-column prop="price" label="单价" align="right" show-overflow-tooltip min-width="150">
                 <template slot-scope="scope">
                   <template v-if="scope.row.fang">
@@ -244,7 +254,7 @@
                   />
                 </template>
               </pl-table-column>
-              <pl-table-column label="返利钱包" align="left" show-overflow-tooltip min-width="150">
+              <pl-table-column label="返利钱包" align="left" show-overflow-tooltip min-width="200">
                 <template slot-scope="scope">
                   <template v-if="scope.row.fang">
                     <template v-for="(item, index) in scope.row.walletRelaList">
@@ -270,7 +280,7 @@
                   </el-select>
                 </template>
               </pl-table-column>
-              <pl-table-column label="现金钱包" align="left" show-overflow-tooltip min-width="150">
+              <pl-table-column label="现金钱包" align="left" show-overflow-tooltip min-width="200">
                 <template slot-scope="scope">
                   <template v-if="scope.row.fang">
                     <template v-for="(item, index) in scope.row.walletRelaList">

src/views/sales_policy/policy_list.vue

@@ -136,6 +136,20 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :xs="24" :ms="6" :lg="6">
+                  <el-form-item label="经销商编码" prop="customerNumber">
+                    <el-select
+                      v-model="screenForm.customerNumber"
+                      size="mini"
+                      filterable
+                      clearable
+                      placeholder="经销商编码"
+                      class="select_height"
+                    >
+                      <el-option v-for="item in CrList" :key="item.id" :label="item.number" :value="item.number" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
 
                 <el-col :xs="24" :ms="6" :lg="6">
                   <el-form-item label="机型" prop="specification">
@@ -328,7 +342,8 @@ export default {
         title: '',
         type: '',
         customerId: '',
-        specification: ''
+        specification: '',
+        customerNumber: ''
       },
       fileList: [],
       statusOptions: [
@@ -414,6 +429,7 @@ export default {
         status: this.screenForm.status,
         title: this.screenForm.title,
         customerId: this.screenForm.customerId,
+        customerNumber: this.screenForm.customerNumber,
         specification: this.screenForm.specification
       }
       getList(params).then(res => {
@@ -422,16 +438,17 @@ export default {
         this.listTotal = res.data.total
         this.listLoading = false
       })
-      const paramsType = {
-        pageNum: 1,
-        pageSize: 10,
-        saleCdoe: '',
-        saleName: '',
-        stauts: ''
-      }
-      getTypeList(paramsType).then(res => {
-        this.typeList = res.data.records
-      })
+      // 产品类型
+      // const paramsType = {
+      //   pageNum: 1,
+      //   pageSize: 10,
+      //   saleCdoe: '',
+      //   saleName: '',
+      //   stauts: ''
+      // }
+      // getTypeList(paramsType).then(res => {
+      //   this.typeList = res.data.records
+      // })
     },
     hanleAbandon(id) {
       setAbandon({ policyId: id }).then(res => {

src/views/setting/role.vue

@@ -120,11 +120,12 @@
         show-checkbox
         :check-strictly="true"
         :default-expand-all="true"
-        :expand-on-click-node="false"
+        :expand-on-click-node="true"
         node-key="moduleId"
         ref="tree"
         highlight-current
         :props="defaultProps"
+        @check-change="getCheck"
       >
         <span class="custom-tree-node" slot-scope="{ node, data }">
           <span>{{ node.label }}</span>
@@ -137,7 +138,13 @@
         </span>
       </el-tree>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="roleFormVisible = false">{{ editId != 1 ? '取 消' : '关 闭' }}</el-button>
+        <el-button
+          @click="
+            roleFormVisible = false
+            flag = false
+          "
+          >{{ editId != 1 ? '取 消' : '关 闭' }}</el-button
+        >
         <el-button type="primary" @click="submitRoleForm" v-if="editId != 1">确 定</el-button>
       </div>
     </el-dialog>
@@ -178,7 +185,7 @@ export default {
       },
 
       roleFormVisible: false,
-
+      flag: false,
       menuRoleList: [],
       defaultProps: {
         children: 'children',
@@ -289,20 +296,45 @@ export default {
       this.editId = id
       getMenuList({ adminUserId: this.userid }).then(res => {
         this.menuRoleList = res.data
+
+        console.log(this.menuRoleList)
       })
       getMenuRoleIds({ adminRoleId: id }).then(res => {
         this.$refs.tree.setCheckedKeys(res.data)
+        this.flag = true
       })
     },
-
+    getCheck(data, val, oval) {
+      // flag 限制初始化时出现卡顿
+      if (this.flag) {
+        const moduleIds = [
+          ...new Set([
+            ...this.$refs.tree.getCheckedNodes().map(e => {
+              return e.parentId
+            }),
+            ...this.$refs.tree.getCheckedKeys()
+          ])
+        ]
+        this.$refs.tree.setCheckedKeys(moduleIds)
+      }
+    },
     // 设置权限 - 提交数据
     submitRoleForm() {
+      const parenIds = [
+        ...new Set(
+          this.$refs.tree.getCheckedNodes().map(e => {
+            return e.parentId
+          })
+        )
+      ]
       let params = {
         adminModuleIds: this.$refs.tree.getCheckedKeys().join(','),
         adminRoleId: this.editId
       }
+
       setMenuRole(params).then(res => {
         this.roleFormVisible = false
+        this.flag = false
         this.getList()
         this.$successMsg()
       })

src/views/supply/allot/allot_list.vue

@@ -150,14 +150,14 @@
             <el-table-column
               align="center"
               label="调出仓库"
-              prop="srcStockId"
+              prop="srcStockName"
               min-width="100"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="调入仓库"
-              prop="destStockId"
+              prop="destStockName"
               min-width="100"
               show-overflow-tooltip
             ></el-table-column>

src/views/supply/engin/components/commerce_form.vue

@@ -246,8 +246,8 @@
         <el-table-column align="center" type="selection" width="55" />
         <el-table-column align="center" label="序号" type="index" width="50" />
         <!--        <el-table-column align="center" label="引用记录" prop="useRefCount" min-width="160" show-overflow-tooltip></el-table-column>-->
-        <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="120" show-overflow-tooltip />
-        <el-table-column align="center" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip />
+        <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="160" show-overflow-tooltip />
+        <el-table-column align="center" label="物料编码" prop="materialNumber" min-width="160" show-overflow-tooltip />
         <el-table-column
           align="center"
           label="产品编码"
@@ -256,7 +256,7 @@
           show-overflow-tooltip
         />
         <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip />
-        <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
+        <el-table-column align="center" label="规格型号" prop="specification" min-width="300" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-if="listItem" v-model="scope.row.specification" size="small" />
             <div v-else>{{ scope.row.specification }}</div>

src/views/supply/engin/components/home_form.vue

@@ -42,7 +42,9 @@
               clearable
               @change="changeSaleType"
             >
-              <el-option v-for="item in salesTypeList" :key="item.id" :label="item.saleName" :value="item.id" />
+              <el-option v-for="item in salesTypeList" :key="item.id" :label="item.saleName" :value="item.id">
+                <span>{{ item.saleName }}</span> <span style="color: #f00">{{ item.saleCode }}</span>
+              </el-option>
             </el-select>
           </el-form-item>
         </el-col>

src/views/supply/implement/implement_list.vue

@@ -68,7 +68,21 @@
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="下单日期" prop="date">
+                  <el-form-item label="制单日期" prop="date">
+                    <el-date-picker
+                      v-model="screenForm.date"
+                      type="datetimerange"
+                      range-separator="至"
+                      style="width: 100%"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      start-placeholder="开始日期"
+                      end-placeholder="结束日期"
+                    >
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="订单日期" prop="orderDate">
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
@@ -114,6 +128,18 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="钱包" prop="walletIds1">
+                    <el-select v-model="screenForm.walletIds1" size="mini" multiple filterable>
+                      <el-option
+                        v-for="item in NoRebateWalletList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
               </el-row>
             </el-form>
           </template>
@@ -153,14 +179,14 @@
             </el-table-column>
             <el-table-column
               align="left"
-              label="下单日期"
+              label="制单日期"
               prop="createTime"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="left"
-              label="受订日期"
+              label="订单日期"
               prop="theTime"
               min-width="160"
               show-overflow-tooltip
@@ -397,6 +423,7 @@
 import { getList } from '@/api/supply/implement'
 import { getCategoryList } from '@/api/common'
 import DisplaceDetail from '@/views/supply/implement/components/displace_detail'
+import { getNoRebateWalletList } from '@/api/policy_list'
 
 let that
 export default {
@@ -436,7 +463,9 @@ export default {
         k3CategoryNumber: [],
         policyCode: '',
         policyRemark: '',
-        isOver: ''
+        isOver: '',
+        walletIds1: [],
+        orderDate: ''
       },
       categoryList: [],
       statusList: [
@@ -447,7 +476,8 @@ export default {
       ],
       isCollapse: true,
       queryItem: {},
-      isShowDisplaceDetail: false
+      isShowDisplaceDetail: false,
+      NoRebateWalletList: []
     }
   },
 
@@ -500,6 +530,8 @@ export default {
         specification: this.screenForm.model,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
+        orderStartTime: this.screenForm.orderDate ? this.screenForm.orderDate[0] : '',
+        orderEndTime: this.screenForm.orderDate ? this.screenForm.orderDate[1] : '',
         serviceName: this.screenForm.serviceName,
         newServiceName: this.screenForm.newServiceName,
         itemServiceName: this.screenForm.itemServiceName,
@@ -508,7 +540,8 @@ export default {
         k3CategoryNumber: this.screenForm.k3CategoryNumber.join(','),
         policyCode: this.screenForm.policyCode,
         policyRemark: this.screenForm.policyRemark,
-        isOver: this.screenForm.isOver
+        isOver: this.screenForm.isOver,
+        walletIds1: this.screenForm.walletIds1.join(',')
       }
       getList(params).then(res => {
         res.data.records.forEach(item => {
@@ -530,6 +563,12 @@ export default {
       }).then(res => {
         this.categoryList = res.data.records
       })
+      getNoRebateWalletList({
+        walletName: ''
+      }).then(res => {
+        console.log(res)
+        this.NoRebateWalletList = res.data
+      })
     },
 
     // 提交筛选表单

src/views/supply/implement/implement_total_list.vue

@@ -120,6 +120,18 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="钱包" prop="walletIds1">
+                    <el-select v-model="screenForm.walletIds1" size="mini" multiple filterable>
+                      <el-option
+                        v-for="item in NoRebateWalletList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
               </el-row>
             </el-form>
           </template>
@@ -408,6 +420,7 @@
 import { getTotalList } from '@/api/supply/implement'
 import { getCategoryList } from '@/api/common'
 import DisplaceDetail from '@/views/supply/implement/components/displace_detail'
+import { getNoRebateWalletList } from '@/api/policy_list'
 
 let that
 export default {
@@ -447,7 +460,8 @@ export default {
         k3CategoryNumber: [],
         policyCode: '',
         policyRemark: '',
-        isOver: ''
+        isOver: '',
+        walletIds1: []
       },
       categoryList: [],
       statusList: [
@@ -458,6 +472,7 @@ export default {
       ],
       isCollapse: true,
       queryItem: {},
+      NoRebateWalletList: [],
       isShowDisplaceDetail: false
     }
   },
@@ -517,6 +532,7 @@ export default {
         projectName: this.screenForm.enginName,
         enginRecordNo: this.screenForm.orderNum,
         k3CategoryNumber: this.screenForm.k3CategoryNumber.join(','),
+        walletIds1: this.screenForm.walletIds1.join(','),
         policyCode: this.screenForm.policyCode,
         policyRemark: this.screenForm.policyRemark,
         isOver: this.screenForm.isOver
@@ -541,6 +557,12 @@ export default {
       }).then(res => {
         this.categoryList = res.data.records
       })
+      getNoRebateWalletList({
+        walletName: ''
+      }).then(res => {
+        console.log(res)
+        this.NoRebateWalletList = res.data
+      })
     },
 
     // 提交筛选表单

src/views/supply/reserve/reserve_list.vue

@@ -194,14 +194,14 @@
             ></el-table-column>
             <el-table-column
               align="right"
-              label="预留数量"
+              label="原预留数量"
               prop="oldNum"
               min-width="100"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="right"
-              label="可发货数量"
+              label="预留数量"
               prop="reservedNum"
               min-width="100"
               show-overflow-tooltip

src/views/supply/retail/retail_list.vue

@@ -40,7 +40,7 @@
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="订单日期" prop="date">
+                  <el-form-item label="订单日期" prop="date" size="mini">
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
@@ -55,7 +55,7 @@
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="是否直调" prop="isDirectTransfer">
-                    <el-select v-model="screenForm.isDirectTransfer" placeholder="请选择是否直调">
+                    <el-select v-model="screenForm.isDirectTransfer" placeholder="请选择是否直调" size="mini">
                       <el-option label="是" :value="true"></el-option>
                       <el-option label="否" :value="false"></el-option>
                     </el-select>
@@ -89,7 +89,7 @@
                     <el-select
                       v-model="screenForm.k3ServiceId"
                       placeholder="选择表头业务员"
-                      size="small"
+                      size="mini"
                       clearable
                       filterable
                       style="width: 100%"
@@ -109,7 +109,7 @@
                     <el-select
                       v-model="screenForm.serviceId"
                       placeholder="选择表体业务员"
-                      size="small"
+                      size="mini"
                       clearable
                       filterable
                       style="width: 100%"