瀏覽代碼

查询优化

chenrui 1 年之前
父節點
當前提交
6308cde53c

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

@@ -2056,7 +2056,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'edit/:id/:sn/:supplierSn',
+                path: 'edit/:id/:sn/:supplierSn/:no',
                 name: 'bulkReturnGoodsEdit',
                 component: () => import(/* webpackChunkName: "bulkManagement" */ '@/views/bulkManagement/bulkReturnGoods/edit.vue'),
                 meta: {
@@ -2067,7 +2067,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'grabEdit/:id/:sn/:supplierSn',
+                path: 'grabEdit/:id/:sn/:supplierSn/:no',
                 name: 'bulkReturnGoodsGrabEdit',
                 component: () => import(/* webpackChunkName: "bulkManagement" */ '@/views/bulkManagement/bulkReturnGoods/grabEdit.vue'),
                 meta: {

+ 1 - 0
src/views/bulkManagement/bulkReturnGoods/edit.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="bulkReturnGoodsEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <span class="head-order-number">单号:{{ $route.params.no || '' }}</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_sparePartsRetPrint')">

+ 1 - 0
src/views/bulkManagement/bulkReturnGoods/grabEdit.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="bulkReturnGoodsEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <span class="head-order-number">单号:{{ $route.params.no || '' }}</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_sparePartsRetPrint')">

+ 2 - 2
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -281,9 +281,9 @@ export default {
     //  编辑
     handleEdit (row) {
       if (row.isGrab == 1) {
-        this.$router.push({ name: 'bulkReturnGoodsGrabEdit', params: { id: row.id, sn: row.sparePartsReturnSn, supplierSn: row.supplierSn } })
+        this.$router.push({ name: 'bulkReturnGoodsGrabEdit', params: { id: row.id, sn: row.sparePartsReturnSn, supplierSn: row.supplierSn, no: row.sparePartsReturnNo } })
       } else {
-        this.$router.push({ name: 'bulkReturnGoodsEdit', params: { id: row.id, sn: row.sparePartsReturnSn, supplierSn: row.supplierSn } })
+        this.$router.push({ name: 'bulkReturnGoodsEdit', params: { id: row.id, sn: row.sparePartsReturnSn, supplierSn: row.supplierSn, no: row.sparePartsReturnNo } })
       }
     },
     //  详情

+ 1 - 1
src/views/bulkManagement/bulkWarehousingOrder/detail.vue

@@ -12,7 +12,7 @@
             style="background-color: #1890ff;margin-left: 20px;border: #1890ff;"
             id="bulkWarehousingOrderDetail-edit-btn"
             @click.stop="handleEdit">编辑</a-button>
-          <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.sparePartsPurchaseNo) || '--' }}</p>
+          <span class="head-order-number">单号:{{ (basicInfoData&&basicInfoData.sparePartsPurchaseNo) || '--' }}</span>
         </template>
         <template slot="tags">
           <a-tag color="red" v-if="basicInfoData&&basicInfoData.stateDictValue">{{ basicInfoData.stateDictValue }}</a-tag>

+ 12 - 12
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -6,7 +6,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="bulkWarehousingOrderEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <p style="display: inline-block;margin: 0 30px 0 60px;color: #000;font-size: 16px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.sparePartsPurchaseNo) || '' }}</p>
+          <span class="head-order-number">单号:{{ (basicInfoData&&basicInfoData.sparePartsPurchaseNo) || '' }}</span>
           <a-button type="primary" ghost @click="isShowBisiceInfo=!isShowBisiceInfo">
             基础信息
             <a-icon :type="isShowBisiceInfo ? 'up' : 'down'"/>
@@ -48,34 +48,34 @@
               <div class="table-page-search-wrapper">
                 <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
                   <a-row type="flex" :gutter="12" justify="start">
-                    <a-col flex="250px">
+                    <a-col :md="6" :sm="24">
                       <a-form-model-item label="产品编码">
                         <a-input id="bulkWarehousingOrderEdit-code" ref="searchProductCode" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
                       </a-form-model-item>
                     </a-col>
-                    <a-col flex="350px">
+                    <a-col :md="6" :sm="24">
                       <a-form-model-item label="产品名称">
                         <a-input id="bulkWarehousingOrderEdit-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
                       </a-form-model-item>
                     </a-col>
-                    <a-col flex="250px">
+                    <a-col :md="6" :sm="24">
                       <a-form-model-item label="原厂编码">
                         <a-input id="bulkWarehousingOrderEdit-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
                       </a-form-model-item>
                     </a-col>
                     <template v-if="advanced">
-                      <a-col flex="250px">
+                      <a-col :md="6" :sm="24">
                         <a-form-item label="产品分类">
                           <ProductType id="productInfoList-productType" @change="changeProductType" v-model="productType"></ProductType>
                         </a-form-item>
                       </a-col>
-                      <a-col flex="250px">
+                      <a-col :md="6" :sm="24">
                         <a-form-item label="产品品牌">
                           <ProductBrand id="bulkWarehousingOrderEdit-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
                         </a-form-item>
                       </a-col>
                     </template>
-                    <a-col flex="auto" style="margin-bottom: 10px;">
+                    <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                       <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderEdit-refresh">查询</a-button>
                       <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="bulkWarehousingOrderEdit-reset">重置</a-button>
                       <a @click="advanced=!advanced" style="margin:0 30px 0 10px">
@@ -173,23 +173,23 @@
               <div class="table-page-search-wrapper">
                 <a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
                   <a-row :gutter="15">
-                    <a-col :md="4" :sm="24">
+                    <a-col :md="5" :sm="24">
                       <a-form-model-item label="产品编码">
                         <a-input id="bulkWarehousingOrderEdit-code" v-model.trim="queryChooseParam.productCode" allowClear placeholder="请输入产品编码"/>
                       </a-form-model-item>
                     </a-col>
-                    <a-col :md="4" :sm="24">
+                    <a-col :md="5" :sm="24">
                       <a-form-model-item label="产品名称">
                         <a-input id="bulkWarehousingOrderEdit-name" v-model.trim="queryChooseParam.productName" allowClear placeholder="请输入产品名称"/>
                       </a-form-model-item>
                     </a-col>
-                    <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
+                    <a-col :md="5" :sm="24" style="margin-bottom: 10px;">
                       <a-button type="primary" @click="$refs.chooseTable.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderEdit-choose-refresh">查询</a-button>
                       <a-button style="margin-left: 8px" @click="resetChooseSearchForm" :disabled="disabled" id="bulkWarehousingOrderEdit-choose-reset">重置</a-button>
                     </a-col>
-                    <a-col :md="4" :sm="24">
+                    <a-col :md="3" :sm="24">
                     </a-col>
-                    <a-col :md="8" :sm="24" style="text-align:right;">
+                    <a-col :md="6" :sm="24" style="text-align:right;">
                       <a-button
                         type="default"
                         @click="openGuideModal=true"

+ 12 - 12
src/views/chainReportData/chainCallReport/detailList.vue

@@ -34,7 +34,7 @@
                 <getTenantList id="chainCallReportExport-putTenantSn" type="out" state="FINISH" placeholder="请选择调往对象" v-model="queryParam.putTenantSn"></getTenantList>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="调拨产品类型">
                 <v-select
                   v-model="queryParam.allocationType"
@@ -45,28 +45,28 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品编码">
                 <a-input id="chainCallReportExport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品名称">
                 <a-input id="chainCallReportExport-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
                 <ProductBrand id="chainCallReportExport-productBrandSn" placeholder="请选择产品品牌" v-model="queryParam.productEntity.productBrandSn"></ProductBrand>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品分类">
                 <ProductType id="chainCallReportExport-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="queryParam.productType"></ProductType>
               </a-form-model-item>
             </a-col>
           </template>
-          <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainCallReportExport-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainCallReportExport-reset">重置</a-button>
             <a-button
@@ -131,11 +131,11 @@ export default {
       tableHeight: 0,
       outWareTime: [],
       queryParam: { //  查询条件
-        time:[],
+        time: [],
         auditBeginDate: '',
         auditEndDate: '',
-        outWarehouseBeginDate:'',
-        outWarehouseEndDate:'',
+        outWarehouseBeginDate: '',
+        outWarehouseEndDate: '',
         productEntity: {
           productBrandSn: undefined, //  产品品牌
           productTypeSn1: '', //  产品一级分类
@@ -145,7 +145,7 @@ export default {
           name: '' //  产品名称
         },
         productType: undefined,
-        putTenantSn:undefined,
+        putTenantSn: undefined,
         allocationType: undefined,
         allocationLinkageOutNo: ''
       },
@@ -176,7 +176,7 @@ export default {
           return data
         })
       },
-      totalData: null, //  合计
+      totalData: null //  合计
     }
   },
   computed: {
@@ -241,7 +241,7 @@ export default {
       this.outWareTime = []
       this.queryParam.outWarehouseBeginDate = ''
       this.queryParam.outWarehouseEndDate = ''
-      
+
       this.queryParam.allocationType = undefined
       this.queryParam.putTenantSn = undefined
       this.queryParam.allocationLinkageOutNo = ''

+ 23 - 23
src/views/chainReportData/chainCallReport/list.vue

@@ -34,19 +34,19 @@
                 <getTenantList id="chainCallReportExport-putTenantSn" type="out" state="FINISH" placeholder="请选择调往对象" v-model="queryParam.putTenantSn"></getTenantList>
               </a-form-item>
             </a-col>
-             <a-col :md="4" :sm="24">
-               <a-form-item label="调拨产品类型">
-                 <v-select
-                   v-model="queryParam.allocationType"
-                   ref="allocationType"
-                   id="chainCallReportExport-allocationType"
-                   code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
-                   placeholder="请选择调拨产品类型"
-                   allowClear></v-select>
-               </a-form-item>
-             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="调拨产品类型">
+                <v-select
+                  v-model="queryParam.allocationType"
+                  ref="allocationType"
+                  id="chainCallReportExport-allocationType"
+                  code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
+                  placeholder="请选择调拨产品类型"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
           </template>
-          <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainCallReportExport-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainCallReportExport-reset">重置</a-button>
             <a-button
@@ -58,10 +58,10 @@
               v-if="$hasPermissions('M_chainCallReportExport')"
               class="button-warning"
               id="chainCallReportExport-export-btn">导出</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
+            <a @click="advanced=!advanced" style="margin-left: 5px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
           </a-col>
         </a-row>
       </a-form-model>
@@ -109,12 +109,12 @@ export default {
       tableHeight: 0,
       outWareTime: [],
       queryParam: { //  查询条件
-        time:[],
+        time: [],
         auditBeginDate: '',
         auditEndDate: '',
-        outWarehouseBeginDate:'',
-        outWarehouseEndDate:'',
-        putTenantSn:undefined,
+        outWarehouseBeginDate: '',
+        outWarehouseEndDate: '',
+        putTenantSn: undefined,
         allocationType: undefined,
         allocationLinkageOutNo: ''
       },
@@ -145,7 +145,7 @@ export default {
           return data
         })
       },
-      totalData: null, //  合计
+      totalData: null //  合计
     }
   },
   computed: {
@@ -208,7 +208,7 @@ export default {
       this.outWareTime = []
       this.queryParam.outWarehouseBeginDate = ''
       this.queryParam.outWarehouseEndDate = ''
-      
+
       this.queryParam.allocationType = undefined
       this.queryParam.putTenantSn = undefined
       this.queryParam.allocationLinkageOutNo = ''
@@ -234,7 +234,7 @@ export default {
           return false
         }
       })
-    },
+    }
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用

+ 18 - 18
src/views/chainReportData/chainTransferReport/detailList.vue

@@ -23,45 +23,45 @@
               <a-input id="chainTransferInReport-allocationLinkagePutNo" v-model.trim="queryParam.allocationLinkagePutNo" allowClear placeholder="请输入连锁调入单号"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-item label="调出对象">
               <getTenantList id="chainTransferInReport-outTenantSn" state="FINISH" v-model="queryParam.outTenantSn"></getTenantList>
             </a-form-item>
           </a-col>
-          <template v-if="advanced">
-            <a-col :md="4" :sm="24">
-              <a-form-item label="调拨产品类型">
-                <v-select
-                  v-model="queryParam.allocationType"
-                  ref="allocationType"
-                  id="chainTransferInReport-allocationType"
-                  code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
-                  placeholder="请选择调拨产品类型"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="调拨产品类型">
+              <v-select
+                v-model="queryParam.allocationType"
+                ref="allocationType"
+                id="chainTransferInReport-allocationType"
+                code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
+                placeholder="请选择调拨产品类型"
+                allowClear></v-select>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced"> 
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品编码">
                 <a-input id="chainTransferInReport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品名称">
                 <a-input id="chainTransferInReport-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
                 <ProductBrand id="chainTransferInReport-productBrandSn" placeholder="请选择产品品牌" v-model="queryParam.productEntity.productBrandSn"></ProductBrand>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品分类">
                 <ProductType id="chainTransferInReport-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="queryParam.productType"></ProductType>
               </a-form-model-item>
             </a-col>
           </template>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="24" :sm="24" style="text-align:center;margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainTransferInReport-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainTransferInReport-reset">重置</a-button>
             <a-button

+ 5 - 5
src/views/customerManagement/customerInfo/list.vue

@@ -10,12 +10,12 @@
                 <a-input id="customerManagementList-customerName" v-model.trim="queryParam.customerName" allowClear placeholder="请输入客户名称"/>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="联系人">
                 <a-input id="customerManagementList-contactName" v-model.trim="queryParam.contactName" allowClear placeholder="请输入联系人"/>
               </a-form-item>
             </a-col>
-            <a-col :md="8" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="最后销售时间">
                 <rangeDate ref="rangeSaleDate" @change="dateSaleChange" />
               </a-form-item>
@@ -42,12 +42,12 @@
                   <AreaList changeOnSelect ref="areaList" @change="areaChange"></AreaList>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="客户类型">
                   <custType v-model="queryParam.customerTypeSn" allowClear placeholder="请选择客户类型"></custType>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="启用状态">
                   <v-select code="ENABLE_FLAG" v-model="queryParam.enabledFlag" allowClear placeholder="请选择启用状态"></v-select>
                 </a-form-item>
@@ -219,7 +219,7 @@ export default {
       this.queryParam.enabledFlag = undefined
       this.addrCityList = []
       this.addrDistrictList = []
-      if(this.advanced){
+      if (this.advanced) {
         this.$refs.areaList.clearData()
       }
       this.$refs.table.refresh(true)

+ 12 - 12
src/views/reportData/bulkReturnReport/detailList.vue

@@ -28,27 +28,27 @@
               <a-input id="bulkInList-sparePartsReturnNo" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入单号"/>
             </a-form-model-item>
           </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="供应商">
+              <supplier
+                id="bulkInList-supplierSn"
+                placeholder="请选择供应商"
+                v-model="queryParam.supplierSn"
+              ></supplier>
+            </a-form-model-item>
+          </a-col>
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="供应商">
-                <supplier
-                  id="bulkInList-supplierSn"
-                  placeholder="请选择供应商"
-                  v-model="queryParam.supplierSn"
-                ></supplier>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="4" :sm="24">
               <a-form-model-item label="产品编码">
                 <a-input id="bulkInList-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品名称">
                 <a-input id="bulkInList-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
                 <ProductBrand id="bulkInList-productBrandSn" placeholder="请选择产品品牌" v-model="queryParam.productEntity.productBrandSn"></ProductBrand>
               </a-form-item>
@@ -59,7 +59,7 @@
               </a-form-model-item>
             </a-col>
           </template>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="24" :sm="24" style="text-align:center;margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="bulkInList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="bulkInList-reset">重置</a-button>
             <a-button

+ 3 - 3
src/views/reportData/bulkReturnReport/list.vue

@@ -23,12 +23,12 @@
               <rangeDate ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <a-col :md="4" :sm="24">
             <a-form-model-item label="散件退货单号">
               <a-input id="bulkReturn-sparePartsReturnNo" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入单号"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <a-col :md="4" :sm="24">
             <a-form-model-item label="供应商">
               <supplier
                 id="bulkReturn-supplierSn"
@@ -37,7 +37,7 @@
               ></supplier>
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="bulkReturn-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="bulkReturn-reset">重置</a-button>
             <a-button

+ 8 - 8
src/views/reportData/bulkWarehousingReport/detailList.vue

@@ -32,14 +32,14 @@
               ></supplier>
             </a-form-model-item>
           </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="散件入库类型">
+              <a-select id="bulkInList-sparePartsType" placeholder="请选择散件入库类型" allowClear v-model="queryParam.sparePartsType">
+                <a-select-option v-for="item in sparePartsPutTypeList" :key="item.sparePartsPutTypeSn" :value="item.sparePartsPutTypeSn">{{ item.name }}</a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
           <template v-if="advanced">
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="散件入库类型">
-                <a-select id="bulkInList-sparePartsType" placeholder="请选择散件入库类型" allowClear v-model="queryParam.sparePartsType">
-                  <a-select-option v-for="item in sparePartsPutTypeList" :key="item.sparePartsPutTypeSn" :value="item.sparePartsPutTypeSn">{{ item.name }}</a-select-option>
-                </a-select>
-              </a-form-model-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品编码">
                 <a-input id="bulkInList-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
@@ -61,7 +61,7 @@
               </a-form-model-item>
             </a-col>
           </template>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="24" :sm="24" style="text-align:center;margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="bulkInList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="bulkInList-reset">重置</a-button>
             <a-button

+ 8 - 8
src/views/reportData/bulkWarehousingReport/list.vue

@@ -13,17 +13,17 @@
         :wrapperCol="wrapperCol"
         @keyup.enter.native="handleSearch" >
         <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
+          <a-col :md="5" :sm="24">
             <a-form-model-item label="审核时间" prop="time">
               <rangeDate ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <a-col :md="5" :sm="24">
             <a-form-model-item label="散件单号">
               <a-input id="bulkIn-sparePartsPurchaseNo" v-model.trim="queryParam.sparePartsPurchaseNo" allowClear placeholder="请输入单号"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <a-col :md="5" :sm="24">
             <a-form-model-item label="供应商">
               <supplier
                 id="bulkIn-supplierSn"
@@ -33,7 +33,7 @@
             </a-form-model-item>
           </a-col>
           <template v-if="advanced">
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-model-item label="散件入库类型">
                 <a-select id="bulkIn-sparePartsType" placeholder="请选择散件入库类型" allowClear v-model="queryParam.sparePartsType">
                   <a-select-option v-for="item in sparePartsPutTypeList" :key="item.sparePartsPutTypeSn" :value="item.sparePartsPutTypeSn">{{ item.name }}</a-select-option>
@@ -41,7 +41,7 @@
               </a-form-model-item>
             </a-col>
           </template>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="bulkIn-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="bulkIn-reset">重置</a-button>
             <a-button
@@ -53,10 +53,10 @@
               v-if="$hasPermissions('M_bulkWarehousingReportExport')"
               class="button-warning"
               id="bulkIn-export-btn">导出</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
+            <!-- <a @click="advanced=!advanced" style="margin-left: 5px">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
-            </a>
+            </a> -->
           </a-col>
         </a-row>
       </a-form-model>
@@ -101,7 +101,7 @@ export default {
       spinning: false,
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
         time: [],

+ 14 - 14
src/views/reportData/salesDetailReport/list.vue

@@ -30,17 +30,17 @@
             </a-form-item>
           </a-col>
           <template v-if="advanced">
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="客户名称">
                 <custList id="salesDetailReportList-salesTargetName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
-                <a-form-item label="客户类型">
-                  <custType v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
-                </a-form-item>
-              </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="客户类型">
+                <custType v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="收款方式">
                 <v-select
                   code="SETTLE_STYLE"
@@ -51,27 +51,27 @@
                 ></v-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
                 <ProductBrand id="salesDetailReportList-productBrandSn" placeholder="请选择产品品牌" v-model="queryParam.productEntity.productBrandSn"></ProductBrand>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品分类">
                 <ProductType id="salesDetailReportList-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="productType"></ProductType>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品编码">
                 <a-input id="salesDetailReportList-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品名称">
                 <a-input id="salesDetailReportList-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="仓库仓位">
                 <a-cascader
                   v-model="queryParam.warehouseCascade"
@@ -85,12 +85,12 @@
                   style="width: 100%;" />
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="单号">
                 <a-input id="salesDetailReportList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入单号"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="业务员">
                 <a-input id="salesDetailReportList-salesManName" v-model.trim="queryParam.salesManName" allowClear placeholder="请输入业务员"/>
               </a-form-model-item>

+ 5 - 5
src/views/reportData/salesReport/list.vue

@@ -30,17 +30,17 @@
             </a-form-item>
           </a-col>
           <template v-if="advanced">
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="客户名称">
                 <custList id="salesReportList-salesTargetName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
                 <a-form-item label="客户类型">
                   <custType v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
                 </a-form-item>
               </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="收款方式">
                 <v-select
                   code="SETTLE_STYLE"
@@ -51,12 +51,12 @@
                 ></v-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="单号">
                 <a-input id="salesReportList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入单号"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="业务员">
                 <a-input id="salesReportList-salesManName" v-model.trim="queryParam.salesManName" allowClear placeholder="请输入业务员"/>
               </a-form-model-item>

+ 6 - 6
src/views/reportData/stockImportReport/detailList.vue

@@ -42,12 +42,12 @@
               ></supplier>
             </a-form-model-item>
           </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="产品编码">
+              <a-input v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
+            </a-form-model-item>
+          </a-col>
           <template v-if="advanced">
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="产品编码">
-                <a-input v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
-              </a-form-model-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品名称">
                 <a-input v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
@@ -69,7 +69,7 @@
               </a-form-model-item>
             </a-col>
           </template>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="24" :sm="24" style="text-align:center;margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesDetailReportList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesDetailReportList-reset">重置</a-button>
             <a-button

+ 8 - 8
src/views/reportData/storeTransferOutReport/detailList.vue

@@ -23,17 +23,17 @@
               <rangeDate ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-model-item label="店内调出单号">
               <a-input id="storeTransOutReport-storeCallOutNo" v-model.trim="queryParam.storeCallOutNo" allowClear placeholder="请输入店内调出单号"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-item label="调往对象">
               <custList id="storeTransOutReport-putPersonName" ref="custList" @change="custChange"></custList>
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-item label="调拨类型">
               <a-select id="sstoreTransOutReport-callOutType" v-model="queryParam.callOutType" placeholder="请选择调拨类型" allowClear >
                 <a-select-option v-for="item in storeCallOutTypeList" :key="item.storeCallOutTypeSn" :value="item.storeCallOutTypeSn">{{ item.name }}</a-select-option>
@@ -41,22 +41,22 @@
             </a-form-item>
           </a-col>
           <template v-if="advanced">
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品编码">
                 <a-input id="storeTransOutDetailReport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品名称">
                 <a-input id="storeTransOutDetailReport-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
                 <ProductBrand id="storeTransOutDetailReport-productBrandSn" placeholder="请选择产品品牌" v-model="queryParam.productEntity.productBrandSn"></ProductBrand>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品分类">
                 <ProductType id="storeTransOutDetailReport-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="queryParam.productType"></ProductType>
               </a-form-model-item>
@@ -143,7 +143,7 @@ export default {
         productType: undefined,
         storeCallOutNo: '',
         customerNameCurrent: undefined, //  调往对象
-        customerSnCurrent: undefined,
+        customerSnCurrent: undefined
       },
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]

+ 3 - 3
src/views/reportData/storeTransferOutReport/list.vue

@@ -23,17 +23,17 @@
               <rangeDate ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-model-item label="店内调出单号">
               <a-input id="storeTransOutReport-storeCallOutNo" v-model.trim="queryParam.storeCallOutNo" allowClear placeholder="请输入店内调出单号"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-item label="调往对象">
               <custList id="storeTransOutReport-putPersonName" ref="custList" @change="custChange"></custList>
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-item label="调拨类型">
               <a-select id="sstoreTransOutReport-callOutType" v-model="queryParam.callOutType" placeholder="请选择调拨类型" allowClear >
                 <a-select-option v-for="item in storeCallOutTypeList" :key="item.storeCallOutTypeSn" :value="item.storeCallOutTypeSn">{{ item.name }}</a-select-option>

+ 6 - 6
src/views/reportData/urgentItemsOffsetReport/detailList.vue

@@ -28,12 +28,12 @@
               <a-input id="urgentItemsOffsetReport-bizBillNo" v-model.trim="queryParam.bizBillNo" allowClear placeholder="请输入销售单号"/>
             </a-form-item>
           </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="客户名称">
+              <custList id="urgentItemsOffsetReport-buyerName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
+            </a-form-model-item>
+          </a-col>
           <template v-if="advanced">
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="客户名称">
-                <custList id="urgentItemsOffsetReport-buyerName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
-              </a-form-model-item>
-            </a-col>
             <!-- <a-col :md="6" :sm="24">
               <a-form-item label="单据来源">
                 <v-select
@@ -66,7 +66,7 @@
               </a-form-model-item>
             </a-col>
           </template>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="24" :sm="24" style="text-align:center;margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="urgentItemsOffsetReport-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="urgentItemsOffsetReport-reset">重置</a-button>
             <a-button

+ 5 - 5
src/views/reportData/urgentItemsOffsetReport/list.vue

@@ -13,22 +13,22 @@
         :wrapperCol="wrapperCol"
         @keyup.enter.native="handleSearch" >
         <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
+          <a-col :md="5" :sm="24">
             <a-form-model-item label="冲减时间" prop="time">
               <rangeDate ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <a-col :md="5" :sm="24">
             <a-form-item label="急件单号">
               <a-input id="urgentItemsOffsetReport-urgentBillNo" v-model.trim="queryParam.urgentBillNo" allowClear placeholder="请输入急件单号"/>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <a-col :md="5" :sm="24">
             <a-form-item label="关联单号">
               <a-input id="urgentItemsOffsetReport-bizBillNo" v-model.trim="queryParam.bizBillNo" allowClear placeholder="请输入销售单号"/>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <a-col :md="5" :sm="24">
             <a-form-model-item label="客户名称">
               <custList id="urgentItemsOffsetReport-buyerName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
             </a-form-model-item>
@@ -44,7 +44,7 @@
                 allowClear></v-select>
             </a-form-item>
           </a-col> -->
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="urgentItemsOffsetReport-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="urgentItemsOffsetReport-reset">重置</a-button>
             <a-button