出库单页面告警错误修正

Signed-off-by: TanYibin <5491541@qq.com>

出库单页面告警错误修正
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬
1 parent c251597f
Showing 9 changed files with 8 additions and 24 deletions
ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderHistoryList.vue
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
ant-design-vue-jeecg/src/views/system/shipment/modules/ShipmentHeaderHistoryModal.vue
ant-design-vue-jeecg/src/views/system/shipment/modules/ShipmentHeaderModal.vue
ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/modules/OverStationTaskModal.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
@@ -10,7 +10,6 @@
                 show-search
                 placeholder="请选择库区"
                 option-filter-prop="children"
-                :filter-option="filterOption"
                 v-model="queryParam.zoneCode">
                 <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
                   {{item.name}}
@@ -15,7 +15,6 @@
                 show-search
                 placeholder="请选择货主"
                 option-filter-prop="children"
-                :filter-option="filterOption"
                 v-model="queryParam.companyCode">
                 <a-select-option v-for="item in companyList" :key="item.name" :value="item.code">{{
                     item.name
@@ -30,7 +29,6 @@
                 show-search
                 placeholder="请选择出库单类型"
                 option-filter-prop="children"
-                :filter-option="filterOption"
                 v-model="queryParam.type">
                 <a-select-option v-for="item in shipmentTypeList" :key="item.name" :value="item.code">{{
                     item.name
@@ -61,7 +59,6 @@
                   show-search
                   placeholder="请选择客户"
                   option-filter-prop="children"
-                  :filter-option="filterOption"
                   v-model="queryParam.customerCode">
                   <a-select-option v-for="item in customerList" :key="item.name" :value="item.code">{{
                       item.name
@@ -15,7 +15,6 @@
                 show-search
                 placeholder="请选择货主"
                 option-filter-prop="children"
-                :filter-option="filterOption"
                 v-model="queryParam.companyCode">
                 <a-select-option v-for="item in companyList" :key="item.name" :value="item.code">{{
                     item.name
@@ -30,7 +29,6 @@
                 show-search
                 placeholder="请选择出库单类型"
                 option-filter-prop="children"
-                :filter-option="filterOption"
                 v-model="queryParam.type">
                 <a-select-option v-for="item in shipmentTypeList" :key="item.name" :value="item.code">{{
                     item.name
@@ -61,7 +59,6 @@
                   show-search
                   placeholder="请选择客户"
                   option-filter-prop="children"
-                  :filter-option="filterOption"
                   v-model="queryParam.customerCode">
                   <a-select-option v-for="item in customerList" :key="item.name" :value="item.code">{{
                       item.name
@@ -17,7 +17,6 @@
                 show-search
                 placeholder="请选择货主"
                 option-filter-prop="children"
-                :filter-option="filterOption"
                 v-model="model.companyCode">
                 <a-select-option v-for="item in companyList" :key="item.name" :value="item.code">{{
                     item.name
@@ -32,7 +31,6 @@
                 show-search
                 placeholder="请选择出库单类型"
                 option-filter-prop="children"
-                :filter-option="filterOption"
                 v-model="model.type">
                 <a-select-option v-for="item in shipmentTypeList" :key="item.name" :value="item.code">{{
                     item.name
@@ -47,7 +45,6 @@
                 show-search
                 placeholder="请选择客户编码"
                 option-filter-prop="children"
-                :filter-option="filterOption"
                 v-model="model.customerCode">
                 <a-select-option v-for="item in customerList" :key="item.name" :value="item.code">{{
                     item.name
@@ -75,12 +72,12 @@ import {getCompanyList, getCustomerList, getShipmentTypeList} from &#39;@api/api&#39;
  
 export default {
   name: "ShipmentHeaderHistoryModal",
-  companyList: [],
-  shipmentTypeList: [],
-  customerList: [],
   components: {},
   data() {
     return {
+      companyList: [],
+      shipmentTypeList: [],
+      customerList: [],
       title: "操作",
       width: 800,
       visible: false,
@@ -17,7 +17,6 @@
                 show-search
                 placeholder="请选择货主"
                 option-filter-prop="children"
-                :filter-option="filterOption"
                 v-model="model.companyCode">
                 <a-select-option v-for="item in companyList" :key="item.name" :value="item.code">{{
                     item.name
@@ -33,7 +32,6 @@
                 show-search
                 placeholder="请选择出库单类型"
                 option-filter-prop="children"
-                :filter-option="filterOption"
                 v-model="model.type">
                 <a-select-option v-for="item in shipmentTypeList" :key="item.name" :value="item.code">{{
                     item.name
@@ -49,7 +47,6 @@
                 show-search
                 placeholder="请选择客户编码"
                 option-filter-prop="children"
-                :filter-option="filterOption"
                 v-model="model.customerCode">
                 <a-select-option v-for="item in customerList" :key="item.name" :value="item.code">{{
                     item.name
@@ -80,12 +77,12 @@ import {getCustomerList} from &#39;@/api/api&#39;
  
 export default {
   name: "ShipmentHeaderModal",
-  companyList: [],
-  shipmentTypeList: [],
-  customerList: [],
   components: {},
   data() {
     return {
+      companyList: [],
+      shipmentTypeList: [],
+      customerList: [],
       title: "操作",
       width: 800,
       visible: false,
@@ -161,7 +161,7 @@
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
-               <a-menu-item v-has="'taskHeader:edit'">
+              <a-menu-item v-has="'taskHeader:edit'">
                 <a @click="handleEdit(record)">编辑</a>
               </a-menu-item>
               <a-menu-item v-has="'taskHeader:delete'">
@@ -21,7 +21,6 @@
                   show-search
                   placeholder="请选择库区"
                   option-filter-prop="children"
-                  :filter-option="filterOption"
                   v-model="queryParam.zoneCode">
                   <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
                     {{item.name}}
@@ -22,7 +22,6 @@
                 show-search
                 placeholder="请选择起始站台"
                 option-filter-prop="children"
-                :filter-option="filterOption"
                 v-model="model.fromPortCode">
                 <a-select-option v-for="item in portList" :key="item.name" :value="item.code">{{
                     item.name
@@ -37,7 +36,6 @@
                 show-search
                 placeholder="请选择目标站台"
                 option-filter-prop="children"
-                :filter-option="filterOption"
                 v-model="model.toPortCode">
                 <a-select-option v-for="item in portList" :key="item.name" :value="item.code">{{
                     item.name
@@ -151,7 +151,7 @@ public class TaskHeaderController extends HuahengBaseController {
      */
     @AutoLog(value = "任务表-通过id删除")
     @ApiOperation(value = "任务表-通过id删除", notes = "任务表-通过id删除")
-    @RequiresPermissions("taskHeader:edit")
+    @RequiresPermissions("taskHeader:delete")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
         taskHeaderService.delMain(id);