Browse Source

修复已知bug

dev-xx
马远东 4 months ago
parent
commit
a07cb9efd9
  1. 4
      src/views/aftersales/aftersalesWorkOrderAdd.vue
  2. 52
      src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
  3. 7
      src/views/distribution/inventory/distrilbutionBillLadingList.vue

4
src/views/aftersales/aftersalesWorkOrderAdd.vue

@ -1723,12 +1723,14 @@ const TabactiveClick = (a, b) => {
box-sizing: border-box;
}
:deep(.tablemun) {
height: 0;
padding: 0;
.el-tabs__nav-scroll {
// border-left: 1px solid #dcdfe6;
// border-right: 1px solid #dcdfe6;
}
.el-tabs__content{
display: none;
}
}
.placeholder {
width: 100%;

52
src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue

@ -1,8 +1,34 @@
<template>
<basic-container v-loading="loadingObj.list" element-loading-text="正在加载中...">
<el-row v-if="details.search">
<el-form :inline="true" :model="Topquery" class="el-fr-d"> </el-form>
</el-row>
<div v-h5uShow="details.search">
<!-- 查询模块 -->
<el-form :inline="true" :model="Topquery" class="header_search">
<el-form-item label="仓库:">
<el-select
v-model="details.query.warehouseId"
class="w100"
clearable
placeholder="请选择仓库"
filterable
>
<el-option
v-for="value in warehouseList"
:key="value.value"
:label="value.label"
:value="value.value"
/>
</el-select>
</el-form-item>
<!-- 查询按钮 -->
<el-form-item class="el-btn">
<el-button type="primary" icon="el-icon-search" @click="searchChange"> </el-button>
<el-button icon="el-icon-delete" @click="searchReset"> </el-button>
</el-form-item>
</el-form>
</div>
<!-- 头部右侧按钮模块 -->
<div>
<el-tabs type="border-card" class="top-el-tabs" v-model="tabName" @tab-change="tabchange">
@ -722,7 +748,13 @@ const searchChangeS = () => {
Topquery.value = {};
onLoad();
};
const searchChange=()=>{
onLoad();
}
//
const searchReset=()=>{
onLoad();
}
const areaoptions = ref([]); //
//
const initialization = () => {
@ -739,7 +771,7 @@ initialization();
const details = reactive({
/** 是否开启搜索 */
search: false,
search: true,
/** 列表 */
columnList: deepClone(columnList),
query: {},
@ -779,6 +811,7 @@ const details = reactive({
/** 包明细 */
packageOrderListlVisited: false,
},
warehouseOption:[],
});
const {
@ -793,6 +826,7 @@ const {
zeroAdditionalRecordingInfo,
popUpShow,
recorddata,
warehouseOption,
} = toRefs(details);
// details.columnList = columnList; //
@ -846,10 +880,13 @@ const MyWareh = () => {
label: item.name,
});
});
columnList.find(res => res.label == '仓库名称').checkarr = warehouseList.value;
}
});
};
MyWareh(); //
const Setheight = () => {
const _node = document.querySelector('.tableNode');
@ -949,7 +986,10 @@ const onLoad = val => {
});
};
onLoad();
const searchHide = () => {};
const searchHide = () => {
return
details.search=!details.search
};
//
const sizeChange = val => {

7
src/views/distribution/inventory/distrilbutionBillLadingList.vue

@ -76,7 +76,7 @@
@click="handleBillAdd"
>创建自提</el-button
>
<el-button type="primary" icon="el-icon-plus" @click="pickupCancellation"
<el-button type="primary" @click="pickupCancellation"
>批量取消</el-button
>
<!-- <el-button
@ -887,7 +887,7 @@ export default {
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
.then(async() => {
//
let data = {
billLodingIds: '',
@ -895,9 +895,10 @@ export default {
data.billLodingIds = this.selectionList.map(res => res.id).join(',');
console.log(data, '处理好的值');
this.loading = true; //
$_distrilbutionBillLading(data)
await $_distrilbutionBillLading(data)
.then(res => {
console.log(res, '批量取消车成功');
this.onLoad(this.page);
})
.catch(res => {})
.finally(() => {

Loading…
Cancel
Save