Browse Source

修改部分页面样式

dev-xx
qb 1 year ago
parent
commit
d53340c056
  1. 15
      src/styles/common.scss
  2. 57
      src/views/basic/coderule/basicTenantCode.vue
  3. 83
      src/views/basic/forklift/basicForklift.vue
  4. 165
      src/views/basicdata/brand/basicBrand.vue
  5. 118
      src/views/basicdata/brand/basicClient.vue
  6. 752
      src/views/basicdata/brand/basicZonePrice.vue
  7. 22
      src/views/basicdata/team/basicdataTeamGroup.vue
  8. 93
      src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
  9. 61
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
  10. 26
      src/views/distribution/deliverylist/distributionDeliveryList.vue
  11. 121
      src/views/distribution/deliverylist/distributionDeliveryListmar.vue

15
src/styles/common.scss

@ -156,12 +156,25 @@ a {
cursor: pointer;
}
.w100 {
width: 100%;
}
.h100 {
height: 100%;
}
// 头部搜索
.search_container {
display: grid;
grid-template-rows: 0fr;
transition: 0.3s;
overflow: hidden;
& > div,
& > form {
overflow: hidden;
}
// overflow: hidden;
}
.header_search {

57
src/views/basic/coderule/basicTenantCode.vue

@ -1,40 +1,38 @@
<template>
<basic-container>
<div class="avue-crud">
<el-row v-if="!search">
<div v-h5uShow="!search">
<!-- 查询模块 -->
<el-form :inline="true" :model="query" class="fr-fo">
<div class="fr-fm">
<el-form-item label="编码类型:">
<el-select type="text" v-model="query.codeType" placeholder="请选择编码类型">
<el-option
v-for="item in codeType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.sort"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="展示类型:" style="margin-left: 5px">
<el-select type="text" v-model="query.showType" placeholder="请选择展示类型">
<el-option
v-for="item in showType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.sort"
>
</el-option>
</el-select>
</el-form-item>
</div>
<el-form :inline="true" :model="query" class="header_search">
<el-form-item label="编码类型:">
<el-select type="text" v-model="query.codeType" placeholder="请选择编码类型">
<el-option
v-for="item in codeType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.sort"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="展示类型:" style="margin-left: 5px">
<el-select type="text" v-model="query.showType" placeholder="请选择展示类型">
<el-option
v-for="item in showType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.sort"
>
</el-option>
</el-select>
</el-form-item>
<!-- 查询按钮 -->
<el-form-item>
<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>
</el-row>
</div>
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
@ -54,6 +52,7 @@
<el-row>
<!-- 列表模块 -->
<tablecmt
class="tableNode"
:columnList="columnList"
:tableData="data"
:loading="loading"
@ -202,6 +201,7 @@ import { getList, getDetail, add, update, remove } from '@/api/basic/basicTenant
import option from '@/option/basic/basicTenantCode';
import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
import { setNodeHeight } from '@/utils/util';
export default {
data() {
@ -365,6 +365,9 @@ export default {
},
searchHide() {
this.search = !this.search;
const _tableNode = document.querySelector('.tableNode');
setNodeHeight(_tableNode, '', true);
},
searchChange() {
this.onLoad(this.page);

83
src/views/basic/forklift/basicForklift.vue

@ -1,53 +1,51 @@
<template>
<basic-container>
<div class="avue-crud">
<el-row v-if="!search">
<div v-h5uShow="!search">
<!-- 查询模块 -->
<el-form :inline="true" :model="query" class="fr-fo">
<div class="mr-f">
<el-form-item label="请选择事业线:">
<el-select v-model="query.businessLine" clearable placeholder="请选择事业线">
<el-option
v-for="item in businessLineData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
>
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="请选择使用单位">-->
<!-- <el-input v-model="query.useUnit" placeholder="请输入使用单位"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="供应商:">
<!-- <el-input v-model="query.supplier" placeholder="请输入供应商;1-汉智叉车,2-荆门荆拓,3-天津德丰,4-力至优叉车,5-深圳鑫涛"></el-input>-->
<el-select v-model="query.supplier" clearable placeholder="请选择供应商:">
<el-option
v-for="item in supplierData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="合同编号:">
<el-input v-model="query.contractNumber" placeholder="请输入合同编号"></el-input>
</el-form-item>
<!-- <el-form-item label="租赁开始时间">-->
<!-- <el-input v-model="query.leaseStartTime" placeholder="请输入租赁开始时间"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="租赁结束时间">-->
<!-- <el-input v-model="query.leaseEndTime" placeholder="请输入租赁结束时间"></el-input>-->
<!-- </el-form-item>-->
</div>
<el-form :inline="true" :model="query" class="header_search">
<el-form-item label="请选择事业线:">
<el-select v-model="query.businessLine" clearable placeholder="请选择事业线">
<el-option
v-for="item in businessLineData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
>
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="请选择使用单位">-->
<!-- <el-input v-model="query.useUnit" placeholder="请输入使用单位"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="供应商:">
<!-- <el-input v-model="query.supplier" placeholder="请输入供应商;1-汉智叉车,2-荆门荆拓,3-天津德丰,4-力至优叉车,5-深圳鑫涛"></el-input>-->
<el-select v-model="query.supplier" clearable placeholder="请选择供应商:">
<el-option
v-for="item in supplierData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="合同编号:">
<el-input v-model="query.contractNumber" placeholder="请输入合同编号"></el-input>
</el-form-item>
<!-- <el-form-item label="租赁开始时间">-->
<!-- <el-input v-model="query.leaseStartTime" placeholder="请输入租赁开始时间"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="租赁结束时间">-->
<!-- <el-input v-model="query.leaseEndTime" placeholder="请输入租赁结束时间"></el-input>-->
<!-- </el-form-item>-->
<!-- 查询按钮 -->
<el-form-item>
<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>
</el-row>
</div>
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
@ -68,6 +66,7 @@
<el-row>
<!-- 列表模块 -->
<tablecmt
class="tableNode"
:columnList="columnList"
:tableData="data"
:loading="loading"
@ -529,6 +528,7 @@ import option from '@/option/basic/basicForklift2';
import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
import { getToken } from '@/utils/auth';
import { setNodeHeight } from '@/utils/util';
export default {
data() {
@ -1058,6 +1058,9 @@ export default {
},
searchHide() {
this.search = !this.search;
const _tableNode = document.querySelector('.tableNode');
setNodeHeight(_tableNode, '', true);
},
searchChange() {
this.onLoad(this.page);

165
src/views/basicdata/brand/basicBrand.vue

@ -1,40 +1,34 @@
<template>
<basic-container>
<div class="avue-crud">
<el-row v-if="!search">
<div v-h5uShow="!search">
<!-- 查询模块 -->
<el-form :inline="true" :model="query" class='fr-fm'>
<div>
<el-form :inline="true" :model="query" class="header_search">
<el-form-item label="品牌名称:">
<el-input v-model="query.brandName" placeholder="请输入品牌名称"></el-input>
</el-form-item>
<el-form-item label="品牌编号:">
<el-input v-model="query.brandCode" placeholder="请输入品牌编号"></el-input>
</el-form-item>
<el-form-item label="承接时间:" class='el-times'>
<!-- <el-input v-model="query.acceptanceTime" placeholder="请输入承接时间"></el-input>-->
<div class="block">
<!-- <span class="demonstration">With quick options</span>-->
<el-date-picker
v-model="dataShi"
type="daterange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
:size="'default'"
/>
</div>
<el-form-item label="承接时间:" class="el-times">
<el-date-picker
class="h100"
v-model="dataShi"
type="daterange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
/>
</el-form-item>
</div>
<!-- 查询按钮 -->
<el-form-item class='el-btn'>
<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>
</el-row>
</div>
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
@ -55,6 +49,7 @@
<el-row>
<!-- 列表模块 -->
<tablecmt
class="tableNode"
:columnList="columnList"
:tableData="data"
:loading="loading"
@ -86,20 +81,20 @@
</tablecmt>
</el-row>
<el-row>
<div class="avue-crud__pagination flex-c-sb" style="width:100%;">
<div style="font-size: 14px;">
勾选数量: {{ selectionList.length }}
</div>
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
<!-- 分页模块 -->
<el-pagination align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50,80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total">
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
</el-pagination>
</div>
</el-row>
@ -111,7 +106,14 @@
:before-close="beforeClose"
append-to-body
>
<el-form :disabled="view" ref="form" :model="form" label-width="80px" :rules="rules">
<el-form
v-loading="loadingObj.detailLoading"
:disabled="view"
ref="form"
:model="form"
label-width="80px"
:rules="rules"
>
<!-- 表单字段 -->
<el-form-item label="品牌名称" prop="brandName">
<el-input v-model="form.brandName" placeholder="请输入品牌名称" />
@ -143,16 +145,17 @@
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
<!-- 表单按钮 -->
<el-form-item v-if="!view">
<div class="flex-c-c w100">
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')">
</el-button>
<el-button icon="el-icon-circle-close" @click="box = false"> </el-button>
</div>
</el-form-item>
</el-form>
<!-- 表单按钮 -->
<template #footer>
<span v-if="!view" class="dialog-footer">
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')"
> </el-button
>
<el-button icon="el-icon-circle-close" @click="box = false"> </el-button>
</span>
</template>
</el-dialog>
<el-drawer
title="子表操作"
@ -180,6 +183,7 @@ import option from '@/option/basicdata/basicBrand';
import { mapGetters } from 'vuex';
import BasicStoreBrandSub from '@/views/basicdata/brand/basicStoreBrandSub.vue';
import { getToken } from '@/utils/auth';
import { setNodeHeight } from '@/utils/util';
export default {
components: {
@ -251,7 +255,7 @@ export default {
hide: true,
},
],
drawerShow:false,
drawerShow: false,
height: 0,
srcList: [],
dataShi: '', //
@ -329,6 +333,10 @@ export default {
brandIcon: [{ required: true, message: '请上传图标', trigger: 'blur' }],
acceptanceTime: [{ required: true, message: '请选择承接时间', trigger: 'blur' }],
},
loadingObj: {
/** 查看loading */
detailLoading: false,
},
};
},
mounted() {
@ -483,6 +491,9 @@ export default {
},
searchHide() {
this.search = !this.search;
const _tableNode = document.querySelector('.tableNode');
setNodeHeight(_tableNode, '', true);
},
searchChange() {
this.onLoad(this.page);
@ -496,6 +507,7 @@ export default {
handleSubmit(from) {
this.$refs[from].validate(valid => {
if (valid) {
this.loadingObj.detailLoading = true;
if (!this.form.id) {
console.log('提交的数据!!', this.form);
add(this.form).then(() => {
@ -504,18 +516,24 @@ export default {
this.$message({
type: 'success',
message: '操作成功!',
}).finally(() => {
this.loadingObj.detailLoading = false;
});
this.imageUrl = null;
});
} else {
update(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
update(this.form)
.then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
})
.finally(() => {
this.loadingObj.detailLoading = false;
});
});
}
}
});
@ -530,17 +548,30 @@ export default {
handleEdit(row) {
this.title = '编辑';
this.box = true;
getDetail(row.id).then(res => {
this.form = res.data.data;
});
this.loadingObj.detailLoading = true;
getDetail(row.id)
.then(res => {
this.form = res.data.data;
this.imageUrl = res.data.data.brandIcon || '';
})
.finally(() => {
this.loadingObj.detailLoading = false;
});
},
handleView(row) {
this.title = '查看';
this.view = true;
this.box = true;
getDetail(row.id).then(res => {
this.form = res.data.data;
});
this.loadingObj.detailLoading = true;
getDetail(row.id)
.then(res => {
this.form = res.data.data;
this.imageUrl = res.data.data.brandIcon || '';
})
.finally(() => {
this.loadingObj.detailLoading = false;
});
},
handleDrawer(row) {
this.basicBrandId = row.id;
@ -634,27 +665,25 @@ export default {
},
};
</script>
<style scoped>
<style lang="scss" scoped>
.avatar-uploader .avatar {
width: 178px;
height: 178px;
display: block;
}
.el-times {
:deep(.el-tooltip__trigger) {
height: 33px !important;
}
}
:deeP(.no-print){
:deep(.no-print) {
margin-left: auto;
}
.fr-fm{
.fr-fm {
width: 100%;
display: flex;
justify-content: space-between;
}
.el-btn{
margin-right:0;
.el-btn {
margin-right: 0;
}
.header_search :deep(.el-range-editor.el-input__wrapper) {
height: 100% !important;
}
</style>

118
src/views/basicdata/brand/basicClient.vue

@ -1,71 +1,57 @@
<template>
<basic-container>
<div class="avue-crud">
<el-row v-if="!search">
<div v-h5uShow="!search">
<!-- 查询模块 -->
<el-form :inline="true" :model="query" class="fr-fo">
<div>
<el-form-item label="客户名称:">
<el-input v-model="query.clientName" placeholder="请输入客户名称"></el-input>
</el-form-item>
<el-form-item label="客户类型:">
<!-- <el-input v-model="query.typeService" placeholder="请输入客户类型;1 C端 2 B端"></el-input>-->
<el-select v-model="query.clientType" class="m-2" placeholder="请选择客户端类型">
<el-option
v-for="item in clientType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
/>
</el-select>
</el-form-item>
<el-form-item label="地址:">
<!-- <el-input v-model="query.bladeRegionProvinceId" placeholder="请输入省份"></el-input>-->
<el-cascader :options="optioner" v-model="query.bladeRegionProvinceId">
<template #default="{ node, data }">
<span>{{ data.label }}</span>
<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
</template>
</el-cascader>
</el-form-item>
<el-form :inline="true" :model="query" class="header_search">
<el-form-item label="客户名称:">
<el-input v-model="query.clientName" placeholder="请输入客户名称"></el-input>
</el-form-item>
<!-- <el-form-item label="市:">-->
<!-- <el-input v-model="query.bladeRegionCityId" placeholder="请输入市"></el-input>-->
<el-form-item label="客户类型:">
<el-select v-model="query.clientType" class="m-2" placeholder="请选择客户端类型">
<el-option
v-for="item in clientType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
/>
</el-select>
</el-form-item>
<!-- </el-form-item>-->
<!-- <el-form-item label="区/县:">-->
<!-- <el-input v-model="query.bladeRegionAreaId" placeholder="请输入区/县"></el-input>-->
<!-- -->
<!-- </el-form-item>-->
<el-form-item label="合同开始时间:" class="el-times">
<!-- <el-input v-model="query.contractStartTime" placeholder="请输入合同开始时间"></el-input>-->
<div class="block">
<!-- <span class="demonstration">With quick options</span>-->
<el-date-picker
v-model="dataShi"
type="daterange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
:size="'default'"
format="YYYY/MM/DD"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</div>
</el-form-item>
<!-- <el-form-item label="合同结束时间:">-->
<!-- <el-input v-model="query.contractEntTime" placeholder="请输入合同结束时间"></el-input>-->
<!-- </el-form-item>-->
</div>
<el-form-item label="地址:">
<el-cascader :options="optioner" v-model="query.bladeRegionProvinceId">
<template #default="{ node, data }">
<span>{{ data.label }}</span>
<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
</template>
</el-cascader>
</el-form-item>
<el-form-item label="合同开始时间:" class="el-times">
<el-date-picker
v-model="dataShi"
type="daterange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
:size="'default'"
format="YYYY/MM/DD"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
<!-- <el-form-item label="合同结束时间:">-->
<!-- <el-input v-model="query.contractEntTime" placeholder="请输入合同结束时间"></el-input>-->
<!-- </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>
</el-row>
</div>
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
@ -85,6 +71,7 @@
</el-row>
<el-row>
<tablecmt
class="tableNode"
:columnList="columnList"
:tableData="data"
:loading="loading"
@ -477,7 +464,7 @@ import globalc from '@/api/basicdata/globalc';
import { Base64 } from 'js-base64';
import dayjs from 'dayjs';
import { exportBlob } from '@/api/common';
import { downloadXls } from '@/utils/util';
import { downloadXls, setNodeHeight } from '@/utils/util';
export default {
components: {
@ -1095,6 +1082,9 @@ export default {
},
searchHide() {
this.search = !this.search;
const _tableNode = document.querySelector('.tableNode');
setNodeHeight(_tableNode, '', true);
},
searchChange() {
this.onLoad(this.page);
@ -1495,12 +1485,16 @@ export default {
height: 32px !important;
}
}
.fr-fo {
width: 100%;
display: flex;
justify-content: space-between;
}
// .fr-fo {
// width: 100%;
// display: flex;
// justify-content: space-between;
// }
.el-btn {
margin-right: 0;
}
:deep(.el-cascader) {
width: 100%;
}
</style>

752
src/views/basicdata/brand/basicZonePrice.vue

File diff suppressed because it is too large Load Diff

22
src/views/basicdata/team/basicdataTeamGroup.vue

@ -1,24 +1,19 @@
<template>
<basic-container>
<div class="avue-crud">
<el-row v-if="!search">
<div v-h5uShow="!search">
<!-- 查询模块 -->
<el-form :inline="true" :model="query" class="fr-fo">
<div class="el-fr">
<!-- <el-form-item label="仓库名称:">-->
<!-- <el-input v-model="query.warehouseName" placeholder="请输入仓库名称"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="班组名称:">
<el-input v-model="query.groupName" placeholder="请输入班组名称"></el-input>
</el-form-item>
</div>
<el-form :inline="true" :model="query" class="header_search">
<el-form-item label="班组名称:">
<el-input v-model="query.groupName" placeholder="请输入班组名称"></el-input>
</el-form-item>
<!-- 查询按钮 -->
<el-form-item class="el-so">
<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>
</el-row>
</div>
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
@ -38,6 +33,7 @@
<el-row>
<!-- 列表模块 -->
<tablecmt
class="tableNode"
:columnList="columnList"
:tableData="data"
:loading="loading"
@ -173,6 +169,7 @@ import { getListUser } from '@/api/distribution/distributionStockup';
import { getDept, getLazyList } from '@/api/system/dept';
import { getDeptWarehouse } from '@/api/basicdata/basicdataWarehouse';
import { getUserDetail } from '@/api/system/user';
import { setNodeHeight } from '@/utils/util';
export default {
data() {
@ -378,6 +375,9 @@ export default {
},
searchHide() {
this.search = !this.search;
const _tableNode = document.querySelector('.tableNode');
setNodeHeight(_tableNode, '', true);
},
searchChange() {
this.onLoad(this.page);

93
src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue

@ -1,58 +1,51 @@
<template>
<basic-container>
<div class="avue-crud">
<el-row v-if="!search">
<div v-h5uShow="!search">
<!-- 查询模块 -->
<el-form :inline="true" :model="query" style="width: 100%">
<el-form :inline="true" :model="query" class="header_search" style="width: 100%">
<!-- 查询按钮 -->
<el-form-item class="fr-fo">
<el-col class="el-sl">
<div>
<el-form-item label="启用状态:" prop="areaStatus">
<!-- <el-input v-model="form.areaStatus" placeholder="请输入货区状态;1-启用,2-禁用"/>-->
<el-select
v-model="query.enableStatus"
clearable
placeholder="请选择启用状态"
style="width: 88%"
>
<el-option
v-for="item in enableStatus"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="货区类型:" prop="areaStatus">
<el-select
v-model="query.areaType"
clearable
placeholder="请选择货区类型"
style="width: 88%"
>
<el-option
v-for="item in areaTypeData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
>
</el-option>
</el-select>
</el-form-item>
</div>
<div>
<el-button type="primary" icon="el-icon-search" @click="searchChange"
> </el-button
>
<el-button icon="el-icon-delete" @click="searchReset()"> </el-button>
</div>
</el-col>
<el-form-item label="启用状态:" prop="areaStatus">
<el-select
v-model="query.enableStatus"
clearable
placeholder="请选择启用状态"
style="width: 88%"
>
<el-option
v-for="item in enableStatus"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="货区类型:" prop="areaStatus">
<el-select
v-model="query.areaType"
clearable
placeholder="请选择货区类型"
style="width: 88%"
>
<el-option
v-for="item in areaTypeData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<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>
</el-row>
</div>
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
@ -89,6 +82,7 @@
<el-row>
<!-- 列表模块 -->
<tablecmt
class="tableNode"
:columnList="columnList"
:tableData="data"
:loading="loading"
@ -276,7 +270,7 @@ import { getWarehouseList } from '@/api/basicdata/basicdataWarehouse';
import { getToken } from '@/utils/auth';
import NProgress from 'nprogress';
import { exportBlob } from '@/api/common';
import { downloadXls } from '@/utils/util';
import { downloadXls, setNodeHeight } from '@/utils/util';
import { dateNow } from '@/utils/date';
export default {
@ -548,6 +542,9 @@ export default {
searchHide() {
this.search = !this.search;
const _tableNode = document.querySelector('.tableNode');
setNodeHeight(_tableNode, '', true);
},
searchChange() {
this.onLoad(this.page);

61
src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue

@ -1,45 +1,32 @@
<template>
<basic-container>
<div class="avue-crud">
<el-row v-if="!search">
<div v-h5uShow="!search">
<!-- 查询模块 -->
<el-form :inline="true" :model="query" style="width: 100%">
<el-form :inline="true" :model="query" class="header_search" style="width: 100%">
<!-- 查询按钮 -->
<el-form-item class="el-lo">
<el-row style="width: 100%">
<el-col class="el-ls">
<div>
<el-form-item label="货区:" prop="info">
<!-- <el-cascader :options="optioner" :show-all-levels="false" clearable >-->
<el-cascader
:options="optioner"
style="width: 80%"
v-model="query.goodsAreaInfo"
placeholder="请选择货区"
:show-all-levels="false"
clearable
/>
<!-- </el-cascader>-->
</el-form-item>
<el-form-item label="货区:" prop="info">
<!-- <el-cascader :options="optioner" :show-all-levels="false" clearable >-->
<el-cascader
:options="optioner"
style="width: 80%"
v-model="query.goodsAreaInfo"
placeholder="请选择货区"
:show-all-levels="false"
clearable
/>
<!-- </el-cascader>-->
</el-form-item>
<el-form-item label="货架名称" prop="info">
<el-input v-model="query.goodsShelfName" placeholder="请输入货架名称" />
</el-form-item>
</div>
<div>
<el-button type="primary" icon="el-icon-search" @click="searchChange"
> </el-button
>
<el-button icon="el-icon-delete" @click="searchReset()"> </el-button>
</div>
</el-col>
</el-row>
<el-form-item label="货架名称" prop="info">
<el-input v-model="query.goodsShelfName" placeholder="请输入货架名称" />
</el-form-item>
<el-form-item>
<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>
</el-row>
</div>
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
@ -70,6 +57,7 @@
<el-row>
<!-- 列表模块 -->
<tablecmt
class="tableNode"
:columnList="columnList"
:tableData="data"
:loading="loading"
@ -457,7 +445,7 @@ import { getTemplateData } from '@/api/basic/basicPrintTemplate';
import { getLodop } from '@/utils/LodopFuncs.js';
import { exportBlob } from '@/api/common';
import { getToken } from '@/utils/auth';
import { downloadXls } from '@/utils/util';
import { downloadXls, setNodeHeight } from '@/utils/util';
export default {
data() {
return {
@ -1048,6 +1036,9 @@ export default {
searchHide() {
this.search = !this.search;
const _tableNode = document.querySelector('.tableNode');
setNodeHeight(_tableNode, '', true);
},
searchChange() {
this.onLoad(this.page);

26
src/views/distribution/deliverylist/distributionDeliveryList.vue

@ -1,9 +1,9 @@
<template>
<basic-container>
<div class="avue-crud">
<el-row v-if="!search">
<div v-h5uShow="!search">
<!-- 查询模块 -->
<el-form :inline="true" :model="query">
<el-form class="header_search" :model="query">
<el-form-item label="配送车次:">
<el-input v-model="query.trainNumber" placeholder="请输入配送车次"></el-input>
</el-form-item>
@ -67,9 +67,9 @@
<el-button icon="el-icon-delete" @click="searchReset()"> </el-button>
</el-form-item>
</el-form>
</el-row>
</div>
<div class="orderInfos">
<el-row class="orderInfos">
<div class="order-info">
<ul>
<li>
@ -130,7 +130,7 @@
</li>
</ul>
</div>
</div>
</el-row>
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
@ -154,6 +154,7 @@
<el-row>
<!-- 列表模块 -->
<tablecmt
class="tableNode"
:columnList="columnList"
:tableData="data"
:loading="loading"
@ -317,7 +318,7 @@ import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
import print from '@/utils/print';
import { getBillLadingExport } from '@/api/distribution/distrilbutionBillLading';
import { downloadXls } from '@/utils/util';
import { downloadXls, setNodeHeight } from '@/utils/util';
export default {
data() {
@ -959,6 +960,9 @@ export default {
},
searchHide() {
this.search = !this.search;
const _tableNode = document.querySelector('.tableNode');
setNodeHeight(_tableNode, '', true);
},
searchChange() {
if (this.query.deliveryKind) {
@ -1207,11 +1211,11 @@ export default {
.el-form-item {
margin-right: 10px;
}
.el-form {
width: 100%;
display: flex;
justify-content: space-between;
}
// .el-form {
// width: 100%;
// display: flex;
// justify-content: space-between;
// }
.avue-crud__right {
display: flex;
align-items: center;

121
src/views/distribution/deliverylist/distributionDeliveryListmar.vue

@ -1,9 +1,9 @@
<template>
<basic-container>
<div class="avue-crud">
<el-row v-if="!search">
<div v-h5uShow="!search">
<!-- 查询模块 -->
<el-form :inline="true" :model="query" class="fr-fo">
<el-form :inline="true" :model="query" class="header_search">
<el-form-item label="配送车次:">
<el-input v-model="query.trainNumber" placeholder="请输入配送车次"></el-input>
</el-form-item>
@ -14,18 +14,6 @@
<el-date-picker v-model="query.taskTime" type="date" placeholder="选择日期">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="配送类型:">-->
<!-- <el-select v-model="query.businessType" placeholder="请选择业务类型">-->
<!-- <el-option-->
<!-- :key="'1'"-->
<!-- :value="'商配'">商配-->
<!-- </el-option>-->
<!-- <el-option-->
<!-- :key="'2'"-->
<!-- :value="'市配'">市配-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="配送种类:">
<el-select v-model="query.deliveryKind" placeholder="请选择业务类型">
<el-option :key="'1'" :value="'自主配送'">自主配送</el-option>
@ -70,7 +58,7 @@
<el-button icon="el-icon-delete" @click="searchReset()"> </el-button>
</el-form-item>
</el-form>
</el-row>
</div>
<el-row>
<!-- <el-col :xl="14" :lg="7" :md="8" :sm="24" >-->
<!-- <span style="padding-left: 10%" >配送总车次{{statistics.vehiclesNub}}/总包件数{{statistics.deliveriesTotal}}/总库存品数{{statistics.dinventoryTotal}} </span>-->
@ -125,62 +113,56 @@
<el-tab-pane label="配送中" name="third"> </el-tab-pane>
<el-tab-pane label="已完成" name="fourth"> </el-tab-pane>
</el-tabs>
<el-row class="el-fy">
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<tablecmt
ref="tableNode"
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionsc"
>
<template #default="slotProps">
<el-text size="small" @click="printOrder(slotProps.scope.row)"> </el-text>
<el-text size="small" @click="editsolt(slotProps.scope)"> </el-text>
<el-text size="small" @click="editmap(slotProps.scope)"> </el-text>
<!-- <el-text size="small" v-if="slotProps.scope.row.deliveryStatusName !== '已完成' ||-->
<!-- slotProps.scope.row.deliveryStatus !== '3'-->
<tablecmt
ref="tableNode"
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionsc"
>
<template #default="slotProps">
<el-text size="small" @click="printOrder(slotProps.scope.row)"> </el-text>
<el-text size="small" @click="editsolt(slotProps.scope)"> </el-text>
<el-text size="small" @click="editmap(slotProps.scope)"> </el-text>
<!-- <el-text size="small" v-if="slotProps.scope.row.deliveryStatusName !== '已完成' ||-->
<!-- slotProps.scope.row.deliveryStatus !== '3'-->
<el-text
size="small"
v-if="
slotProps.scope.row.deliveryStatusName !== '已完成' ||
slotProps.scope.row.deliveryStatus !== '3'
"
@click="handleEdit(slotProps.scope)"
>
</el-text>
<el-text
size="small"
v-if="
slotProps.scope.row.deliveryStatusName !== '已完成' ||
slotProps.scope.row.deliveryStatus !== '3'
"
@click="handleEdit(slotProps.scope)"
>
</el-text>
<!-- " @click="handleEdit(slotProps.scope)"> </el-text>-->
<!-- " @click="handleEdit(slotProps.scope)"> </el-text>-->
<!-- <el-button size="small" @click="costadd(slotProps.scope)"> </el-button>-->
</template>
</tablecmt>
</div>
<!-- <el-button size="small" @click="costadd(slotProps.scope)"> </el-button>-->
</template>
</tablecmt>
<div class="el-fx-btn">
<div class="el_fontsize" style="font-size: 14px">
勾选数量: {{ selectionList.length }}
</div>
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
</el-pagination>
</div>
</el-row>
<div class="el-fx-btn">
<div class="el_fontsize" style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
</el-pagination>
</div>
<!-- 打印模块 -->
<el-dialog title="二维码" :visible.sync="isShow" width="780px" v-model="isShow">
@ -862,7 +844,6 @@ export default {
console.log('this.tableNode :>> ', this.$refs.tableNode.$el);
const elNode = this.$refs.tableNode.$el;
// getWinHeight
console.log('getWinHeight() :>> ', getWinHeight());
setNodeHeight(elNode, getWinHeight() - elNode.getBoundingClientRect().top - 60 + 'px');
},
@ -1150,6 +1131,10 @@ export default {
},
searchHide() {
this.search = !this.search;
const elNode = this.$refs.tableNode.$el;
// getWinHeight
setNodeHeight(elNode, '', true);
},
searchChange() {
if (this.query.deliveryKind) {

Loading…
Cancel
Save