Explorar o código

列表搜索条件 一行显示,多出部分默认隐藏

chenrui %!s(int64=4) %!d(string=hai) anos
pai
achega
9acd013890

+ 1 - 1
src/views/basicData/supplierManagement/list.vue

@@ -23,7 +23,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="supplierManagementList-add" type="primary" @click="handleAdd" style="margin-top: 18px;">新增供应商</a-button>
+      <a-button id="supplierManagementList-add" type="primary" @click="handleAdd">新增供应商</a-button>
     </div>
     <!-- 列表 -->
     <s-table

+ 24 - 19
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -19,27 +19,33 @@
               <a-input id="inventoryQueryList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入产品名称"/>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="产品品牌">
-              <a-select id="inventoryQueryList-bundleNames" placeholder="请选择产品品牌" allowClear v-model="queryParam.brand">
-                <a-select-option v-for="item in brandData" :key="item.stationNo" :value="item.stationNo">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="产品类别">
-              <a-cascader :options="typeData" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="库存数量是否为0">
-              <a-switch checkedChildren="是" unCheckedChildren="否" id="inventoryQueryList-bundleNamess" v-model="queryParam.inventoryNum" />
-            </a-form-item>
-          </a-col>
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品品牌">
+                <a-select id="inventoryQueryList-bundleNames" placeholder="请选择产品品牌" allowClear v-model="queryParam.brand">
+                  <a-select-option v-for="item in brandData" :key="item.stationNo" :value="item.stationNo">{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品类别">
+                <a-cascader :options="typeData" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="库存数量是否为0">
+                <a-switch checkedChildren="是" unCheckedChildren="否" id="inventoryQueryList-bundleNamess" v-model="queryParam.inventoryNum" />
+              </a-form-item>
+            </a-col>
+          </template>
           <a-col :md="6" :sm="24">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryQueryList-refresh">查询</a-button>
             <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="inventoryQueryList-reset">重置</a-button>
             <a-button style="margin-left: 8px" type="danger" @click="handleExport" :disabled="disabled" :loading="exportLoading" id="inventoryQueryList-export">导出</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 8px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
           </a-col>
         </a-row>
       </a-form>
@@ -77,8 +83,7 @@ export default {
   components: { STable, inventoryQueryDetailModal },
   data () {
     return {
-      labelCol: { span: 10 },
-      wrapperCol: { span: 14 },
+      advanced: false,  // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         orderBundleNo: '', //  订单编号
         orderBundle: {

+ 27 - 22
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -19,36 +19,42 @@
               <a-input id="inventoryWarningList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入产品名称"/>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="产品品牌">
-              <a-select id="inventoryWarningList-bundleNames" placeholder="请选择产品品牌" allowClear v-model="queryParam.brand">
-                <a-select-option v-for="item in brandData" :key="item.stationNo" :value="item.stationNo">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="产品类别">
-              <a-cascader :options="typeData" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="预警提示">
-              <a-select id="inventoryWarningList-bundleNames" placeholder="请选择预警提示" allowClear v-model="queryParam.brand">
-                <a-select-option v-for="item in brandData" :key="item.stationNo" :value="item.stationNo">{{ 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="产品品牌">
+                <a-select id="inventoryWarningList-bundleNames" placeholder="请选择产品品牌" allowClear v-model="queryParam.brand">
+                  <a-select-option v-for="item in brandData" :key="item.stationNo" :value="item.stationNo">{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品类别">
+                <a-cascader :options="typeData" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="预警提示">
+                <a-select id="inventoryWarningList-bundleNames" placeholder="请选择预警提示" allowClear v-model="queryParam.brand">
+                  <a-select-option v-for="item in brandData" :key="item.stationNo" :value="item.stationNo">{{ 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="inventoryWarningList-refresh">查询</a-button>
             <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="inventoryWarningList-reset">重置</a-button>
             <a-button style="margin-left: 8px" type="danger" @click="handleExport" :disabled="disabled" :loading="exportLoading" id="inventoryWarningList-export">导出</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 8px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
           </a-col>
         </a-row>
       </a-form>
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="inventoryWarningList-update" type="primary" @click="handleupdate" style="margin-top: 18px;">批量更新</a-button>
+      <a-button id="inventoryWarningList-update" type="primary" @click="handleupdate">批量更新</a-button>
     </div>
     <!-- 列表 -->
     <s-table
@@ -103,8 +109,7 @@ export default {
   components: { STable },
   data () {
     return {
-      labelCol: { span: 10 },
-      wrapperCol: { span: 14 },
+      advanced: false,  // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         orderBundleNo: '', //  订单编号
         orderBundle: {

+ 174 - 148
src/views/inventoryManagement/satelliteWarehouseInventory/list.vue

@@ -1,158 +1,184 @@
 <template>
-  <a-card :bordered="false" class="satelliteWarehouseInventoryList-wrap">
-    <!-- 搜索条件 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="客户名称">
-            	<a-select placeholder="请选择" allowClear v-model="queryParam.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
-            		<a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
-            	</a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="配件名称">
-              <a-input id="satelliteWarehouseInventoryList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入配件名称"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="配件编码">
-              <a-input id="satelliteWarehouseInventoryList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入产品编码或产品原厂编码"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="satelliteWarehouseInventoryList-refresh">查询</a-button>
-            <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="satelliteWarehouseInventoryList-reset">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 操作按钮 -->
-    <div class="table-operator">
-      <a-button id="satelliteWarehouseInventoryList-replenishment" type="primary" @click="handleReplenishment">补货清单</a-button>
-    </div>
-    <!-- 列表 -->
-    <s-table
-      class="sTable"
-      ref="table"
-      size="default"
-      :rowKey="(record) => record.id"
-      :columns="columns"
-      :data="loadData"
-      bordered>
-      <!-- 操作 -->
-      <template slot="action" slot-scope="text, record">
-        <a-button type="primary" @click="handleAdd(record)" id="satelliteWarehouseInventoryList-add-btn">加入补货单</a-button>
-      </template>
-    </s-table>
-    <!-- 客户详情 -->
-    <satellite-warehouse-inventory-add-modal :openModal="openModal" @close="closeModal" />
-  </a-card>
+	<a-card :bordered="false" class="satelliteWarehouseInventoryList-wrap">
+		<!-- 搜索条件 -->
+		<div class="table-page-search-wrapper">
+			<a-form-model
+				id="productBrandEdit-form"
+				ref="ruleForm"
+				:model="queryParam"
+				:rules="rules"
+				:labelCol="labelCol"
+				:wrapperCol="wrapperCol"
+				@keyup.enter.native="$refs.table.refresh(true)" >
+				<a-row :gutter="15">
+					<a-col :md="6" :sm="24">
+						<a-form-model-item label="客户名称" prop="customer">
+							<a-select
+								placeholder="请选择客户"
+								allowClear
+								v-model="queryParam.customer"
+								:showSearch="true"
+								option-filter-prop="children"
+								:filter-option="filterOption"
+							>
+								<a-select-option v-for="item in brandData" :key="item.id" :value="item.id">{{ 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="satelliteWarehouseInventoryList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入配件名称" />
+						</a-form-model-item>
+					</a-col>
+					<a-col :md="6" :sm="24">
+						<a-form-model-item label="配件编码">
+							<a-input id="satelliteWarehouseInventoryList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入产品编码或产品原厂编码" />
+						</a-form-model-item>
+					</a-col>
+					<a-col :md="6" :sm="24">
+						<a-button type="primary" @click="handleSearch" :disabled="disabled" id="satelliteWarehouseInventoryList-refresh" style="margin-top: 4px">
+							查询
+						</a-button>
+						<a-button @click="resetSearchForm" :disabled="disabled" id="satelliteWarehouseInventoryList-reset" style="margin: 4px 0 0 8px">重置</a-button>
+					</a-col>
+				</a-row>
+			</a-form-model>
+		</div>
+		<!-- 操作按钮 -->
+		<div class="table-operator"><a-button id="satelliteWarehouseInventoryList-replenishment" type="primary" @click="handleReplenishment">补货清单</a-button></div>
+		<!-- 列表 -->
+		<s-table class="sTable" ref="table" size="default" :rowKey="record => record.id" :columns="columns" :data="loadData" bordered>
+			<!-- 操作 -->
+			<template slot="action" slot-scope="text, record">
+				<a-button type="primary" @click="handleAdd(record)" id="satelliteWarehouseInventoryList-add-btn">加入补货单</a-button>
+			</template>
+		</s-table>
+		<!-- 客户详情 -->
+		<satellite-warehouse-inventory-add-modal :openModal="openModal" @close="closeModal" />
+	</a-card>
 </template>
 
 <script>
-import moment from 'moment'
+import moment from 'moment';
 // import { customerBundleDelayList, customerBundleExportDelay } from '@/api/FinancialManagement'
-import { STable, VSelect } from '@/components'
-import satelliteWarehouseInventoryAddModal from './addModal.vue'
+import { STable, VSelect } from '@/components';
+import satelliteWarehouseInventoryAddModal from './addModal.vue';
 export default {
-  components: { STable, VSelect, satelliteWarehouseInventoryAddModal },
-  data () {
-    return {
-      labelCol: { span: 10 },
-      wrapperCol: { span: 14 },
-      queryParam: { //  查询条件
-        orderBundleNo: '', //  订单编号
-        bundleName: '', //  套餐名称
-        itemName: '', //  服务名称
-        brand: undefined,  //  产品品牌
-      },
-      exportLoading: false, // 导出loading
-      disabled: false, //  查询、重置按钮是否可操作
-      brandData: [],  //  产品品牌下拉数据
-      typeData: [],  //  产品类别下拉数据
-      dateFormat: 'YYYY-MM-DD',
-      creatTime: [],  //  创建时间
-      columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '客户名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true },
-        { title: '配件名称', dataIndex: 'productBrand', width: 200, align: 'center', ellipsis: true },
-        { title: '产品编码', dataIndex: 'productOldNum', width: 160, align: 'center' },
-        { title: '原厂编码', dataIndex: 'productType', width: 200, align: 'center' },
-        { title: '当前库存', dataIndex: 'inventoryNumss', width: 180, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        this.disabled = true
-        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-        //   const data = res.data
-        //   const no = (data.pageNo - 1) * data.pageSize
-        //   for (var i = 0; i < data.list.length; i++) {
-        //     data.list[i].no = no + i + 1
-        //   }
-        //   this.disabled = false
-        //   return data
-        // })
-        const _this = this
-        return new Promise(function(resolve, reject){
-          const data = {
-            pageNo: 1,
-            pageSize: 10,
-            list: [
-              { id: '1', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', productType: '产品分类1', inventoryNum: '5', inventoryMoney: '122' }
-            ]
-          }
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-          }
-          _this.disabled = false
-          resolve(data)
-        })
-      },
-      openModal: false,  //  查看客户详情  弹框
-    }
-  },
-  methods: {
-    // 不可选日期
-    disabledDate (date, dateStrings) {
-      return date && date.valueOf() > Date.now()
+	components: { STable, VSelect, satelliteWarehouseInventoryAddModal },
+	data() {
+		return {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 16 },
+			queryParam: {
+				//  查询条件
+				customer: undefined, //  客户名称
+				bundleName: '', //  套餐名称
+				itemName: '', //  服务名称
+				brand: undefined //  产品品牌
+			},
+			rules: {
+				customer: [{ required: true, message: '请输入客户名称', trigger: 'blur' }]
+			},
+			exportLoading: false, // 导出loading
+			disabled: false, //  查询、重置按钮是否可操作
+			brandData: [], //  产品品牌下拉数据
+			typeData: [], //  产品类别下拉数据
+			dateFormat: 'YYYY-MM-DD',
+			creatTime: [], //  创建时间
+			columns: [
+				{ title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+				{ title: '客户名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true },
+				{ title: '配件名称', dataIndex: 'productBrand', width: 200, align: 'center', ellipsis: true },
+				{ title: '产品编码', dataIndex: 'productOldNum', width: 160, align: 'center' },
+				{ title: '原厂编码', dataIndex: 'productType', width: 200, align: 'center' },
+				{ title: '当前库存', dataIndex: 'inventoryNumss', width: 180, align: 'center' },
+				{ title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
+			],
+			// 加载数据方法 必须为 Promise 对象
+			loadData: parameter => {
+				this.disabled = true;
+				// return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+				//   const data = res.data
+				//   const no = (data.pageNo - 1) * data.pageSize
+				//   for (var i = 0; i < data.list.length; i++) {
+				//     data.list[i].no = no + i + 1
+				//   }
+				//   this.disabled = false
+				//   return data
+				// })
+				const _this = this;
+				return new Promise(function(resolve, reject) {
+					const data = {
+						pageNo: 1,
+						pageSize: 10,
+						list: [
+							{
+								id: '1',
+								productNum: 'jgqp11111111111',
+								productName: '产品1',
+								productOldNum: 'jgqp111123545',
+								productBrand: '箭冠品牌',
+								productType: '产品分类1',
+								inventoryNum: '5',
+								inventoryMoney: '122'
+							}
+						]
+					};
+					const no = (data.pageNo - 1) * data.pageSize;
+					for (var i = 0; i < data.list.length; i++) {
+						data.list[i].no = no + i + 1;
+					}
+					_this.disabled = false;
+					resolve(data);
+				});
+			},
+			openModal: false //  查看客户详情  弹框
+		};
+	},
+	methods: {
+		// 不可选日期
+		disabledDate(date, dateStrings) {
+			return date && date.valueOf() > Date.now()
+		},
+    //  查询
+    handleSearch(){
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          this.$refs.table.refresh(true)
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
     },
-    //  重置
-    resetSearchForm () {
-      this.queryParam.orderBundleNo = ''
-      this.queryParam.orderBundle.custMobile = ''
-      this.queryParam.bundleName = ''
-      this.queryParam.itemName = ''
-      this.oldTime = undefined
-      this.newTime = undefined
-      this.$refs.table.refresh(true)
-    },
-    //  补货清单
-    handleReplenishment(){
-      this.openModal = true
-    },
-    //  加入货补单
-    handleAdd(row){
-      
-    },
-    //  关闭弹框
-    closeModal(){
-      this.openModal = false
-    },
-    filterOption(input, option) {
-    	return (
-    		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-    	)
-    },
-  }
-}
+		//  重置
+		resetSearchForm() {
+			this.queryParam.orderBundleNo = ''
+			this.queryParam.orderBundle.custMobile = ''
+			this.queryParam.bundleName = ''
+			this.queryParam.itemName = ''
+			this.oldTime = undefined
+			this.newTime = undefined
+			this.$refs.table.refresh(true)
+		},
+		//  补货清单
+		handleReplenishment() {
+			this.openModal = true
+		},
+		//  加入货补单
+		handleAdd(row) {},
+		//  关闭弹框
+		closeModal() {
+			this.openModal = false
+		},
+		filterOption(input, option) {
+			return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+		}
+	}
+};
 </script>
 
 <style lang="less">
-  .satelliteWarehouseInventoryList-wrap{
-    
-  }
-</style>
+.satelliteWarehouseInventoryList-wrap {
+}
+</style>

+ 1 - 1
src/views/inventoryManagement/warehouse/list.vue

@@ -23,7 +23,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="warehouseList-add" type="primary" @click="handleEdit" style="margin-top: 18px;">新增仓库</a-button>
+      <a-button id="warehouseList-add" type="primary" @click="handleEdit">新增仓库</a-button>
     </div>
     <!-- 列表 -->
     <s-table

+ 2 - 2
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -23,8 +23,8 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="storingLocationList-back" @click="handleBack" style="margin-top: 18px;">返回列表</a-button>
-      <a-button id="storingLocationList-add" type="primary" @click="handleEdit" style="margin-top: 18px;">新增仓位</a-button>
+      <a-button id="storingLocationList-back" @click="handleBack">返回列表</a-button>
+      <a-button id="storingLocationList-add" type="primary" @click="handleEdit">新增仓位</a-button>
     </div>
     <!-- 列表 -->
     <s-table

+ 2 - 2
src/views/productManagement/productBrand/list.vue

@@ -23,8 +23,8 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="productBrandList-add" type="primary" @click="handleEdit" style="margin-top: 18px;">新增品牌</a-button>
-      <a-button id="productBrandList-import" @click="handleImport" style="margin-top: 18px;">导入品牌</a-button>
+      <a-button id="productBrandList-add" type="primary" @click="handleEdit">新增品牌</a-button>
+      <a-button id="productBrandList-import" @click="handleImport">导入品牌</a-button>
     </div>
     <!-- 列表 -->
     <s-table

+ 32 - 27
src/views/productManagement/productInfo/list.vue

@@ -19,53 +19,59 @@
               <a-input id="productInfoList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入原厂编码"/>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
             <a-form-item label="产品品牌">
-            	<a-select placeholder="请选择" id="productInfoList-state" allowClear v-model="queryParam.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
-            		<a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
-            	</a-select>
+              <a-select placeholder="请选择" id="productInfoList-state" allowClear v-model="queryParam.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
+                <a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
+              </a-select>
             </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
+            </a-col>
+            <a-col :md="6" :sm="24">
             <a-form-item label="产品类别">
               <a-cascader :options="typeData" id="productInfoList-state" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
             </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
+            </a-col>
+            <a-col :md="6" :sm="24">
             <a-form-item label="状态">
               <v-select code="CHECK_ENABLE_STATE" id="productInfoList-state" v-model="queryParam.state" allowClear placeholder="请选择状态"></v-select>
             </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
+            </a-col>
+            <a-col :md="6" :sm="24">
             <a-form-item label="产品来源">
               <v-select code="CHECK_ENABLE_STATE" id="productInfoList-state" v-model="queryParam.state" allowClear placeholder="请选择产品来源"></v-select>
             </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
+            </a-col>
+            <a-col :md="6" :sm="24">
             <a-form-item label="创建时间">
               <a-range-picker
-                  style="width:100%"
-                  id="customerManagementList-creatTime"
-                  :disabledDate="disabledDate"
-                  v-model="creatTime"
-                  :format="dateFormat"
-                  :placeholder="['开始时间', '结束时间']" />
+                style="width:100%"
+                id="customerManagementList-creatTime"
+                :disabledDate="disabledDate"
+                v-model="creatTime"
+                :format="dateFormat"
+                :placeholder="['开始时间', '结束时间']" />
               </a-form-item>
             </a-form-item>
-          </a-col>
+            </a-col>
+          </template>
           <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
-            <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="productInfoList-reset">重置</a-button>
-            <a-button style="margin-left: 8px" type="danger" @click="handleExport" :disabled="disabled" :loading="exportLoading" id="inventoryQueryList-export">导出</a-button>
+            <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
+            <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="productInfoList-reset">重置</a-button>
+            <a-button style="margin: 0 0 18px 8px" type="danger" @click="handleExport" :disabled="disabled" :loading="exportLoading" id="inventoryQueryList-export">导出</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 8px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
           </a-col>
         </a-row>
       </a-form>
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="productInfoList-add" type="primary" @click="handleAdd" style="margin-top: 18px;">新增产品</a-button>
-      <a-button id="productInfoList-import" @click="handleImport" style="margin: 18px 15px 0;">批量导入产品</a-button>
-      <a-button id="productInfoList-state" @click="handleEditState" style="margin-top: 18px;">批量修改状态</a-button>
+      <a-button id="productInfoList-add" type="primary" @click="handleAdd">新增产品</a-button>
+      <a-button id="productInfoList-import" @click="handleImport" style="margin: 0 15px;">批量导入产品</a-button>
+      <a-button id="productInfoList-state" @click="handleEditState">批量修改状态</a-button>
     </div>
     <!-- 列表 -->
     <s-table
@@ -100,8 +106,7 @@ export default {
   components: { STable, VSelect, productInfoDetailModal },
   data () {
     return {
-      labelCol: { span: 10 },
-      wrapperCol: { span: 14 },
+      advanced: false,  // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         bundleName: '', //  供应商名称
         state: undefined,  //  状态

+ 50 - 45
src/views/salesManagement/customerManagement/list.vue

@@ -28,54 +28,60 @@
               <a-input id="customerManagementList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入联系人"/>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="最后销售时间">
-              <a-range-picker
-                  style="width:100%"
-                  id="customerManagementList-creatTime"
-                  :disabledDate="disabledDate"
-                  v-model="creatTime"
-                  :format="dateFormat"
-                  :placeholder="['开始时间', '结束时间']" />
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="最后销售时间">
+                <a-range-picker
+                    style="width:100%"
+                    id="customerManagementList-creatTime"
+                    :disabledDate="disabledDate"
+                    v-model="creatTime"
+                    :format="dateFormat"
+                    :placeholder="['开始时间', '结束时间']" />
+                </a-form-item>
               </a-form-item>
-            </a-form-item>
-          </a-col>
-          <a-col :md="12" :sm="24">
-            <a-row>
-              <!-- 客户地址 -->
-              <a-form-item prop="provinceCode" label="客户地址">
-                <a-col span="7">
-                  <a-form-item prop="provinceCode" style="margin: 0;">
-                    <a-select v-model="queryParam.provinceCode" @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="cityCode" style="margin: 0;">
-                    <a-select v-model="queryParam.cityCode" @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="districtCode" style="margin: 0;">
-                    <a-select v-model="queryParam.districtCode" 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-col>
+            <a-col :md="12" :sm="24">
+              <a-row>
+                <!-- 客户地址 -->
+                <a-form-item prop="provinceCode" label="客户地址">
+                  <a-col span="7">
+                    <a-form-item prop="provinceCode" style="margin: 0;">
+                      <a-select v-model="queryParam.provinceCode" @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="cityCode" style="margin: 0;">
+                      <a-select v-model="queryParam.cityCode" @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="districtCode" style="margin: 0;">
+                      <a-select v-model="queryParam.districtCode" 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-row>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="是否卫星仓客户">
+                <v-select code="CHECK_ENABLE_STATE" id="customerManagementList-state" v-model="queryParam.state" allowClear placeholder="请选择"></v-select>
               </a-form-item>
-            </a-row>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="是否卫星仓客户">
-              <v-select code="CHECK_ENABLE_STATE" id="customerManagementList-state" v-model="queryParam.state" allowClear placeholder="请选择"></v-select>
-            </a-form-item>
-          </a-col>
+            </a-col>
+          </template>
           <a-col :md="6" :sm="24">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="customerManagementList-refresh">查询</a-button>
             <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="customerManagementList-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>
@@ -119,8 +125,7 @@ export default {
   components: { STable, VSelect, customerManagementDetailModal },
   data () {
     return {
-      labelCol: { span: 10 },
-      wrapperCol: { span: 14 },
+      advanced: false,  // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         orderBundleNo: '', //  订单编号
         bundleName: '', //  套餐名称

+ 12 - 7
src/views/salesManagement/urgentItemsOffset/list.vue

@@ -28,14 +28,20 @@
               <a-input id="urgentItemsOffsetList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入销售单号"/>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="采购单号">
-              <a-input id="urgentItemsOffsetList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入采购单号"/>
-            </a-form-item>
-          </a-col>
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="采购单号">
+                <a-input id="urgentItemsOffsetList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入采购单号"/>
+              </a-form-item>
+            </a-col>
+          </template>
           <a-col :md="6" :sm="24">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="urgentItemsOffsetList-refresh">查询</a-button>
             <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="urgentItemsOffsetList-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>
@@ -69,8 +75,7 @@ export default {
   components: { STable, VSelect },
   data () {
     return {
-      labelCol: { span: 10 },
-      wrapperCol: { span: 14 },
+      advanced: false,  // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         bundleName: '', //  供应商名称
         state: undefined,  //  状态