Procházet zdrojové kódy

bug修复、报表

chenrui před 3 roky
rodič
revize
cbc7e19bf9

+ 17 - 17
src/config/router.config.js

@@ -1579,7 +1579,7 @@ export const asyncRouterMap = [
         component: PageView,
         meta: {
           title: '报表',
-          icon: 'pushpin'
+          icon: 'project'
           // permission: 'M_basicData'
         },
         children: [
@@ -1690,7 +1690,7 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '销售退货明细报表',
-              icon: 'deployment-unit'
+              icon: 'profile'
               // permission: 'M_warehouseList'
             },
             hideChildrenInMenu: true,
@@ -1701,7 +1701,7 @@ export const asyncRouterMap = [
                 '@/views/reportData/salesReturnDetailReport/list.vue'),
               meta: {
                 title: '销售退货明细报表列表',
-                icon: 'deployment-unit',
+                icon: 'profile',
                 hidden: true
                 // permission: 'M_warehouseList'
               }
@@ -1714,7 +1714,7 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '开单销售单报表',
-              icon: 'deployment-unit'
+              icon: 'profile'
               // permission: 'M_warehouseList'
             },
             hideChildrenInMenu: true,
@@ -1725,7 +1725,7 @@ export const asyncRouterMap = [
                 '@/views/reportData/salesSlipReport/list.vue'),
               meta: {
                 title: '开单销售单报表列表',
-                icon: 'deployment-unit',
+                icon: 'profile',
                 hidden: true
                 // permission: 'M_warehouseList'
               }
@@ -1738,7 +1738,7 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '开单退货单报表',
-              icon: 'deployment-unit'
+              icon: 'profile'
               // permission: 'M_warehouseList'
             },
             hideChildrenInMenu: true,
@@ -1749,7 +1749,7 @@ export const asyncRouterMap = [
                 '@/views/reportData/returnSlipReport/list.vue'),
               meta: {
                 title: '开单退货单报表列表',
-                icon: 'deployment-unit',
+                icon: 'profile',
                 hidden: true
                 // permission: 'M_warehouseList'
               }
@@ -1762,7 +1762,7 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '开单销售报表',
-              icon: 'deployment-unit'
+              icon: 'profile'
               // permission: 'M_warehouseList'
             },
             hideChildrenInMenu: true,
@@ -1773,7 +1773,7 @@ export const asyncRouterMap = [
                 '@/views/reportData/salesAmountReport/list.vue'),
               meta: {
                 title: '开单销售报表列表',
-                icon: 'deployment-unit',
+                icon: 'profile',
                 hidden: true
                 // permission: 'M_warehouseList'
               }
@@ -1886,7 +1886,7 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '全国各省品类实际销售明细',
-              icon: 'deployment-unit'
+              icon: 'profile'
               // permission: 'M_warehouseList'
             },
             hideChildrenInMenu: true,
@@ -1897,7 +1897,7 @@ export const asyncRouterMap = [
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/reportData/provinceTypeSalesDetails/list.vue'),
                 meta: {
                   title: '全国各省品类实际销售明细列表',
-                  icon: 'deployment-unit',
+                  icon: 'profile',
                   hidden: true
                   // permission: 'M_warehouseList'
                 }
@@ -1911,7 +1911,7 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '全国各区品类实际销售明细',
-              icon: 'deployment-unit'
+              icon: 'profile'
               // permission: 'M_warehouseList'
             },
             hideChildrenInMenu: true,
@@ -1922,7 +1922,7 @@ export const asyncRouterMap = [
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/reportData/districtTypeSalesDetails/list.vue'),
                 meta: {
                   title: '全国各区品类实际销售明细列表',
-                  icon: 'deployment-unit',
+                  icon: 'profile',
                   hidden: true
                   // permission: 'M_warehouseList'
                 }
@@ -1936,7 +1936,7 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '区域促销费用统计',
-              icon: 'deployment-unit'
+              icon: 'profile'
               // permission: 'M_warehouseList'
             },
             hideChildrenInMenu: true,
@@ -1947,7 +1947,7 @@ export const asyncRouterMap = [
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/reportData/regionalPromotionCostStatistics/list.vue'),
                 meta: {
                   title: '区域促销费用统计列表',
-                  icon: 'deployment-unit',
+                  icon: 'profile',
                   hidden: true
                   // permission: 'M_warehouseList'
                 }
@@ -1961,7 +1961,7 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '全国客户费用统计',
-              icon: 'deployment-unit'
+              icon: 'profile'
               // permission: 'M_warehouseList'
             },
             hideChildrenInMenu: true,
@@ -1972,7 +1972,7 @@ export const asyncRouterMap = [
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/reportData/nationalCustomerCostStatistics/list.vue'),
                 meta: {
                   title: '全国客户费用统计列表',
-                  icon: 'deployment-unit',
+                  icon: 'profile',
                   hidden: true
                   // permission: 'M_warehouseList'
                 }

+ 37 - 9
src/views/power/user/updateAreal.vue

@@ -20,12 +20,21 @@
           <a-form-model-item label="用户名称">
             {{ form.name }}
           </a-form-model-item>
-          <a-form-model-item label="所属营销分区" prop="subareaSn">
-            <subarea id="user-subarea" v-model="form.subareaSn"></subarea>
+          <a-form-model-item label="所属营销分区" prop="subareaSnList">
+            <!-- <subarea id="user-subarea" v-model="form.subareaSn"></subarea> -->
+            <a-select
+              placeholder="请选择分区"
+              allowClear
+              mode="multiple"
+              v-model="form.subareaSnList"
+              :showSearch="true"
+              :filter-option="filterOption">
+              <a-select-option v-for="item in subareaList" :key="item.subareaSn" :value="item.subareaSn">{{ item.subareaName }}</a-select-option>
+            </a-select>
           </a-form-model-item>
           <div style="display: flex;justify-content: center;padding: 30px 0;">
             <a-button type="primary" @click="onSubmit">确定</a-button>
-            <a-button style="margin-left: 50px;" @click="cansel">取消</a-button>
+            <a-button style="margin-left: 15px;" @click="cansel">取消</a-button>
           </div>
         </a-form-model>
       </a-spin>
@@ -36,6 +45,7 @@
 <script>
 import { VSelect } from '@/components'
 import { userSubareaSave } from '@/api/power-user'
+import { subareaQueryAll } from '@/api/subarea'
 import subarea from '@/views/common/subarea.js'
 export default {
   name: 'UpdateArea',
@@ -56,21 +66,22 @@ export default {
       other: '',
       form: {
         name: '',
-        subareaSn: undefined
+        subareaSnList: undefined
       },
       rules: {
-        subareaSn: [
-          { required: true, message: '请选择所属营销分区', trigger: 'blur' }
+        subareaSnList: [
+          { required: true, message: '请选择所属营销分区', trigger: 'change' }
         ]
       },
-      nowData: undefined
+      nowData: undefined,
+      subareaList: []
     }
   },
   methods: {
     setData (row) {
       this.form.id = row.id
       this.form.name = row.name
-      this.form.subareaSn = row.subareaSn || undefined
+      this.form.subareaSnList = row.subareaSnList || undefined
       this.nowData = row
     },
     onSubmit () {
@@ -83,11 +94,26 @@ export default {
         }
       })
     },
+    filterOption (input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    },
+    getSubareaList () {
+      const _this = this
+      subareaQueryAll().then(res => {
+        if (res.status == 200) {
+          _this.subareaList = res.data || []
+        } else {
+          _this.subareaList = []
+        }
+      })
+    },
     submitForm () {
       const _this = this
       const params = {
         userSn: _this.nowData.sn,
-        subareaSn: _this.form.subareaSn
+        subareaSnList: _this.form.subareaSnList
       }
       _this.spinning = true
       userSubareaSave(params).then(res => {
@@ -115,6 +141,8 @@ export default {
     isShow (newValue, oldValue) {
       if (!newValue) {
         this.$emit('close')
+      } else {
+        this.getSubareaList()
       }
     }
   }

+ 7 - 4
src/views/power/user/userList.vue

@@ -42,7 +42,9 @@
       <span slot="status" slot-scope="text, record">
         <!-- <a-switch v-if="$hasPermissions('B_powerMD_user_enable')" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
         <span v-else>{{ record.loginFlag==1?'已启用':'已禁用' }}</span> -->
-        <a-switch checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
+        <!-- 超级管理员不可删除不可编辑不可启禁用 -->
+        <a-switch v-if="record.superAdmin!=1" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
+        <span v-if="record.superAdmin==1">{{ record.loginFlag==1?'已启用':'已禁用' }}</span>
       </span>
       <span slot="action" slot-scope="text, record">
         <!-- <a-icon
@@ -67,20 +69,21 @@
         <a-icon
           type="edit"
           title="编辑"
+          v-if="record.superAdmin!=1"
           :style="{fontSize: '20px',color:' #1890FF',padding:' 0 10px'}"
           @click="handleEdit(record)"
         />
         <a-icon
           type="unlock"
           title="重置密码"
-          v-if="record.loginFlag==1"
+          v-if="record.loginFlag==1 && record.superAdmin!=1"
           :style="{fontSize: '20px',color:' #ffaa00',padding: '0 10px'}"
           @click="resetPassword(record)" />
         <a-icon
           type="delete"
           title="删除"
           :style="{fontSize: '20px',color: '#f00',padding: '0 10px'}"
-          v-if="record.loginFlag==0"
+          v-if="record.loginFlag==0 && record.superAdmin!=1"
           @click="delect(record)"/>
         <a-icon
           type="setting"
@@ -123,7 +126,7 @@ export default {
         { title: '用户名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '手机号码', dataIndex: 'phone', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '用户账号', dataIndex: 'loginName', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '所属分区', dataIndex: 'subareaName', width: 150, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '所属分区', dataIndex: 'allSubareaName', width: 150, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '角色', dataIndex: 'roleNames', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', width: 100, align: 'center', scopedSlots: { customRender: 'status' }, fixed: 'right' },
         { title: '操作', width: 160, align: 'center', scopedSlots: { customRender: 'action' }, fixed: 'right' }

+ 37 - 32
src/views/reportData/actualSalesReport/list.vue

@@ -19,42 +19,47 @@
               <custList ref="custList" id="shortageStatisticsCList-buyerSn" @change="custChange"></custList>
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="所在区域">
-              <subarea id="shortageStatisticsCList-subarea" v-model="queryParam.subareaSn"></subarea>
-            </a-form-item>
-          </a-col>
-          <a-col :md="12" :sm="24">
-            <a-row :gutter="15">
-              <!-- 地址 -->
-              <a-col span="8">
-                <a-form-item prop="provinceSn">
-                  <a-select id="supplierInfoEdit-provinceSn" @change="getCityList" v-model="queryParam.provinceSn" placeholder="请选择省">
-                    <a-select-option v-for="item in addrProvinceList" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-              <a-col span="8">
-                <a-form-item prop="citySn">
-                  <a-select id="supplierInfoEdit-citySn" @change="getAreaList" v-model="queryParam.citySn" placeholder="请选择市">
-                    <a-select-option v-for="item in addrCityList" :value="item.areaSn" :key="item.areaSn + 'b'">{{ item.name }}</a-select-option>
-                  </a-select>
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="所在区域">
+                <subarea id="shortageStatisticsCList-subarea" v-model="queryParam.subareaSn"></subarea>
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-row>
+                <a-form-item label="地区">
+                  <a-col span="7">
+                    <a-form-item prop="dealerProvinceSn" style="margin: 0;">
+                      <a-select v-model="queryParam.dealerProvinceSn" @change="getCityList" placeholder="请选择省">
+                        <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
+                      </a-select>
+                    </a-form-item>
+                  </a-col>
+                  <a-col span="7" offset="1">
+                    <a-form-item prop="dealerCitySn" style="margin: 0;">
+                      <a-select v-model="queryParam.dealerCitySn" @change="getAreaList" placeholder="请选择市">
+                        <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
+                      </a-select>
+                    </a-form-item>
+                  </a-col>
+                  <a-col span="7" offset="1">
+                    <a-form-item prop="dealerCountySn" style="margin: 0;">
+                      <a-select v-model="queryParam.dealerCountySn" placeholder="请选择区/县">
+                        <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
+                      </a-select>
+                    </a-form-item>
+                  </a-col>
                 </a-form-item>
-              </a-col>
-              <a-col span="8">
-                <a-form-item prop="districtSn">
-                  <a-select id="supplierInfoEdit-districtSn" @change="areaCharged" v-model="queryParam.districtSn" placeholder="请选择区/县">
-                    <a-select-option v-for="item in addrDistrictList" :value="item.areaSn" :key="item.areaSn + 'c'">{{ item.name }}</a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-            </a-row>
-          </a-col>
+              </a-row>
+            </a-col>
+          </template>
           <a-col :md="6" :sm="24">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsCList-refresh">查询</a-button>
             <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="shortageStatisticsCList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 8px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
           </a-col>
         </a-row>
       </a-form>

+ 37 - 32
src/views/reportData/billingReturnReport/list.vue

@@ -19,42 +19,47 @@
               <custList ref="custList" id="shortageStatisticsCList-buyerSn" @change="custChange"></custList>
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="所在区域">
-              <subarea id="shortageStatisticsCList-subarea" v-model="queryParam.subareaSn"></subarea>
-            </a-form-item>
-          </a-col>
-          <a-col :md="12" :sm="24">
-            <a-row :gutter="15">
-              <!-- 地址 -->
-              <a-col span="8">
-                <a-form-item prop="provinceSn">
-                  <a-select id="supplierInfoEdit-provinceSn" @change="getCityList" v-model="queryParam.provinceSn" placeholder="请选择省">
-                    <a-select-option v-for="item in addrProvinceList" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-              <a-col span="8">
-                <a-form-item prop="citySn">
-                  <a-select id="supplierInfoEdit-citySn" @change="getAreaList" v-model="queryParam.citySn" placeholder="请选择市">
-                    <a-select-option v-for="item in addrCityList" :value="item.areaSn" :key="item.areaSn + 'b'">{{ item.name }}</a-select-option>
-                  </a-select>
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="所在区域">
+                <subarea id="shortageStatisticsCList-subarea" v-model="queryParam.subareaSn"></subarea>
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-row>
+                <a-form-item label="地区">
+                  <a-col span="7">
+                    <a-form-item prop="dealerProvinceSn" style="margin: 0;">
+                      <a-select v-model="queryParam.dealerProvinceSn" @change="getCityList" placeholder="请选择省">
+                        <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
+                      </a-select>
+                    </a-form-item>
+                  </a-col>
+                  <a-col span="7" offset="1">
+                    <a-form-item prop="dealerCitySn" style="margin: 0;">
+                      <a-select v-model="queryParam.dealerCitySn" @change="getAreaList" placeholder="请选择市">
+                        <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
+                      </a-select>
+                    </a-form-item>
+                  </a-col>
+                  <a-col span="7" offset="1">
+                    <a-form-item prop="dealerCountySn" style="margin: 0;">
+                      <a-select v-model="queryParam.dealerCountySn" placeholder="请选择区/县">
+                        <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
+                      </a-select>
+                    </a-form-item>
+                  </a-col>
                 </a-form-item>
-              </a-col>
-              <a-col span="8">
-                <a-form-item prop="districtSn">
-                  <a-select id="supplierInfoEdit-districtSn" @change="areaCharged" v-model="queryParam.districtSn" placeholder="请选择区/县">
-                    <a-select-option v-for="item in addrDistrictList" :value="item.areaSn" :key="item.areaSn + 'c'">{{ item.name }}</a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-            </a-row>
-          </a-col>
+              </a-row>
+            </a-col>
+          </template>
           <a-col :md="6" :sm="24">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsCList-refresh">查询</a-button>
             <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="shortageStatisticsCList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 8px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
           </a-col>
         </a-row>
       </a-form>

+ 61 - 53
src/views/reportData/priceDifferenceDetailReport/list.vue

@@ -9,68 +9,70 @@
               <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
             </a-form-item>
           </a-col>
-          <a-col :md="3" :sm="24">
-            <a-form-item label="">
-              <a-checkbox>
-                盘点区间日期
-              </a-checkbox>
-            </a-form-item>
-          </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-item label="单号">
               <a-input placeholder="请输入单号" />
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-item label="客户名称">
               <custList ref="custList" id="shortageStatisticsCList-buyerSn" @change="custChange"></custList>
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="24">
-            <a-form-item label="客户类型">
-              <custList ref="custList" id="shortageStatisticsCList-buyerSn" @change="custChange"></custList>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="品牌类别">
-              <a-select placeholder="选择品牌类别">
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="产品品牌">
-              <ProductBrand id="productInfoList-productBrandSn" v-model="queryParam.brandSn"></ProductBrand>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="二级品类">
-              <ProductType id="productInfoList-productType" v-model="productType" @change="changeProductType"></ProductType>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="所在区域">
-              <subarea id="shortageStatisticsCList-subarea" v-model="queryParam.subareaSn"></subarea>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="省级区域" prop="provinceSn">
-              <a-select id="supplierInfoEdit-provinceSn" @change="getCityList" v-model="queryParam.provinceSn" placeholder="请选择省">
-                <a-select-option v-for="item in addrProvinceList" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="类型">
-              <subarea id="shortageStatisticsCList-subarea" v-model="queryParam.subareaSn"></subarea>
-            </a-form-item>
-          </a-col>
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="客户类型">
+                <custList ref="custList" id="shortageStatisticsCList-buyerSn" @change="custChange"></custList>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="品牌类别">
+                <a-select placeholder="选择品牌类别">
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品品牌">
+                <ProductBrand id="productInfoList-productBrandSn" v-model="queryParam.brandSn"></ProductBrand>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="二级品类">
+                <ProductType id="productInfoList-productType" v-model="productType" @change="changeProductType"></ProductType>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="所在区域">
+                <subarea id="shortageStatisticsCList-subarea" v-model="queryParam.subareaSn"></subarea>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="省级区域" prop="provinceSn">
+                <a-select id="supplierInfoEdit-provinceSn" @change="getCityList" v-model="queryParam.provinceSn" placeholder="请选择省">
+                  <a-select-option v-for="item in addrProvinceList" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="类型">
+                <subarea id="shortageStatisticsCList-subarea" v-model="queryParam.subareaSn"></subarea>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="">
+                <a-checkbox>
+                  盘点区间日期
+                </a-checkbox>
+              </a-form-item>
+            </a-col>
+          </template>
           <a-col :md="6" :sm="24">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsCList-refresh">查询</a-button>
             <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="shortageStatisticsCList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 8px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
           </a-col>
         </a-row>
       </a-form>
@@ -79,7 +81,7 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
@@ -118,7 +120,7 @@ import subarea from '@/views/common/subarea.js'
 import { getArea } from '@/api/data'
 import ProductBrand from '@/views/common/productBrand.js'
 import ProductType from '@/views/common/productType.js'
-import { oosBuyerList, oosBuyerDetailCount, oosBuyerDetailPageCount, oosDetailExport } from '@/api/oos'
+// import { oosBuyerList, oosBuyerDetailCount, oosBuyerDetailPageCount, oosDetailExport } from '@/api/oos'
 export default {
   components: { STable, VSelect, custList, subarea, rangeDate, ProductBrand, ProductType },
   data () {
@@ -357,6 +359,12 @@ export default {
     custChange (obj) {
       this.queryParam.buyerSn = obj.key
     },
+    //  产品分类  change
+    changeProductType (val, opt) {
+      this.queryParam.productTypeSn1 = val[0] ? val[0] : ''
+      this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
+      this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
+    },
     // 获取城市列表
     getCityList (val) {
       const index = this.addrProvinceList.findIndex(item => item.areaSn == val)

+ 43 - 38
src/views/reportData/returnSlipReport/list.vue

@@ -19,47 +19,52 @@
               <custList ref="custList" id="shortageStatisticsCList-buyerSn" @change="custChange"></custList>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="退货单号">
-              <a-input id="salesSlipReportList-allocateTypeSn" v-model.trim="queryParam.allocateTypeSn" allowClear placeholder="请输入退货单号"/>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="所在区域">
-              <subarea id="shortageStatisticsCList-subarea" v-model="queryParam.subareaSn"></subarea>
-            </a-form-item>
-          </a-col>
-          <a-col :md="12" :sm="24">
-            <a-row :gutter="15">
-              <!-- 地址 -->
-              <a-col span="8">
-                <a-form-item prop="provinceSn">
-                  <a-select id="supplierInfoEdit-provinceSn" @change="getCityList" v-model="queryParam.provinceSn" placeholder="请选择省">
-                    <a-select-option v-for="item in addrProvinceList" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-              <a-col span="8">
-                <a-form-item prop="citySn">
-                  <a-select id="supplierInfoEdit-citySn" @change="getAreaList" v-model="queryParam.citySn" placeholder="请选择市">
-                    <a-select-option v-for="item in addrCityList" :value="item.areaSn" :key="item.areaSn + 'b'">{{ item.name }}</a-select-option>
-                  </a-select>
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="退货单号">
+                <a-input id="salesSlipReportList-allocateTypeSn" v-model.trim="queryParam.allocateTypeSn" allowClear placeholder="请输入退货单号"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="所在区域">
+                <subarea id="shortageStatisticsCList-subarea" v-model="queryParam.subareaSn"></subarea>
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-row>
+                <a-form-item label="地区">
+                  <a-col span="7">
+                    <a-form-item prop="dealerProvinceSn" style="margin: 0;">
+                      <a-select v-model="queryParam.dealerProvinceSn" @change="getCityList" placeholder="请选择省">
+                        <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
+                      </a-select>
+                    </a-form-item>
+                  </a-col>
+                  <a-col span="7" offset="1">
+                    <a-form-item prop="dealerCitySn" style="margin: 0;">
+                      <a-select v-model="queryParam.dealerCitySn" @change="getAreaList" placeholder="请选择市">
+                        <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
+                      </a-select>
+                    </a-form-item>
+                  </a-col>
+                  <a-col span="7" offset="1">
+                    <a-form-item prop="dealerCountySn" style="margin: 0;">
+                      <a-select v-model="queryParam.dealerCountySn" placeholder="请选择区/县">
+                        <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
+                      </a-select>
+                    </a-form-item>
+                  </a-col>
                 </a-form-item>
-              </a-col>
-              <a-col span="8">
-                <a-form-item prop="districtSn">
-                  <a-select id="supplierInfoEdit-districtSn" @change="areaCharged" v-model="queryParam.districtSn" placeholder="请选择区/县">
-                    <a-select-option v-for="item in addrDistrictList" :value="item.areaSn" :key="item.areaSn + 'c'">{{ item.name }}</a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-            </a-row>
-          </a-col>
+              </a-row>
+            </a-col>
+          </template>
           <a-col :md="6" :sm="24">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsCList-refresh">查询</a-button>
             <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="shortageStatisticsCList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 8px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
           </a-col>
         </a-row>
       </a-form>
@@ -68,7 +73,7 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"

+ 93 - 87
src/views/reportData/salesReturnDetailReport/list.vue

@@ -19,85 +19,91 @@
               <a-input id="salesReturn-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="产品编码" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <a-input id="salesReturn-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入产品编码"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="产品名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <a-input id="salesReturn-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入产品名称"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <custList id="salesReturn-buyerSn" ref="custList" @change="custChange"></custList>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="客户类型">
-              <custList ref="custList" id="shortageStatisticsCList-buyerSn" @change="custChange"></custList>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="品牌类别">
-              <a-select id="provinceTypeSalesDetailsList-allocateTypeSn" v-model="queryParam.allocateTypeSn" placeholder="请选择" allowClear >
-                <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn" :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="产品品牌">
-              <a-select id="provinceTypeSalesDetailsList-allocateTypeSn" v-model="queryParam.allocateTypeSn" placeholder="请选择" allowClear >
-                <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn" :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="二级类别">
-              <a-select id="provinceTypeSalesDetailsList-allocateTypeSn" v-model="queryParam.allocateTypeSn" placeholder="请选择" allowClear >
-                <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn" :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="三级类别">
-              <a-select id="provinceTypeSalesDetailsList-allocateTypeSn" v-model="queryParam.allocateTypeSn" placeholder="请选择" allowClear >
-                <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn" :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="所在区域">
-              <a-select id="provinceTypeSalesDetailsList-allocateTypeSn" v-model="queryParam.allocateTypeSn" placeholder="请选择区域" allowClear >
-                <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn" :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="省份">
-              <a-select id="provinceTypeSalesDetailsList-state" v-model="queryParam.state" placeholder="请选择省份" allowClear >
-                <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn" :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="市">
-              <a-select id="provinceTypeSalesDetailsList-state" v-model="queryParam.state" placeholder="请选择市" allowClear >
-                <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn" :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="区">
-              <a-select id="provinceTypeSalesDetailsList-state" v-model="queryParam.state" placeholder="请选择区" allowClear >
-                <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn" :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品编码" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <a-input id="salesReturn-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入产品编码"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <a-input id="salesReturn-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入产品名称"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <custList id="salesReturn-buyerSn" ref="custList" @change="custChange"></custList>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="客户类型">
+                <custList ref="custList" id="shortageStatisticsCList-buyerSn" @change="custChange"></custList>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="品牌类别">
+                <a-select id="provinceTypeSalesDetailsList-allocateTypeSn" v-model="queryParam.allocateTypeSn" placeholder="请选择" allowClear >
+                  <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn" :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品品牌">
+                <a-select id="provinceTypeSalesDetailsList-allocateTypeSn" v-model="queryParam.allocateTypeSn" placeholder="请选择" allowClear >
+                  <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn" :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="二级类别">
+                <a-select id="provinceTypeSalesDetailsList-allocateTypeSn" v-model="queryParam.allocateTypeSn" placeholder="请选择" allowClear >
+                  <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn" :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="三级类别">
+                <a-select id="provinceTypeSalesDetailsList-allocateTypeSn" v-model="queryParam.allocateTypeSn" placeholder="请选择" allowClear >
+                  <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn" :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="所在区域">
+                <a-select id="provinceTypeSalesDetailsList-allocateTypeSn" v-model="queryParam.allocateTypeSn" placeholder="请选择区域" allowClear >
+                  <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn" :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="省份">
+                <a-select id="provinceTypeSalesDetailsList-state" v-model="queryParam.state" placeholder="请选择省份" allowClear >
+                  <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn" :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="市">
+                <a-select id="provinceTypeSalesDetailsList-state" v-model="queryParam.state" placeholder="请选择市" allowClear >
+                  <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn" :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="区">
+                <a-select id="provinceTypeSalesDetailsList-state" v-model="queryParam.state" placeholder="请选择区" allowClear >
+                  <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn" :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </template>
           <a-col :md="6" :sm="24">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="provinceTypeSalesDetailsList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="provinceTypeSalesDetailsList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 8px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
           </a-col>
         </a-row>
       </a-form>
@@ -106,16 +112,16 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 3650 }"
+      :scroll="{ x: 3750 }"
       bordered>
       <template slot="footer" slot-scope="currentPageData">
         <a-table
           ref="table_footer"
-          size="default"
+          size="small"
           :pagination="false"
           :bordered="false"
           :rowKey="(record) => record.id"
@@ -152,22 +158,22 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
       reportData: reportData.salesReturnDetailReportList,
-	  totalData: [
-		  { printCsountss: 3, prinftCounts: 27, prisntCogunts: 22.5, prinxtCounts: '0', printCocunts: 3, printCvounts: '0', printCgounts: '0.00', printCouhnts: '0.00', printCournts: '0.00' }
-	  ],
+      totalData: [
+        { printCsountss: 3, prinftCounts: 27, prisntCogunts: 22.5, prinxtCounts: '0', printCocunts: 3, printCvounts: '0', printCgounts: '0.00', printCouhnts: '0.00', printCournts: '0.00' }
+      ],
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
         { title: '区域', dataIndex: 'area', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货单号', dataIndex: 'returnNo', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '退货单号', dataIndex: 'returnNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'province', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'customerName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'customerName', width: 200, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户类型', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '直接绑定客户名称', dataIndex: 'directCustomName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '间接绑定客户名称', dataIndex: 'IndirectCustomName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '直接绑定客户名称', dataIndex: 'directCustomName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '间接绑定客户名称', dataIndex: 'IndirectCustomName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '退货完成日期', dataIndex: 'returnFinTime', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'type', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '二级类别', dataIndex: 'allocateTypeName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'stateDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'stateDictValue', width: 220, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品编码', dataIndex: 'printStateDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productUnit', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货数量', dataIndex: 'printCounts', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 39 - 34
src/views/reportData/salesReturnReport/list.vue

@@ -19,42 +19,47 @@
               <custList ref="custList" id="shortageStatisticsCList-buyerSn" @change="custChange"></custList>
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="所在区域">
-              <subarea id="shortageStatisticsCList-subarea" v-model="queryParam.subareaSn"></subarea>
-            </a-form-item>
-          </a-col>
-          <a-col :md="12" :sm="24">
-            <a-row :gutter="15">
-              <!-- 地址 -->
-              <a-col span="8">
-                <a-form-item prop="provinceSn">
-                  <a-select id="supplierInfoEdit-provinceSn" @change="getCityList" v-model="queryParam.provinceSn" placeholder="请选择省">
-                    <a-select-option v-for="item in addrProvinceList" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-              <a-col span="8">
-                <a-form-item prop="citySn">
-                  <a-select id="supplierInfoEdit-citySn" @change="getAreaList" v-model="queryParam.citySn" placeholder="请选择市">
-                    <a-select-option v-for="item in addrCityList" :value="item.areaSn" :key="item.areaSn + 'b'">{{ item.name }}</a-select-option>
-                  </a-select>
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="所在区域">
+                <subarea id="shortageStatisticsCList-subarea" v-model="queryParam.subareaSn"></subarea>
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-row>
+                <a-form-item label="地区">
+                  <a-col span="7">
+                    <a-form-item prop="dealerProvinceSn" style="margin: 0;">
+                      <a-select v-model="queryParam.dealerProvinceSn" @change="getCityList" placeholder="请选择省">
+                        <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
+                      </a-select>
+                    </a-form-item>
+                  </a-col>
+                  <a-col span="7" offset="1">
+                    <a-form-item prop="dealerCitySn" style="margin: 0;">
+                      <a-select v-model="queryParam.dealerCitySn" @change="getAreaList" placeholder="请选择市">
+                        <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
+                      </a-select>
+                    </a-form-item>
+                  </a-col>
+                  <a-col span="7" offset="1">
+                    <a-form-item prop="dealerCountySn" style="margin: 0;">
+                      <a-select v-model="queryParam.dealerCountySn" placeholder="请选择区/县">
+                        <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
+                      </a-select>
+                    </a-form-item>
+                  </a-col>
                 </a-form-item>
-              </a-col>
-              <a-col span="8">
-                <a-form-item prop="districtSn">
-                  <a-select id="supplierInfoEdit-districtSn" @change="areaCharged" v-model="queryParam.districtSn" placeholder="请选择区/县">
-                    <a-select-option v-for="item in addrDistrictList" :value="item.areaSn" :key="item.areaSn + 'c'">{{ item.name }}</a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-            </a-row>
-          </a-col>
+              </a-row>
+            </a-col>
+          </template>
           <a-col :md="6" :sm="24">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsCList-refresh">查询</a-button>
             <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="shortageStatisticsCList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 8px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
           </a-col>
         </a-row>
       </a-form>
@@ -63,7 +68,7 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
@@ -81,7 +86,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import custList from '@/views/common/custList.vue'
 import subarea from '@/views/common/subarea.js'
 import { getArea } from '@/api/data'
-import { oosBuyerList, oosBuyerDetailCount, oosBuyerDetailPageCount, oosDetailExport } from '@/api/oos'
+// import { oosBuyerList, oosBuyerDetailCount, oosBuyerDetailPageCount, oosDetailExport } from '@/api/oos'
 export default {
   components: { STable, VSelect, custList, subarea, rangeDate },
   data () {

+ 8 - 10
src/views/reportData/salesReturnsReport/list.vue

@@ -45,11 +45,8 @@
                   placeholder="请选择"
                   id="productPricingList-productBrandSn"
                   allowClear
-                  v-model="queryParam.productBrandSn"
-                  :showSearch="true"
-                  option-filter-prop="children"
-                  :filter-option="filterOption">
-                  <a-select-option v-for="item in productBrandList" :key="item.brandSn" :value="item.brandSn">{{ item.brandName }}</a-select-option>
+                  v-model="queryParam.productBrandSn">
+                  <a-select-option v-for="item in allocateTypeList" :key="item.brandSn" :value="item.brandSn">{{ item.brandName }}</a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
@@ -74,11 +71,11 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 2300 }"
+      :scroll="{ x: 2380 }"
       bordered>
       <template slot="footer" slot-scope="currentPageData">
         <a-row :gutter="15">
@@ -131,9 +128,10 @@ export default {
       checkVal: '',
       reportData: reportData.salesReturnsReportList,
       columns: [
-        { title: '退货单号', dataIndex: 'data1', width: 200, align: 'center', fixed: 'left', customRender: function (text) { return text || '--' } },
-        { title: '退货完成日期', dataIndex: 'data2', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'data3', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '退货单号', dataIndex: 'data1', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '退货完成日期', dataIndex: 'data2', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'data3', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '客户类型', dataIndex: 'data4', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '直接绑定客户类型', dataIndex: 'data5', width: 200, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '间接绑定客户类型', dataIndex: 'data6', width: 200, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 1 - 1
src/views/reportData/salesSlipReport/list.vue

@@ -79,7 +79,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 3120 }"
+      :scroll="{ x: 3220 }"
       bordered>
     </s-table>
   </a-card>