Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4 into develop

肖超群
2 parents 1df31863 cd35d7ec
Showing 147 changed files with 3301 additions and 1649 deletions
ant-design-vue-jeecg/.env.production
ant-design-vue-jeecg/pom.xml
ant-design-vue-jeecg/src/components/jeecg/modal/JPopupOnlReport.vue
ant-design-vue-jeecg/src/components/tools/DepartSelect.vue
ant-design-vue-jeecg/src/components/tools/UserMenu.vue
ant-design-vue-jeecg/src/views/account/settings/BaseSetting.vue
ant-design-vue-jeecg/src/views/jeecg/JeecgOrderMainList.vue
ant-design-vue-jeecg/src/views/jeecg/TableExpandeSub.vue
ant-design-vue-jeecg/src/views/jeecg/tablist/JeecgOrderCustomerList.vue
ant-design-vue-jeecg/src/views/jeecg/tablist/JeecgOrderDMainList.vue
ant-design-vue-jeecg/src/views/jeecg/tablist/JeecgOrderTicketList.vue
ant-design-vue-jeecg/src/views/system/DataLogList.vue
ant-design-vue-jeecg/src/views/system/DepartList2.vue
ant-design-vue-jeecg/src/views/system/NewPermissionList.vue
ant-design-vue-jeecg/src/views/system/PermissionList.vue
ant-design-vue-jeecg/src/views/system/RoleList.vue
ant-design-vue-jeecg/src/views/system/RoleUserList.vue
ant-design-vue-jeecg/src/views/system/SysAnnouncementList.vue
ant-design-vue-jeecg/src/views/system/SysCategoryList.vue
ant-design-vue-jeecg/src/views/system/SysPositionList.vue
 NODE_ENV=production
 VUE_APP_ENV=production
 outputDir=dist
-VUE_APP_API_BASE_URL=http://172.16.29.77:8081/wms
+VUE_APP_API_BASE_URL=http://127.0.0.1:8080/wms
 VUE_APP_CAS_BASE_URL=http://localhost:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 \ No newline at end of file
@@ -68,7 +68,7 @@
                             <goal>npm</goal>
                         </goals>
                         <configuration>
-                            <arguments>run build_development</arguments>
+                            <arguments>run build</arguments>
                         </configuration>
                     </execution>
                 </executions>
@@ -8,22 +8,28 @@
     wrapClassName="j-popup-modal"
     @ok="handleSubmit"
     @cancel="handleCancel"
-    cancelText="关闭">
-
+    cancelText="关闭"
+  >
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchByquery">
         <a-row :gutter="24" v-if="showSearchFlag">
-          <template v-for="(item,index) in queryInfo">
-            <template v-if=" item.hidden==='1' ">
-              <a-col :md="8" :sm="24" :key=" 'query'+index " v-show="toggleSearchStatus">
-                <online-query-form-item :queryParam="queryParam" :item="item"
-                                        :dictOptions="dictOptions"></online-query-form-item>
+          <template v-for="(item, index) in queryInfo">
+            <template v-if="item.hidden === '1'">
+              <a-col :md="8" :sm="24" :key="'query' + index" v-show="toggleSearchStatus">
+                <online-query-form-item
+                  :queryParam="queryParam"
+                  :item="item"
+                  :dictOptions="dictOptions"
+                ></online-query-form-item>
               </a-col>
             </template>
             <template v-else>
-              <a-col :md="8" :sm="24" :key=" 'query'+index ">
-                <online-query-form-item :queryParam="queryParam" :item="item"
-                                        :dictOptions="dictOptions"></online-query-form-item>
+              <a-col :md="8" :sm="24" :key="'query' + index">
+                <online-query-form-item
+                  :queryParam="queryParam"
+                  :item="item"
+                  :dictOptions="dictOptions"
+                ></online-query-form-item>
               </a-col>
             </template>
           </template>
@@ -34,18 +40,17 @@
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
               <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
               </a>
             </span>
           </a-col>
-
         </a-row>
       </a-form>
     </div>
     <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
       <i class="anticon anticon-info-circle ant-alert-icon"></i>
-      已选择&nbsp;<a style="font-weight: 600">{{ table.selectedRowKeys.length }}</a>项&nbsp;&nbsp;
+      已选择 <a style="font-weight: 600">{{ table.selectedRowKeys.length }}</a> 项
       <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       <a v-if="!showSearchFlag" style="margin-left: 24px" @click="onlyReload">刷新</a>
@@ -60,25 +65,29 @@
       :dataSource="table.dataSource"
       :pagination="table.pagination"
       :loading="table.loading"
-      :rowSelection="{type:rowSelectionType,fixed:true,selectedRowKeys: table.selectedRowKeys, onChange: handleChangeInTableSelect}"
+      :rowSelection="{
+        type: rowSelectionType,
+        fixed: true,
+        selectedRowKeys: table.selectedRowKeys,
+        onChange: handleChangeInTableSelect
+      }"
       @change="handleChangeInTable"
       style="min-height: 300px"
       :scroll="tableScroll"
-      :customRow="clickThenCheck">
+      :customRow="clickThenCheck"
+    >
     </a-table>
-
-
   </j-modal>
 </template>
 <script>
-import {getAction} from '@/api/manage'
-import {filterObj} from '@/utils/util'
-import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-import {httpGroupRequest} from '@/api/GroupRequest.js'
+import { getAction } from '@/api/manage'
+import { filterObj } from '@/utils/util'
+import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
+import { httpGroupRequest } from '@/api/GroupRequest.js'
 import md5 from 'md5'
-const MODAL_WIDTH = 1200;
+const MODAL_WIDTH = 1200
 export default {
   name: 'JPopupOnlReport',
   props: ['multi', 'code', 'sorter', 'groupId', 'param'],
@@ -86,7 +95,7 @@ export default {
   data() {
     return {
       visible: false,
-      title: "",
+      title: '',
       confirmLoading: false,
       queryInfo: [],
       toggleSearchStatus: false,
@@ -119,12 +128,12 @@ export default {
           total: 0
         }
       },
-      cgRpConfigId: "",
+      cgRpConfigId: '',
       modalWidth: MODAL_WIDTH,
-      tableScroll: {x: true},
+      tableScroll: { x: true },
       dynamicParam: {},
       // 排序字段，默认无排序
-      iSorter: null,
+      iSorter: null
     }
   },
   mounted() {
@@ -140,10 +149,10 @@ export default {
         // update--begin--autor:liusq-----date:20210706------for：JPopup组件在modal中使用报错#2729------
         if (this.visible) {
           this.dynamicParamHandler()
-          this.loadData();
+          this.loadData()
         }
         // update--begin--autor:liusq-----date:20210706------for：JPopup组件在modal中使用报错#2729------
-      },
+      }
     },
     sorter: {
       immediate: true,
@@ -151,7 +160,7 @@ export default {
         if (this.sorter) {
           let arr = this.sorter.split('=')
           if (arr.length === 2 && ['asc', 'desc'].includes(arr[1].toLowerCase())) {
-            this.iSorter = {column: arr[0], order: arr[1].toLowerCase()}
+            this.iSorter = { column: arr[0], order: arr[1].toLowerCase() }
             // 排序字段受控
             this.table.columns.forEach(col => {
               if (col.dataIndex === this.iSorter.column) {
@@ -164,8 +173,8 @@ export default {
             console.warn('【JPopup】sorter参数不合法')
           }
         }
-      },
-    },
+      }
+    }
   },
   computed: {
     showSearchFlag() {
@@ -174,7 +183,7 @@ export default {
     // 行选择框类型，根据是否多选来控制显示为单选框还是多选框
     rowSelectionType() {
       return this.multi ? 'checkbox' : 'radio'
-    },
+    }
   },
   methods: {
     loadColumnsInfo() {
@@ -186,15 +195,15 @@ export default {
       }
       httpGroupRequest(() => getAction(url), groupIdKey).then(res => {
         if (res.success) {
-          this.initDictOptionData(res.result.dictOptions);
+          this.initDictOptionData(res.result.dictOptions)
           this.cgRpConfigId = res.result.cgRpConfigId
           this.title = res.result.cgRpConfigName
           let currColumns = res.result.columns
           for (let a = 0; a < currColumns.length; a++) {
             if (currColumns[a].customRender) {
-              let dictCode = currColumns[a].customRender;
-              currColumns[a].customRender = (text) => {
-                return filterMultiDictText(this.dictOptions[dictCode], text + "");
+              let dictCode = currColumns[a].customRender
+              currColumns[a].customRender = text => {
+                return filterMultiDictText(this.dictOptions[dictCode], text + '')
               }
             }
             // 排序字段受控
@@ -207,8 +216,14 @@ export default {
         } else {
           this.$error({
             title: '出错了',
-            content: (<p>Popup初始化失败，请检查你的配置或稍后重试！<br/>错误信息如下：{res.message}</p>),
-            onOk: () => this.close(),
+            content: (
+              <p>
+                Popup初始化失败，请检查你的配置或稍后重试！
+                <br />
+                错误信息如下：{res.message}
+              </p>
+            ),
+            onOk: () => this.close()
           })
         }
       })
@@ -220,7 +235,7 @@ export default {
       if (this.groupId) {
         groupIdKey = this.groupId + url
       }
-      httpGroupRequest(() => getAction(url), groupIdKey).then((res) => {
+      httpGroupRequest(() => getAction(url), groupIdKey).then(res => {
         // console.log("获取查询条件", res);
         if (res.success) {
           this.dynamicParamHandler(res.result)
@@ -242,7 +257,7 @@ export default {
             queryTemp[item.field] = ''
           }
         }
-        this.queryParam = {...queryTemp}
+        this.queryParam = { ...queryTemp }
       }
       let dynamicTemp = {}
       if (this.param) {
@@ -258,13 +273,13 @@ export default {
           dynamicTemp[key] = this.param[key]
         })
       }
-      this.dynamicParam = {...dynamicTemp}
+      this.dynamicParam = { ...dynamicTemp }
     },
     loadData(arg) {
       if (arg == 1) {
         this.table.pagination.current = 1
       }
-      let params = this.getQueryParams();//查询条件
+      let params = this.getQueryParams() //查询条件
       this.table.loading = true
       let url = `${this.url.getData}${this.cgRpConfigId}`
       //缓存key
@@ -293,10 +308,10 @@ export default {
           paramTarget['self_' + key] = this.dynamicParam[key]
         })
       }
-      let param = Object.assign(paramTarget, this.queryParam, this.iSorter);
-      param.pageNo = this.table.pagination.current;
-      param.pageSize = this.table.pagination.pageSize;
-      return filterObj(param);
+      let param = Object.assign(paramTarget, this.queryParam, this.iSorter)
+      param.pageNo = this.table.pagination.current
+      param.pageSize = this.table.pagination.pageSize
+      return filterObj(param)
     },
     handleChangeInTableSelect(selectedRowKeys, selectionRows) {
       //update-begin-author:taoyan date:2020902 for:【issue】开源online的几个问题 LOWCOD-844
@@ -307,7 +322,7 @@ export default {
       } else {
         //当两者长度不一的时候 需要判断
         let keys = this.table.selectedRowKeys
-        let rows = this.table.selectionRows;
+        let rows = this.table.selectionRows
         //这个循环 添加新的记录
         for (let i = 0; i < selectionRows.length; i++) {
           let combineKey = this.combineRowKey(selectionRows[i])
@@ -350,20 +365,20 @@ export default {
     handleSubmit() {
       if (!this.multi) {
         if (this.table.selectionRows && this.table.selectionRows.length > 1) {
-          this.$message.warning("请选择一条记录")
+          this.$message.warning('请选择一条记录')
           return false
         }
       }
       if (!this.table.selectionRows || this.table.selectionRows.length == 0) {
-        this.$message.warning("请选择一条记录")
+        this.$message.warning('请选择一条记录')
         return false
       }
-      this.$emit('ok', this.table.selectionRows);
+      this.$emit('ok', this.table.selectionRows)
       this.close()
     },
     close() {
-      this.$emit('close');
-      this.visible = false;
+      this.$emit('close')
+      this.visible = false
       this.onClearSelected()
     },
     show() {
@@ -371,19 +386,19 @@ export default {
       this.loadColumnsInfo()
     },
     handleToggleSearch() {
-      this.toggleSearchStatus = !this.toggleSearchStatus;
+      this.toggleSearchStatus = !this.toggleSearchStatus
     },
     searchByquery() {
-      this.loadData(1);
+      this.loadData(1)
     },
     onlyReload() {
-      this.loadData();
+      this.loadData()
     },
     searchReset() {
       Object.keys(this.queryParam).forEach(key => {
-        this.queryParam[key] = ""
+        this.queryParam[key] = ''
       })
-      this.loadData(1);
+      this.loadData(1)
     },
     onClearSelected() {
       this.table.selectedRowKeys = []
@@ -415,7 +430,8 @@ export default {
           click: () => {
             let rowKey = this.combineRowKey(record)
             if (!this.table.selectedRowKeys || this.table.selectedRowKeys.length == 0) {
-              let arr1 = [], arr2 = []
+              let arr1 = [],
+                arr2 = []
               arr1.push(record)
               arr2.push(rowKey)
               this.table.selectedRowKeys = arr2
@@ -426,8 +442,8 @@ export default {
                 this.table.selectionRows.push(record)
               } else {
                 let rowKey_index = this.table.selectedRowKeys.indexOf(rowKey)
-                this.table.selectedRowKeys.splice(rowKey_index, 1);
-                this.table.selectionRows.splice(rowKey_index, 1);
+                this.table.selectedRowKeys.splice(rowKey_index, 1)
+                this.table.selectionRows.splice(rowKey_index, 1)
               }
             }
             // 判断是否允许多选，如果不允许多选，就只存储最后一个选中的行
@@ -445,15 +461,13 @@ export default {
       Object.keys(dictOptions).map(k => {
         obj[k] = dictOptions[k].filter(item => {
           return item != null
-        });
-      });
+        })
+      })
       this.dictOptions = obj
     }
-
   }
 }
 </script>
 <style scoped>
-
 </style>
 \ No newline at end of file
@@ -136,14 +136,14 @@ export default {
       })
     },
     show() {
-      //如果组件传值username此处就不用loadDepartList了
-      this.loadDepartList().then(() => {
-        this.visible = true
-        if (!this.departList || this.departList.length <= 0) {
-          this.$message.warning("您尚未设置部门信息!")
-          this.departClear()
-        }
-      })
+      // 如果组件传值username此处就不用loadDepartList了
+      // this.loadDepartList().then(() => {
+      //   this.visible = true
+      //   if (!this.departList || this.departList.length <= 0) {
+      //     this.$message.warning("您尚未设置部门信息!")
+      //     this.departClear()
+      //   }
+      // })
     },
     departClear() {
       this.departList = []
@@ -40,12 +40,12 @@
         <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>
       </span>
       <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
-        <a-menu-item key="0">
+        <!-- <a-menu-item key="0">
           <router-link :to="{ name: 'account-center' }">
             <a-icon type="user"/>
             <span>个人中心</span>
           </router-link>
-        </a-menu-item>
+        </a-menu-item> -->
         <a-menu-item key="1">
           <router-link :to="{ name: 'account-settings-base' }">
             <a-icon type="setting"/>
@@ -60,10 +60,10 @@
           <a-icon type="setting"/>
           <span>密码修改</span>
         </a-menu-item>
-        <a-menu-item key="5" @click="updateCurrentDepart">
+        <!-- <a-menu-item key="5" @click="updateCurrentDepart">
           <a-icon type="cluster"/>
           <span>切换部门</span>
-        </a-menu-item>
+        </a-menu-item> -->
         <a-menu-item key="6" @click="clearCache">
           <a-icon type="sync"/>
           <span>清理缓存</span>
@@ -51,7 +51,7 @@
         </a-form>
       </a-col>
-      <a-col :md="24" :lg="8" :style="{ minHeight: '180px' }">
+      <!-- <a-col :md="24" :lg="8" :style="{ minHeight: '180px' }">
         <div class="ant-upload-preview" @click="$refs.modal.edit(1)">
           <a-icon type="cloud-upload-o" class="upload-icon"/>
           <div class="mask">
@@ -59,7 +59,7 @@
           </div>
           <img :src="option.img"/>
         </div>
-      </a-col>
+      </a-col> -->
     </a-row>
@@ -57,7 +57,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -52,7 +52,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -22,7 +22,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -53,7 +53,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -22,7 +22,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -34,8 +34,8 @@
     <div>
       <!--已选择的清空 -->
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
       <a-table
@@ -51,7 +51,7 @@
         @change="handleTableChange"
       >
         <!-- 字符串超长截取省略号显示-->
-        <span slot="dataContent" slot-scope="text, record">
+        <span slot="dataContent" slot-scope="text">
           <j-ellipsis :value="text" :length="80"/>
         </span>
       </a-table>
@@ -25,7 +25,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
       <a-table
@@ -17,9 +17,9 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
           selectedRowKeys.length
-        }}</a>项&nbsp;&nbsp;
+        }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -18,9 +18,9 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
           selectedRowKeys.length
-        }}</a>项&nbsp;&nbsp;
+        }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -56,8 +56,8 @@
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择&nbsp;<a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -31,23 +31,22 @@
           </a-form>
         </div>
         <!-- 操作按钮区域 -->
-        <div class="table-operator" style="margin: 5px 0 10px 2px">
+        <div class="table-operator">
           <a-button @click="handleAdd" v-has="'role:add'" type="primary" icon="plus">新建角色</a-button>
           <!--<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>-->
-          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
-                    :action="importExcelUrl" @change="handleImportExcel">
+          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
             <a-button v-has="'role:import'" type="primary" icon="import">导入</a-button>
           </a-upload>
           <a-button v-has="'role:export'" type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button>
         </div>
-        <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-          <i class="anticon anticon-info-circle ant-alert-icon">
-          </i> 已选择 <a><b>{{ selectedRowKeys1.length }}</b></a>项
-          <a style="margin-left: 24px" @click="onClearSelected1">清空</a>
-        </div>
+        <div>
+          <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+            <i class="anticon anticon-info-circle ant-alert-icon">
+            </i> 已选择 <a><b>{{ selectedRowKeys1.length }}</b></a> 项
+            <a style="margin-left: 24px" @click="onClearSelected1">清空</a>
+          </div>
-        <div style="margin-top: 15px">
           <a-table
             style="height:500px"
             ref="table"
@@ -60,30 +59,26 @@
             :loading="loading"
             :rowSelection="{selectedRowKeys: selectedRowKeys1, onChange: onSelectChange1, type:'radio'}"
             @change="handleTableChange">
-          <span slot="action" slot-scope="text, record">
-            <a @click="handleOpen(record)">用户</a>
-            <a-divider type="vertical"/>
-
-
-            <a-dropdown>
-              <a class="ant-dropdown-link">
-                更多 <a-icon type="down"/>
-              </a>
-              <a-menu slot="overlay">
-                <a-menu-item>
-                  <a v-has="'role:authorize'" @click="handlePerssion(record.id)">授权</a>
-                </a-menu-item>
-                <a-menu-item>
-                  <a v-has="'role:edit'" @click="handleEdit(record)">编辑</a>
-                </a-menu-item>
-                <a-menu-item>
-                  <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete1(record.id)">
-                    <a v-has="'role:delete'">删除</a>
-                  </a-popconfirm>
-                </a-menu-item>
-              </a-menu>
-            </a-dropdown>
-        </span>
+            <span slot="action" slot-scope="text, record">
+              <a @click="handleOpen(record)">用户</a>
+              <a-divider type="vertical"/>
+              <a-dropdown>
+                <a class="ant-dropdown-link">更多<a-icon type="down"/></a>
+                <a-menu slot="overlay">
+                  <a-menu-item>
+                    <a v-has="'role:authorize'" @click="handlePerssion(record.id)">授权</a>
+                  </a-menu-item>
+                  <a-menu-item>
+                    <a v-has="'role:edit'" @click="handleEdit(record)">编辑</a>
+                  </a-menu-item>
+                  <a-menu-item>
+                    <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete1(record.id)">
+                      <a v-has="'role:delete'">删除</a>
+                    </a-popconfirm>
+                  </a-menu-item>
+                </a-menu>
+              </a-dropdown>
+            </span>
           </a-table>
         </div>
         <!-- 右侧的角色权限配置 -->
@@ -52,7 +52,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -26,7 +26,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -64,7 +64,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -24,7 +24,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -29,7 +29,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -61,7 +61,7 @@
     </div>
     <!-- 操作按钮区域 -->
-    <div class="table-operator" style="border-top: 5px">
+    <div class="table-operator">
       <a-button v-has="'user:add'" @click="handleAdd" type="primary" icon="plus">添加用户</a-button>
       <a-button v-has="'user:export'" type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button>
       <a-upload v-has="'user:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@@ -97,8 +97,8 @@
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择
+        <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -23,6 +23,25 @@
               />
             </a-form-item>
           </a-col>
+          <a-col :xl="12" :lg="14" :md="16" :sm="24">
+            <a-form-item label="任务创建时间">
+              <j-date
+                :show-time="true"
+                date-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择开始时间"
+                class="query-group-cust"
+                v-model="queryParam.taskCreateTimeBegin"
+              ></j-date>
+              <span class="query-group-split-cust"></span>
+              <j-date
+                :show-time="true"
+                date-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择结束时间"
+                class="query-group-cust"
+                v-model="queryParam.taskCreateTimeEnd"
+              ></j-date>
+            </a-form-item>
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@@ -90,20 +109,40 @@ export default {
       required: false
     }
   },
+
   watch: {
     mainId: {
       immediate: true,
       handler(val) {
-        if (!this.mainId) {
-          this.clearList()
-        } else {
-          this.queryParam['locationCode'] = val
-          this.loadData(1)
-        }
+        var nowDate = new Date()
+        this.queryParam['taskCreateTimeBegin'] = new Date(nowDate.getTime() - 90 * 24 * 60 * 60 * 1000).format('yyyy-MM-dd hh:mm:ss')
+        this.queryParam['taskCreateTimeEnd'] = nowDate.format('yyyy-MM-dd hh:mm:ss')
+        this.queryParam['locationCode'] = val
+        this.loadData(1)
       }
     }
   },
   data() {
+    Date.prototype.format = function(fmt) {
+      var o = {
+        'M+': this.getMonth() + 1, //月份
+        'd+': this.getDate(), //日
+        'h+': this.getHours(), //小时
+        'm+': this.getMinutes(), //分
+        's+': this.getSeconds(), //秒
+        'q+': Math.floor((this.getMonth() + 3) / 3), //季度
+        S: this.getMilliseconds() //毫秒
+      }
+      if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length))
+      }
+      for (var k in o) {
+        if (new RegExp('(' + k + ')').test(fmt)) {
+          fmt = fmt.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length))
+        }
+      }
+      return fmt
+    }
     return {
       description: '库位任务信息比较页面',
       disableMixinCreated: true,
@@ -227,7 +266,6 @@ export default {
           }
         })
       }
-
       // 获取 wcs_task_status
       if (getDictItemsFromCache('wcs_task_status')) {
         this.wcsTaskStatusList = getDictItemsFromCache('wcs_task_status')
@@ -49,7 +49,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -47,7 +47,7 @@
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -31,7 +31,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -43,7 +43,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -34,7 +34,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -20,7 +20,7 @@
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
               <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
               </a>
             </span>
           </a-col>
@@ -33,19 +33,27 @@
     <div class="table-operator">
       <a-button @click="handleAdd" v-has="'company:add'" type="primary" icon="plus">新增</a-button>
       <a-button v-has="'company:export'" type="primary" icon="download" @click="handleExportXls('货主')">导出</a-button>
-      <a-upload v-has="'company:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
-                @change="handleImportExcel">
+      <a-upload
+        v-has="'company:import'"
+        name="file"
+        :showUploadList="false"
+        :multiple="false"
+        :headers="tokenHeader"
+        :action="importExcelUrl"
+        @change="handleImportExcel"
+      >
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay" v-has="'company:deleteBatch'">
           <a-menu-item key="1" @click="batchDel">
-            <a-icon type="deleteBatch"/>
+            <a-icon type="deleteBatch" />
             删除
           </a-menu-item>
         </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
+        <a-button style="margin-left: 8px">
+          批量操作
+          <a-icon type="down" />
         </a-button>
       </a-dropdown>
     </div>
@@ -53,49 +61,47 @@
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择
+        <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
       <a-table
         ref="table"
         size="middle"
-        :scroll="{x:true}"
+        :scroll="{ x: true }"
         bordered
         rowKey="id"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         class="j-table-force-nowrap"
-        @change="handleTableChange">
-
+        @change="handleTableChange"
+      >
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
         <template slot="imgSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt=""
-               style="max-width:80px;font-size: 12px;font-style: italic;"/>
+          <img
+            v-else
+            :src="getImgView(text)"
+            height="25px"
+            alt=""
+            style="max-width:80px;font-size: 12px;font-style: italic;"
+          />
         </template>
         <template slot="fileSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
+          <a-button v-else :ghost="true" type="primary" icon="download" size="small" @click="downloadFile(text)">
             下载
           </a-button>
         </template>
         <span slot="action" slot-scope="text, record">
-          <a v-has="'company:edit'" @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical"/>
+          <a v-has="'company:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical" /></a>
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
@@ -110,7 +116,6 @@
             </a-menu>
           </a-dropdown>
         </span>
-
       </a-table>
     </div>
@@ -119,10 +124,9 @@
 </template>
 <script>
-
 import '@/assets/less/TableExpand.less'
-import {mixinDevice} from '@/utils/mixin'
-import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import CompanyModal from './modules/CompanyModal'
 export default {
@@ -141,105 +145,103 @@ export default {
           dataIndex: '',
           key: 'rowIndex',
           width: 60,
-          align: "center",
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1;
+          align: 'center',
+          customRender: function(t, r, index) {
+            return parseInt(index) + 1
           }
         },
         {
           title: '货主编码',
-          align: "center",
+          align: 'center',
           dataIndex: 'code'
         },
         {
           title: '货主名称',
-          align: "center",
+          align: 'center',
           dataIndex: 'name'
         },
         {
           title: '地址',
-          align: "center",
+          align: 'center',
           dataIndex: 'address'
         },
         {
           title: '区县',
-          align: "center",
+          align: 'center',
           dataIndex: 'district'
         },
         {
           title: '城市',
-          align: "center",
+          align: 'center',
           dataIndex: 'city'
         },
         {
           title: '省份',
-          align: "center",
+          align: 'center',
           dataIndex: 'province'
         },
         {
           title: '国家',
-          align: "center",
+          align: 'center',
           dataIndex: 'country'
         },
         {
           title: '邮编',
-          align: "center",
+          align: 'center',
           dataIndex: 'postalcode'
         },
         {
           title: '联系人',
-          align: "center",
+          align: 'center',
           dataIndex: 'attentionto'
         },
         {
           title: '联系电话',
-          align: "center",
+          align: 'center',
           dataIndex: 'phonenum'
         },
         {
           title: '操作',
           dataIndex: 'action',
-          align: "center",
-          fixed: "right",
+          align: 'center',
+          fixed: 'right',
           width: 147,
-          scopedSlots: {customRender: 'action'}
+          scopedSlots: { customRender: 'action' }
         }
       ],
       url: {
-        list: "/config/company/list",
-        delete: "/config/company/delete",
-        deleteBatch: "/config/company/deleteBatch",
-        exportXlsUrl: "/config/company/exportXls",
-        importExcelUrl: "config/company/importExcel",
-
+        list: '/config/company/list',
+        delete: '/config/company/delete',
+        deleteBatch: '/config/company/deleteBatch',
+        exportXlsUrl: '/config/company/exportXls',
+        importExcelUrl: 'config/company/importExcel'
       },
       dictOptions: {},
-      superFieldList: [],
+      superFieldList: []
     }
   },
   created() {
-    this.getSuperFieldList();
+    this.getSuperFieldList()
   },
   computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    },
+    importExcelUrl: function() {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    }
   },
   methods: {
-    initDictConfig() {
-    },
+    initDictConfig() {},
     getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({type: 'string', value: 'code', text: '货主编码', dictCode: ''})
-      fieldList.push({type: 'string', value: 'name', text: '货主名称', dictCode: ''})
-      fieldList.push({type: 'string', value: 'address', text: '地址', dictCode: ''})
-      fieldList.push({type: 'string', value: 'district', text: '区县', dictCode: ''})
-      fieldList.push({type: 'string', value: 'city', text: '城市', dictCode: ''})
-      fieldList.push({type: 'string', value: 'province', text: '省份', dictCode: ''})
-      fieldList.push({type: 'string', value: 'country', text: '国家', dictCode: ''})
-      fieldList.push({type: 'string', value: 'postalcode', text: '邮编', dictCode: ''})
-      fieldList.push({type: 'string', value: 'attentionto', text: '联系人', dictCode: ''})
-      fieldList.push({type: 'string', value: 'phonenum', text: '联系电话', dictCode: ''})
+      let fieldList = []
+      fieldList.push({ type: 'string', value: 'code', text: '货主编码', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'name', text: '货主名称', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'address', text: '地址', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'district', text: '区县', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'city', text: '城市', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'province', text: '省份', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'country', text: '国家', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'postalcode', text: '邮编', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'attentionto', text: '联系人', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'phonenum', text: '联系电话', dictCode: '' })
       this.superFieldList = fieldList
     }
   }
@@ -6,7 +6,16 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="容器类型">
-              <a-input placeholder="请输入容器类型" v-model="queryParam.containerTypeCode"></a-input>
+              <a-select
+                show-search
+                placeholder="请选择容器类型"
+                option-filter-prop="children"
+                v-model="queryParam.containerTypeCode"
+              >
+                <a-select-option v-for="item in containerTypeList" :key="item.name" :value="item.code">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -14,21 +23,15 @@
               <a-input placeholder="请输入物料编码" v-model="queryParam.materialCode"></a-input>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="是否可用">
-                <j-dict-select-tag placeholder="请选择是否可用" v-model="queryParam.enable" dictCode="enable_status"/>
-              </a-form-item>
-            </a-col>
-          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="是否可用">
+              <j-dict-select-tag placeholder="请选择是否可用" v-model="queryParam.enable" dictCode="enable_status" />
+            </a-form-item>
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
             </span>
           </a-col>
         </a-row>
@@ -39,20 +42,35 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" v-has="'containerCapacity:add'" type="primary" icon="plus">新增</a-button>
-      <a-button v-has="'containerCapacity:export'" type="primary" icon="download" @click="handleExportXls('容器容量管理')">导出</a-button>
-      <a-upload v-has="'containerCapacity:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
-                @change="handleImportExcel">
+      <a-button
+        v-has="'containerCapacity:export'"
+        type="primary"
+        icon="download"
+        @click="handleExportXls('容器容量管理')"
+      >
+        导出
+      </a-button>
+      <a-upload
+        v-has="'containerCapacity:import'"
+        name="file"
+        :showUploadList="false"
+        :multiple="false"
+        :headers="tokenHeader"
+        :action="importExcelUrl"
+        @change="handleImportExcel"
+      >
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay" v-has="'containerCapacity:deleteBatch'">
           <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
+            <a-icon type="delete" />
             删除
           </a-menu-item>
         </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
+        <a-button style="margin-left: 8px">
+          批量操作
+          <a-icon type="down" />
         </a-button>
       </a-dropdown>
     </div>
@@ -60,50 +78,52 @@
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择
+        <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
       <a-table
         ref="table"
         size="middle"
-        :scroll="{x:true}"
+        :scroll="{ x: true }"
         bordered
         rowKey="id"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         class="j-table-force-nowrap"
-        @change="handleTableChange">
+        @change="handleTableChange"
+      >
+        <span slot="containerTypeCode" slot-scope="containerTypeCode">
+          <a-tag :key="containerTypeCode" color="pink">
+            {{ solutionContainerType(containerTypeCode) }}
+          </a-tag>
+        </span>
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
         <template slot="imgSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt=""
-               style="max-width:80px;font-size: 12px;font-style: italic;"/>
+          <img
+            v-else
+            :src="getImgView(text)"
+            height="25px"
+            alt=""
+            style="max-width:80px;font-size: 12px;font-style: italic;"
+          />
         </template>
         <template slot="fileSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
+          <a-button v-else :ghost="true" type="primary" icon="download" size="small" @click="downloadFile(text)">
             下载
           </a-button>
         </template>
-
         <span slot="action" slot-scope="text, record">
-          <a v-has="'containerCapacity:edit'" @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
+          <a v-has="'containerCapacity:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical"/></a>
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
@@ -118,7 +138,6 @@
             </a-menu>
           </a-dropdown>
         </span>
-
       </a-table>
     </div>
@@ -127,13 +146,12 @@
 </template>
 <script>
-
 import '@/assets/less/TableExpand.less'
-import {mixinDevice} from '@/utils/mixin'
-import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import ContainerCapacityModal from './modules/ContainerCapacityModal'
-import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-import {getZoneList} from '@/api/api'
+import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
+import { getZoneList, getContainerTypeList } from '@/api/api'
 export default {
   name: 'ContainerCapacityList',
@@ -144,6 +162,7 @@ export default {
   data() {
     return {
       description: '容器容量管理管理页面',
+      containerTypeList: [],
       // 表头
       columns: [
         {
@@ -151,112 +170,125 @@ export default {
           dataIndex: '',
           key: 'rowIndex',
           width: 60,
-          align: "center",
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1;
+          align: 'center',
+          customRender: function(t, r, index) {
+            return parseInt(index) + 1
           }
         },
         {
           title: '容器类型',
-          align: "center",
-          dataIndex: 'containerTypeCode'
-        },
-        {
-          title: '货主',
-          align: "center",
-          dataIndex: 'companyCode'
+          align: 'center',
+          dataIndex: 'containerTypeCode',
+          key: 'containerTypeCode',
+          scopedSlots: { customRender: 'containerTypeCode' }
         },
         {
           title: '物料编码',
-          align: "center",
+          align: 'center',
           dataIndex: 'materialCode'
         },
         {
           title: '物料名称',
-          align: "center",
+          align: 'center',
           dataIndex: 'materialName'
         },
         {
           title: '物料单位',
-          align: "center",
+          align: 'center',
           dataIndex: 'materialUnit'
         },
         {
           title: '存放数量',
-          align: "center",
+          align: 'center',
           dataIndex: 'qty'
         },
         {
           title: '是否可用',
-          align: "center",
+          align: 'center',
           dataIndex: 'enable_dictText'
         },
         {
           title: '创建人',
-          align: "center",
+          align: 'center',
           dataIndex: 'createBy'
         },
         {
           title: '创建日期',
-          align: "center",
+          align: 'center',
           dataIndex: 'createTime'
         },
         {
           title: '更新人',
-          align: "center",
+          align: 'center',
           dataIndex: 'updateBy'
         },
         {
           title: '更新日期',
-          align: "center",
+          align: 'center',
           dataIndex: 'updateTime'
         },
         {
           title: '操作',
           dataIndex: 'action',
-          align: "center",
-          fixed: "right",
+          align: 'center',
+          fixed: 'right',
           width: 147,
-          scopedSlots: {customRender: 'action'}
+          scopedSlots: { customRender: 'action' }
         }
       ],
       url: {
-        list: "/config/containerCapacity/list",
-        delete: "/config/containerCapacity/delete",
-        deleteBatch: "/config/containerCapacity/deleteBatch",
-        exportXlsUrl: "/config/containerCapacity/exportXls",
-        importExcelUrl: "config/containerCapacity/importExcel",
-
+        list: '/config/containerCapacity/list',
+        delete: '/config/containerCapacity/delete',
+        deleteBatch: '/config/containerCapacity/deleteBatch',
+        exportXlsUrl: '/config/containerCapacity/exportXls',
+        importExcelUrl: 'config/containerCapacity/importExcel'
       },
       dictOptions: {},
-      superFieldList: [],
+      superFieldList: []
     }
   },
   created() {
-    this.getSuperFieldList();
+    this.getSuperFieldList()
+    this.loadFrom()
   },
   computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    },
+    importExcelUrl: function() {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    }
   },
   methods: {
-    initDictConfig() {
+    initDictConfig() {},
+    solutionContainerType(value) {
+      var actions = []
+      Object.keys(this.containerTypeList).some(key => {
+        if (this.containerTypeList[key].code == '' + value) {
+          actions.push(this.containerTypeList[key].name)
+          return true
+        }
+      })
+      return actions.join('')
+    },
+    loadFrom() {
+      getContainerTypeList().then(res => {
+        if (res.success) {
+          this.containerTypeList = res.result
+        }
+      })
     },
     getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({type: 'string', value: 'containerTypeCode', text: '容器类型', dictCode: ''})
-      fieldList.push({type: 'string', value: 'warehouseCode', text: '仓库编码', dictCode: ''})
-      fieldList.push({type: 'string', value: 'companyCode', text: '货主', dictCode: ''})
-      fieldList.push({type: 'string', value: 'materialCode', text: '物料编码', dictCode: ''})
-      fieldList.push({type: 'string', value: 'materialName', text: '物料名称', dictCode: ''})
-      fieldList.push({type: 'string', value: 'materialUnit', text: '物料单位', dictCode: ''})
-      fieldList.push({type: 'BigDecimal', value: 'qty', text: '存放数量', dictCode: ''})
-      fieldList.push({type: 'int', value: 'enable', text: '是否可用', dictCode: 'enable_status'})
-      fieldList.push({type: 'string', value: 'createBy', text: '创建人', dictCode: ''})
-      fieldList.push({type: 'datetime', value: 'createTime', text: '创建日期'})
-      fieldList.push({type: 'string', value: 'updateBy', text: '更新人', dictCode: ''})
-      fieldList.push({type: 'datetime', value: 'updateTime', text: '更新日期'})
+      let fieldList = []
+      fieldList.push({ type: 'string', value: 'containerTypeCode', text: '容器类型', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'warehouseCode', text: '仓库编码', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'companyCode', text: '货主', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'materialCode', text: '物料编码', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'materialName', text: '物料名称', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'materialUnit', text: '物料单位', dictCode: '' })
+      fieldList.push({ type: 'BigDecimal', value: 'qty', text: '存放数量', dictCode: '' })
+      fieldList.push({ type: 'int', value: 'enable', text: '是否可用', dictCode: 'enable_status' })
+      fieldList.push({ type: 'string', value: 'createBy', text: '创建人', dictCode: '' })
+      fieldList.push({ type: 'datetime', value: 'createTime', text: '创建日期' })
+      fieldList.push({ type: 'string', value: 'updateBy', text: '更新人', dictCode: '' })
+      fieldList.push({ type: 'datetime', value: 'updateTime', text: '更新日期' })
       this.superFieldList = fieldList
     }
   }
@@ -21,18 +21,30 @@
                   show-search
                   placeholder="请选择容器类型"
                   option-filter-prop="children"
-
-                  v-model="queryParam.containerTypeCode">
-                  <a-select-option v-for="item in containerTypeList" :key="item.name" :value="item.code">{{
-                      item.name
-                    }}
+                  v-model="queryParam.containerTypeCode"
+                >
+                  <a-select-option v-for="item in containerTypeList" :key="item.name" :value="item.code"
+                    >{{ item.name }}
                   </a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="容器状态">
-                <j-dict-select-tag placeholder="请选择容器状态" v-model="queryParam.status" dictCode="container_status"/>
+                <j-dict-select-tag
+                  placeholder="请选择容器状态"
+                  v-model="queryParam.status"
+                  dictCode="container_status"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="容器填充状态">
+                <j-dict-select-tag
+                  placeholder="请选择容器填充状态"
+                  v-model="queryParam.fillStatus"
+                  dictCode="fill_status"
+                />
               </a-form-item>
             </a-col>
           </template>
@@ -42,7 +54,7 @@
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
               <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
               </a>
             </span>
           </a-col>
@@ -54,21 +66,30 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" v-has="'container:add'" type="primary" icon="plus">新增</a-button>
-      <a-button v-has="'container:export'" type="primary" icon="download" @click="handleExportXls('容器管理')">导出</a-button>
-      <a-upload  name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
-                @change="handleImportExcel">
+      <a-button v-has="'container:export'" type="primary" icon="download" @click="handleExportXls('容器管理')">
+        导出
+      </a-button>
+      <a-upload
+        name="file"
+        :showUploadList="false"
+        :multiple="false"
+        :headers="tokenHeader"
+        :action="importExcelUrl"
+        @change="handleImportExcel"
+      >
         <a-button v-has="'container:import'" type="primary" icon="import">导入</a-button>
       </a-upload>
       <a-button v-has="'container:print'" @click="batchPrint()" type="primary">打印</a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay" v-has="'container:deleteBatch'">
           <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
+            <a-icon type="delete" />
             删除
           </a-menu-item>
         </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
+        <a-button style="margin-left: 8px">
+          批量操作
+          <a-icon type="down" />
         </a-button>
       </a-dropdown>
     </div>
@@ -76,33 +97,33 @@
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择
+        <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
       <a-table
         ref="table"
         size="middle"
-        :scroll="{x:true}"
+        :scroll="{ x: true }"
         bordered
         rowKey="id"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         class="j-table-force-nowrap"
-        @change="handleTableChange">
-
+        @change="handleTableChange"
+      >
         <span slot="zoneCode" slot-scope="zoneCode">
-          <a-tag :key="zoneCode" color=blue>
+          <a-tag :key="zoneCode" color="blue">
             {{ solutionZoneCode(zoneCode) }}
           </a-tag>
         </span>
         <span slot="containerTypeCode" slot-scope="containerTypeCode">
-          <a-tag :key="containerTypeCode" color=pink>
+          <a-tag :key="containerTypeCode" color="pink">
             {{ solutionContainerType(containerTypeCode) }}
           </a-tag>
         </span>
@@ -112,26 +133,23 @@
         </template>
         <template slot="imgSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt=""
-               style="max-width:80px;font-size: 12px;font-style: italic;"/>
+          <img
+            v-else
+            :src="getImgView(text)"
+            height="25px"
+            alt=""
+            style="max-width:80px;font-size: 12px;font-style: italic;"
+          />
         </template>
         <template slot="fileSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
+          <a-button v-else :ghost="true" type="primary" icon="download" size="small" @click="downloadFile(text)">
             下载
           </a-button>
         </template>
         <span slot="action" slot-scope="text, record">
-          <a v-has="'container:add'" @click="editForm(record)">编辑</a>
-
-          <a-divider type="vertical"/>
+          <a v-has="'container:add'" @click="editForm(record)">编辑<a-divider type="vertical"/></a>
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
@@ -146,7 +164,6 @@
             </a-menu>
           </a-dropdown>
         </span>
-
       </a-table>
     </div>
@@ -157,16 +174,15 @@
 </template>
 <script>
-
 import '@/assets/less/TableExpand.less'
-import {mixinDevice} from '@/utils/mixin'
-import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import ContainerModal from './modules/ContainerModal'
-import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-import {getZoneList} from '@/api/api'
-import {getContainerTypeList} from '@/api/api'
-import ContainerEditModal from "./modules/ContainerEditModal";
-import ContainerPrintModal from "./modules/ContainerPrintModal";
+import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
+import { getZoneList } from '@/api/api'
+import { getContainerTypeList } from '@/api/api'
+import ContainerEditModal from './modules/ContainerEditModal'
+import ContainerPrintModal from './modules/ContainerPrintModal'
 export default {
   name: 'ContainerList',
@@ -188,125 +204,132 @@ export default {
           dataIndex: '',
           key: 'rowIndex',
           width: 60,
-          align: "center",
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1;
+          align: 'center',
+          customRender: function(t, r, index) {
+            return parseInt(index) + 1
           }
         },
         {
           title: '容器编码',
-          align: "center",
+          align: 'center',
           dataIndex: 'code'
         },
         {
           title: '库位编码',
-          align: "center",
+          align: 'center',
           dataIndex: 'locationCode'
         },
         {
           title: '容器类型',
-          align: "center",
+          align: 'center',
           dataIndex: 'containerTypeCode',
           key: 'containerTypeCode',
-          scopedSlots: {customRender: 'containerTypeCode'}
+          scopedSlots: { customRender: 'containerTypeCode' }
         },
         {
           title: '容器状态',
-          align: "center",
+          align: 'center',
           dataIndex: 'status_dictText'
         },
         {
+          title: '容器填充状态',
+          align: 'center',
+          dataIndex: 'fillStatus_dictText'
+        },
+        {
           title: '创建人',
-          align: "center",
+          align: 'center',
           dataIndex: 'createBy'
         },
         {
           title: '创建日期',
-          align: "center",
+          align: 'center',
           dataIndex: 'createTime'
         },
         {
           title: '更新人',
-          align: "center",
+          align: 'center',
           dataIndex: 'updateBy'
         },
         {
           title: '更新日期',
-          align: "center",
+          align: 'center',
           dataIndex: 'updateTime'
         },
         {
           title: '操作',
           dataIndex: 'action',
-          align: "center",
-          fixed: "right",
+          align: 'center',
+          fixed: 'right',
           width: 147,
-          scopedSlots: {customRender: 'action'}
+          scopedSlots: { customRender: 'action' }
         }
       ],
       url: {
-        list: "/config/container/list",
-        delete: "/config/container/delete",
-        deleteBatch: "/config/container/deleteBatch",
-        exportXlsUrl: "/config/container/exportXls",
-        importExcelUrl: "config/container/importExcel",
-
+        list: '/config/container/list',
+        delete: '/config/container/delete',
+        deleteBatch: '/config/container/deleteBatch',
+        exportXlsUrl: '/config/container/exportXls',
+        importExcelUrl: 'config/container/importExcel'
       },
       dictOptions: {},
-      superFieldList: [],
+      superFieldList: []
     }
   },
   created() {
-    this.getSuperFieldList();
-    this.loadFrom();
+    this.getSuperFieldList()
+    this.loadFrom()
   },
   computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    },
+    importExcelUrl: function() {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    }
   },
   methods: {
-    initDictConfig() {
-    },
+    initDictConfig() {},
     getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({type: 'string', value: 'code', text: '容器编码', dictCode: ''})
-      fieldList.push({type: 'string', value: 'companyCode', text: '货主', dictCode: ''})
-      fieldList.push({type: 'string', value: 'locationCode', text: '库位编码', dictCode: ''})
+      let fieldList = []
+      fieldList.push({ type: 'string', value: 'code', text: '容器编码', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'companyCode', text: '货主', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'locationCode', text: '库位编码', dictCode: '' })
       // fieldList.push({type:'string',value:'zoneCode',text:'库区编码',dictCode:''})
-      fieldList.push({type: 'string', value: 'containerTypeCode', text: '容器类型', dictCode: ''})
-      fieldList.push({type: 'string', value: 'status', text: '容器状态', dictCode: 'container_status'})
-      fieldList.push({type: 'string', value: 'createBy', text: '创建人', dictCode: ''})
-      fieldList.push({type: 'datetime', value: 'createTime', text: '创建日期'})
-      fieldList.push({type: 'string', value: 'updateBy', text: '更新人', dictCode: ''})
-      fieldList.push({type: 'datetime', value: 'updateTime', text: '更新日期'})
+      fieldList.push({ type: 'string', value: 'containerTypeCode', text: '容器类型', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'status', text: '容器状态', dictCode: 'container_status' })
+      fieldList.push({ type: 'string', value: 'fillStatus', text: '容器填充状态', dictCode: 'fill_status' })
+      fieldList.push({ type: 'string', value: 'createBy', text: '创建人', dictCode: '' })
+      fieldList.push({ type: 'datetime', value: 'createTime', text: '创建日期' })
+      fieldList.push({ type: 'string', value: 'updateBy', text: '更新人', dictCode: '' })
+      fieldList.push({ type: 'datetime', value: 'updateTime', text: '更新日期' })
       this.superFieldList = fieldList
     },
     editForm(record) {
-      this.$refs.modalEditForm.edit(record);
-      this.$refs.modalEditForm.title = "编辑容器";
-      this.$refs.modalEditForm.disableSubmit = false;
+      this.$refs.modalEditForm.edit(record)
+      this.$refs.modalEditForm.title = '编辑容器'
+      this.$refs.modalEditForm.disableSubmit = false
     },
     batchPrint() {
       if (this.selectedRowKeys.length <= 0) {
-        this.$message.warning('请选择一条记录！');
-        return;
+        this.$message.warning('请选择一条记录！')
+        return
       } else {
-        var ids = "";
+        var ids = ''
         for (var a = 0; a < this.selectedRowKeys.length; a++) {
-          ids += this.selectedRowKeys[a] + ",";
+          ids += this.selectedRowKeys[a] + ','
         }
-        window.open(window._CONFIG['domianURL'] + "/jmreport/view/768644669245833216/?id=" + ids, "newWindow", "toolbar=no,scrollbars=no,menubar=no,screenX=100,screenY=100");
-
+        window.open(
+          window._CONFIG['domianURL'] + '/jmreport/view/768644669245833216/?id=' + ids,
+          'newWindow',
+          'toolbar=no,scrollbars=no,menubar=no,screenX=100,screenY=100'
+        )
       }
     },
     loadFrom() {
-      getZoneList().then((res) => {
+      getZoneList().then(res => {
         if (res.success) {
           this.zoneList = res.result
         }
       })
-      getContainerTypeList().then((res) => {
+      getContainerTypeList().then(res => {
         if (res.success) {
           this.containerTypeList = res.result
         }
@@ -314,8 +337,8 @@ export default {
     },
     solutionZoneCode(value) {
       var actions = []
-      Object.keys(this.zoneList).some((key) => {
-        if (this.zoneList[key].code == ('' + value)) {
+      Object.keys(this.zoneList).some(key => {
+        if (this.zoneList[key].code == '' + value) {
           actions.push(this.zoneList[key].name)
           return true
         }
@@ -324,14 +347,14 @@ export default {
     },
     solutionContainerType(value) {
       var actions = []
-      Object.keys(this.containerTypeList).some((key) => {
-        if (this.containerTypeList[key].code == ('' + value)) {
+      Object.keys(this.containerTypeList).some(key => {
+        if (this.containerTypeList[key].code == '' + value) {
           actions.push(this.containerTypeList[key].name)
           return true
         }
       })
       return actions.join('')
-    },
+    }
   }
 }
 </script>
@@ -20,7 +20,7 @@
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
               <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
               </a>
             </span>
           </a-col>
@@ -32,20 +32,30 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" v-has="'containerType:add'" type="primary" icon="plus">新增</a-button>
-      <a-button v-has="'containerType:export'" type="primary" icon="download" @click="handleExportXls('容器类型')">导出</a-button>
-      <a-upload v-has="'containerType:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
-                @change="handleImportExcel">
+      <a-button v-has="'containerType:export'" type="primary" icon="download" @click="handleExportXls('容器类型')">
+        导出
+      </a-button>
+      <a-upload
+        v-has="'containerType:import'"
+        name="file"
+        :showUploadList="false"
+        :multiple="false"
+        :headers="tokenHeader"
+        :action="importExcelUrl"
+        @change="handleImportExcel"
+      >
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay" v-has="'containerType:deleteBatch'">
           <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
+            <a-icon type="delete" />
             删除
           </a-menu-item>
         </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
+        <a-button style="margin-left: 8px">
+          批量操作
+          <a-icon type="down" />
         </a-button>
       </a-dropdown>
     </div>
@@ -53,50 +63,59 @@
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择
+        <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
       <a-table
         ref="table"
         size="middle"
-        :scroll="{x:true}"
+        :scroll="{ x: true }"
         bordered
         rowKey="id"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         class="j-table-force-nowrap"
-        @change="handleTableChange">
+        @change="handleTableChange"
+      >
+        <span slot="companyCode" slot-scope="companyCode">
+          <a-tag :key="companyCode" color=blue>
+            {{ solutionCompany(companyCode) }}
+          </a-tag>
+        </span>
+
+        <span slot="locationTypes" slot-scope="locationTypes" >
+          <a-tag v-for="locationType in locationTypes" :key="locationType" color=pink>
+            {{ solutionLocationType(locationType) }}
+          </a-tag>
+        </span>
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
         <template slot="imgSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt=""
-               style="max-width:80px;font-size: 12px;font-style: italic;"/>
+          <img
+            v-else
+            :src="getImgView(text)"
+            height="25px"
+            alt=""
+            style="max-width:80px;font-size: 12px;font-style: italic;"
+          />
         </template>
         <template slot="fileSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
+          <a-button v-else :ghost="true" type="primary" icon="download" size="small" @click="downloadFile(text)">
             下载
           </a-button>
         </template>
         <span slot="action" slot-scope="text, record">
-          <a v-has="'containerType:edit'" @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
+          <a v-has="'containerType:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical"/></a>
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
@@ -111,7 +130,6 @@
             </a-menu>
           </a-dropdown>
         </span>
-
       </a-table>
     </div>
@@ -120,11 +138,11 @@
 </template>
 <script>
-
 import '@/assets/less/TableExpand.less'
-import {mixinDevice} from '@/utils/mixin'
-import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import ContainerTypeModal from './modules/ContainerTypeModal'
+import {getCompanyList, getLocationTypeList } from '@/api/api'
 export default {
   name: 'ContainerTypeList',
@@ -134,6 +152,8 @@ export default {
   },
   data() {
     return {
+      companyList: [],
+      locationTypeList: [],
       description: '容器类型管理页面',
       // 表头
       columns: [
@@ -142,123 +162,158 @@ export default {
           dataIndex: '',
           key: 'rowIndex',
           width: 60,
-          align: "center",
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1;
+          align: 'center',
+          customRender: function(t, r, index) {
+            return parseInt(index) + 1
           }
         },
         {
           title: '编码',
-          align: "center",
+          align: 'center',
           dataIndex: 'code'
         },
         {
           title: '名称',
-          align: "center",
+          align: 'center',
           dataIndex: 'name'
         },
-        {
-          title: '货主编码',
-          align: "center",
-          dataIndex: 'companyCode'
-        },
+        // {
+        //   title: '货主',
+        //   align: 'center',
+        //   dataIndex: 'companyCode',
+        //   key: 'companyCode',
+        //   scopedSlots: {customRender: 'companyCode'}
+        // },
         {
           title: '绑定的库位类型',
-          align: "center",
-          dataIndex: 'locationType'
+          align: 'center',
+          dataIndex: 'locationTypes',
+          key: 'locationTypes',
+          scopedSlots: {customRender: 'locationTypes'}
         },
         {
           title: '长',
-          align: "center",
+          align: 'center',
           dataIndex: 'length'
         },
         {
           title: '宽',
-          align: "center",
+          align: 'center',
           dataIndex: 'width'
         },
         {
           title: '高',
-          align: "center",
+          align: 'center',
           dataIndex: 'height'
         },
         {
           title: '空容器重量',
-          align: "center",
+          align: 'center',
           dataIndex: 'emptyweight'
         },
         {
           title: '容器最大承重',
-          align: "center",
+          align: 'center',
           dataIndex: 'maxweight'
         },
         {
           title: '创建人',
-          align: "center",
+          align: 'center',
           dataIndex: 'createBy'
         },
         {
           title: '创建日期',
-          align: "center",
+          align: 'center',
           dataIndex: 'createTime'
         },
         {
           title: '更新人',
-          align: "center",
+          align: 'center',
           dataIndex: 'updateBy'
         },
         {
           title: '更新日期',
-          align: "center",
+          align: 'center',
           dataIndex: 'updateTime'
         },
         {
           title: '操作',
           dataIndex: 'action',
-          align: "center",
-          fixed: "right",
+          align: 'center',
+          fixed: 'right',
           width: 147,
-          scopedSlots: {customRender: 'action'}
+          scopedSlots: { customRender: 'action' }
         }
       ],
       url: {
-        list: "/config/containerType/list",
-        delete: "/config/containerType/delete",
-        deleteBatch: "/config/containerType/deleteBatch",
-        exportXlsUrl: "/config/containerType/exportXls",
-        importExcelUrl: "config/containerType/importExcel",
-
+        list: '/config/containerType/list',
+        delete: '/config/containerType/delete',
+        deleteBatch: '/config/containerType/deleteBatch',
+        exportXlsUrl: '/config/containerType/exportXls',
+        importExcelUrl: 'config/containerType/importExcel'
       },
       dictOptions: {},
-      superFieldList: [],
+      superFieldList: []
     }
   },
   created() {
-    this.getSuperFieldList();
+    this.getSuperFieldList()
+    this.loadFrom()
   },
   computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    },
+    importExcelUrl: function() {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    }
   },
   methods: {
-    initDictConfig() {
+    initDictConfig() {},
+    loadFrom() {
+      getCompanyList().then((res) => {
+        if (res.success) {
+          this.companyList = res.result
+        }
+      });
+      getLocationTypeList().then(res => {
+        if (res.success) {
+          this.locationTypeList = res.result
+        }
+      });
+    },
+    solutionCompany(value) {
+      var actions = []
+      Object.keys(this.companyList).some((key) => {
+        if (this.companyList[key].code == ('' + value)) {
+          actions.push(this.companyList[key].name)
+          return true
+        }
+      })
+      return actions.join('')
+    },
+    solutionLocationType(value) {
+      var actions = []
+      Object.keys(this.locationTypeList).some(key => {
+        if (this.locationTypeList[key].code == '' + value) {
+          actions.push(this.locationTypeList[key].name)
+          return true
+        }
+      })
+      return actions.join('')
     },
     getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({type: 'string', value: 'code', text: '编码', dictCode: ''})
-      fieldList.push({type: 'string', value: 'name', text: '名称', dictCode: ''})
-      fieldList.push({type: 'string', value: 'companyCode', text: '货主编码', dictCode: ''})
-      fieldList.push({type: 'string', value: 'locationType', text: '绑定的库位类型', dictCode: ''})
-      fieldList.push({type: 'int', value: 'length', text: '长', dictCode: ''})
-      fieldList.push({type: 'int', value: 'width', text: '宽', dictCode: ''})
-      fieldList.push({type: 'int', value: 'height', text: '高', dictCode: ''})
-      fieldList.push({type: 'int', value: 'emptyweight', text: '空容器重量', dictCode: ''})
-      fieldList.push({type: 'int', value: 'maxweight', text: '容器最大承重', dictCode: ''})
-      fieldList.push({type: 'string', value: 'createBy', text: '创建人', dictCode: ''})
-      fieldList.push({type: 'datetime', value: 'createTime', text: '创建日期'})
-      fieldList.push({type: 'string', value: 'updateBy', text: '更新人', dictCode: ''})
-      fieldList.push({type: 'datetime', value: 'updateTime', text: '更新日期'})
+      let fieldList = []
+      fieldList.push({ type: 'string', value: 'code', text: '编码', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'name', text: '名称', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'companyCode', text: '货主编码', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'locationType', text: '绑定的库位类型', dictCode: '' })
+      fieldList.push({ type: 'int', value: 'length', text: '长', dictCode: '' })
+      fieldList.push({ type: 'int', value: 'width', text: '宽', dictCode: '' })
+      fieldList.push({ type: 'int', value: 'height', text: '高', dictCode: '' })
+      fieldList.push({ type: 'int', value: 'emptyweight', text: '空容器重量', dictCode: '' })
+      fieldList.push({ type: 'int', value: 'maxweight', text: '容器最大承重', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'createBy', text: '创建人', dictCode: '' })
+      fieldList.push({ type: 'datetime', value: 'createTime', text: '创建日期' })
+      fieldList.push({ type: 'string', value: 'updateBy', text: '更新人', dictCode: '' })
+      fieldList.push({ type: 'datetime', value: 'updateTime', text: '更新日期' })
       this.superFieldList = fieldList
     }
   }
@@ -34,7 +34,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -34,7 +34,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -54,7 +54,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -16,7 +16,7 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="状态">
-              <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="location_status"/>
+              <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="location_status" />
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -25,10 +25,10 @@
                 show-search
                 placeholder="请选择库位类型"
                 option-filter-prop="children"
-
-                v-model="queryParam.locationTypeCode">
+                v-model="queryParam.locationTypeCode"
+              >
                 <a-select-option v-for="item in locationTypeList" :key="item.name" :value="item.code">
-                  {{item.name}}
+                  {{ item.name }}
                 </a-select-option>
               </a-select>
             </a-form-item>
@@ -40,10 +40,10 @@
                   show-search
                   placeholder="请选择库区编码"
                   option-filter-prop="children"
-
-                  v-model="queryParam.zoneCode">
+                  v-model="queryParam.zoneCode"
+                >
                   <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
-                    {{item.name}}
+                    {{ item.name }}
                   </a-select-option>
                 </a-select>
               </a-form-item>
@@ -70,17 +70,17 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="高低位">
-                <j-dict-select-tag placeholder="请输入高低位" v-model="queryParam.high" dictCode="high_status"/>
+                <j-dict-select-tag placeholder="请输入高低位" v-model="queryParam.high" dictCode="high_status" />
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="内外侧">
-                <j-dict-select-tag placeholder="请选择内外侧" v-model="queryParam.rowFlag" dictCode="row_type"/>
+                <j-dict-select-tag placeholder="请选择内外侧" v-model="queryParam.rowFlag" dictCode="row_type" />
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="是否可用">
-                <j-dict-select-tag placeholder="请选择是否可用" v-model="queryParam.enable" dictCode="enable_status"/>
+                <j-dict-select-tag placeholder="请选择是否可用" v-model="queryParam.enable" dictCode="enable_status" />
               </a-form-item>
             </a-col>
           </template>
@@ -90,7 +90,7 @@
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
               <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
               </a>
             </span>
           </a-col>
@@ -103,21 +103,31 @@
     <div class="table-operator">
       <a-button @click="batchAdd()" v-has="'location:batchAdd'" type="primary" icon="plus">批量新增</a-button>
       <a-button v-has="'location:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button v-has="'location:export'"  type="primary" icon="download" @click="handleExportXls('库位管理')">导出</a-button>
-      <a-upload v-has="'location:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
-                @change="handleImportExcel">
+      <a-button v-has="'location:export'" type="primary" icon="download" @click="handleExportXls('库位管理')">
+        导出
+      </a-button>
+      <a-upload
+        v-has="'location:import'"
+        name="file"
+        :showUploadList="false"
+        :multiple="false"
+        :headers="tokenHeader"
+        :action="importExcelUrl"
+        @change="handleImportExcel"
+      >
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <a-button v-has="'material:print'" @click="batchPrint()" type="primary">打印</a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay" v-has="'location:deleteBatch'">
           <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
+            <a-icon type="delete" />
             删除
           </a-menu-item>
         </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
+        <a-button style="margin-left: 8px">
+          批量操作
+          <a-icon type="down" />
         </a-button>
       </a-dropdown>
     </div>
@@ -125,33 +135,33 @@
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择
+        <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
       <a-table
         ref="table"
         size="middle"
-        :scroll="{x:true}"
+        :scroll="{ x: true }"
         bordered
         rowKey="id"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-         <span slot="locationTypeCode" slot-scope="locationTypeCode">
-          <a-tag :key="locationTypeCode" color=pink>
+        @change="handleTableChange"
+      >
+        <span slot="locationTypeCode" slot-scope="locationTypeCode">
+          <a-tag :key="locationTypeCode" color="pink">
             {{ solutionLocationType(locationTypeCode) }}
           </a-tag>
         </span>
         <span slot="zoneCode" slot-scope="zoneCode">
-          <a-tag :key="zoneCode" color=blue>
+          <a-tag :key="zoneCode" color="blue">
             {{ solutionZoneCode(zoneCode) }}
           </a-tag>
         </span>
@@ -161,26 +171,23 @@
         </template>
         <template slot="imgSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt=""
-               style="max-width:80px;font-size: 12px;font-style: italic;"/>
+          <img
+            v-else
+            :src="getImgView(text)"
+            height="25px"
+            alt=""
+            style="max-width:80px;font-size: 12px;font-style: italic;"
+          />
         </template>
         <template slot="fileSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
+          <a-button v-else :ghost="true" type="primary" icon="download" size="small" @click="downloadFile(text)">
             下载
           </a-button>
         </template>
         <span slot="action" slot-scope="text, record">
-          <a v-has="'location:edit'" @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
+          <a v-has="'location:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical"/></a>
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
@@ -195,7 +202,6 @@
             </a-menu>
           </a-dropdown>
         </span>
-
       </a-table>
     </div>
@@ -206,15 +212,14 @@
 </template>
 <script>
-
 import '@/assets/less/TableExpand.less'
-import {mixinDevice} from '@/utils/mixin'
-import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import LocationModal from './modules/LocationModal'
-import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-import {getLocationTypeList} from '@/api/api'
-import {getZoneList} from '@/api/api'
-import LocationBatchAddModal from "./modules/LocationBatchAddModal";
+import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
+import { getLocationTypeList } from '@/api/api'
+import { getZoneList } from '@/api/api'
+import LocationBatchAddModal from './modules/LocationBatchAddModal'
 import LocationPrintModal from './modules/LocationPrintModal'
 export default {
@@ -234,114 +239,113 @@ export default {
       columns: [
         {
           title: 'ID',
-          align: "center",
+          align: 'center',
           dataIndex: 'id'
         },
         {
           title: '库位编码',
-          align: "center",
+          align: 'center',
           dataIndex: 'code'
         },
         {
           title: '容器编码',
-          align: "center",
+          align: 'center',
           dataIndex: 'containerCode'
         },
         {
           title: '状态',
-          align: "center",
+          align: 'center',
           dataIndex: 'status_dictText'
         },
         {
           title: '库区',
-          align: "center",
+          align: 'center',
           dataIndex: 'zoneCode',
           key: 'zoneCode',
-          scopedSlots: {customRender: 'zoneCode'}
+          scopedSlots: { customRender: 'zoneCode' }
         },
         {
           title: '库位类型',
-          align: "center",
+          align: 'center',
           dataIndex: 'locationTypeCode',
           key: 'locationTypeCode',
-          scopedSlots: {customRender: 'locationTypeCode'}
+          scopedSlots: { customRender: 'locationTypeCode' }
         },
         {
           title: '巷道',
-          align: "center",
+          align: 'center',
           dataIndex: 'roadWay'
         },
         {
           title: '行',
-          align: "center",
+          align: 'center',
           dataIndex: 'row'
         },
         {
           title: '列',
-          align: "center",
+          align: 'center',
           dataIndex: 'icolumn'
         },
         {
           title: '层',
-          align: "center",
+          align: 'center',
           dataIndex: 'layer'
         },
         {
           title: '高低位',
-          align: "center",
+          align: 'center',
           dataIndex: 'high_dictText'
         },
         {
           title: '内外侧',
-          align: "center",
+          align: 'center',
           dataIndex: 'rowFlag_dictText'
         },
         {
           title: '物料分区存放',
-          align: "center",
+          align: 'center',
           dataIndex: 'materialAreaCode'
         },
         {
           title: '是否可用',
-          align: "center",
+          align: 'center',
           dataIndex: 'enable_dictText'
         },
         {
           title: '创建人',
-          align: "center",
+          align: 'center',
           dataIndex: 'createBy'
         },
         {
           title: '创建日期',
-          align: "center",
+          align: 'center',
           dataIndex: 'createTime'
         },
         {
           title: '更新人',
-          align: "center",
+          align: 'center',
           dataIndex: 'updateBy'
         },
         {
           title: '更新日期',
-          align: "center",
+          align: 'center',
           dataIndex: 'updateTime'
         },
         {
           title: '操作',
           dataIndex: 'action',
-          align: "center",
-          fixed: "right",
+          align: 'center',
+          fixed: 'right',
           width: 147,
-          scopedSlots: {customRender: 'action'}
+          scopedSlots: { customRender: 'action' }
         }
       ],
       url: {
-        list: "/config/location/list",
-        delete: "/config/location/delete",
-        deleteBatch: "/config/location/deleteBatch",
-        exportXlsUrl: "/config/location/exportXls",
-        importExcelUrl: "config/location/importExcel",
-
+        list: '/config/location/list',
+        delete: '/config/location/delete',
+        deleteBatch: '/config/location/deleteBatch',
+        exportXlsUrl: '/config/location/exportXls',
+        importExcelUrl: 'config/location/importExcel'
       },
       /* 分页参数 */
       ipagination: {
@@ -349,83 +353,86 @@ export default {
         pageSize: 10,
         pageSizeOptions: ['10', '20', '50'],
         showTotal: (total, range) => {
-          return range[0] + "-" + range[1] + " 共" + total + "条"
+          return range[0] + '-' + range[1] + ' 共' + total + '条'
         },
         showQuickJumper: true,
         showSizeChanger: true,
         total: 0
       },
       dictOptions: {},
-      superFieldList: [],
+      superFieldList: []
     }
   },
   created() {
-    this.getSuperFieldList();
-    this.loadFrom();
+    this.getSuperFieldList()
+    this.loadFrom()
   },
   computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    },
+    importExcelUrl: function() {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    }
   },
   methods: {
-    initDictConfig() {
-    },
+    initDictConfig() {},
     getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({type: 'string', value: 'code', text: '库位编码', dictCode: ''})
-      fieldList.push({type: 'string', value: 'zoneCode', text: '库区编码', dictCode: ''})
-      fieldList.push({type: 'string', value: 'locationTypeCode', text: '库位类型', dictCode: ''})
-      fieldList.push({type: 'string', value: 'containerCode', text: '容器编码', dictCode: ''})
-      fieldList.push({type: 'string', value: 'status', text: '状态', dictCode: 'location_status'})
-      fieldList.push({type: 'int', value: 'roadWay', text: '巷道', dictCode: ''})
-      fieldList.push({type: 'int', value: 'row', text: '行', dictCode: ''})
-      fieldList.push({type: 'int', value: 'icolumn', text: '列', dictCode: ''})
-      fieldList.push({type: 'int', value: 'layer', text: '层', dictCode: ''})
-      fieldList.push({type: 'int', value: 'grid', text: '格', dictCode: ''})
-      fieldList.push({type: 'int', value: 'high', text: '高低位', dictCode: ''})
-      fieldList.push({type: 'int', value: 'rowFlag', text: '内外侧', dictCode: 'row_type'})
-      fieldList.push({type: 'string', value: 'materialAreaCode', text: '物料分区存放', dictCode: ''})
-      fieldList.push({type: 'int', value: 'enable', text: '是否可用', dictCode: 'enable_status'})
-      fieldList.push({type: 'string', value: 'createBy', text: '创建人', dictCode: ''})
-      fieldList.push({type: 'datetime', value: 'createTime', text: '创建日期'})
-      fieldList.push({type: 'string', value: 'updateBy', text: '更新人', dictCode: ''})
-      fieldList.push({type: 'datetime', value: 'updateTime', text: '更新日期'})
+      let fieldList = []
+      fieldList.push({ type: 'string', value: 'code', text: '库位编码', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'zoneCode', text: '库区编码', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'locationTypeCode', text: '库位类型', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'containerCode', text: '容器编码', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'status', text: '状态', dictCode: 'location_status' })
+      fieldList.push({ type: 'int', value: 'roadWay', text: '巷道', dictCode: '' })
+      fieldList.push({ type: 'int', value: 'row', text: '行', dictCode: '' })
+      fieldList.push({ type: 'int', value: 'icolumn', text: '列', dictCode: '' })
+      fieldList.push({ type: 'int', value: 'layer', text: '层', dictCode: '' })
+      fieldList.push({ type: 'int', value: 'grid', text: '格', dictCode: '' })
+      fieldList.push({ type: 'int', value: 'high', text: '高低位', dictCode: '' })
+      fieldList.push({ type: 'int', value: 'rowFlag', text: '内外侧', dictCode: 'row_type' })
+      fieldList.push({ type: 'string', value: 'materialAreaCode', text: '物料分区存放', dictCode: '' })
+      fieldList.push({ type: 'int', value: 'enable', text: '是否可用', dictCode: 'enable_status' })
+      fieldList.push({ type: 'string', value: 'createBy', text: '创建人', dictCode: '' })
+      fieldList.push({ type: 'datetime', value: 'createTime', text: '创建日期' })
+      fieldList.push({ type: 'string', value: 'updateBy', text: '更新人', dictCode: '' })
+      fieldList.push({ type: 'datetime', value: 'updateTime', text: '更新日期' })
       this.superFieldList = fieldList
     },
     loadFrom() {
-      getZoneList().then((res) => {
+      getZoneList().then(res => {
         if (res.success) {
           this.zoneList = res.result
         }
-      });
-      getLocationTypeList().then((res) => {
+      })
+      getLocationTypeList().then(res => {
         if (res.success) {
           this.locationTypeList = res.result
         }
       })
     },
     batchAdd() {
-      this.$refs.batchAddModalForm.add();
-      this.$refs.batchAddModalForm.title = "批量新增";
-      this.$refs.batchAddModalForm.disableSubmit = false;
+      this.$refs.batchAddModalForm.add()
+      this.$refs.batchAddModalForm.title = '批量新增'
+      this.$refs.batchAddModalForm.disableSubmit = false
     },
     batchPrint() {
       if (this.selectedRowKeys.length <= 0) {
-        this.$message.warning('请选择一条记录！');
-        return;
+        this.$message.warning('请选择一条记录！')
+        return
       } else {
-        var ids = "";
+        var ids = ''
         for (var a = 0; a < this.selectedRowKeys.length; a++) {
-          ids += this.selectedRowKeys[a] + ",";
+          ids += this.selectedRowKeys[a] + ','
         }
-        window.open(window._CONFIG['domianURL'] + "/jmreport/view/768700106074832896/?id=" + ids, "newWindow", "toolbar=no,scrollbars=no,menubar=no,screenX=100,screenY=100");
+        window.open(
+          window._CONFIG['domianURL'] + '/jmreport/view/768700106074832896/?id=' + ids,
+          'newWindow',
+          'toolbar=no,scrollbars=no,menubar=no,screenX=100,screenY=100'
+        )
       }
     },
     solutionZoneCode(value) {
       var actions = []
-      Object.keys(this.zoneList).some((key) => {
-        if (this.zoneList[key].code == ('' + value)) {
+      Object.keys(this.zoneList).some(key => {
+        if (this.zoneList[key].code == '' + value) {
           actions.push(this.zoneList[key].name)
           return true
         }
@@ -434,14 +441,14 @@ export default {
     },
     solutionLocationType(value) {
       var actions = []
-      Object.keys(this.locationTypeList).some((key) => {
-        if (this.locationTypeList[key].code == ('' + value)) {
+      Object.keys(this.locationTypeList).some(key => {
+        if (this.locationTypeList[key].code == '' + value) {
           actions.push(this.locationTypeList[key].name)
           return true
         }
       })
       return actions.join('')
-    },
+    }
   }
 }
 </script>
@@ -20,7 +20,7 @@
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
               <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
               </a>
             </span>
           </a-col>
@@ -32,20 +32,30 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button v-has="'locationType:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button v-has="'locationType:export'" type="primary" icon="download" @click="handleExportXls('库位类型')">导出</a-button>
-      <a-upload v-has="'locationType:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
-                @change="handleImportExcel">
+      <a-button v-has="'locationType:export'" type="primary" icon="download" @click="handleExportXls('库位类型')">
+        导出
+      </a-button>
+      <a-upload
+        v-has="'locationType:import'"
+        name="file"
+        :showUploadList="false"
+        :multiple="false"
+        :headers="tokenHeader"
+        :action="importExcelUrl"
+        @change="handleImportExcel"
+      >
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay" v-has="'locationType:deleteBatch'">
           <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
+            <a-icon type="delete" />
             删除
           </a-menu-item>
         </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
+        <a-button style="margin-left: 8px">
+          批量操作
+          <a-icon type="down" />
         </a-button>
       </a-dropdown>
     </div>
@@ -53,50 +63,47 @@
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择
+        <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
       <a-table
         ref="table"
         size="middle"
-        :scroll="{x:true}"
+        :scroll="{ x: true }"
         bordered
         rowKey="id"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         class="j-table-force-nowrap"
-        @change="handleTableChange">
-
+        @change="handleTableChange"
+      >
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
         <template slot="imgSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt=""
-               style="max-width:80px;font-size: 12px;font-style: italic;"/>
+          <img
+            v-else
+            :src="getImgView(text)"
+            height="25px"
+            alt=""
+            style="max-width:80px;font-size: 12px;font-style: italic;"
+          />
         </template>
         <template slot="fileSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
+          <a-button v-else :ghost="true" type="primary" icon="download" size="small" @click="downloadFile(text)">
             下载
           </a-button>
         </template>
         <span slot="action" slot-scope="text, record">
-          <a v-has="'locationType:edit'" @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
+          <a v-has="'locationType:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical"/></a>
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
@@ -111,7 +118,6 @@
             </a-menu>
           </a-dropdown>
         </span>
-
       </a-table>
     </div>
@@ -120,10 +126,9 @@
 </template>
 <script>
-
 import '@/assets/less/TableExpand.less'
-import {mixinDevice} from '@/utils/mixin'
-import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import LocationTypeModal from './modules/LocationTypeModal'
 export default {
@@ -142,114 +147,111 @@ export default {
           dataIndex: '',
           key: 'rowIndex',
           width: 60,
-          align: "center",
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1;
+          align: 'center',
+          customRender: function(t, r, index) {
+            return parseInt(index) + 1
           }
         },
         {
           title: '编码',
-          align: "center",
+          align: 'center',
           dataIndex: 'code'
         },
         {
           title: '名称',
-          align: "center",
+          align: 'center',
           dataIndex: 'name'
         },
         {
           title: '库区',
-          align: "center",
+          align: 'center',
           dataIndex: 'zoneCode'
         },
         {
           title: '长度',
-          align: "center",
+          align: 'center',
           dataIndex: 'length'
         },
         {
           title: '宽度',
-          align: "center",
+          align: 'center',
           dataIndex: 'weight'
         },
         {
           title: '高度',
-          align: "center",
+          align: 'center',
           dataIndex: 'height'
         },
         {
           title: '最大承重',
-          align: "center",
+          align: 'center',
           dataIndex: 'maxWeight'
         },
         {
           title: '创建人',
-          align: "center",
+          align: 'center',
           dataIndex: 'createBy'
         },
         {
           title: '创建日期',
-          align: "center",
+          align: 'center',
           dataIndex: 'createTime'
         },
         {
           title: '更新人',
-          align: "center",
+          align: 'center',
           dataIndex: 'updateBy'
         },
         {
           title: '更新日期',
-          align: "center",
+          align: 'center',
           dataIndex: 'updateTime'
         },
         {
           title: '操作',
           dataIndex: 'action',
-          align: "center",
-          fixed: "right",
+          align: 'center',
+          fixed: 'right',
           width: 147,
-          scopedSlots: {customRender: 'action'}
+          scopedSlots: { customRender: 'action' }
         }
       ],
       url: {
-        list: "/config/locationType/list",
-        delete: "/config/locationType/delete",
-        deleteBatch: "/config/locationType/deleteBatch",
-        exportXlsUrl: "/config/locationType/exportXls",
-        importExcelUrl: "config/locationType/importExcel",
-
+        list: '/config/locationType/list',
+        delete: '/config/locationType/delete',
+        deleteBatch: '/config/locationType/deleteBatch',
+        exportXlsUrl: '/config/locationType/exportXls',
+        importExcelUrl: 'config/locationType/importExcel'
       },
       dictOptions: {},
-      superFieldList: [],
+      superFieldList: []
     }
   },
   created() {
-    this.getSuperFieldList();
-    this.loadFrom();
+    this.getSuperFieldList()
   },
   computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    },
+    importExcelUrl: function() {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    }
   },
   methods: {
-    initDictConfig() {
-    },
+    initDictConfig() {},
     getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({type: 'string', value: 'code', text: '编码', dictCode: ''})
-      fieldList.push({type: 'string', value: 'name', text: '名称', dictCode: ''})
-      fieldList.push({type: 'int', value: 'length', text: '长度', dictCode: ''})
-      fieldList.push({type: 'int', value: 'weight', text: '宽度', dictCode: ''})
-      fieldList.push({type: 'int', value: 'height', text: '高度', dictCode: ''})
-      fieldList.push({type: 'int', value: 'maxWeight', text: '最大承重', dictCode: ''})
-      fieldList.push({type: 'string', value: 'createBy', text: '创建人', dictCode: ''})
-      fieldList.push({type: 'datetime', value: 'createTime', text: '创建日期'})
-      fieldList.push({type: 'string', value: 'updateBy', text: '更新人', dictCode: ''})
-      fieldList.push({type: 'datetime', value: 'updateTime', text: '更新日期'})
+      let fieldList = []
+      fieldList.push({ type: 'string', value: 'code', text: '编码', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'name', text: '名称', dictCode: '' })
+      fieldList.push({ type: 'int', value: 'length', text: '长度', dictCode: '' })
+      fieldList.push({ type: 'int', value: 'weight', text: '宽度', dictCode: '' })
+      fieldList.push({ type: 'int', value: 'height', text: '高度', dictCode: '' })
+      fieldList.push({ type: 'int', value: 'maxWeight', text: '最大承重', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'createBy', text: '创建人', dictCode: '' })
+      fieldList.push({ type: 'datetime', value: 'createTime', text: '创建日期' })
+      fieldList.push({ type: 'string', value: 'updateBy', text: '更新人', dictCode: '' })
+      fieldList.push({ type: 'datetime', value: 'updateTime', text: '更新日期' })
       this.superFieldList = fieldList
-    },
-  },
+    }
+  }
 }
 </script>
 <style scoped>
@@ -34,7 +34,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -62,7 +62,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -34,7 +34,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -54,7 +54,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -61,7 +61,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -54,7 +54,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -61,7 +61,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -61,7 +61,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -53,7 +53,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -53,7 +53,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -29,7 +29,7 @@
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -61,7 +61,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -49,7 +49,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -56,7 +56,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -20,7 +20,7 @@
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
               <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
               </a>
             </span>
           </a-col>
@@ -32,20 +32,30 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button v-has="'zone:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button v-has="'zone:export'" type="primary" icon="download" @click="handleExportXls('库区管理')">导出</a-button>
-      <a-upload v-has="'zone:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
-                @change="handleImportExcel">
+      <a-button v-has="'zone:export'" type="primary" icon="download" @click="handleExportXls('库区管理')"
+        >导出</a-button
+      >
+      <a-upload
+        v-has="'zone:import'"
+        name="file"
+        :showUploadList="false"
+        :multiple="false"
+        :headers="tokenHeader"
+        :action="importExcelUrl"
+        @change="handleImportExcel"
+      >
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay" v-has="'zone:deleteBatch'">
           <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
+            <a-icon type="delete" />
             删除
           </a-menu-item>
         </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
+        <a-button style="margin-left: 8px">
+          批量操作
+          <a-icon type="down" />
         </a-button>
       </a-dropdown>
     </div>
@@ -53,27 +63,27 @@
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择
+        <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
       <a-table
         ref="table"
         size="middle"
-        :scroll="{x:true}"
+        :scroll="{ x: true }"
         bordered
         rowKey="id"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <span slot="locationTypeCode" slot-scope="locationTypeCode">
-          <a-tag :key="locationTypeCode" color=pink>
+        @change="handleTableChange"
+      >
+        <span slot="locationTypeCodes" slot-scope="locationTypeCodes" >
+          <a-tag v-for="locationTypeCode in locationTypeCodes" :key="locationTypeCode" color=pink>
             {{ solutionLocationType(locationTypeCode) }}
           </a-tag>
         </span>
@@ -83,26 +93,23 @@
         </template>
         <template slot="imgSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt=""
-               style="max-width:80px;font-size: 12px;font-style: italic;"/>
+          <img
+            v-else
+            :src="getImgView(text)"
+            height="25px"
+            alt=""
+            style="max-width:80px;font-size: 12px;font-style: italic;"
+          />
         </template>
         <template slot="fileSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
+          <a-button v-else :ghost="true" type="primary" icon="download" size="small" @click="downloadFile(text)">
             下载
           </a-button>
         </template>
         <span slot="action" slot-scope="text, record">
-          <a v-has="'zone:edit'" @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
+          <a v-has="'zone:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical"/></a>
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
@@ -117,7 +124,6 @@
             </a-menu>
           </a-dropdown>
         </span>
-
       </a-table>
     </div>
@@ -126,12 +132,11 @@
 </template>
 <script>
-
 import '@/assets/less/TableExpand.less'
-import {mixinDevice} from '@/utils/mixin'
-import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import ZoneModal from './modules/ZoneModal'
-import {getLocationTypeList} from '@/api/api'
+import { getLocationTypeList } from '@/api/api'
 export default {
   name: 'ZoneList',
@@ -150,93 +155,93 @@ export default {
           dataIndex: '',
           key: 'rowIndex',
           width: 60,
-          align: "center",
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1;
+          align: 'center',
+          customRender: function(t, r, index) {
+            return parseInt(index) + 1
           }
         },
         {
           title: '编码',
-          align: "center",
+          align: 'center',
           dataIndex: 'code'
         },
         {
           title: '名称',
-          align: "center",
+          align: 'center',
           dataIndex: 'name'
         },
         {
           title: '包含库位类型',
-          align: "center",
-          dataIndex: 'locationTypeCode',
+          align: 'center',
+          dataIndex: 'locationTypeCodes',
+          key: 'locationTypeCodes',
+          scopedSlots: {customRender: 'locationTypeCodes'}
         },
         {
           title: '创建人',
-          align: "center",
+          align: 'center',
           dataIndex: 'createBy'
         },
         {
           title: '创建日期',
-          align: "center",
+          align: 'center',
           dataIndex: 'createTime'
         },
         {
           title: '更新人',
-          align: "center",
+          align: 'center',
           dataIndex: 'updateBy'
         },
         {
           title: '更新日期',
-          align: "center",
+          align: 'center',
           dataIndex: 'updateTime'
         },
         {
           title: '操作',
           dataIndex: 'action',
-          align: "center",
-          fixed: "right",
+          align: 'center',
+          fixed: 'right',
           width: 147,
-          scopedSlots: {customRender: 'action'}
+          scopedSlots: { customRender: 'action' }
         }
       ],
       url: {
-        list: "/config/zone/list",
-        delete: "/config/zone/delete",
-        deleteBatch: "/config/zone/deleteBatch",
-        exportXlsUrl: "/config/zone/exportXls",
-        importExcelUrl: "config/zone/importExcel",
-
+        list: '/config/zone/list',
+        delete: '/config/zone/delete',
+        deleteBatch: '/config/zone/deleteBatch',
+        exportXlsUrl: '/config/zone/exportXls',
+        importExcelUrl: 'config/zone/importExcel'
       },
       dictOptions: {},
-      superFieldList: [],
+      superFieldList: []
     }
   },
   created() {
-    this.getSuperFieldList();
-    this.loadFrom();
+    this.getSuperFieldList()
+    this.loadFrom()
   },
   computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    },
+    importExcelUrl: function() {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    }
   },
   methods: {
-    initDictConfig() {
-    },
+    initDictConfig() {},
     getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({type: 'string', value: 'code', text: '编码', dictCode: ''})
-      fieldList.push({type: 'string', value: 'name', text: '名称', dictCode: ''})
-      fieldList.push({type: 'string', value: 'companyCode', text: '货主编码', dictCode: ''})
-      fieldList.push({type: 'string', value: 'locationTypeCode', text: '库位类型', dictCode: ''})
-      fieldList.push({type: 'string', value: 'createBy', text: '创建人', dictCode: ''})
-      fieldList.push({type: 'datetime', value: 'createTime', text: '创建日期'})
-      fieldList.push({type: 'string', value: 'updateBy', text: '更新人', dictCode: ''})
-      fieldList.push({type: 'datetime', value: 'updateTime', text: '更新日期'})
+      let fieldList = []
+      fieldList.push({ type: 'string', value: 'code', text: '编码', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'name', text: '名称', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'companyCode', text: '货主编码', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'locationTypeCode', text: '库位类型', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'createBy', text: '创建人', dictCode: '' })
+      fieldList.push({ type: 'datetime', value: 'createTime', text: '创建日期' })
+      fieldList.push({ type: 'string', value: 'updateBy', text: '更新人', dictCode: '' })
+      fieldList.push({ type: 'datetime', value: 'updateTime', text: '更新日期' })
       this.superFieldList = fieldList
     },
     loadFrom() {
-      getLocationTypeList().then((res) => {
+      getLocationTypeList().then(res => {
         if (res.success) {
           this.locationTypeList = res.result
         }
@@ -244,8 +249,8 @@ export default {
     },
     solutionLocationType(value) {
       var actions = []
-      Object.keys(this.locationTypeList).some((key) => {
-        if (this.locationTypeList[key].code == ('' + value)) {
+      Object.keys(this.locationTypeList).some(key => {
+        if (this.locationTypeList[key].code == '' + value) {
           actions.push(this.locationTypeList[key].name)
           return true
         }
@@ -5,12 +5,15 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="容器类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="containerTypeCode">
-              <a-input v-model="model.containerTypeCode" placeholder="请输入容器类型"></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="货主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyCode">
-              <a-input v-model="model.companyCode" placeholder="请输入货主"></a-input>
+              <a-select
+                show-search
+                placeholder="请选择容器类型"
+                option-filter-prop="children"
+                v-model="model.containerTypeCode">
+                <a-select-option v-for="item in containerTypeList" :key="item.name" :value="item.code">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -19,18 +22,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialName">
-              <a-input v-model="model.materialName" placeholder="请输入物料名称"></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="物料单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialUnit">
-              <a-input v-model="model.materialUnit" placeholder="请输入物料单位"></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="存放数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="qty">
-              <a-input-number v-model="model.qty" placeholder="请输入存放数量" style="width: 100%"/>
+            <a-form-model-item label="容量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="qty">
+              <a-input-number v-model="model.qty" placeholder="请输入容量" style="width: 100%"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -48,6 +41,7 @@
 import {httpAction, getAction} from '@/api/manage'
 import {validateDuplicateValue} from '@/utils/util'
+import {getContainerTypeList} from '@/api/api'
 export default {
   name: 'ContainerCapacityForm',
@@ -63,6 +57,7 @@ export default {
   data() {
     return {
       model: {},
+      containerTypeList: [],
       labelCol: {
         xs: {span: 24},
         sm: {span: 5},
@@ -80,10 +75,10 @@ export default {
           {required: true, message: '请输入物料编码!'},
         ],
         qty: [
-          {required: true, message: '请输入存放数量!'},
+          {required: true, message: '请输入容量!'},
         ],
         enable: [
-          {required: true, message: '请输入是否可用!'},
+          {required: true, message: '请选择是否可用!'},
         ],
       },
       url: {
@@ -101,8 +96,16 @@ export default {
   created() {
     //备份model原始值
     this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    this.loadFrom();
   },
   methods: {
+    loadFrom() {
+      getContainerTypeList().then((res) => {
+        if (res.success) {
+          this.containerTypeList = res.result
+        }
+      });
+    },
     add() {
       this.edit(this.modelDefault);
     },
@@ -9,11 +9,9 @@
                 show-search
                 placeholder="请选择容器类型"
                 option-filter-prop="children"
-                
                 v-model="model.containerTypeCode">
-                <a-select-option v-for="item in containerTypeList" :key="item.name" :value="item.code">{{
-                    item.name
-                  }}
+                <a-select-option v-for="item in containerTypeList" :key="item.name" :value="item.code">
+                  {{ item.name }}
                 </a-select-option>
               </a-select>
             </a-form-model-item>
@@ -13,14 +13,26 @@
               <a-input v-model="model.name" placeholder="请输入名称"></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="货主编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyCode">
-              <a-input v-model="model.companyCode" placeholder="请输入货主编码"></a-input>
+          <!-- <a-col :span="24">
+            <a-form-model-item label="货主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyCode">
+              <a-select
+                show-search
+                placeholder="请选择货主编码"
+                option-filter-prop="children"
+                v-model="model.companyCode">
+                <a-select-option v-for="item in companyList" :key="item.name" :value="item.code">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
             </a-form-model-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="24">
             <a-form-model-item label="绑定的库位类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationType">
-              <a-input v-model="model.locationType" placeholder="请输入绑定的库位类型"></a-input>
+              <j-select-multiple
+                v-model="model.locationType"
+                :options="locationTypeOptions"
+                placeholder="请选择库位类型">
+              </j-select-multiple>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -57,7 +69,7 @@
 <script>
 import {httpAction, getAction} from '@/api/manage'
-import {validateDuplicateValue} from '@/utils/util'
+import {getLocationTypeList, getCompanyList} from '@/api/api'
 export default {
   name: 'ContainerTypeForm',
@@ -73,6 +85,8 @@ export default {
   data() {
     return {
       model: {},
+      companyList: [],
+      locationTypeOptions: [],
       labelCol: {
         xs: {span: 24},
         sm: {span: 5},
@@ -90,7 +104,7 @@ export default {
           {required: true, message: '请输入名称!'},
         ],
         locationType:  [
-          {required: true, message: '请输入库位类型!'},
+          {required: true, message: '请选择库位类型!'},
         ],
       },
       url: {
@@ -110,10 +124,26 @@ export default {
     this.modelDefault = JSON.parse(JSON.stringify(this.model));
   },
   methods: {
+    loadFrom() {
+      getCompanyList().then((res) => {
+        if (res.success) {
+          this.companyList = res.result
+        }
+      });
+      getLocationTypeList().then((res) => {
+        if (res.success) {
+          this.locationTypeOptions = res.result.map((item, index, arr) => {
+            return {label: item.name, value: item.code}
+          })
+        }
+      });
+    },
     add() {
+      this.loadFrom();
       this.edit(this.modelDefault);
     },
     edit(record) {
+      this.loadFrom();
       this.model = Object.assign({}, record);
       this.visible = true;
     },
@@ -15,7 +15,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="包含库位类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationTypeCode">
-              <a-input v-model="model.locationTypeCode" placeholder="请输入库位类型编码"></a-input>
+              <a-input v-model="model.locationTypeCode" placeholder="请输入包含库位类型编码，用英文逗号分割"></a-input>
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -106,7 +106,7 @@
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -143,12 +143,9 @@
             下载
           </a-button>
         </template>
-
         <span slot="action" slot-scope="text, record">
           <a v-has="'inventoryChild:edit'" @click="handleEdit(record)">编辑</a>
-
         </span>
-
       </a-table>
     </div>
@@ -3,7 +3,9 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator" v-if="mainId">
       <a-button v-has="'inventoryDetail:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button v-has="'inventoryDetail:export'" type="primary" icon="download" @click="handleExportXls('库存详情')">导出</a-button>
+      <a-button v-has="'inventoryDetail:export'" type="primary" icon="download" @click="handleExportXls('库存详情')"
+        >导出</a-button
+      >
       <a-upload
         v-has="'inventoryDetail:import'"
         name="file"
@@ -11,18 +13,20 @@
         :multiple="false"
         :headers="tokenHeader"
         :action="importExcelUrl"
-        @change="handleImportExcel">
+        @change="handleImportExcel"
+      >
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay" v-has="'inventoryDetail:deleteBatch'">
           <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
+            <a-icon type="delete" />
             删除
           </a-menu-item>
         </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
+        <a-button style="margin-left: 8px">
+          批量操作
+          <a-icon type="down" />
         </a-button>
       </a-dropdown>
     </div>
@@ -30,8 +34,8 @@
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择
+        <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -40,16 +44,16 @@
         size="middle"
         bordered
         rowKey="id"
-        :scroll="{x:true}"
+        :scroll="{ x: true }"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-
+        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        @change="handleTableChange"
+      >
         <span slot="companyCode" slot-scope="companyCode">
-          <a-tag :key="companyCode" color=blue>
+          <a-tag :key="companyCode" color="blue">
             {{ solutionCompany(companyCode) }}
           </a-tag>
         </span>
@@ -59,31 +63,27 @@
         </template>
         <template slot="imgSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt=""
-               style="max-width:80px;font-size: 12px;font-style: italic;"/>
+          <img
+            v-else
+            :src="getImgView(text)"
+            height="25px"
+            alt=""
+            style="max-width:80px;font-size: 12px;font-style: italic;"
+          />
         </template>
         <template slot="fileSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
+          <a-button v-else :ghost="true" type="primary" icon="download" size="small" @click="downloadFile(text)">
             下载
           </a-button>
         </template>
         <span slot="action" slot-scope="text, record">
-          <a v-has="'inventoryDetail:edit'" @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical"/>
-
+          <a v-has="'inventoryDetail:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical"/></a>
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a v-has="'inventoryDetail:delete'">删除</a>
           </a-popconfirm>
         </span>
-
       </a-table>
     </div>
@@ -92,15 +92,14 @@
 </template>
 <script>
-
-import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import InventoryDetailModal from './modules/InventoryDetailModal'
-import {getCompanyList} from '@/api/api'
+import { getCompanyList } from '@/api/api'
 export default {
-  name: "InventoryDetailList",
+  name: 'InventoryDetailList',
   mixins: [JeecgListMixin],
-  components: {InventoryDetailModal},
+  components: { InventoryDetailModal },
   props: {
     mainId: {
       type: String,
@@ -116,7 +115,7 @@ export default {
           this.clearList()
         } else {
           this.queryParam['inventoryHeaderId'] = val
-          this.loadData(1);
+          this.loadData(1)
         }
       }
     }
@@ -130,15 +129,15 @@ export default {
       columns: [
         {
           title: '库存详情ID',
-          align: "center",
+          align: 'center',
           dataIndex: 'id'
         },
         {
           title: '货主',
-          align: "center",
+          align: 'center',
           dataIndex: 'companyCode',
           key: 'companyCode',
-          scopedSlots: {customRender: 'companyCode'}
+          scopedSlots: { customRender: 'companyCode' }
         },
         // {
         //   title: '库区',
@@ -147,130 +146,138 @@ export default {
         // },
         {
           title: '容器编码',
-          align: "center",
+          align: 'center',
           dataIndex: 'containerCode'
         },
         {
           title: '库位编码',
-          align: "center",
+          align: 'center',
           dataIndex: 'locationCode'
         },
         {
           title: '物料编码',
-          align: "center",
+          align: 'center',
           dataIndex: 'materialCode'
         },
         {
           title: '物料名称',
-          align: "center",
+          align: 'center',
           dataIndex: 'materialName'
         },
         {
           title: '物料规格',
-          align: "center",
+          align: 'center',
           dataIndex: 'materialSpec'
         },
         {
           title: '物料单位',
-          align: "center",
+          align: 'center',
           dataIndex: 'materialUnit'
         },
         {
           title: '数量',
-          align: "center",
+          align: 'center',
           dataIndex: 'qty'
         },
         {
           title: '任务锁定数量',
-          align: "center",
+          align: 'center',
           dataIndex: 'taskQty'
         },
         {
+          title: '托盘填充度',
+          align: 'center',
+          dataIndex: 'fillDensity',
+          customRender: text => {
+            return text == null ? '' : text + '%'
+          }
+        },
+        {
           title: '库存状态',
-          align: "center",
-          dataIndex: 'inventoryStatus_dictText',
+          align: 'center',
+          dataIndex: 'inventoryStatus_dictText'
         },
         {
           title: '批次',
-          align: "center",
+          align: 'center',
           dataIndex: 'batch'
         },
-        {
-          title: '唯一号',
-          align: "center",
-          dataIndex: 'uniqueCode'
-        },
+        // {
+        //   title: '唯一号',
+        //   align: "center",
+        //   dataIndex: 'uniqueCode'
+        // },
         {
           title: '入库日期',
-          align: "center",
+          align: 'center',
           dataIndex: 'receiptDate'
         },
         {
           title: '库龄（天）',
-          align: "center",
+          align: 'center',
           dataIndex: 'inventoryAge'
         },
         {
           title: '创建人',
-          align: "center",
+          align: 'center',
           dataIndex: 'createBy'
         },
         {
           title: '创建日期',
-          align: "center",
+          align: 'center',
           dataIndex: 'createTime'
         },
         {
           title: '更新人',
-          align: "center",
+          align: 'center',
           dataIndex: 'updateBy'
         },
         {
           title: '更新日期',
-          align: "center",
+          align: 'center',
           dataIndex: 'updateTime'
         },
         {
           title: '操作',
           dataIndex: 'action',
-          align: "center",
-          fixed: "right",
+          align: 'center',
+          fixed: 'right',
           width: 147,
-          scopedSlots: {customRender: 'action'},
+          scopedSlots: { customRender: 'action' }
         }
       ],
       url: {
-        list: "/inventory/inventoryHeader/listInventoryDetailByMainId",
-        delete: "/inventory/inventoryHeader/deleteInventoryDetail",
-        deleteBatch: "/inventory/inventoryHeader/deleteBatchInventoryDetail",
-        exportXlsUrl: "/inventory/inventoryHeader/exportInventoryDetail",
-        importUrl: "/inventory/inventoryHeader/importInventoryDetail",
+        list: '/inventory/inventoryHeader/listInventoryDetailByMainId',
+        delete: '/inventory/inventoryHeader/deleteInventoryDetail',
+        deleteBatch: '/inventory/inventoryHeader/deleteBatchInventoryDetail',
+        exportXlsUrl: '/inventory/inventoryHeader/exportInventoryDetail',
+        importUrl: '/inventory/inventoryHeader/importInventoryDetail'
       },
       dictOptions: {
-        containerStatus: [],
+        containerStatus: []
       }
     }
   },
   created() {
-    this.loadFrom();
+    this.loadFrom()
   },
   computed: {
     importExcelUrl() {
-      return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`;
+      return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`
     }
   },
   methods: {
     loadFrom() {
-      getCompanyList().then((res) => {
+      getCompanyList().then(res => {
         if (res.success) {
           this.companyList = res.result
         }
-      });
+      })
     },
     solutionCompany(value) {
       var actions = []
-      Object.keys(this.companyList).some((key) => {
-        if (this.companyList[key].code == ('' + value)) {
+      Object.keys(this.companyList).some(key => {
+        if (this.companyList[key].code == '' + value) {
           actions.push(this.companyList[key].name)
           return true
         }
@@ -282,10 +289,9 @@ export default {
       this.selectedRowKeys = []
       this.ipagination.current = 1
     }
-
   }
 }
 </script>
 <style scoped>
-@import '~@assets/less/common.less'
+@import '~@assets/less/common.less';
 </style>
@@ -73,7 +73,7 @@
     <div>
 <!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
 <!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a-->
-<!--        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项-->
 <!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
 <!--      </div>-->
@@ -53,7 +53,7 @@
     <!-- table区域-begin -->
     <div>
 <!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
-<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项-->
 <!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
 <!--      </div>-->
@@ -113,7 +113,7 @@
       </a-tab-pane>
     </a-tabs>
-    <inventory-material-summary-modal ref="modalForm" @ok="modalFormOk"></inventory-material-summary-modal>
+    <!-- <inventory-material-summary-modal ref="modalForm" @ok="modalFormOk"></inventory-material-summary-modal> -->
   </a-card>
 </template>
@@ -213,8 +213,8 @@
     methods: {
       solutionZoneCode(value) {
         var actions = []
-        Object.keys(this.zoneList).some((key) => {
-          if (this.zoneList[key].code == ('' + value)) {
+        Object.keys(this.zoneList).some(key => {
+          if (this.zoneList[key].code == '' + value) {
             actions.push(this.zoneList[key].name)
             return true
           }
@@ -255,9 +255,7 @@
       },
       initDictConfig(){
       },
-
       solutionCompany(value) {
-        debugger
         var actions = []
         Object.keys(this.companyList).some((key) => {
           if (this.companyList[key].code == ('' + value)) {
@@ -10,7 +10,6 @@
                 show-search
                 placeholder="请选择货主"
                 option-filter-prop="children"
-                
                 v-model="queryParam.companyCode">
                 <a-select-option v-for="item in companyList" :key="item.name" :value="item.code">{{
                     item.name
@@ -121,7 +120,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -361,7 +360,7 @@ export default {
       fieldList.push({type: 'string', value: 'materialName', text: '物料名称', dictCode: ''})
       fieldList.push({type: 'string', value: 'materialSpec', text: '物料规格', dictCode: ''})
       fieldList.push({type: 'string', value: 'materialUnit', text: '物料单位', dictCode: ''})
-      fieldList.push({type: 'string', value: 'inventoryStatus', text: '库存状态', dictCode: ''})
+      fieldList.push({type: 'string', value: 'inventoryStatus', text: '库存状态', dictCode: 'inventory_status'})
       fieldList.push({type: 'BigDecimal', value: 'qty', text: '数量', dictCode: ''})
       fieldList.push({type: 'string', value: 'batch', text: '批次', dictCode: ''})
       fieldList.push({type: 'string', value: 'createBy', text: '创建人', dictCode: ''})
@@ -47,7 +47,11 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="库存状态">
-                <j-dict-select-tag placeholder="请选择库存状态" v-model="queryParam.inventoryStatus" dictCode="inventory_status"/>
+                <j-dict-select-tag
+                  placeholder="请选择库存状态"
+                  v-model="queryParam.inventoryStatus"
+                  dictCode="inventory_status"
+                />
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -55,14 +59,19 @@
                 <a-input placeholder="请输入批次" v-model="queryParam.batch"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="唯一号">
                 <a-input placeholder="请输入唯一号" v-model="queryParam.uniqueCode"></a-input>
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="入库日期">
-                <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择入库日期" v-model="queryParam.receiptDate"></j-date>
+                <j-date
+                  :show-time="true"
+                  date-format="YYYY-MM-DD HH:mm:ss"
+                  placeholder="请选择入库日期"
+                  v-model="queryParam.receiptDate"
+                ></j-date>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -77,7 +86,7 @@
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
               <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
               </a>
             </span>
           </a-col>
@@ -89,70 +98,81 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button v-has="'inventoryDetail:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button v-has="'inventoryDetail:export'" type="primary" icon="download" @click="handleExportXls('库存详情')">导出</a-button>
-      <a-upload v-has="'inventoryDetail:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+      <a-button v-has="'inventoryDetail:export'" type="primary" icon="download" @click="handleExportXls('库存详情')"
+        >导出</a-button
+      >
+      <a-upload
+        v-has="'inventoryDetail:import'"
+        name="file"
+        :showUploadList="false"
+        :multiple="false"
+        :headers="tokenHeader"
+        :action="importExcelUrl"
+        @change="handleImportExcel"
+      >
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList"  v-has="'inventoryDetail:superSearch'" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-<!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
-<!--        <a-menu slot="overlay">-->
-<!--          <a-menu-item v-has="'inventoryDetail:delete'" key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
-<!--        </a-menu>-->
-<!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
-<!--      </a-dropdown>-->
+      <j-super-query
+        :fieldList="superFieldList"
+        v-has="'inventoryDetail:superSearch'"
+        ref="superQueryModal"
+        @handleSuperQuery="handleSuperQuery"
+      ></j-super-query>
+      <!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
+      <!--        <a-menu slot="overlay">-->
+      <!--          <a-menu-item v-has="'inventoryDetail:delete'" key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+      <!--        </a-menu>-->
+      <!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+      <!--      </a-dropdown>-->
     </div>
     <!-- table区域-begin -->
     <div>
-<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
-<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
-<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
-<!--      </div>-->
+      <!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+      <!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项-->
+      <!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+      <!--      </div>-->
       <a-table
         ref="table"
         size="middle"
-        :scroll="{x:true}"
+        :scroll="{ x: true }"
         bordered
         rowKey="id"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         class="j-table-force-nowrap"
-        @change="handleTableChange">
-
+        @change="handleTableChange"
+      >
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
         <template slot="imgSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+          <img
+            v-else
+            :src="getImgView(text)"
+            height="25px"
+            alt=""
+            style="max-width:80px;font-size: 12px;font-style: italic;"
+          />
         </template>
         <template slot="fileSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
+          <a-button v-else :ghost="true" type="primary" icon="download" size="small" @click="downloadFile(text)">
             下载
           </a-button>
         </template>
-
         <span slot="action" slot-scope="text, record">
-          <a v-has="'inventoryDetail:edit'"@click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
+          <a v-has="'inventoryDetail:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical"/></a>
           <a-popconfirm v-has="'inventoryDetail:delete'" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>
-
       </a-table>
     </div>
@@ -161,187 +181,192 @@
 </template>
 <script>
+import '@/assets/less/TableExpand.less'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import SimpleInventoryDetailModal from './modules/SimpleInventoryDetailModal'
+import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import SimpleInventoryDetailModal from './modules/SimpleInventoryDetailModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-
-  export default {
-    name: 'InventoryDetailList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      SimpleInventoryDetailModal
-    },
-    data () {
-      return {
-        description: '库存详情管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'货主',
-            align:"center",
-            dataIndex: 'companyCode'
-          },
-          {
-            title:'库区',
-            align:"center",
-            dataIndex: 'zoneCode'
-          },
-          {
-            title:'容器编码',
-            align:"center",
-            dataIndex: 'containerCode'
-          },
-          {
-            title:'库位编码',
-            align:"center",
-            dataIndex: 'locationCode'
-          },
-          {
-            title:'物料编码',
-            align:"center",
-            dataIndex: 'materialCode'
-          },
-          {
-            title:'物料名称',
-            align:"center",
-            dataIndex: 'materialName'
-          },
-          {
-            title:'物料规格',
-            align:"center",
-            dataIndex: 'materialSpec'
-          },
-          {
-            title:'物料单位',
-            align:"center",
-            dataIndex: 'materialUnit'
-          },
-          {
-            title:'数量',
-            align:"center",
-            dataIndex: 'qty'
-          },
-          {
-            title:'任务锁定数量',
-            align:"center",
-            dataIndex: 'taskQty'
-          },
-          {
-            title:'库存状态',
-            align:"center",
-            dataIndex: 'inventoryStatus_dictText'
-          },
-          {
-            title:'批次',
-            align:"center",
-            dataIndex: 'batch'
-          },
-          {
-            title:'唯一号',
-            align:"center",
-            dataIndex: 'uniqueCode'
-          },
-          {
-            title:'入库日期',
-            align:"center",
-            dataIndex: 'receiptDate'
-          },
-          {
-            title:'库龄（天）',
-            align:"center",
-            dataIndex: 'inventoryAge'
-          },
-          {
-            title:'创建人',
-            align:"center",
-            dataIndex: 'createBy'
-          },
-          {
-            title:'创建日期',
-            align:"center",
-            dataIndex: 'createTime'
-          },
-          {
-            title:'更新人',
-            align:"center",
-            dataIndex: 'updateBy'
-          },
-          {
-            title:'更新日期',
-            align:"center",
-            dataIndex: 'updateTime'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
+export default {
+  name: 'InventoryDetailList',
+  mixins: [JeecgListMixin, mixinDevice],
+  components: {
+    SimpleInventoryDetailModal
+  },
+  data() {
+    return {
+      description: '库存详情管理页面',
+      // 表头
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function(t, r, index) {
+            return parseInt(index) + 1
           }
-        ],
-        url: {
-          list: "/inventory/inventoryDetail/list",
-          delete: "/inventory/inventoryDetail/delete",
-          deleteBatch: "/inventory/inventoryDetail/deleteBatch",
-          exportXlsUrl: "/inventory/inventoryDetail/exportXls",
-          importExcelUrl: "inventory/inventoryDetail/importExcel",
-
         },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
+        {
+          title: '货主',
+          align: 'center',
+          dataIndex: 'companyCode'
+        },
+        {
+          title: '库区',
+          align: 'center',
+          dataIndex: 'zoneCode'
+        },
+        {
+          title: '容器编码',
+          align: 'center',
+          dataIndex: 'containerCode'
+        },
+        {
+          title: '库位编码',
+          align: 'center',
+          dataIndex: 'locationCode'
+        },
+        {
+          title: '物料编码',
+          align: 'center',
+          dataIndex: 'materialCode'
+        },
+        {
+          title: '物料名称',
+          align: 'center',
+          dataIndex: 'materialName'
+        },
+        {
+          title: '物料规格',
+          align: 'center',
+          dataIndex: 'materialSpec'
+        },
+        {
+          title: '物料单位',
+          align: 'center',
+          dataIndex: 'materialUnit'
+        },
+        {
+          title: '数量',
+          align: 'center',
+          dataIndex: 'qty'
+        },
+        {
+          title: '任务锁定数量',
+          align: 'center',
+          dataIndex: 'taskQty'
+        },
+        {
+          title: '托盘填充度',
+          align: 'center',
+          dataIndex: 'fillDensity',
+          customRender: text => {
+            return text == null ? '' : text + '%'
+          }
+        },
+        {
+          title: '库存状态',
+          align: 'center',
+          dataIndex: 'inventoryStatus_dictText'
+        },
+        {
+          title: '批次',
+          align: 'center',
+          dataIndex: 'batch'
+        },
+        // {
+        //   title:'唯一号',
+        //   align:"center",
+        //   dataIndex: 'uniqueCode'
+        // },
+        {
+          title: '入库日期',
+          align: 'center',
+          dataIndex: 'receiptDate'
+        },
+        {
+          title: '库龄（天）',
+          align: 'center',
+          dataIndex: 'inventoryAge'
+        },
+        {
+          title: '创建人',
+          align: 'center',
+          dataIndex: 'createBy'
+        },
+        {
+          title: '创建日期',
+          align: 'center',
+          dataIndex: 'createTime'
+        },
+        {
+          title: '更新人',
+          align: 'center',
+          dataIndex: 'updateBy'
+        },
+        {
+          title: '更新日期',
+          align: 'center',
+          dataIndex: 'updateTime'
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align: 'center',
+          fixed: 'right',
+          width: 147,
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      url: {
+        list: '/inventory/inventoryDetail/list',
+        delete: '/inventory/inventoryDetail/delete',
+        deleteBatch: '/inventory/inventoryDetail/deleteBatch',
+        exportXlsUrl: '/inventory/inventoryDetail/exportXls',
+        importExcelUrl: 'inventory/inventoryDetail/importExcel'
       },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'companyCode',text:'货主',dictCode:''})
-        fieldList.push({type:'string',value:'zoneCode',text:'库区',dictCode:''})
-        fieldList.push({type:'string',value:'containerCode',text:'容器编码',dictCode:''})
-        fieldList.push({type:'string',value:'locationCode',text:'库位编码',dictCode:''})
-        fieldList.push({type:'string',value:'materialCode',text:'物料编码',dictCode:''})
-        fieldList.push({type:'string',value:'materialName',text:'物料名称',dictCode:''})
-        fieldList.push({type:'string',value:'materialSpec',text:'物料规格',dictCode:''})
-        fieldList.push({type:'string',value:'materialUnit',text:'物料单位',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'qty',text:'数量',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'taskQty',text:'任务锁定数量',dictCode:''})
-        fieldList.push({type:'string',value:'inventoryStatus',text:'库存状态',dictCode:'inventory_status'})
-        fieldList.push({type:'string',value:'batch',text:'批次',dictCode:''})
-        fieldList.push({type:'string',value:'uniqueCode',text:'唯一号',dictCode:''})
-        fieldList.push({type:'datetime',value:'receiptDate',text:'入库日期'})
-        fieldList.push({type:'int',value:'inventoryAge',text:'库龄（天）',dictCode:''})
-        fieldList.push({type:'string',value:'createBy',text:'创建人',dictCode:''})
-        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
-        fieldList.push({type:'string',value:'updateBy',text:'更新人',dictCode:''})
-        fieldList.push({type:'datetime',value:'updateTime',text:'更新日期'})
-        this.superFieldList = fieldList
-      }
+      dictOptions: {},
+      superFieldList: []
+    }
+  },
+  created() {
+    this.getSuperFieldList()
+  },
+  computed: {
+    importExcelUrl: function() {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    }
+  },
+  methods: {
+    initDictConfig() {},
+    getSuperFieldList() {
+      let fieldList = []
+      fieldList.push({ type: 'string', value: 'companyCode', text: '货主', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'zoneCode', text: '库区', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'containerCode', text: '容器编码', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'locationCode', text: '库位编码', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'materialCode', text: '物料编码', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'materialName', text: '物料名称', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'materialSpec', text: '物料规格', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'materialUnit', text: '物料单位', dictCode: '' })
+      fieldList.push({ type: 'BigDecimal', value: 'qty', text: '数量', dictCode: '' })
+      fieldList.push({ type: 'BigDecimal', value: 'taskQty', text: '任务锁定数量', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'inventoryStatus', text: '库存状态', dictCode: 'inventory_status' })
+      fieldList.push({ type: 'string', value: 'batch', text: '批次', dictCode: '' })
+      // fieldList.push({type:'string',value:'uniqueCode',text:'唯一号',dictCode:''})
+      fieldList.push({ type: 'datetime', value: 'receiptDate', text: '入库日期' })
+      fieldList.push({ type: 'int', value: 'inventoryAge', text: '库龄（天）', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'createBy', text: '创建人', dictCode: '' })
+      fieldList.push({ type: 'datetime', value: 'createTime', text: '创建日期' })
+      fieldList.push({ type: 'string', value: 'updateBy', text: '更新人', dictCode: '' })
+      fieldList.push({ type: 'datetime', value: 'updateTime', text: '更新日期' })
+      this.superFieldList = fieldList
     }
   }
+}
 </script>
 <style scoped>
-  @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
 </style>
 \ No newline at end of file
@@ -30,7 +30,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
@@ -38,7 +38,7 @@
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">
-        {{ selectedRowKeys.length }}</a>项
+        {{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
       <a-table