diff --git a/fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue b/fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue index 0e6a9ea39..f4d4ef7ae 100644 --- a/fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue +++ b/fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue @@ -77,7 +77,6 @@ export default { let data = true val.forEach(key => { if (this.propsData.adjusted == key) { - // if (this.propsData.adjusted == key && this.propsData.creatorId == this.$store.getters.name.id) { data = false } }) diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue index 0f3813a9d..496fc9df6 100644 --- a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue +++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue @@ -9,7 +9,7 @@ :totalCount="totalCount" :multipleSelection="multipleSelection" :MaxResultCount="PageListParams.MaxResultCount" - @topbutton="topbuttonHandle" + @topbutton="topbutton" @inlineDialog="inlineDialog" @sortChange="sortChange" @alertoldSkipCount="alertoldSkipCount" @@ -22,7 +22,6 @@ :primarySearchOption="primarySearchOption" @overallSearchFormClick="overallSearchFormClick" :httpOverallSearchData="httpOverallSearchData" - :tableSelection="true" > @@ -107,14 +106,6 @@ 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(),//筛选 @@ -207,49 +198,6 @@ 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 - }) - - // inventoryBalanceActive({id: this.propsData.id}).then(res => { - // this.$successMsg('启用成功!') - // this.Loading.tableLoading = false - // this.displayDialog.detailsDialog = false - // this.paging() - // // getDetailed(this.propsData.id, this.URL).then(res => { - // // this.propsData = res - // // this.Loading.DrawerLoading = false - // // }) - // }).catch(err => { - // this.Loading.tableLoading = false - // }) - }).catch((err) => { - console.log(err) - }); - }else{ - this.topbutton(val,item) - } - }, //抽屉下拉按钮操作 库存余额删除 只能删除库存数量为0的记录 // drawerHandle(val) { // if (val == 'delete') {