Merge branch 'develop'

src/api/basic_data/dealer.js

@@ -162,3 +162,12 @@ export function getListCustomer(params) {
     params
   })
 }
+
+//获取经销商
+export function getK3DepartmentList(params) {
+  return request({
+    url: '/k3/department/list',
+    method: 'get',
+    params
+  })
+}

src/api/common.js

@@ -44,9 +44,9 @@ export function getTypeList(params) {
 }
 // 销售类型-家用工程专用
 export function getHomeTypeList(params) {
-  // /sale/type/home/list
+  ///sale/type/home/list
   return request({
-    url: '/sale/type/list',
+    url: '/sale/type/home/list',
     method: 'get',
     params
   })

src/api/engin_deposit/refund_list.js

@@ -68,7 +68,7 @@ export function getCommonFileGetStream(params) {
 export function examineData(params) {
   return request({
     url: '/deposit-manage/bach-condition-examine-home',
-    method: 'get',
+    method: 'POST',
     params
   })
 }

src/components/Common/collapse.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="collapse">
     <el-form @keydown.enter.native.prevent="handleScreen">
       <div class="btn_box">
         <div><slot name="left_btn" /></div>
@@ -125,7 +125,7 @@ export default {
   }
 }
 .search_box {
-  height: 39px;
+  height: 37px;
   overflow: hidden;
   transition: all 0.3s;
 }

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/styles/element-ui.scss

@@ -42,11 +42,20 @@
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  padding: 2px 10px !important;
+  padding: 0 10px !important;
 }
 .el-range-editor--mini.el-input__inner {
   height: 28px !important;
 }
+// 隐藏滚动条样式
+.scrollbar-wrapper::-webkit-scrollbar {
+  display: none;
+}
+.collapse {
+  .el-form-item__content {
+    line-height: 0 !important;
+  }
+}
 // dropdown
 .el-dropdown-menu {
   a {

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/basic_data/dealer/dealer_stock.vue

@@ -201,10 +201,16 @@
           </template> -->
         </el-form-item>
         <el-form-item label="金蝶部门编号" prop="k3OrgNumber">
-          <el-input v-model="addForm.k3OrgNumber"></el-input>
-          <!-- <template slot-scope="scope">
-            {{ scope.row }}
-          </template> -->
+          <!--          <el-input v-model="addForm.k3OrgNumber"></el-input>-->
+          <el-select class="selectStyle" v-model="addForm.k3OrgNumber" placeholder="请选择" filterable>
+            <el-option
+              v-for="item in k3DepartmentList"
+              :key="item.number"
+              :label="item.name + '（' + item.number + '）'"
+              :value="item.number"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="钱包" prop="customerWalletId">
           <el-select class="selectStyle" v-model="addForm.customerWalletId" placeholder="请选择" filterable>
@@ -304,7 +310,8 @@ import {
   getAdminUserList,
   getCustomerPtDetail,
   getCustomerPtUpdate,
-  getWalletCustomerList
+  getWalletCustomerList,
+  getK3DepartmentList
 } from '@/api/basic_data/dealer'
 import { getDealerList } from '@/api/basic_data/dealer'
 import { getDepartmentList } from '@/api/setting'
@@ -387,13 +394,15 @@ export default {
       // threeList: [], //三级区域数据
       userList: [], //业务员
       ids: [],
-      rowID: null //编辑ID
+      rowID: null, //编辑ID
+      k3DepartmentList: []
     }
   },
   async created() {
     this.getTree()
     // this.getAdminWebsit(1);
     this.getList()
+    this.getK3DepartmentList()
     this.getDealerDataList({ pageNum: 1, pageSize: -1 })
     this.getUserList(1)
     // this.getSelectList({ sysDictEnum: "PRODUCT_TYPE" });
@@ -459,6 +468,11 @@ export default {
         this.$message.error(result.message)
       }
     },
+    getK3DepartmentList() {
+      getK3DepartmentList().then(res => {
+        this.k3DepartmentList = res.data
+      })
+    },
     //下载模板
     downLoadFn() {
       downloadFiles('customer/pt/download')

src/views/deposit_home/refund_list.vue

@@ -247,7 +247,7 @@
               </el-radio-group> -->
                     <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
                   </div>
-                  <el-form-item label="" class="fr"> > </el-form-item>
+                  <el-form-item label="" class="fr"> </el-form-item>
                 </el-col>
               </el-row>
             </el-form>
@@ -758,10 +758,10 @@ export default {
       })
       ids = [...new Set(ids)]
       examineData({
-        id: ids.join(','),
-        examineStatus: this.examineForm.status,
-        examineRemark: this.examineForm.remark,
-        serviceId: ''
+        ids: ids.join(',')
+        // examineStatus: this.examineForm.status,
+        // examineRemark: this.examineForm.remark,
+        // serviceId: ''
       }).then(res => {
         this.isShowExamineDialog = false
         this.$successMsg('修改成功')

src/views/finance/change_apply.vue

@@ -227,7 +227,7 @@ export default {
     // },
 
     resetFn() {
-      // this.searchForm.theTime = null;
+      this.searchForm.theTime = null
       this.dataList.forEach(v => {
         v.money = ''
         v.bz = ''

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

@@ -88,20 +88,26 @@
           </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" 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
+                style="width: 100%"
                 class="mountclass"
                 :disabled="show"
                 type="number"
-                @mousewheel.native.prevent
-                v-model="scope.row.allowanceAmount"
+                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="left"
             label="备注"
@@ -219,12 +225,13 @@ 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(res, 888);
+
       if (this.state == 1) {
         await getRebateOrderAclUpdate(res)
         this.$message.success('编辑成功')
@@ -264,6 +271,7 @@ export default {
 ::v-deep .mountclass {
   input {
     text-align: right;
+    width: 100%;
   }
 }
 </style>

src/views/finance/rebate_form.vue

@@ -411,12 +411,12 @@ export default {
     },
     // 重置
     cancelFn() {
-      // this.searchForm = {
-      //   theTime: '',
-      //   createTime: '',
-      //   remark: '',
-      //   createBy: ''
-      // }
+      this.searchForm = {
+        theTime: '',
+        createTime: '',
+        remark: '',
+        createBy: ''
+      }
       this.searchForm.remark = ''
       this.dataList = []
     },

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

@@ -95,6 +95,7 @@
                   <el-input v-model="searchForm.customerNumber" placeholder="请输入经销商编码"></el-input>
                 </el-form-item>
               </el-col>
+
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="单据类型" prop="billType">
                   <el-select class="selectStyle" v-model="searchForm.billType" placeholder="请选择" filterable>
@@ -102,6 +103,11 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="摘要" prop="remark">
+                  <el-input v-model="searchForm.remark" placeholder="请输入摘要"></el-input>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
         </template>
@@ -461,8 +467,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 +483,7 @@ export default {
       dataList: [],
       isCollapse: true,
       walletList: [],
+      parent: 'mymain-container',
       // dictList: [],
       customerName: '',
       customerNumber: '',
@@ -486,7 +494,8 @@ export default {
         startTime: '',
         endTime: '',
         customerNumber: '',
-        billType: ''
+        billType: '',
+        remark: ''
       }, //搜索表单
       listLoading: false, // 列表加载loading
 
@@ -1202,6 +1211,7 @@ export default {
           pageNum: this.currentPage,
           pageSize: this.pageSize,
           startTime: this.searchForm.startTime,
+          remark: this.searchForm.remark,
           type: this.bill,
           walletRebateId: ''
         }
@@ -1213,7 +1223,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

@@ -36,6 +36,7 @@
                 <el-form-item label="" prop="type">
                   <div style="height: 30px">
                     <el-checkbox v-model="searchForm.isFullRebate">返利使用金额需满额使用</el-checkbox>
+                    <el-checkbox v-model="searchForm.commercialType">商用空调政策</el-checkbox>
                   </div>
                 </el-form-item>
               </el-col>
@@ -223,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">
@@ -240,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">
@@ -266,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">
@@ -489,7 +501,8 @@ export default {
         mainId: '',
         mainName: '',
         type: '',
-        isFullRebate: false
+        isFullRebate: false,
+        commercialType: false
       },
       dataList: [],
       addList: [],

src/views/sales_policy/components/Examine.vue

@@ -85,6 +85,7 @@
               </div>
             </el-col>
           </el-row>
+
           <el-row v-if="detail.imgSrc && $parent.isShow !== 5" class="img-box">
             <el-col :span="24" class="item">
               <div class="label" style="height: 150px">政策封面图</div>
@@ -124,6 +125,24 @@
             <!--              <div class="value"></div>-->
             <!--            </el-col>-->
           </el-row>
+          <el-row>
+            <el-col :span="12" class="item">
+              <div class="label">返利使用金额需满额使用</div>
+              <div class="value">
+                <el-checkbox v-model="detail.isFullRebate" disabled>{{
+                  detail.isFullRebate ? '是' : '否'
+                }}</el-checkbox>
+              </div>
+            </el-col>
+            <el-col :span="12" class="item">
+              <div class="label">商用空调政策</div>
+              <div class="value">
+                <el-checkbox v-model="detail.commercialType" disabled>{{
+                  detail.commercialType ? '是' : '否'
+                }}</el-checkbox>
+              </div>
+            </el-col>
+          </el-row>
         </div>
         <div class="mymain-container">
           <el-row>
@@ -197,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">{{
@@ -206,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

@@ -109,6 +109,23 @@
               <div class="label">审核日期</div>
               <div class="value">{{ detail.examineTime }}</div>
             </el-col>
+            <el-col :span="12" class="item">
+              <div class="label">返利使用金额需满额使用</div>
+              <div class="value">
+                <el-checkbox v-model="detail.isFullRebate" disabled>{{
+                  detail.isFullRebate ? '是' : '否'
+                }}</el-checkbox>
+              </div>
+            </el-col>
+            <el-col :span="12" class="item">
+              <div class="label">商用空调政策</div>
+              <div class="value">
+                <el-checkbox v-model="detail.commercialType" disabled>{{
+                  detail.commercialType ? '是' : '否'
+                }}</el-checkbox>
+              </div>
+            </el-col>
+
             <!--            <el-col :span="8" class="item">-->
             <!--              <div class="label">关闭人</div>-->
             <!--              <div class="value"></div>-->
@@ -204,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">{{
@@ -213,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

@@ -37,6 +37,7 @@
                 <el-form-item label="" prop="type">
                   <div style="height: 30px">
                     <el-checkbox v-model="searchForm.isFullRebate">返利使用金额需满额使用</el-checkbox>
+                    <el-checkbox v-model="searchForm.commercialType">商用空调政策</el-checkbox>
                   </div>
                 </el-form-item>
               </el-col>
@@ -65,8 +66,9 @@
                     placeholder="生效日期"
                     default-time="00:00:00"
                     value-format="yyyy-MM-dd HH:mm:ss"
-                  /> </el-form-item
-              ></el-col>
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :xs="24" :ms="12" :lg="12">
                 <el-form-item label="失效日期" prop="endTime">
                   <el-date-picker
@@ -75,8 +77,9 @@
                     placeholder="失效日期"
                     default-time="00:00:00"
                     value-format="yyyy-MM-dd HH:mm:ss"
-                  /> </el-form-item
-              ></el-col>
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :xs="24" :ms="24" :lg="24">
                 <el-form-item label="表头备注" prop="remark">
                   <el-input v-model="searchForm.remark" placeholder="新风机变频挂机。按提货数量1:3开单" />
@@ -224,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">
@@ -241,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">
@@ -267,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">
@@ -310,8 +323,8 @@
               <pl-table-column fixed="right" label="操作" align="center" min-width="150">
                 <template slot-scope="scope">
                   <el-button type="text" class="textColor el-popover-left" @click="scope.row.fang = !scope.row.fang"
-                    >编辑</el-button
-                  >
+                    >编辑
+                  </el-button>
                   <el-popconfirm
                     confirm-button-text="好的"
                     cancel-button-text="不用了"
@@ -369,8 +382,8 @@
             <el-row type="flex">
               <el-col :span="12">
                 <h4 style="display: inline-block; margin-right: 20px">条件信息</h4>
-                <el-button type="primary" size="mini" @click="handleAddCondition">添加</el-button></el-col
-              >
+                <el-button type="primary" size="mini" @click="handleAddCondition">添加</el-button>
+              </el-col>
             </el-row>
             <el-divider />
           </el-row>
@@ -397,8 +410,8 @@
                     scope.row.fang = false
                     conditName = scope.row.name
                   "
-                  >编辑</el-button
-                >
+                  >编辑
+                </el-button>
                 <el-button type="text" size="mini" @click="handleCondition(scope.row.id, scope.$index)">删除</el-button>
                 <el-button type="text" size="mini" @click="catCond(scope.row)">查看条件</el-button>
               </template>
@@ -499,7 +512,8 @@ export default {
         mainId: '',
         mainName: '',
         type: '',
-        isFullRebate: false
+        isFullRebate: false,
+        commercialType: false
       },
       conditName: '',
       dataList: [],
@@ -748,7 +762,9 @@ export default {
           remark: this.detail.remark,
           startTime: this.detail.startTime,
           title: this.detail.title,
-          type: this.detail.type
+          type: this.detail.type,
+          isFullRebate: this.detail.isFullRebate,
+          commercialType: this.detail.commercialType
         }),
           (this.region = res.data.flag)
         this.srcList = [this.$imageUrl + this.detail.imgSrc]
@@ -1003,24 +1019,30 @@ export default {
 h4 {
   margin: 0;
 }
+
 .yinput {
   ::v-deep input {
     text-align: right;
   }
 }
+
 .pdt {
   padding-top: 20px;
 }
+
 .import-btn {
   margin-right: 10px;
   display: inline-block;
 }
+
 .radio {
   padding: 20px 0;
 }
+
 .el-divider--horizontal {
   margin: 20px 0;
 }
+
 .el-container .el-divider--horizontal {
   margin: 10px;
 }
@@ -1032,6 +1054,7 @@ h4 {
 .footer {
   margin-bottom: 20px;
 }
+
 ::v-deep .el-table__virtual-wrapper {
   width: auto !important;
 }

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/apply/apply_list.vue

@@ -194,7 +194,12 @@
             :summary-method="$getSummaries"
             @selection-change="handleSelectionChange"
           >
-            <el-table-column align="center" type="selection" width="55" fixed="left" />
+            <el-table-column align="center" type="selection" width="55" fixed="left" :selectable="selectable" />
+            <el-table-column align="left" label="订单状态" prop="type" min-width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.automaticStatus ? '非计划单推发货' : '计划单推发货' }}
+              </template>
+            </el-table-column>
             <el-table-column align="left" label="订单类型" prop="type" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.type | orderTypeFilter }}
@@ -370,7 +375,11 @@
             <el-table-column align="center" label="操作" width="180" fixed="right">
               <template slot-scope="scope">
                 <el-popconfirm
-                  v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'SAVE'"
+                  v-if="
+                    $checkBtnRole('apply', $route.meta.roles) &&
+                    !scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'SAVE'
+                  "
                   style="margin-right: 10px"
                   title="确定申请吗？"
                   @onConfirm="handleSubmit(scope.row.id, 'WAIT')"
@@ -378,7 +387,11 @@
                   <el-button slot="reference" type="text">申请</el-button>
                 </el-popconfirm>
                 <el-popconfirm
-                  v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'WAIT'"
+                  v-if="
+                    $checkBtnRole('apply', $route.meta.roles) &&
+                    !scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT'
+                  "
                   style="margin-right: 10px"
                   title="确定撤回吗？"
                   @onConfirm="handleSubmit(scope.row.id, 'SAVE')"
@@ -386,7 +399,11 @@
                   <el-button slot="reference" type="text">撤回</el-button>
                 </el-popconfirm>
                 <el-popconfirm
-                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'"
+                  v-if="
+                    $checkBtnRole('examine', $route.meta.roles) &&
+                    !scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'OK'
+                  "
                   style="margin-right: 10px"
                   title="确定弃审吗？"
                   @onConfirm="handleAbandon(scope.row.id)"
@@ -396,6 +413,7 @@
                 <el-button
                   v-if="
                     $checkBtnRole('edit', $route.meta.roles) &&
+                    !scope.row.automaticStatus &&
                     (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
                     scope.row.type === 1
                   "
@@ -407,6 +425,7 @@
                 <el-button
                   v-if="
                     $checkBtnRole('edit', $route.meta.roles) &&
+                    !scope.row.automaticStatus &&
                     (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
                     scope.row.type === 2
                   "
@@ -416,7 +435,11 @@
                   编辑
                 </el-button>
                 <el-button
-                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'"
+                  v-if="
+                    $checkBtnRole('examine', $route.meta.roles) &&
+                    !scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT'
+                  "
                   type="text"
                   @click="toExamine(scope.row)"
                 >
@@ -424,7 +447,11 @@
                 </el-button>
                 <el-button type="text" @click="toDetail(scope.row)"> 详情 </el-button>
                 <el-popconfirm
-                  v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'"
+                  v-if="
+                    $checkBtnRole('del', $route.meta.roles) &&
+                    !scope.row.automaticStatus &&
+                    scope.row.examineStatus !== 'OK'
+                  "
                   style="margin-left: 10px"
                   title="确定删除吗？"
                   @onConfirm="handleDelete(scope.row.id)"
@@ -785,6 +812,22 @@ export default {
       }).then(res => {
         this.categoryList = res.data.records
       })
+    },
+    /**
+     * 根据条件禁用行复选框
+     * 函数返回值为false则禁用选择(反之亦然)
+     * @param {Object} row - 行数据
+     * @param {String} index - 索引值
+     * @return Boolean
+     */
+    selectable: function (row, index) {
+      if (row.automaticStatus) {
+        return false
+      }
+      return true
+      // 函数必须有返回值且是布尔值
+      // 页面刷新后该函数会执行 N 次进行判断(N 为表格行数)
+      // 如果没有返回值则默认返回false(全部无法选中)
     }
   }
 }

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

@@ -155,8 +155,8 @@
               <div class="label">计划单</div>
               <div class="value">
                 <el-radio-group v-model="detailData.isPlanOrder" disabled>
-                  <el-radio label="true">是</el-radio>
-                  <el-radio label="false">否</el-radio>
+                  <el-radio label="true">计划单</el-radio>
+                  <el-radio label="false">非计划单</el-radio>
                 </el-radio-group>
               </div>
             </el-col>

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

@@ -137,8 +137,8 @@
           <div class="label">计划单</div>
           <div class="value">
             <el-radio-group v-model="detailData.isPlanOrder" disabled>
-              <el-radio label="true">是</el-radio>
-              <el-radio label="false">否</el-radio>
+              <el-radio label="true">计划单</el-radio>
+              <el-radio label="false">非计划单</el-radio>
             </el-radio-group>
           </div>
         </el-col>

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

@@ -206,10 +206,11 @@
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24">
           <el-form-item label="计划单">
-            <el-radio-group v-model="isPlanOrder" disabled>
-              <el-radio label="true">是</el-radio>
-              <el-radio label="false">否</el-radio>
+            <el-radio-group v-model="isPlanOrder">
+              <el-radio label="true">计划单</el-radio>
+              <el-radio label="false">非计划单</el-radio>
             </el-radio-group>
+            <span style="color: #ff0000; margin-left: 20px">注：如需开直调单，请下计划单，不要下非计划单</span>
           </el-form-item>
         </el-col>
       </el-row>
@@ -246,8 +247,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 +257,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>
@@ -477,6 +478,7 @@ import {
 } from '@/api/supply/engin'
 import { getDictList, getTypeList, getSalesmanList, getDealerList } from '@/api/common'
 import { findElem } from '@/utils/util'
+import { mapGetters } from 'vuex'
 
 let that
 export default {
@@ -571,11 +573,12 @@ export default {
       flag: false,
       isFirst: false,
       salesmanList: [],
-      isPlanOrder: 'false'
+      isPlanOrder: ''
     }
   },
 
   computed: {
+    ...mapGetters(['websitNumber']),
     isDealer() {
       return JSON.parse(localStorage.getItem('supply_user')).isCustomer
     },
@@ -634,6 +637,11 @@ export default {
     this.getDictList()
     this.getWarehouseList()
     this.getDealerList()
+    if (this.websitNumber === 'GZ') {
+      this.isPlanOrder = 'false'
+    } else if (this.websitNumber === 'FS') {
+      this.isPlanOrder = 'true'
+    }
 
     if (this.listItem) {
       this.isFirst = true
@@ -856,7 +864,7 @@ export default {
         this.mainForm.geLiInerNote = data.geLiInerNote
         this.mainForm.geLiNote = data.geLiNote
         this.mainForm.fileNo = data.fileNo
-        this.isPlanOrder = String(data.isPlanOrder)
+        // this.isPlanOrder = String(data.isPlanOrder)
         if (!this.isDealer) {
           this.mainForm.jxsNum = data.customerNumber
           this.mainForm.jxsName = data.customerName

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

@@ -120,8 +120,8 @@
           <div class="label">计划单</div>
           <div class="value">
             <el-radio-group v-model="detailData.isPlanOrder" disabled>
-              <el-radio label="true">是</el-radio>
-              <el-radio label="false">否</el-radio>
+              <el-radio label="true">计划单</el-radio>
+              <el-radio label="false">非计划单</el-radio>
             </el-radio-group>
           </div>
         </el-col>

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

@@ -217,20 +217,20 @@
       </div>
       <div class="diy-table-1">
         <el-row :gutter="0">
-          <el-col :span="8" class="item">
+          <el-col :span="12" class="item">
             <div class="label">审批人</div>
             <div class="value">{{ detailData.confirmName }}</div>
           </el-col>
-          <el-col :span="8" class="item">
-            <div class="label">是否计划单</div>
-            <div class="value">
-              <el-radio-group v-model="detailData.isPlanOrder" disabled>
-                <el-radio :label="true">是</el-radio>
-                <el-radio :label="false">否</el-radio>
-              </el-radio-group>
-            </div>
-          </el-col>
-          <el-col :span="8" class="item">
+          <!--          <el-col :span="8" class="item">-->
+          <!--            <div class="label">是否计划单</div>-->
+          <!--            <div class="value">-->
+          <!--              <el-radio-group v-model="detailData.isPlanOrder" disabled>-->
+          <!--                <el-radio :label="true">是</el-radio>-->
+          <!--                <el-radio :label="false">否</el-radio>-->
+          <!--              </el-radio-group>-->
+          <!--            </div>-->
+          <!--          </el-col>-->
+          <el-col :span="12" class="item">
             <div class="label">审批结果</div>
             <div class="value">
               {{ detailData.examineStatus | statusFilter }}

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

@@ -254,20 +254,20 @@
     </div>
     <div class="diy-table-1">
       <el-row :gutter="0">
-        <el-col :span="8" class="item">
+        <el-col :span="12" class="item">
           <div class="label">审批人</div>
           <div class="value">{{ userName }}</div>
         </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">是否计划单</div>
-          <div class="value">
-            <el-radio-group v-model="examineForm.isPlanOrder" :disabled="websitNumber === 'GZ'">
-              <el-radio :label="true">是</el-radio>
-              <el-radio :label="false">否</el-radio>
-            </el-radio-group>
-          </div>
-        </el-col>
-        <el-col :span="8" class="item">
+        <!--        <el-col :span="8" class="item">-->
+        <!--          <div class="label">是否计划单</div>-->
+        <!--          <div class="value">-->
+        <!--            <el-radio-group v-model="examineForm.isPlanOrder" :disabled="websitNumber === 'GZ'">-->
+        <!--              <el-radio :label="true">是</el-radio>-->
+        <!--              <el-radio :label="false">否</el-radio>-->
+        <!--            </el-radio-group>-->
+        <!--          </div>-->
+        <!--        </el-col>-->
+        <el-col :span="12" class="item">
           <div class="label">审批结果</div>
           <div class="value">
             <el-radio-group v-model="examineForm.examineResult">
@@ -521,9 +521,9 @@ export default {
 
     // 获取详情
     getDetail() {
-      if (this.websitNumber === 'GZ') {
-        this.examineForm.isPlanOrder = false
-      }
+      // if (this.websitNumber === 'GZ') {
+      //   this.examineForm.isPlanOrder = false
+      // }
       getEnginDetail({ id: this.listItem.enginInfoId }).then(res => {
         this.detailData = res.data
         this.examineStatus = res.data.examineStatus
@@ -737,82 +737,82 @@ export default {
     },
 
     clickSubmitForm() {
-      if (this.websitNumber === 'GZ') {
-        if (!this.detailData.serviceId) {
-          return this.$errorMsg('请选择业务员')
-        }
-        this.$confirm('此操作将审批订单, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        })
-          .then(() => {
-            const saleManItem = this.salesmanList.find(o => o.adminUserId == this.detailData.serviceId)
-            const params = JSON.parse(JSON.stringify(this.detailData))
-            params.enginInfoId = this.listItem.enginInfoId
-            params.mainId = this.listItem.mainId
-            params.examineResult = this.examineForm.examineResult
-            params.examineNote = this.examineForm.remark
-            params.isPlanOrder = this.examineForm.isPlanOrder
-            params.serviceName = saleManItem.nickName
-            params.items = this.goodsList
-            this.formLoading = true
-            examineEngin(params)
-              .then(res => {
-                this.$successMsg('审批成功')
-                this.goBack()
-                this.$parent.getList()
-              })
-              .finally(res => {
-                this.formLoading = false
-              })
-          })
-          .catch(() => {})
-        return
+      // if (this.websitNumber === 'GZ') {
+      if (!this.detailData.serviceId) {
+        return this.$errorMsg('请选择业务员')
       }
-      this.$confirm('请确认信息单是否未计划单，请勾选是否计划单选项', '提示', {
-        confirmButtonText: '是计划单',
-        cancelButtonText: '不是计划单',
+      this.$confirm('此操作将审批订单, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
         type: 'warning'
       })
         .then(() => {
-          this.examineForm.isPlanOrder = true
-        })
-        .catch(() => {
-          this.examineForm.isPlanOrder = false
-        })
-        .finally(() => {
-          if (!this.detailData.serviceId) {
-            return this.$errorMsg('请选择业务员')
-          }
-          this.$confirm('此操作将审批订单, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          })
-            .then(() => {
-              const saleManItem = this.salesmanList.find(o => o.adminUserId == this.detailData.serviceId)
-              const params = JSON.parse(JSON.stringify(this.detailData))
-              params.enginInfoId = this.listItem.enginInfoId
-              params.mainId = this.listItem.mainId
-              params.examineResult = this.examineForm.examineResult
-              params.examineNote = this.examineForm.remark
-              params.isPlanOrder = this.examineForm.isPlanOrder
-              params.serviceName = saleManItem.nickName
-              params.items = this.goodsList
-              this.formLoading = true
-              examineEngin(params)
-                .then(res => {
-                  this.$successMsg('审批成功')
-                  this.goBack()
-                  this.$parent.getList()
-                })
-                .finally(res => {
-                  this.formLoading = false
-                })
+          const saleManItem = this.salesmanList.find(o => o.adminUserId == this.detailData.serviceId)
+          const params = JSON.parse(JSON.stringify(this.detailData))
+          params.enginInfoId = this.listItem.enginInfoId
+          params.mainId = this.listItem.mainId
+          params.examineResult = this.examineForm.examineResult
+          params.examineNote = this.examineForm.remark
+          params.isPlanOrder = this.examineForm.isPlanOrder
+          params.serviceName = saleManItem.nickName
+          params.items = this.goodsList
+          this.formLoading = true
+          examineEngin(params)
+            .then(res => {
+              this.$successMsg('审批成功')
+              this.goBack()
+              this.$parent.getList()
+            })
+            .finally(res => {
+              this.formLoading = false
             })
-            .catch(() => {})
         })
+        .catch(() => {})
+      //   return
+      // }
+      // this.$confirm('请确认信息单是否未计划单，请勾选是否计划单选项', '提示', {
+      //   confirmButtonText: '是计划单',
+      //   cancelButtonText: '不是计划单',
+      //   type: 'warning'
+      // })
+      //   .then(() => {
+      //     this.examineForm.isPlanOrder = true
+      //   })
+      //   .catch(() => {
+      //     this.examineForm.isPlanOrder = false
+      //   })
+      //   .finally(() => {
+      //     if (!this.detailData.serviceId) {
+      //       return this.$errorMsg('请选择业务员')
+      //     }
+      //     this.$confirm('此操作将审批订单, 是否继续?', '提示', {
+      //       confirmButtonText: '确定',
+      //       cancelButtonText: '取消',
+      //       type: 'warning'
+      //     })
+      //       .then(() => {
+      //         const saleManItem = this.salesmanList.find(o => o.adminUserId == this.detailData.serviceId)
+      //         const params = JSON.parse(JSON.stringify(this.detailData))
+      //         params.enginInfoId = this.listItem.enginInfoId
+      //         params.mainId = this.listItem.mainId
+      //         params.examineResult = this.examineForm.examineResult
+      //         params.examineNote = this.examineForm.remark
+      //         params.isPlanOrder = this.examineForm.isPlanOrder
+      //         params.serviceName = saleManItem.nickName
+      //         params.items = this.goodsList
+      //         this.formLoading = true
+      //         examineEngin(params)
+      //           .then(res => {
+      //             this.$successMsg('审批成功')
+      //             this.goBack()
+      //             this.$parent.getList()
+      //           })
+      //           .finally(res => {
+      //             this.formLoading = false
+      //           })
+      //       })
+      //       .catch(() => {})
+      //   })
     }
   }
 }

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>
@@ -447,7 +449,14 @@
 
     <!-- 工程登录列表 -->
     <el-dialog title="工程登录列表" :visible.sync="isShowDialog" width="70%" :close-on-click-modal="false">
-      <el-form ref="screenForm" :model="screenForm" label-width="0" size="small" label-position="left">
+      <el-form
+        ref="screenForm"
+        :model="screenForm"
+        label-width="0"
+        size="small"
+        label-position="left"
+        v-if="mainForm.examineStatus !== 'SAVE'"
+      >
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item prop="loginNum">
@@ -961,7 +970,7 @@ export default {
 
     // 获取家用销售类型列表
     getHomeTypeList() {
-      getHomeTypeList({ pageNum: 1, pageSize: -1 }).then(res => {
+      getHomeTypeList().then(res => {
         this.salesTypeList = res.data.records
       })
     },

src/views/supply/implement/implement_list.vue

@@ -68,7 +68,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">
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
@@ -82,6 +82,20 @@
                   </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.orderDate"
+                      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="serviceName ">
                     <el-input v-model="screenForm.serviceName" placeholder="请输入表头业务员"></el-input>
                   </el-form-item>
@@ -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

@@ -74,7 +74,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">
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
@@ -88,6 +88,20 @@
                   </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.orderDate"
+                      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="serviceName ">
                     <el-input v-model="screenForm.serviceName" placeholder="请输入表头业务员"></el-input>
                   </el-form-item>
@@ -120,6 +134,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>
@@ -159,14 +185,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
@@ -408,6 +434,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 +474,9 @@ export default {
         k3CategoryNumber: [],
         policyCode: '',
         policyRemark: '',
-        isOver: ''
+        isOver: '',
+        orderDate: '',
+        walletIds1: []
       },
       categoryList: [],
       statusList: [
@@ -458,6 +487,7 @@ export default {
       ],
       isCollapse: true,
       queryItem: {},
+      NoRebateWalletList: [],
       isShowDisplaceDetail: false
     }
   },
@@ -473,6 +503,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,
@@ -511,12 +543,15 @@ 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,
         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 +576,12 @@ export default {
       }).then(res => {
         this.categoryList = res.data.records
       })
+      getNoRebateWalletList({
+        walletName: ''
+      }).then(res => {
+        console.log(res)
+        this.NoRebateWalletList = res.data
+      })
     },
 
     // 提交筛选表单

src/views/supply/policy/components/retail_detail.vue

@@ -73,6 +73,15 @@
             <div class="label">销售政策说明</div>
             <div class="value">{{ detailData.policyRemark }}</div>
           </el-col>
+          <el-col :span="24" class="item" v-if="detailData.commercialType">
+            <div class="label">计划单</div>
+            <div class="value">
+              <el-radio-group v-model="detailData.isPlanOrder" disabled>
+                <el-radio :label="true">是</el-radio>
+                <el-radio :label="false">否</el-radio>
+              </el-radio-group>
+            </div>
+          </el-col>
         </el-row>
       </div>
 
@@ -226,21 +235,22 @@
       <div class="footer" :class="classObj">
         <el-button type="success" @click="toCheckOrder">联查单据</el-button>
         <!-- <el-button v-if="isCustomer" type="primary" :disabled="detailData.examineStatus !== 'OK'" @click="openDirectDialog">提前开票</el-button> -->
-
-        <el-button
-          v-if="isCustomer"
-          :type="status ? 'info' : 'primary'"
-          :disabled="detailData.examineStatus !== 'OK' || status || detailData.directTransferStatus"
-          @click="openDeliverDialog"
-          >直调发货</el-button
-        >
-        <el-button
-          v-if="isCustomer"
-          :type="status ? 'info' : 'primary'"
-          :disabled="detailData.examineStatus !== 'OK' || status || detailData.directTransferStatus"
-          @click="handleFinish"
-          >直调完成</el-button
-        >
+        <template v-if="detailData.isPlanOrder">
+          <el-button
+            v-if="isCustomer"
+            :type="status ? 'info' : 'primary'"
+            :disabled="detailData.examineStatus !== 'OK' || status || detailData.directTransferStatus"
+            @click="openDeliverDialog"
+            >直调发货</el-button
+          >
+          <el-button
+            v-if="isCustomer"
+            :type="status ? 'info' : 'primary'"
+            :disabled="detailData.examineStatus !== 'OK' || status || detailData.directTransferStatus"
+            @click="handleFinish"
+            >直调完成</el-button
+          >
+        </template>
         <el-button @click="goBack">返回列表</el-button>
       </div>
     </div>

src/views/supply/policy/components/retail_examine.vue

@@ -70,6 +70,15 @@
           <div class="label">关闭人</div>
           <div class="value">{{ detailData.closeName }}</div>
         </el-col>
+        <el-col :span="24" class="item" v-if="detailData.commercialType">
+          <div class="label">计划单</div>
+          <div class="value">
+            <el-radio-group v-model="detailData.isPlanOrder" disabled>
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+          </div>
+        </el-col>
       </el-row>
     </div>
 

src/views/supply/policy/components/retail_form.vue

@@ -65,13 +65,28 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="24" :sm="12" :lg="12" v-if="goodsList.length && commercialType">
+          <el-form-item label="计划单" prop="isPlanOrder">
+            <el-radio-group v-model="mainForm.isPlanOrder">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
 
     <div class="main-title">
       <div class="title">货品信息</div>
       <div>
-        <el-select v-model="warehouseValue" placeholder="请选择发货仓库" size="small" style="margin-right: 10px">
+        <el-select
+          v-model="warehouseValue"
+          placeholder="请选择发货仓库"
+          :disabled="!goodsList.length"
+          size="small"
+          style="margin-right: 10px"
+          @change="handleWarehouseValue"
+        >
           <el-option v-for="(item, index) in warehouseList" :key="index" :label="item.name" :value="item.id" />
         </el-select>
         <el-button type="primary" size="small" icon="el-icon-search" @click="checkStock">检查库存</el-button>
@@ -259,6 +274,7 @@
         <!--            <div>{{ scope.row.status1 | status1Filter }}</div>-->
         <!--          </template>-->
         <!--        </el-table-column>-->
+        <el-table-column align="left" label="仓库" prop="correspondName" min-width="150" show-overflow-tooltip />
         <el-table-column
           v-if="!listItem"
           align="left"
@@ -311,17 +327,17 @@
             备注：{{ factor[0].remark }}
           </el-row>
           <el-row :gutter="20">
-            <el-col :xs="24" :sm="8" :lg="11">
+            <el-col :xs="24" :sm="12" :lg="12">
               <el-form-item label="规格型号">
                 <div style="display: flex">
-                  <el-input v-model="screenForm.specification" placeholder="请输入型号规格型号" />
+                  <el-input v-model="screenForm.specification" placeholder="请输入规格型号" />
                   <el-button style="margin-left: 10px" type="primary" size="mini" @click="handleGetPolicyList"
                     >查询</el-button
                   >
                 </div>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="11">
+            <el-col :xs="24" :sm="12" :lg="12">
               <el-form-item label="销售政策" class="myselect">
                 <el-select
                   v-model="screenForm.policyId"
@@ -340,14 +356,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="8" :lg="11">
+            <el-col :xs="24" :sm="12" :lg="12">
               <el-form-item label="规格型号">
                 <div style="display: flex">
                   <el-input v-model="screenForm.specifications" placeholder="请输入型号规格型号" />
                 </div>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="11">
+            <el-col :xs="24" :sm="12" :lg="12">
               <el-form-item label="销售类型">
                 <el-select
                   v-model="screenForm.saleTypeCode"
@@ -360,8 +376,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
-
-            <el-col :xs="22" :sm="22" :lg="22" class="tr">
+            <el-col :xs="24" :sm="12" :lg="12">
+              <el-form-item label="价格类型">
+                <div style="display: flex">
+                  <el-input v-model="screenForm.priceType" placeholder="请输入价格类型" />
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="22" :sm="22" :lg="12" class="tr">
               <!-- <el-button
                 type="primary"
                 size="small"
@@ -434,7 +456,7 @@
                   show-overflow-tooltip
                 >
                   <template slot-scope="scope">
-                    <template v-if="col.lable == '产品名称' || col.lable == '规格型号'">
+                    <template v-if="col.lable == '产品名称' || col.lable == '规格型号' || col.lable == '价格类型'">
                       <CopyButton :copy-text="scope.row[col.prop]" />
                       <span> {{ scope.row[col.prop] }}</span>
                     </template>
@@ -451,6 +473,7 @@
                     <el-col />
                     <el-col />
                     <el-col />
+                    <el-col />
                     <el-col>{{ totalArr[index].totalQty }}</el-col>
                     <el-col>{{ totalArr[index].totalPrice | numToFixed }}</el-col>
                     <el-col>{{ totalArr[index].totalAmount | numToFixed }}</el-col>
@@ -541,7 +564,7 @@
                 show-overflow-tooltip
               >
                 <template slot-scope="scope">
-                  <template v-if="col.lable == '产品名称' || col.lable == '规格型号'">
+                  <template v-if="col.lable == '产品名称' || col.lable == '规格型号' || col.lable == '价格类型'">
                     <CopyButton :copy-text="scope.row[col.prop]" />
                     <span> {{ scope.row[col.prop] }}</span>
                   </template>
@@ -558,6 +581,7 @@
                   <el-col />
                   <el-col />
                   <el-col />
+                  <el-col />
                   <el-col>{{ totalQty }}</el-col>
                   <el-col>{{ totalPrice | numToFixed }}</el-col>
                   <el-col>{{ totalAmount | numToFixed }}</el-col>
@@ -641,6 +665,7 @@ export default {
         remark: '',
         fileNum: '',
         policyCode: '',
+        isPlanOrder: '',
         policyRemark: '',
         policyId: '',
         k3ServiceId: '',
@@ -658,10 +683,10 @@ export default {
         saleTypeCode: '',
         factorId: '',
         specification: '',
+        priceType: '',
         specifications: ''
       },
-      currentPage: 1,
-      listTotal: 0,
+
       salesTypeList: [],
       typeList: [],
       ztypeList: [],
@@ -692,6 +717,12 @@ export default {
           widht: 350,
           align: 'left'
         },
+        {
+          prop: 'priceType',
+          lable: '价格类型',
+          widht: 200,
+          align: 'left'
+        },
 
         {
           prop: 'qty',
@@ -738,7 +769,10 @@ export default {
       totalArr: [],
       type: 1,
       newMultipleSelections: [],
-      remark: ''
+      remark: '',
+      commercialType: false,
+      correspondName: '',
+      correspondId: ''
     }
   },
 
@@ -806,6 +840,10 @@ export default {
       handler(newValue, oldValue) {
         if (newValue && newValue.length) {
           newValue.forEach((item, index) => {
+            if (this.correspondId) {
+              this.goodsList[index].correspondName = this.correspondName
+              this.goodsList[index].correspondId = this.correspondId
+            }
             this.goodsList[index].compute_amount = item.price * item.qty
             this.goodsList[index].compute_flAmount =
               ((item.price - item.discAmount) * item.qty * (item.rebateRate * 100)) / 100
@@ -903,6 +941,18 @@ export default {
     goBack() {
       this.$emit('backListFormDetail')
     },
+    handleWarehouseValue(e) {
+      if (!this.goodsList.length) return
+      this.correspondName = this.warehouseList.find(k => {
+        return k.id === e
+      }).name
+      this.correspondId = e
+      this.goodsList.forEach(k => {
+        this.$set(k, 'correspondName', this.correspondName)
+        this.$set(k, 'correspondId', this.correspondId)
+      })
+      console.log(this.goodsList)
+    },
 
     handleWallets(e, row, index) {
       if (e) {
@@ -936,11 +986,13 @@ export default {
       this.dataList = []
       this.popDataArr = []
       this.screenForm.saleTypeCode = ''
-      const type = this.policyList.filter(k => {
+
+      const policy = this.policyList.filter(k => {
         return k.code === e
-      })[0].type
-      console.log(type == 'PROVISION')
-      if (type == 'PROVISION') {
+      })[0]
+      this.commercialType = policy.commercialType
+      console.log(policy.type)
+      if (policy.type == 'PROVISION') {
         // PROVISION 配提
         //   选择销售政策PolidcyId改变获取条件列表
         const { data } = await getPolicyConditionList({ policyId: e })
@@ -1020,6 +1072,7 @@ export default {
         policyConditionId,
         popType,
         status: true,
+        priceType: this.screenForm.priceType,
         specification: this.screenForm.specifications,
         saleTypeCode: this.screenForm.saleTypeCode,
         customerId: JSON.parse(localStorage.getItem('supply_user')).customerId
@@ -1090,6 +1143,7 @@ export default {
         pageSize: -1,
         policyId: this.screenForm.policyId,
         saleTypeCode: this.screenForm.saleTypeCode,
+        priceType: this.screenForm.priceType,
         specification: this.screenForm.specifications,
         status: true,
         customerId: JSON.parse(localStorage.getItem('supply_user')).customerId,
@@ -1369,12 +1423,19 @@ export default {
           this.mainForm.type = data.mainId
           this.mainForm.remark = data.remark
           this.mainForm.policyId = data.policyId
+          this.mainForm.isPlanOrder = data.isPlanOrder
+          this.commercialType = data.commercialType
+          this.correspondId = data.correspondId
+          this.correspondName = data.correspondName
+          this.warehouseValue = data.correspondId
           this.policyId = data.policyId
           this.mainForm.k3ServiceName = data.k3ServiceName
           ;(this.mainForm.k3ServiceId = data.k3ServiceId), (this.mainForm.fileNum = data.fileNum)
           // this.mainForm.k3ServiceName = data.retailOrderItemList[0].wallets[0].serviceName
           // this.mainForm.k3ServiceId = data.retailOrderItemList[0].wallets[0].serviceId
           data.retailOrderItemList.forEach(item => {
+            item.correspondName = data.correspondName
+            item.warehouseValue = data.correspondId
             item.status1 = ''
             item.status2 = ''
             item.sums1 = ['qty', 'directTransferQty']
@@ -1770,10 +1831,18 @@ export default {
             }
           })
           if (hasCustomerWalletId) return
+          if (this.commercialType && !this.mainForm.isPlanOrder && !this.correspondId) {
+            this.$errorMsg(`仓库必选`)
+            return
+          }
           const params = {
             theTime: this.mainForm.date,
             k3ServiceId: this.mainForm.k3ServiceId,
             k3ServiceName: this.mainForm.k3ServiceName,
+            isPlanOrder: this.mainForm.isPlanOrder,
+            commercialType: this.commercialType,
+            correspondName: this.correspondName,
+            correspondId: this.correspondId,
             remark: this.mainForm.remark,
             type: 2, // 1:普通零售单，2:政策零售单
             retailOrderItemList: this.goodsList,
@@ -1782,7 +1851,6 @@ export default {
           }
           console.log(params)
           if (this.listItem) {
-            console.log(params.listItem)
             params.id = this.listItem.id
             editData(params).then(res => {
               this.$successMsg('编辑成功')

src/views/supply/policy/components/retail_return.vue

@@ -40,6 +40,15 @@
           <div class="label">关闭人</div>
           <div class="value">{{ detailData.closeName }}</div>
         </el-col>
+        <el-col :span="24" class="item" v-if="detailData.commercialType">
+          <div class="label">计划单</div>
+          <div class="value">
+            <el-radio-group v-model="detailData.isPlanOrder" disabled>
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+          </div>
+        </el-col>
       </el-row>
     </div>
 

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%"