diff --git a/fe/PC/src/api/wms-pad.js b/fe/PC/src/api/wms-pad.js
index cbba4e86f..70a2018fc 100644
--- a/fe/PC/src/api/wms-pad.js
+++ b/fe/PC/src/api/wms-pad.js
@@ -29,9 +29,9 @@ export function pageLockToLogout(params) {
 }
 
 // 库移-查看余额
-export function inventoryBalanceUsableList(params) {
+export function inventoryBalanceRecommendList(params) {
   return request({
-    url: baseURL + 'wms/inventory/inventory-balance/usable-list',
+    url: baseURL + 'wms/inventory/inventory-balance/recommend-list',
     method: 'get',
     params: params,
   })
diff --git a/fe/PC/src/mixins/padListPageMixins.js b/fe/PC/src/mixins/padListPageMixins.js
index 867b67f8c..2200e57ff 100644
--- a/fe/PC/src/mixins/padListPageMixins.js
+++ b/fe/PC/src/mixins/padListPageMixins.js
@@ -27,6 +27,7 @@ export const padListPageMixins = {
     // 页面初始化
     initPage(){
       this.initPadParams()
+      this.clearSearchHandle()
       this.getPadList()
       let _this = this
       document.getElementById("padListCard").addEventListener('scroll', function() {
@@ -97,7 +98,6 @@ export const padListPageMixins = {
     },
     // 清空筛选条件
     clearSearchHandle(ifFlesh){
-      console.log(100)
       for(let i in this.searchFormData){
         this.searchFormData[i] = ""
       }
diff --git a/fe/PC/src/styles/padMain.scss b/fe/PC/src/styles/padMain.scss
index fb357e0d4..4215fef70 100644
--- a/fe/PC/src/styles/padMain.scss
+++ b/fe/PC/src/styles/padMain.scss
@@ -89,6 +89,8 @@
 
     .el-button{
       margin-left: 20px;
+      padding-left: 20px;
+      padding-right: 20px;
     }
   }
 }
@@ -124,5 +126,16 @@
     width: 100%;
     display: flex;
   }
+
+  .hasStaTitle{
+    display: flex;
+    justify-content: space-between;
+    width: 100%;
+  }
+
+  .sta-tag{
+    padding: 0 10px;
+    border-color: rgba(0,0,0,0);
+  }
 }
 
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 4354f1725..f585edcac 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -2758,6 +2758,7 @@ export const InventoryBalance = [
   { label: "物品名称", prop: 'itemName' },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
+  { label: "类型", prop: 'item_typeFromFE', type: "filter", filters: "ItemTypeBasic", showProp:true },
   { label: "配置", prop: "item_configurationFromFE",showProp:true },
   { label: "库存数量", prop: "qty",isNumber:true },
   { label: "计量单位", prop: "uom" },
diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue
index 79237a68c..a355de6ee 100644
--- a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue
+++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue
@@ -101,12 +101,12 @@ export default {
   },
   data () {
     return {
-      showTableBaseFromFE:['configuration'],
+      showTableBaseFromFE:['configuration','type'],
       URL: 'wms/inventory/inventory-balance',
       listURL:"wms/inventory/inventory-balance/get-list",
       //常用按钮数据
       currenButtonData: [
-        this.defaultImportBtn(),//导入
+        // this.defaultImportBtn(),//导入
         this.defaultExportBtn(),//导出
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
diff --git a/fe/PC/src/views/padManage/components/padListPage/index.vue b/fe/PC/src/views/padManage/components/padListPage/index.vue
index ec1d792b4..7e609af37 100644
--- a/fe/PC/src/views/padManage/components/padListPage/index.vue
+++ b/fe/PC/src/views/padManage/components/padListPage/index.vue
@@ -11,6 +11,7 @@
           >
             <!-- input -->
             <el-input
+              :style="{width:item.width}"
               v-if="item.type == 'input'" 
               v-model="searchFormData[item.prop]" 
               :placeholder="item.label"
@@ -18,6 +19,7 @@
             ></el-input>
             <!-- select -->
             <el-select 
+              :style="{width:item.width}"
               v-if="item.type == 'select'" 
               v-model="searchFormData[item.prop]" 
               :placeholder="item.label"
@@ -46,7 +48,7 @@
       <el-button circle icon="el-icon-upload2" type="primary" class="pageToTop" @click="pageToTopHandle"></el-button>
     </div>
     <!-- 列表 -->
-    <div class="padListCard" v-show="padListData && padListData.length > 0" v-loading="padListLoading"  id="padListCard">
+    <div class="padListCard" id="padListCard" v-loading="padListLoading">
       <div 
         class="padListRow" 
         v-for="(item,index) in padListData"
@@ -54,8 +56,17 @@
       > 
         <div class="commonRowTitle" :style="{background:getRowTitleBack(item)}">
           <el-tag size="mini" effect="dark">{{index + 1}}</el-tag>
-          <!-- <div>aaa:{{item | initMainFirstColumn(item)}}</div> -->
-          <div>{{item[padMainFirstColumnProp] || item[padMainColumn[0].prop]}}</div>
+          <div v-if="!padMainStaColumn">{{item[padMainColumn[0].prop]}}</div>
+          <div v-else class="hasStaTitle">
+            <div v-if="padMainStaColumn[0]">{{item[padMainStaColumn[0].prop]}}</div>
+            <el-tag 
+              class="sta-tag"
+              v-if="padMainStaColumn[1]" 
+              size="small" 
+              effect="dark"
+              :color="item[padMainStaColumn[1].prop] | initMainFirstColumn('background',padMainStaColumn[1].filters)"
+            >{{item[padMainStaColumn[1].prop] | initMainFirstColumn('label',padMainStaColumn[1].filters)}}</el-tag>
+          </div>
         </div>
         <!-- 主表 -->
         <div class="mainDataBox">
@@ -180,9 +191,10 @@ export default {
         return []
       }
     },
-    // 主表第一行title显示数据
-    padMainFirstColumnProp:{
-      type: String,
+    // 主表第一行title显示数据(第一个值为左侧显示的值，第二个值为状态标签值，
+    // 示例：:padMainStaColumn="[{prop:'number'},{prop:'jobStatus',filters:'jobStatus'}]")
+    padMainStaColumn:{
+      type: Array,
       default: null
     },
     // 子表数据配置
@@ -263,9 +275,10 @@ export default {
     },
   },
   filters:{
-    initMainFirstColumn(item){
-      console.log(item)
-      return 1
+    initMainFirstColumn(index,type,filters){
+      let Function = statusType.default[filters]
+      if(!Function)return '无'
+      return Function(index, type, filters) 
     },
   },
   data () {
@@ -279,7 +292,11 @@ export default {
   methods: {
     getRowTitleBack(item){
       let _backRow = null
-      this.padMainColumn.forEach(item=>{ if(item.titleBack){ _backRow = item } })
+      if(this.padMainStaColumn && this.padMainStaColumn[1]){
+        _backRow = this.padMainStaColumn[1]
+      }else{
+        this.padMainColumn.forEach(item=>{ if(item.titleBack){ _backRow = item } })
+      }
       if(_backRow){
         let _filter = statusType.default[_backRow.filters]()
         let _back = null
diff --git a/fe/PC/src/views/padManage/isPadForKittingPack.vue b/fe/PC/src/views/padManage/isPadForKittingPack.vue
index 279eb645c..a066e3a75 100644
--- a/fe/PC/src/views/padManage/isPadForKittingPack.vue
+++ b/fe/PC/src/views/padManage/isPadForKittingPack.vue
@@ -53,6 +53,10 @@
                   prop="chassisNumber"
                   label="底盘组"
                 ></el-table-column>
+                <el-table-column
+                  prop="itemCode"
+                  label="物料代码"
+                ></el-table-column>
                 <el-table-column
                   prop="creationTime"
                   label="时间"
@@ -418,6 +422,7 @@ export default {
       this.loading = true
       postCreate(_data, 'wms/store/KittingPackagingNote').then(res => {
         this.initData()
+        this.$successMsg('提交成功')
         this.loading = false
       }).catch(err => {
         this.loading = false
diff --git a/fe/PC/src/views/padManage/isPadForTransferLibJob_new.vue b/fe/PC/src/views/padManage/isPadForTransferLibJob_new.vue
index 26622e235..7629420c3 100644
--- a/fe/PC/src/views/padManage/isPadForTransferLibJob_new.vue
+++ b/fe/PC/src/views/padManage/isPadForTransferLibJob_new.vue
@@ -15,12 +15,12 @@
       :getPadList="getPadList"
       :intSearchFilters="intSearchFilters"
       :padListParams="padListParams"
-      :showDetailBtn="true"
       :mainIsShowDetail="true"
       @listRowButtonClick="listRowButtonClick"
       @headerButtonClick="headerButtonClick"
       @headerSearchHandle="headerSearchHandle"
       @resetSearchHandle="resetSearchHandle"
+      :padMainStaColumn="[{prop:'number'},{prop:'jobStatus',filters:'jobStatus'}]"
     ></padListPage>
     <!-- :mainIsShowDetail="true" -->
     <!-- 完成库移弹窗 -->
@@ -58,21 +58,30 @@
     </el-dialog>
     <!-- 查看余额 -->
     <el-dialog
+      class="showInventoryPop"
       title="查看余额"
       :visible="showInventoryVisible"
       top="5vh"
       width="90%">
-      <div v-loading="showInventoryLoading" style="height:calc(100vh - 280px);overflow:auto">
-        <curren-descriptions
+      <div v-loading="showInventoryLoading" style="height:calc(100vh - 220px);overflow:auto">
+        <div 
+          class="showInventoryRow"
           v-for="(item,index) in inventoryTableData"
-          :key="index"
-          :column="3"
-          :direction="'horizontal'"
-          :tabsDesTions="inventoryColumn"
-          :propsData="currentRowData.details[0]"
-          style="width:100%;padding-top:20px"
-          :labelStyle="{'width':'200px'}"
-        ></curren-descriptions>
+          :key="index">
+          <div class="commonRowTitle">
+            <el-tag size="mini" effect="dark">{{index + 1}}</el-tag>
+            <div>{{item[inventoryColumn[6].prop]}}</div>
+          </div>
+          <curren-descriptions
+            :column="2"
+            :border="true"
+            :direction="'horizontal'"
+            :tabsDesTions="inventoryColumn"
+            :propsData="item"
+            style="width:100%;padding-top:20px"
+            :labelStyle="{'width':'200px'}"
+          ></curren-descriptions>
+        </div>
         <el-empty v-if="(!inventoryTableData || inventoryTableData.length <= 0) && !showInventoryLoading" description="暂无数据"></el-empty>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -89,7 +98,7 @@ import currenForm from "@/components/currenForm"
 import currenDescriptions from "@/components/currenDescriptions"
 import { getInventoryByPackingCode } from '@/api/wms-api'
 import { transferLibJobHandel } from '@/api/wms-job'
-import { inventoryBalanceUsableList } from '@/api/wms-pad'
+import { inventoryBalanceRecommendList } from '@/api/wms-pad'
 import { filterSelectMixins } from '@/mixins/filter-Select'
 
 export default {
@@ -127,8 +136,8 @@ export default {
         requestNumber:"",
       },
       searchForm:[
-        {label:'任务单号',prop:'number',type:'input'},
-        {label:'申请单号',prop:'requestNumber',type:'input'},
+        {label:'传入申请单号',prop:'callRequestNumber',type:'input',width:'140px'},
+        {label:'传入任务单号',prop:'callJobNumber',type:'input',width:'140px'},
       ],
       showFilterSta:false,
       headerButton:[
@@ -140,7 +149,7 @@ export default {
         },
         {
           type: 'danger',
-          label: '重置数据状态[当前待执行]',
+          label: '重置[待执行]数据',
           name: "showAllData",
           hide: () => { return this.hideButton(false) },
         },
@@ -148,7 +157,7 @@ export default {
       padMainColumn:[
         { label:'任务单号',prop:'number'},
         { label:'申请单号',prop:'requestNumber'},
-        { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus",titleBack:true },
+        // { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus",titleBack:true },
         { label: "传入申请单号", prop: "callRequestNumber" },
         { label: "传入任务单号", prop: "callJobNumber" },
         { label: "任务描述", prop: 'jobDescription' },
@@ -211,7 +220,7 @@ export default {
         },
         {
           type: 'primary',
-          label: '查看余额',
+          label: '查看库存余额',
           name: "showInventory",
         },
       ],
@@ -244,12 +253,31 @@ export default {
       showInventoryLoading:false,
       inventoryTableData:[],
       inventoryColumn:[
-        { label: "物品代码", prop: "itemCode"},
+        { label: "物品代码", prop: "itemCode" },
         { label: "物品名称", prop: "itemName" },
         { label: "物品描述1", prop: "itemDesc1" },
         { label: "物品描述2", prop: "itemDesc2" },
-        { label: "请求数量", prop: 'requestQty' },
-        { label: "请求ERP库位", prop: 'requestLocationErpCode' },
+        { label: "计量单位", prop: "uom" },
+        { label: '数量', prop: "qty" },
+        { label: "箱码", prop: 'packingCode' },
+        { label: "批次", prop: 'lot' },
+        { label: "供应商批次", prop: "supplierBatch" },
+        { label: "标包数量", prop: "stdPackQty" },
+        { label: "库位", prop: 'locationCode' },
+        { label: "ERP储位", prop: "locationErpCode" },
+        { label: "库位组", prop: 'locationGroup' },
+        { label: "标准成本单价", prop: "stdCostPrice" },
+        { label: "标准成本金额", prop: "stdCost" },
+        { label: "备注", prop: 'remark' },
+        { label: "序号", prop: 'serialNumber' },
+        { label: "状态", prop: "status", type: "filter", filters: "openToClose" },
+        { label: "库区", prop: 'locationArea' },
+        { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
+        { label: "入库时间", prop: 'putInTime', type:"dateTime" },
+        { label: "生产时间", prop: "produceDate", type: "dateTime" },
+        { label: "到货时间", prop: "arriveDate", type: "dateTime" },
+        { label: "过期时间", prop: "expireDate", type: "dateTime" },
+        { label: "创建时间", prop: "creationTime", type: "dateTime" },
       ]
     }
   },
@@ -260,17 +288,7 @@ export default {
     // 头部其他按钮点击事件
     headerButtonClick(item,index){
       if(item.name == 'showCanHandle'){
-        this.showFilterSta = true
-        let _filters = [{
-          logic:"And",
-          column:"jobStatus",
-          action:"In",
-          value: JSON.stringify([1,2,4,30])
-        }]
-        this.padListParams.condition.filters = _filters
-        document.getElementById("padListCard").scrollTop = 0
-        this.clearSearchHandle()
-        this.getPadList();
+        this.showCanHandleFunc()
       }
       else if(item.name == 'showAllData'){
         this.showFilterSta = false
@@ -279,6 +297,20 @@ export default {
         this.getPadList();
       }
     },
+    // 筛选可执行功能
+    showCanHandleFunc(){
+      this.showFilterSta = true
+      let _filters = [{
+        logic:"And",
+        column:"jobStatus",
+        action:"In",
+        value: JSON.stringify([1,2,4,30])
+      }]
+      this.padListParams.condition.filters = _filters
+      document.getElementById("padListCard").scrollTop = 0
+      this.clearSearchHandle()
+      this.getPadList();
+    },
     // 当前行按钮点击事件
     listRowButtonClick(row,item){
       if(item.name == "showInventory"){
@@ -288,10 +320,10 @@ export default {
           itemCode:row.details[0].itemCode,
           qty:9999999999,
           statuses:'OK',
-          isPackingCode:true
+          locationTypes:'RAW'
         }
         this.showInventoryLoading = true
-        inventoryBalanceUsableList(_params)
+        inventoryBalanceRecommendList(_params)
         .then(res=>{
           this.inventoryTableData = res
           this.showInventoryLoading = false
@@ -345,11 +377,15 @@ export default {
             transferLibJobHandel(this.currentRowData.id, _data).then(res => {
               this.compeletLoading = false
               this.$successMsg("完成库移成功！")
-              this.initPage()
+              if(this.showFilterSta){
+                this.showCanHandleFunc()
+              }
+              else{
+                this.getPadList()
+              }
               this.compeletHandleClose()
             }).catch(err => {
               this.compeletLoading = false
-              this.$errorMsg("完成库移失败！")
             })
           }).catch(err => {
             this.compeletLoading = false
@@ -369,4 +405,15 @@ export default {
 </script>
 <style lang="scss" scoped>
 @import "@/styles/padMain.scss";
+.showInventoryPop{
+  ::v-deep .el-dialog__body{
+    padding:0 15px !important;
+  }
+  .showInventoryRow{
+    margin-bottom: 20px;
+    .el-descriptions{
+      padding: 0 !important;
+    }
+  }
+}
 </style>
\ No newline at end of file