Merge branch 'dev_web' into dev_web_online

fe/PC/public/version.json

@@ -1,3 +1,3 @@
 {
-    "version": "1.0.62"
+    "version": "1.0.65"
 }

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

@@ -407,7 +407,9 @@ export default {
         // 如果是pda类型盘点，库位类型 则使用 locationTypeForPADPlan 枚举（区别为线边库位为不可选）
         // 如果是Excel类型盘点，库位类型 则使用 locationTypeForExcelPlan 枚举（区别为原材料库位为不可选）
         if(item.prop == 'type'){
+          // todo:暂时
           item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationTypeForExcelPlan'
+          // item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationType'
         }
       });
       return _list
@@ -451,7 +453,9 @@ export default {
         // 盘点库存 过滤线边仓数据 20230703更新
         // 如果是Excel盘点类型(this.CreateFormData.requestType == 1)，过滤原材料2
         // 如果不是Excel盘点类型(this.CreateFormData.requestType != 1)，过滤线边仓数据5
+        // todo://暂时
         let type_value = this.CreateFormData.requestType == 1 ? '2' : '5'
+        // let type_value = this.CreateFormData.requestType == 1 ? null : '5'
         let _filter = {
           action: "!=",
           column: "type",
@@ -468,7 +472,7 @@ export default {
           hide: true
         }
         if(this.pageListLocation.condition.filters.length <= 0){
-          this.pageListLocation.condition.filters.push(_filter)
+          if(type_value)this.pageListLocation.condition.filters.push(_filter)
           this.pageListLocation.condition.filters.push(_filter_code)
         }
         // code多选处理   20230705更新

fe/PC/src/components/searchOverall/style/index.scss

@@ -1,7 +1,7 @@
  .searchOverallComponent{
   height: 0;
   transition:all 0.5s;
-  z-index: 1;
+  z-index: 2;
   overflow: hidden;
 
   .border-outer{

fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue

@@ -114,6 +114,10 @@ export default {
     //抽屉常用按钮
     drawerbutton (val) {
       if(val == 'adjust'){
+        if(this.propsData.creatorId != this.$store.getters.name.id){
+          this.$errorMsg('当前用户与创建用户不符，不能进行生成盘点调整申请')
+          return
+        }
         const data = this.propsData.id
         this.Loading.appMainLoading = true
         StartAdjust(data).then(res=>{

fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue

@@ -9,7 +9,7 @@
       :totalCount="totalCount"
       :multipleSelection="multipleSelection"
       :MaxResultCount="PageListParams.MaxResultCount"
-      @topbutton="topbutton"
+      @topbutton="topbuttonHandle"
       @inlineDialog="inlineDialog"
       @sortChange="sortChange"
       @alertoldSkipCount="alertoldSkipCount"
@@ -22,6 +22,7 @@
       :primarySearchOption="primarySearchOption"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
+      :tableSelection="true"
     >
     </tablePagination>
     <!-- 新增与编辑 -->
@@ -106,6 +107,14 @@ export default {
       currenButtonData: [
         this.defaultImportBtn(),//导入
         this.defaultExportBtn(),//导出
+        {
+          type: "success",
+          icon: "el-icon-check",
+          label: "批量启用",
+          name: "batch-active",
+          size: "mini",
+          background:"#31bb99"
+        },
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
@@ -198,6 +207,37 @@ export default {
         });
       }
     },
+    topbuttonHandle(val,item){
+      // 批量操作
+      if(val == 'batch-active'){
+        if(!this.multipleSelection || this.multipleSelection.length <= 0){
+          this.$warningMsg('请选择数据')
+          return
+        }
+        this.$confirm('此操作将启用已选 ('+this.multipleSelection.length+'条) 数据, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        }).then(() => {
+          this.Loading.tableLoading = true
+          let _ajaxs = []
+          this.multipleSelection.forEach(item=>{
+            _ajaxs.push(inventoryBalanceActive({id: item.id}))
+          })
+          Promise.all(_ajaxs).then((allData) => {
+            this.$successMsg('启用成功!')
+            this.Loading.tableLoading = false
+            this.paging()
+          }).catch((err)=>{
+            this.Loading.tableLoading = false
+          })
+        }).catch((err) => {
+          console.log(err)
+        });
+      }else{
+        this.topbutton(val,item)
+      }
+    },
     //抽屉下拉按钮操作 库存余额删除 只能删除库存数量为0的记录
     // drawerHandle(val) {
     //   if (val == 'delete') {