盘点筛选按钮位置组件调整+pda盘点筛选条件问题调整

fe/PC/src/components/StepsCountPlanForm/index.vue

@@ -51,12 +51,13 @@
             'locationData',
             oldSkipCountLocation
           )"
-        :setUTableHeight="330"
+        :setUTableHeight="355"
         :filterPageListParams="[]"
         :formTitle="''"
         :displayDialog="active == 1"
         :selectionTable="false"
         :editHandle="editHandle"
+        :buttonsAllIsRight="true"
         :searchTableData="locationData"
         :searchTableColumns="initSearchPageTableColums()"
         :searchTotalCount="totalCountLocation"
@@ -79,6 +80,7 @@
           )"
         @tableButtonClick="addFormData(arguments)"
       ></searchPage>
+      <!-- @filterBtnClickHandle="filterBtnClickHandle" -->
       <!-- 其他参数 -->
       <curren-Form
         v-loading="loading"
@@ -426,6 +428,25 @@ export default {
       return () => {
         list.SkipCount = (oldSkipCount - 1) * list.MaxResultCount;
         this.tableLoading = true;
+        // 盘点库存 过滤线边仓数据 20230703更新
+        // 如果不是Excel盘点类型(this.CreateFormData.requestType != 1)，过滤线边仓数据  20230703更新
+        if ( this.CreateFormData.requestType != 1) {
+          let _filter = {
+            action: "!=",
+            column: "type",
+            logic: "And",
+            value: "5",
+            hide:true
+          }
+          if(this.pageListLocation.condition.filters.length <= 0){
+            this.pageListLocation.condition.filters.push(_filter)
+          }
+          list.condition.filters.forEach((item,key)=>{
+            if(item.action == '!=' && item.column == 'type' && item.value == '5'){
+              item.hide = true
+            }
+          })
+        }
         getPageList(list, url)
           .then((res) => {
             this[data] = res.items;
@@ -553,17 +574,6 @@ export default {
             // 总体信息
             if (this.active == 0) {
               this.pageListLocation.condition.filters = []
-              // 盘点库存 过滤线边仓数据 20230417
-              // 如果不是Excel盘点类型(this.CreateFormData.requestType != 1)，过滤线边仓数据  20230626
-              if ( this.CreateFormData.requestType != 1) {
-                this.pageListLocation.condition.filters.push({
-                  action: "!=",
-                  column: "type",
-                  logic: "And",
-                  value: "5",
-                  hide:true
-                })
-              }
               const Function = this.advancedFilter(
                 // "basedata/item-basic",
                 // this.pageListItemBasic,

fe/PC/src/components/currenButton/index.vue

@@ -40,6 +40,11 @@ export default {
       type: Object,
       default: null
     },
+    // 按钮整体靠右
+    buttonsAllIsRight:{
+      type: Boolean,
+      default: false
+    }
   },
   data () {
     return {
@@ -55,6 +60,10 @@ export default {
     initButtonsData(){
       this.buttonsLeft = []
       this.buttonsRight = []
+      if(this.buttonsAllIsRight){
+        this.buttonsRight = this.Butttondata
+        return
+      }
       this.Butttondata.forEach(item=>{
         if(item.float && item.float == 'right'){
           this.buttonsRight.push(item)

fe/PC/src/components/searchPage/index.vue

@@ -38,6 +38,7 @@
       ></pagination>
       <div class="formButton">
         <currenButton
+          :buttonsAllIsRight="buttonsAllIsRight"
           :Butttondata="editHandle"
           @tableButtonClick="tableButtonClick"
         ></currenButton>
@@ -80,6 +81,11 @@ export default {
         return 220;
       }
     },
+    // 按钮整体靠右
+    buttonsAllIsRight:{
+      type: Boolean,
+      default: false
+    },
     //名称
     formTitle: {
       type: String,

fe/PC/src/filters/status.js

@@ -671,11 +671,11 @@ export function CountPanCompleteType(index, prop){
       value:1
     },
     2:{
-      label:"按照盘点数量为0处理",
+      label:"未盘点到的按照盘点数量为0处理",
       value:2
     },
     3:{
-      label:"按照盘平计算",
+      label:"未盘点到的按照盘平计算",
       value:3
     },
   }

fe/PC/src/styles/mainbasicData.scss

@@ -2,6 +2,9 @@
 @import './basicData.scss';
 .page-box {
   ::v-deep .el-dialog {
+      .el-dialog__body {
+        padding-bottom: 20px;
+      }
       .form1,
       .form2 {
         display: flex;