wms / wms4_hubeijili · Commits

Commit e9488486167e641f85b4d27e8056b598f8e91eea

Authored by 肖超群
1 parent 1db30dc6

界面上 去掉高级查询

Inline Side-by-side
Showing 40 changed files with 24 additions and 133 deletions
ant-design-vue-jeecg/src/views/system/config/AddressList.vue
  View file @e948848
@@ -32,9 +32,6 @@ @@ -32,9 +32,6 @@
32 @change="handleImportExcel"> 32 @change="handleImportExcel">
33 <a-button type="primary" icon="import">导入</a-button> 33 <a-button type="primary" icon="import">导入</a-button>
34 </a-upload> 34 </a-upload>
35 - <!-- 高级查询区域 -->  
36 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
37 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
38 <a-dropdown v-if="selectedRowKeys.length > 0"> 35 <a-dropdown v-if="selectedRowKeys.length > 0">
39 <a-menu slot="overlay" v-has="'address:deleteBatch'"> 36 <a-menu slot="overlay" v-has="'address:deleteBatch'">
40 <a-menu-item key="1" @click="batchDel"> 37 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/AgvPortList.vue
  View file @e948848
@@ -36,8 +36,6 @@ @@ -36,8 +36,6 @@
36 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> 36 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
37 <a-button type="primary" icon="import">导入</a-button> 37 <a-button type="primary" icon="import">导入</a-button>
38 </a-upload> 38 </a-upload>
39 - <!-- 高级查询区域 -->  
40 - <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>  
41 <a-dropdown v-if="selectedRowKeys.length > 0"> 39 <a-dropdown v-if="selectedRowKeys.length > 0">
42 <a-menu slot="overlay"> 40 <a-menu slot="overlay">
43 <a-menu-item key="1" v-has="'agvPort:delete'" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> 41 <a-menu-item key="1" v-has="'agvPort:delete'" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
ant-design-vue-jeecg/src/views/system/config/BomHeaderList.vue
  View file @e948848
@@ -37,9 +37,6 @@ @@ -37,9 +37,6 @@
37 @change="handleImportExcel"> 37 @change="handleImportExcel">
38 <a-button type="primary" icon="import">导入</a-button> 38 <a-button type="primary" icon="import">导入</a-button>
39 </a-upload> 39 </a-upload>
40 - <!-- 高级查询区域 -->  
41 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
42 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
43 </div> 40 </div>
44 41
45 <!-- table区域-begin --> 42 <!-- table区域-begin -->
ant-design-vue-jeecg/src/views/system/config/CarrierList.vue
  View file @e948848
@@ -17,9 +17,6 @@ @@ -17,9 +17,6 @@
17 @change="handleImportExcel"> 17 @change="handleImportExcel">
18 <a-button type="primary" icon="import">导入</a-button> 18 <a-button type="primary" icon="import">导入</a-button>
19 </a-upload> 19 </a-upload>
20 - <!-- 高级查询区域 -->  
21 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
22 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
23 <a-dropdown v-if="selectedRowKeys.length > 0"> 20 <a-dropdown v-if="selectedRowKeys.length > 0">
24 <a-menu slot="overlay" v-has="'carrier:deleteBatch'"> 21 <a-menu slot="overlay" v-has="'carrier:deleteBatch'">
25 <a-menu-item key="1" @click="batchDel"> 22 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/CompanyList.vue
  View file @e948848
@@ -37,9 +37,6 @@ @@ -37,9 +37,6 @@
37 @change="handleImportExcel"> 37 @change="handleImportExcel">
38 <a-button type="primary" icon="import">导入</a-button> 38 <a-button type="primary" icon="import">导入</a-button>
39 </a-upload> 39 </a-upload>
40 - <!-- 高级查询区域 -->  
41 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
42 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
43 <a-dropdown v-if="selectedRowKeys.length > 0"> 40 <a-dropdown v-if="selectedRowKeys.length > 0">
44 <a-menu slot="overlay" v-has="'company:deleteBatch'"> 41 <a-menu slot="overlay" v-has="'company:deleteBatch'">
45 <a-menu-item key="1" @click="batchDel"> 42 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/ContainerCapacityList.vue
  View file @e948848
@@ -44,9 +44,6 @@ @@ -44,9 +44,6 @@
44 @change="handleImportExcel"> 44 @change="handleImportExcel">
45 <a-button type="primary" icon="import">导入</a-button> 45 <a-button type="primary" icon="import">导入</a-button>
46 </a-upload> 46 </a-upload>
47 - <!-- 高级查询区域 -->  
48 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
49 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
50 <a-dropdown v-if="selectedRowKeys.length > 0"> 47 <a-dropdown v-if="selectedRowKeys.length > 0">
51 <a-menu slot="overlay" v-has="'containerCapacity:deleteBatch'"> 48 <a-menu slot="overlay" v-has="'containerCapacity:deleteBatch'">
52 <a-menu-item key="1" @click="batchDel"> 49 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/ContainerList.vue
  View file @e948848
@@ -60,9 +60,6 @@ @@ -60,9 +60,6 @@
60 <a-button type="primary" icon="import">导入</a-button> 60 <a-button type="primary" icon="import">导入</a-button>
61 <a-button v-has="'container:print'" @click="batchPrint()" type="primary">打印</a-button> 61 <a-button v-has="'container:print'" @click="batchPrint()" type="primary">打印</a-button>
62 </a-upload> 62 </a-upload>
63 - <!-- 高级查询区域 -->  
64 -<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->  
65 -<!-- @handleSuperQuery="handleSuperQuery"></j-super-query>-->  
66 <a-dropdown v-if="selectedRowKeys.length > 0"> 63 <a-dropdown v-if="selectedRowKeys.length > 0">
67 <a-menu slot="overlay" v-has="'container:deleteBatch'"> 64 <a-menu slot="overlay" v-has="'container:deleteBatch'">
68 <a-menu-item key="1" @click="batchDel"> 65 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/ContainerTypeList.vue
  View file @e948848
@@ -37,9 +37,6 @@ @@ -37,9 +37,6 @@
37 @change="handleImportExcel"> 37 @change="handleImportExcel">
38 <a-button type="primary" icon="import">导入</a-button> 38 <a-button type="primary" icon="import">导入</a-button>
39 </a-upload> 39 </a-upload>
40 - <!-- 高级查询区域 -->  
41 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
42 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
43 <a-dropdown v-if="selectedRowKeys.length > 0"> 40 <a-dropdown v-if="selectedRowKeys.length > 0">
44 <a-menu slot="overlay" v-has="'containerType:deleteBatch'"> 41 <a-menu slot="overlay" v-has="'containerType:deleteBatch'">
45 <a-menu-item key="1" @click="batchDel"> 42 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/CustomerList.vue
  View file @e948848
@@ -17,9 +17,6 @@ @@ -17,9 +17,6 @@
17 @change="handleImportExcel"> 17 @change="handleImportExcel">
18 <a-button type="primary" icon="import">导入</a-button> 18 <a-button type="primary" icon="import">导入</a-button>
19 </a-upload> 19 </a-upload>
20 - <!-- 高级查询区域 -->  
21 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
22 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
23 <a-dropdown v-if="selectedRowKeys.length > 0"> 20 <a-dropdown v-if="selectedRowKeys.length > 0">
24 <a-menu slot="overlay" v-has="'customer:deleteBatch'"> 21 <a-menu slot="overlay" v-has="'customer:deleteBatch'">
25 <a-menu-item key="1" @click="batchDel"> 22 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/CycleCountPreferenceList.vue
  View file @e948848
@@ -17,9 +17,6 @@ @@ -17,9 +17,6 @@
17 @change="handleImportExcel"> 17 @change="handleImportExcel">
18 <a-button type="primary" icon="import">导入</a-button> 18 <a-button type="primary" icon="import">导入</a-button>
19 </a-upload> 19 </a-upload>
20 - <!-- 高级查询区域 -->  
21 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
22 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
23 <a-dropdown v-if="selectedRowKeys.length > 0"> 20 <a-dropdown v-if="selectedRowKeys.length > 0">
24 <a-menu slot="overlay" v-has="'cycleCountPreference:deleteBatch'"> 21 <a-menu slot="overlay" v-has="'cycleCountPreference:deleteBatch'">
25 <a-menu-item key="1" @click="batchDel"> 22 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/LocationHighList.vue
  View file @e948848
@@ -37,9 +37,6 @@ @@ -37,9 +37,6 @@
37 @change="handleImportExcel"> 37 @change="handleImportExcel">
38 <a-button type="primary" icon="import">导入</a-button> 38 <a-button type="primary" icon="import">导入</a-button>
39 </a-upload> 39 </a-upload>
40 - <!-- 高级查询区域 -->  
41 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
42 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
43 <a-dropdown v-if="selectedRowKeys.length > 0"> 40 <a-dropdown v-if="selectedRowKeys.length > 0">
44 <a-menu slot="overlay" v-has="'locationHigh:deleteBatch'"> 41 <a-menu slot="overlay" v-has="'locationHigh:deleteBatch'">
45 <a-menu-item key="1" @click="batchDel"> 42 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/LocationList.vue
  View file @e948848
@@ -113,9 +113,6 @@ @@ -113,9 +113,6 @@
113 <a-button type="primary" icon="import">导入</a-button> 113 <a-button type="primary" icon="import">导入</a-button>
114 <a-button v-has="'material:print'" @click="batchPrint()" type="primary">打印</a-button> 114 <a-button v-has="'material:print'" @click="batchPrint()" type="primary">打印</a-button>
115 </a-upload> 115 </a-upload>
116 - <!-- 高级查询区域 -->  
117 -<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->  
118 -<!-- @handleSuperQuery="handleSuperQuery"></j-super-query>-->  
119 <a-dropdown v-if="selectedRowKeys.length > 0"> 116 <a-dropdown v-if="selectedRowKeys.length > 0">
120 <a-menu slot="overlay" v-has="'location:deleteBatch'"> 117 <a-menu slot="overlay" v-has="'location:deleteBatch'">
121 <a-menu-item key="1" @click="batchDel"> 118 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/LocationTypeList.vue
  View file @e948848
@@ -37,9 +37,6 @@ @@ -37,9 +37,6 @@
37 @change="handleImportExcel"> 37 @change="handleImportExcel">
38 <a-button type="primary" icon="import">导入</a-button> 38 <a-button type="primary" icon="import">导入</a-button>
39 </a-upload> 39 </a-upload>
40 - <!-- 高级查询区域 -->  
41 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
42 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
43 <a-dropdown v-if="selectedRowKeys.length > 0"> 40 <a-dropdown v-if="selectedRowKeys.length > 0">
44 <a-menu slot="overlay" v-has="'locationType:deleteBatch'"> 41 <a-menu slot="overlay" v-has="'locationType:deleteBatch'">
45 <a-menu-item key="1" @click="batchDel"> 42 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/MaterialAreaList.vue
  View file @e948848
@@ -17,9 +17,6 @@ @@ -17,9 +17,6 @@
17 @change="handleImportExcel"> 17 @change="handleImportExcel">
18 <a-button type="primary" icon="import">导入</a-button> 18 <a-button type="primary" icon="import">导入</a-button>
19 </a-upload> 19 </a-upload>
20 - <!-- 高级查询区域 -->  
21 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
22 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
23 <a-dropdown v-if="selectedRowKeys.length > 0"> 20 <a-dropdown v-if="selectedRowKeys.length > 0">
24 <a-menu slot="overlay" v-has="'materialArea:deleteBatch'"> 21 <a-menu slot="overlay" v-has="'materialArea:deleteBatch'">
25 <a-menu-item key="1" @click="batchDel"> 22 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/MaterialList.vue
  View file @e948848
@@ -45,9 +45,6 @@ @@ -45,9 +45,6 @@
45 <a-button type="primary" icon="import">导入</a-button> 45 <a-button type="primary" icon="import">导入</a-button>
46 <a-button v-has="'material:print'" @click="batchPrint()" type="primary">打印</a-button> 46 <a-button v-has="'material:print'" @click="batchPrint()" type="primary">打印</a-button>
47 </a-upload> 47 </a-upload>
48 - <!-- 高级查询区域 -->  
49 -<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->  
50 -<!-- @handleSuperQuery="handleSuperQuery"></j-super-query>-->  
51 <a-dropdown v-if="selectedRowKeys.length > 0"> 48 <a-dropdown v-if="selectedRowKeys.length > 0">
52 <a-menu slot="overlay" v-has="'material:deleteBatch'"> 49 <a-menu slot="overlay" v-has="'material:deleteBatch'">
53 <a-menu-item key="1" @click="batchDel"> 50 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/MaterialMultipleList.vue
  View file @e948848
@@ -17,9 +17,6 @@ @@ -17,9 +17,6 @@
17 @change="handleImportExcel"> 17 @change="handleImportExcel">
18 <a-button type="primary" icon="import">导入</a-button> 18 <a-button type="primary" icon="import">导入</a-button>
19 </a-upload> 19 </a-upload>
20 - <!-- 高级查询区域 -->  
21 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
22 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
23 <a-dropdown v-if="selectedRowKeys.length > 0"> 20 <a-dropdown v-if="selectedRowKeys.length > 0">
24 <a-menu slot="overlay" v-has="'materialMultiple:deleteBatch'"> 21 <a-menu slot="overlay" v-has="'materialMultiple:deleteBatch'">
25 <a-menu-item key="1" @click="batchDel"> 22 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/MaterialTypeList.vue
  View file @e948848
@@ -37,9 +37,6 @@ @@ -37,9 +37,6 @@
37 @change="handleImportExcel"> 37 @change="handleImportExcel">
38 <a-button type="primary" icon="import">导入</a-button> 38 <a-button type="primary" icon="import">导入</a-button>
39 </a-upload> 39 </a-upload>
40 - <!-- 高级查询区域 -->  
41 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
42 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
43 <a-dropdown v-if="selectedRowKeys.length > 0"> 40 <a-dropdown v-if="selectedRowKeys.length > 0">
44 <a-menu slot="overlay" v-has="'materialType:deleteBatch'"> 41 <a-menu slot="overlay" v-has="'materialType:deleteBatch'">
45 <a-menu-item key="1" @click="batchDel"> 42 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/MaterialUnitList.vue
  View file @e948848
@@ -44,9 +44,6 @@ @@ -44,9 +44,6 @@
44 @change="handleImportExcel"> 44 @change="handleImportExcel">
45 <a-button type="primary" icon="import">导入</a-button> 45 <a-button type="primary" icon="import">导入</a-button>
46 </a-upload> 46 </a-upload>
47 - <!-- 高级查询区域 -->  
48 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
49 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
50 <a-dropdown v-if="selectedRowKeys.length > 0"> 47 <a-dropdown v-if="selectedRowKeys.length > 0">
51 <a-menu slot="overlay" v-has="'materialUnit:deleteBatch'"> 48 <a-menu slot="overlay" v-has="'materialUnit:deleteBatch'">
52 <a-menu-item key="1" @click="batchDel"> 49 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/MaterialWarningList.vue
  View file @e948848
@@ -37,9 +37,6 @@ @@ -37,9 +37,6 @@
37 @change="handleImportExcel"> 37 @change="handleImportExcel">
38 <a-button type="primary" icon="import">导入</a-button> 38 <a-button type="primary" icon="import">导入</a-button>
39 </a-upload> 39 </a-upload>
40 - <!-- 高级查询区域 -->  
41 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
42 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
43 <a-dropdown v-if="selectedRowKeys.length > 0"> 40 <a-dropdown v-if="selectedRowKeys.length > 0">
44 <a-menu slot="overlay" v-has="'materialWarning:deleteBatch'"> 41 <a-menu slot="overlay" v-has="'materialWarning:deleteBatch'">
45 <a-menu-item key="1" @click="batchDel"> 42 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/ParameterConfigurationList.vue
  View file @e948848
@@ -44,9 +44,6 @@ @@ -44,9 +44,6 @@
44 @change="handleImportExcel"> 44 @change="handleImportExcel">
45 <a-button type="primary" icon="import">导入</a-button> 45 <a-button type="primary" icon="import">导入</a-button>
46 </a-upload> 46 </a-upload>
47 - <!-- 高级查询区域 -->  
48 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
49 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
50 <a-dropdown v-if="selectedRowKeys.length > 0"> 47 <a-dropdown v-if="selectedRowKeys.length > 0">
51 <a-menu slot="overlay" v-has="'ParameterConfiguration:deleteBatch'"> 48 <a-menu slot="overlay" v-has="'ParameterConfiguration:deleteBatch'">
52 <a-menu-item key="1" @click="batchDel"> 49 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/PortList.vue
  View file @e948848
@@ -44,9 +44,6 @@ @@ -44,9 +44,6 @@
44 @change="handleImportExcel"> 44 @change="handleImportExcel">
45 <a-button type="primary" icon="import">导入</a-button> 45 <a-button type="primary" icon="import">导入</a-button>
46 </a-upload> 46 </a-upload>
47 - <!-- 高级查询区域 -->  
48 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
49 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
50 <a-dropdown v-if="selectedRowKeys.length > 0"> 47 <a-dropdown v-if="selectedRowKeys.length > 0">
51 <a-menu slot="overlay" v-has="'port:deleteBatch'"> 48 <a-menu slot="overlay" v-has="'port:deleteBatch'">
52 <a-menu-item key="1" @click="batchDel"> 49 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/ReceiptTypeList.vue
  View file @e948848
@@ -37,9 +37,6 @@ @@ -37,9 +37,6 @@
37 @change="handleImportExcel"> 37 @change="handleImportExcel">
38 <a-button type="primary" icon="import">导入</a-button> 38 <a-button type="primary" icon="import">导入</a-button>
39 </a-upload> 39 </a-upload>
40 - <!-- 高级查询区域 -->  
41 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
42 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
43 <a-dropdown v-if="selectedRowKeys.length > 0"> 40 <a-dropdown v-if="selectedRowKeys.length > 0">
44 <a-menu slot="overlay" v-has="'receiptType:deleteBatch'"> 41 <a-menu slot="overlay" v-has="'receiptType:deleteBatch'">
45 <a-menu-item key="1" @click="batchDel"> 42 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/ShipmentTypeList.vue
  View file @e948848
@@ -37,9 +37,6 @@ @@ -37,9 +37,6 @@
37 @change="handleImportExcel"> 37 @change="handleImportExcel">
38 <a-button type="primary" icon="import">导入</a-button> 38 <a-button type="primary" icon="import">导入</a-button>
39 </a-upload> 39 </a-upload>
40 - <!-- 高级查询区域 -->  
41 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
42 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
43 <a-dropdown v-if="selectedRowKeys.length > 0"> 40 <a-dropdown v-if="selectedRowKeys.length > 0">
44 <a-menu slot="overlay" v-has="'shipmentType:deleteBatch'"> 41 <a-menu slot="overlay" v-has="'shipmentType:deleteBatch'">
45 <a-menu-item key="1" @click="batchDel"> 42 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/SupplierList.vue
  View file @e948848
@@ -44,9 +44,6 @@ @@ -44,9 +44,6 @@
44 @change="handleImportExcel"> 44 @change="handleImportExcel">
45 <a-button type="primary" icon="import">导入</a-button> 45 <a-button type="primary" icon="import">导入</a-button>
46 </a-upload> 46 </a-upload>
47 - <!-- 高级查询区域 -->  
48 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
49 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
50 <a-dropdown v-if="selectedRowKeys.length > 0"> 47 <a-dropdown v-if="selectedRowKeys.length > 0">
51 <a-menu slot="overlay" v-has="'supplier:deleteBatch'"> 48 <a-menu slot="overlay" v-has="'supplier:deleteBatch'">
52 <a-menu-item key="1" @click="batchDel"> 49 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/SysUserWarehouseList.vue
  View file @e948848
@@ -17,9 +17,6 @@ @@ -17,9 +17,6 @@
17 @change="handleImportExcel"> 17 @change="handleImportExcel">
18 <a-button type="primary" icon="import">导入</a-button> 18 <a-button type="primary" icon="import">导入</a-button>
19 </a-upload> 19 </a-upload>
20 - <!-- 高级查询区域 -->  
21 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
22 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
23 <a-dropdown v-if="selectedRowKeys.length > 0"> 20 <a-dropdown v-if="selectedRowKeys.length > 0">
24 <a-menu slot="overlay" v-has="'sysUserWarehouse:deleteBatch'"> 21 <a-menu slot="overlay" v-has="'sysUserWarehouse:deleteBatch'">
25 <a-menu-item key="1" @click="batchDel"> 22 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/config/WarehouseList.vue
  View file @e948848
@@ -44,9 +44,6 @@ @@ -44,9 +44,6 @@
44 @change="handleImportExcel"> 44 @change="handleImportExcel">
45 <a-button type="primary" icon="import">导入</a-button> 45 <a-button type="primary" icon="import">导入</a-button>
46 </a-upload> 46 </a-upload>
47 - <!-- 高级查询区域 -->  
48 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
49 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
50 <!-- <a-dropdown v-if="selectedRowKeys.length > 0">--> 47 <!-- <a-dropdown v-if="selectedRowKeys.length > 0">-->
51 <!-- <a-menu slot="overlay">--> 48 <!-- <a-menu slot="overlay">-->
52 <!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>--> 49 <!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
ant-design-vue-jeecg/src/views/system/config/ZoneList.vue
  View file @e948848
@@ -37,9 +37,6 @@ @@ -37,9 +37,6 @@
37 @change="handleImportExcel"> 37 @change="handleImportExcel">
38 <a-button type="primary" icon="import">导入</a-button> 38 <a-button type="primary" icon="import">导入</a-button>
39 </a-upload> 39 </a-upload>
40 - <!-- 高级查询区域 -->  
41 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
42 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
43 <a-dropdown v-if="selectedRowKeys.length > 0"> 40 <a-dropdown v-if="selectedRowKeys.length > 0">
44 <a-menu slot="overlay" v-has="'zone:deleteBatch'"> 41 <a-menu slot="overlay" v-has="'zone:deleteBatch'">
45 <a-menu-item key="1" @click="batchDel"> 42 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue
  View file @e948848
@@ -64,9 +64,6 @@ @@ -64,9 +64,6 @@
64 @change="handleImportExcel"> 64 @change="handleImportExcel">
65 <a-button type="primary" icon="import">导入</a-button> 65 <a-button type="primary" icon="import">导入</a-button>
66 </a-upload> 66 </a-upload>
67 - <!-- 高级查询区域 -->  
68 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
69 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
70 </div> 67 </div>
71 68
72 <!-- table区域-begin --> 69 <!-- table区域-begin -->
ant-design-vue-jeecg/src/views/system/inventory/InventoryMaterialSummaryList.vue
  View file @e948848
@@ -16,8 +16,6 @@ @@ -16,8 +16,6 @@
16 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> 16 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
17 <a-button type="primary" icon="import">导入</a-button> 17 <a-button type="primary" icon="import">导入</a-button>
18 </a-upload> 18 </a-upload>
19 - <!-- 高级查询区域 -->  
20 - <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>  
21 </div> 19 </div>
22 20
23 <!-- table区域-begin --> 21 <!-- table区域-begin -->
ant-design-vue-jeecg/src/views/system/inventory/InventoryTransactionList.vue
  View file @e948848
@@ -104,9 +104,6 @@ @@ -104,9 +104,6 @@
104 @change="handleImportExcel"> 104 @change="handleImportExcel">
105 <a-button type="primary" icon="import">导入</a-button> 105 <a-button type="primary" icon="import">导入</a-button>
106 </a-upload> 106 </a-upload>
107 - <!-- 高级查询区域 -->  
108 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
109 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
110 <a-dropdown v-if="selectedRowKeys.length > 0"> 107 <a-dropdown v-if="selectedRowKeys.length > 0">
111 <a-menu slot="overlay" v-has="'inventoryTransaction:deleteBatch'"> 108 <a-menu slot="overlay" v-has="'inventoryTransaction:deleteBatch'">
112 <a-menu-item key="1" @click="batchDel"> 109 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/monitor/ApiLogList.vue
  View file @e948848
@@ -78,9 +78,6 @@ @@ -78,9 +78,6 @@
78 @change="handleImportExcel"> 78 @change="handleImportExcel">
79 <a-button type="primary" icon="import">导入</a-button> 79 <a-button type="primary" icon="import">导入</a-button>
80 </a-upload> 80 </a-upload>
81 - <!-- 高级查询区域 -->  
82 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
83 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
84 <a-dropdown v-if="selectedRowKeys.length > 0"> 81 <a-dropdown v-if="selectedRowKeys.length > 0">
85 <a-menu slot="overlay" v-has="'apiLog:deleteBatch'"> 82 <a-menu slot="overlay" v-has="'apiLog:deleteBatch'">
86 <a-menu-item key="1" @click="batchDel"> 83 <a-menu-item key="1" @click="batchDel">
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
  View file @e948848
@@ -66,9 +66,6 @@ @@ -66,9 +66,6 @@
66 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> 66 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
67 <a-button type="primary" icon="import">导入</a-button> 67 <a-button type="primary" icon="import">导入</a-button>
68 </a-upload> 68 </a-upload>
69 - <!-- 高级查询区域 -->  
70 -<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->  
71 -<!-- @handleSuperQuery="handleSuperQuery"></j-super-query>-->  
72 </div> 69 </div>
73 70
74 <!-- table区域-begin --> 71 <!-- table区域-begin -->
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue
  View file @e948848
@@ -107,9 +107,6 @@ @@ -107,9 +107,6 @@
107 @change='handleImportExcel'> 107 @change='handleImportExcel'>
108 <!-- <a-button type="primary" icon="import">导入</a-button>--> 108 <!-- <a-button type="primary" icon="import">导入</a-button>-->
109 </a-upload> 109 </a-upload>
110 - <!-- 高级查询区域 -->  
111 -<!-- <j-super-query :fieldList='superFieldList' ref='superQueryModal'-->  
112 -<!-- @handleSuperQuery='handleSuperQuery'></j-super-query>-->  
113 </div> 110 </div>
114 111
115 <!-- table区域-begin --> 112 <!-- table区域-begin -->
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
  View file @e948848
@@ -106,9 +106,6 @@ @@ -106,9 +106,6 @@
106 <a-button type="primary" icon="import">导入</a-button> 106 <a-button type="primary" icon="import">导入</a-button>
107 <a-button v-has="'receiptHeader:print'" @click="batchPrint()" type="primary">打印</a-button> 107 <a-button v-has="'receiptHeader:print'" @click="batchPrint()" type="primary">打印</a-button>
108 </a-upload> 108 </a-upload>
109 - <!-- 高级查询区域 -->  
110 -<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->  
111 -<!-- @handleSuperQuery="handleSuperQuery"></j-super-query>-->  
112 </div> 109 </div>
113 110
114 <!-- table区域-begin --> 111 <!-- table区域-begin -->
ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
  View file @e948848
@@ -74,9 +74,6 @@ @@ -74,9 +74,6 @@
74 @change="handleImportExcel"> 74 @change="handleImportExcel">
75 <a-button type="primary" icon="import">导入</a-button> 75 <a-button type="primary" icon="import">导入</a-button>
76 </a-upload> 76 </a-upload>
77 - <!-- 高级查询区域 -->  
78 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
79 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
80 </div> 77 </div>
81 78
82 <!-- table区域-begin --> 79 <!-- table区域-begin -->
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderHistoryList.vue
  View file @e948848
@@ -109,9 +109,6 @@ @@ -109,9 +109,6 @@
109 @change="handleImportExcel"> 109 @change="handleImportExcel">
110 <!-- <a-button type="primary" icon="import">导入</a-button>--> 110 <!-- <a-button type="primary" icon="import">导入</a-button>-->
111 </a-upload> 111 </a-upload>
112 - <!-- 高级查询区域 -->  
113 - <j-super-query :fieldList="superFieldList" ref="superQueryModal"  
114 - @handleSuperQuery="handleSuperQuery"></j-super-query>  
115 </div> 112 </div>
116 113
117 <!-- table区域-begin --> 114 <!-- table区域-begin -->
ant-design-vue-jeecg/src/views/system/stocktaking/CycleCountHeaderList.vue
  View file @e948848
@@ -16,8 +16,6 @@ @@ -16,8 +16,6 @@
16 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> 16 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
17 <a-button type="primary" icon="import">导入</a-button> 17 <a-button type="primary" icon="import">导入</a-button>
18 </a-upload> 18 </a-upload>
19 - <!-- 高级查询区域 -->  
20 - <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>  
21 <a-dropdown v-if="selectedRowKeys.length > 0"> 19 <a-dropdown v-if="selectedRowKeys.length > 0">
22 <a-menu slot="overlay"> 20 <a-menu slot="overlay">
23 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> 21 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue
  View file @e948848
@@ -53,8 +53,6 @@ @@ -53,8 +53,6 @@
53 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> 53 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
54 <a-button type="primary" icon="import">导入</a-button> 54 <a-button type="primary" icon="import">导入</a-button>
55 </a-upload> 55 </a-upload>
56 - <!-- 高级查询区域 -->  
57 - <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>  
58 <!-- <a-dropdown v-if="selectedRowKeys.length > 0">--> 56 <!-- <a-dropdown v-if="selectedRowKeys.length > 0">-->
59 <!-- <a-menu slot="overlay">--> 57 <!-- <a-menu slot="overlay">-->
60 <!-- <a-menu-item key="1" v-has="'agvTask:delete'" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>--> 58 <!-- <a-menu-item key="1" v-has="'agvTask:delete'" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/service/impl/MaterialServiceImpl.java
  View file @e948848
1 package org.jeecg.modules.wms.config.material.service.impl; 1 package org.jeecg.modules.wms.config.material.service.impl;
2 2
3 -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;  
4 -import com.baomidou.mybatisplus.core.toolkit.Wrappers;  
5 -import org.jeecg.common.api.vo.Result; 3 +import java.util.List;
  4 +
6 import org.jeecg.modules.wms.config.material.entity.Material; 5 import org.jeecg.modules.wms.config.material.entity.Material;
7 import org.jeecg.modules.wms.config.material.mapper.MaterialMapper; 6 import org.jeecg.modules.wms.config.material.mapper.MaterialMapper;
8 import org.jeecg.modules.wms.config.material.service.IMaterialService; 7 import org.jeecg.modules.wms.config.material.service.IMaterialService;
9 import org.jeecg.utils.StringUtils; 8 import org.jeecg.utils.StringUtils;
  9 +import org.jeecg.utils.constant.QuantityConstant;
10 import org.springframework.stereotype.Service; 10 import org.springframework.stereotype.Service;
11 11
  12 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  13 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
12 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 14 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
13 15
14 -import javax.annotation.Resource;  
15 -import java.util.List;  
16 -  
17 /** 16 /**
18 * @Description: 物料管理 17 * @Description: 物料管理
19 * @Author: jeecg-boot 18 * @Author: jeecg-boot
@@ -29,7 +28,7 @@ public class MaterialServiceImpl extends ServiceImpl&lt;MaterialMapper, Material&gt; i @@ -29,7 +28,7 @@ public class MaterialServiceImpl extends ServiceImpl&lt;MaterialMapper, Material&gt; i
29 return null; 28 return null;
30 } 29 }
31 LambdaQueryWrapper<Material> materialLambdaQueryWrapper = Wrappers.lambdaQuery(); 30 LambdaQueryWrapper<Material> materialLambdaQueryWrapper = Wrappers.lambdaQuery();
32 - materialLambdaQueryWrapper.eq(Material::getCode, code); 31 + materialLambdaQueryWrapper.eq(Material::getCode, code).eq(Material::getEnable, QuantityConstant.STATUS_DISABLE);
33 Material material = this.getOne(materialLambdaQueryWrapper); 32 Material material = this.getOne(materialLambdaQueryWrapper);
34 return material; 33 return material;
35 } 34 }
huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java
  View file @e948848
1 package org.jeecg.utils.constant; 1 package org.jeecg.utils.constant;
2 2
3 /** 3 /**
4 - * 数字自定义常量  
5 - * 1、入库单状态  
6 - * 2、出库单状态  
7 - * 3、单据上传状态  
8 - * 4、入库组盘状态  
9 - * 5、出库组盘状态  
10 - * 6、任务类型  
11 - * 7、任务状态  
12 - * 8、波次状态  
13 - * 9、质检状态  
14 - * 10、盘点状态  
15 - * 11、INVENTORY_TRANSACTION_RECEIPT  
16 - * 12、调整单状态  
17 - * 13、任务内部类型  
18 - * 14、质检单类型 4 + * 数字自定义常量
  5 + * 1、入库单状态
  6 + * 2、出库单状态
  7 + * 3、单据上传状态
  8 + * 4、入库组盘状态
  9 + * 5、出库组盘状态
  10 + * 6、任务类型
  11 + * 7、任务状态
  12 + * 8、波次状态
  13 + * 9、质检状态
  14 + * 10、盘点状态
  15 + * 11、INVENTORY_TRANSACTION_RECEIPT
  16 + * 12、调整单状态
  17 + * 13、任务内部类型
  18 + * 14、质检单类型
19 * 16、请求类型 19 * 16、请求类型
20 * @author ricard 20 * @author ricard
21 */ 21 */
22 public class QuantityConstant { 22 public class QuantityConstant {
23 /** 23 /**
24 - 24 +
25 */ 25 */
26 26
27 // 1、入库单状态 27 // 1、入库单状态
@@ -544,7 +544,9 @@ public class QuantityConstant { @@ -544,7 +544,9 @@ public class QuantityConstant {
544 public static final String BILL_TYPE_NAME_RN = "退货通知单"; 544 public static final String BILL_TYPE_NAME_RN = "退货通知单";
545 public static final String BILL_TYPE_NAME_SO = "出库申请单"; 545 public static final String BILL_TYPE_NAME_SO = "出库申请单";
546 546
  547 + /* 可用 */
547 public static final int STATUS_ENABLE = 1; 548 public static final int STATUS_ENABLE = 1;
  549 + /* 不可用 */
548 public static final int STATUS_DISABLE = 0; 550 public static final int STATUS_DISABLE = 0;
549 551
550 public static final int HTTP_OK = 200; 552 public static final int HTTP_OK = 200;