java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

修改部分页面样式

dev-xx
qb 1 year ago
parent
8efd9fa24b
commit
d53340c056
11 changed files with 776 additions and 737 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      src/styles/common.scss
  2. 13
      src/views/basic/coderule/basicTenantCode.vue
  3. 13
      src/views/basic/forklift/basicForklift.vue
  4. 103
      src/views/basicdata/brand/basicBrand.vue
  5. 44
      src/views/basicdata/brand/basicClient.vue
  6. 358
      src/views/basicdata/brand/basicZonePrice.vue
  7. 16
      src/views/basicdata/team/basicdataTeamGroup.vue
  8. 27
      src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
  9. 29
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
  10. 26
      src/views/distribution/deliverylist/distributionDeliveryList.vue
  11. 31
      src/views/distribution/deliverylist/distributionDeliveryListmar.vue

13
src/styles/common.scss
Unescape View File

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

13
src/views/basic/coderule/basicTenantCode.vue
Unescape View File

@ -1,10 +1,9 @@
<template> <template>
<basic-container> <basic-container>
<div class="avue-crud"> <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">
<div class="fr-fm">
<el-form-item label="编码类型:"> <el-form-item label="编码类型:">
<el-select type="text" v-model="query.codeType" placeholder="请选择编码类型"> <el-select type="text" v-model="query.codeType" placeholder="请选择编码类型">
<el-option <el-option
@ -27,14 +26,13 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</div>
<!-- 查询按钮 --> <!-- 查询按钮 -->
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button> <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button> <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-row> </div>
<el-row> <el-row>
<div class="avue-crud__header"> <div class="avue-crud__header">
<!-- 头部左侧按钮模块 --> <!-- 头部左侧按钮模块 -->
@ -54,6 +52,7 @@
<el-row> <el-row>
<!-- 列表模块 --> <!-- 列表模块 -->
<tablecmt <tablecmt
class="tableNode"
:columnList="columnList" :columnList="columnList"
:tableData="data" :tableData="data"
:loading="loading" :loading="loading"
@ -202,6 +201,7 @@ import { getList, getDetail, add, update, remove } from '@/api/basic/basicTenant
import option from '@/option/basic/basicTenantCode'; import option from '@/option/basic/basicTenantCode';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict'; import { getDictionaryBiz } from '@/api/system/dict';
import { setNodeHeight } from '@/utils/util';
export default { export default {
data() { data() {
@ -365,6 +365,9 @@ export default {
}, },
searchHide() { searchHide() {
this.search = !this.search; this.search = !this.search;
const _tableNode = document.querySelector('.tableNode');
setNodeHeight(_tableNode, '', true);
}, },
searchChange() { searchChange() {
this.onLoad(this.page); this.onLoad(this.page);

13
src/views/basic/forklift/basicForklift.vue
Unescape View File

@ -1,10 +1,9 @@
<template> <template>
<basic-container> <basic-container>
<div class="avue-crud"> <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">
<div class="mr-f">
<el-form-item label="请选择事业线:"> <el-form-item label="请选择事业线:">
<el-select v-model="query.businessLine" clearable placeholder="请选择事业线"> <el-select v-model="query.businessLine" clearable placeholder="请选择事业线">
<el-option <el-option
@ -40,14 +39,13 @@
<!-- <el-form-item label="租赁结束时间">--> <!-- <el-form-item label="租赁结束时间">-->
<!-- <el-input v-model="query.leaseEndTime" placeholder="请输入租赁结束时间"></el-input>--> <!-- <el-input v-model="query.leaseEndTime" placeholder="请输入租赁结束时间"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</div>
<!-- 查询按钮 --> <!-- 查询按钮 -->
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button> <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button> <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-row> </div>
<el-row> <el-row>
<div class="avue-crud__header"> <div class="avue-crud__header">
<!-- 头部左侧按钮模块 --> <!-- 头部左侧按钮模块 -->
@ -68,6 +66,7 @@
<el-row> <el-row>
<!-- 列表模块 --> <!-- 列表模块 -->
<tablecmt <tablecmt
class="tableNode"
:columnList="columnList" :columnList="columnList"
:tableData="data" :tableData="data"
:loading="loading" :loading="loading"
@ -529,6 +528,7 @@ import option from '@/option/basic/basicForklift2';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict'; import { getDictionaryBiz } from '@/api/system/dict';
import { getToken } from '@/utils/auth'; import { getToken } from '@/utils/auth';
import { setNodeHeight } from '@/utils/util';
export default { export default {
data() { data() {
@ -1058,6 +1058,9 @@ export default {
}, },
searchHide() { searchHide() {
this.search = !this.search; this.search = !this.search;
const _tableNode = document.querySelector('.tableNode');
setNodeHeight(_tableNode, '', true);
}, },
searchChange() { searchChange() {
this.onLoad(this.page); this.onLoad(this.page);

103
src/views/basicdata/brand/basicBrand.vue
Unescape View File

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

44
src/views/basicdata/brand/basicClient.vue
Unescape View File

@ -1,15 +1,14 @@
<template> <template>
<basic-container> <basic-container>
<div class="avue-crud"> <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">
<div>
<el-form-item label="客户名称:"> <el-form-item label="客户名称:">
<el-input v-model="query.clientName" placeholder="请输入客户名称"></el-input> <el-input v-model="query.clientName" placeholder="请输入客户名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="客户类型:"> <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-select v-model="query.clientType" class="m-2" placeholder="请选择客户端类型">
<el-option <el-option
v-for="item in clientType" v-for="item in clientType"
@ -19,8 +18,8 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="地址:"> <el-form-item label="地址:">
<!-- <el-input v-model="query.bladeRegionProvinceId" placeholder="请输入省份"></el-input>-->
<el-cascader :options="optioner" v-model="query.bladeRegionProvinceId"> <el-cascader :options="optioner" v-model="query.bladeRegionProvinceId">
<template #default="{ node, data }"> <template #default="{ node, data }">
<span>{{ data.label }}</span> <span>{{ data.label }}</span>
@ -29,18 +28,7 @@
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<!-- <el-form-item label="市:">-->
<!-- <el-input v-model="query.bladeRegionCityId" placeholder="请输入市"></el-input>-->
<!-- </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-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 <el-date-picker
v-model="dataShi" v-model="dataShi"
type="daterange" type="daterange"
@ -53,19 +41,17 @@
format="YYYY/MM/DD" format="YYYY/MM/DD"
value-format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
/> />
</div>
</el-form-item> </el-form-item>
<!-- <el-form-item label="合同结束时间:">--> <!-- <el-form-item label="合同结束时间:">-->
<!-- <el-input v-model="query.contractEntTime" placeholder="请输入合同结束时间"></el-input>--> <!-- <el-input v-model="query.contractEntTime" placeholder="请输入合同结束时间"></el-input>-->
<!-- </el-form-item>--> <!-- </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 type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button> <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-row> </div>
<el-row> <el-row>
<div class="avue-crud__header"> <div class="avue-crud__header">
<!-- 头部左侧按钮模块 --> <!-- 头部左侧按钮模块 -->
@ -85,6 +71,7 @@
</el-row> </el-row>
<el-row> <el-row>
<tablecmt <tablecmt
class="tableNode"
:columnList="columnList" :columnList="columnList"
:tableData="data" :tableData="data"
:loading="loading" :loading="loading"
@ -477,7 +464,7 @@ import globalc from '@/api/basicdata/globalc';
import { Base64 } from 'js-base64'; import { Base64 } from 'js-base64';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { exportBlob } from '@/api/common'; import { exportBlob } from '@/api/common';
import { downloadXls } from '@/utils/util'; import { downloadXls, setNodeHeight } from '@/utils/util';
export default { export default {
components: { components: {
@ -1095,6 +1082,9 @@ export default {
}, },
searchHide() { searchHide() {
this.search = !this.search; this.search = !this.search;
const _tableNode = document.querySelector('.tableNode');
setNodeHeight(_tableNode, '', true);
}, },
searchChange() { searchChange() {
this.onLoad(this.page); this.onLoad(this.page);
@ -1495,12 +1485,16 @@ export default {
height: 32px !important; height: 32px !important;
} }
} }
.fr-fo { // .fr-fo {
width: 100%; // width: 100%;
display: flex; // display: flex;
justify-content: space-between; // justify-content: space-between;
} // }
.el-btn { .el-btn {
margin-right: 0; margin-right: 0;
} }
:deep(.el-cascader) {
width: 100%;
}
</style> </style>

358
src/views/basicdata/brand/basicZonePrice.vue
Unescape View File

@ -1,13 +1,17 @@
<template> <template>
<basic-container> <basic-container>
<div class="avue-crud"> <div class="avue-crud">
<el-row v-if="!search"> <div v-h5uShow="!search">
<!-- 查询模块 --> <!-- 查询模块 -->
<el-form :inline="true" :model="query" class='fr-fm'> <el-form :inline="true" :model="query" class="header_search">
<div>
<el-form-item label="始发地地址:"> <el-form-item label="始发地地址:">
<!-- <el-input v-model="query.province" placeholder="请输入省"></el-input>--> <el-cascader
<el-cascader :options="optioner" v-model="query.province" :props="{ checkStrictly: true }" popper-class='ca'> :options="optioner"
v-model="query.province"
:props="{ checkStrictly: true }"
popper-class="ca"
class="w100"
>
<template #default="{ node, data }"> <template #default="{ node, data }">
<span>{{ data.label }}</span> <span>{{ data.label }}</span>
<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span> <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
@ -15,25 +19,24 @@
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="目的地地址:"> <el-form-item label="目的地地址:">
<!-- <el-input v-model="query.province" placeholder="请输入省"></el-input>--> <el-cascader
<el-cascader :options="optioner" v-model="query.provinceEnd" :props="{ checkStrictly: true }" popper-class='ca'> :options="optioner"
v-model="query.provinceEnd"
:props="{ checkStrictly: true }"
popper-class="ca"
class="w100"
>
<template #default="{ node, data }"> <template #default="{ node, data }">
<span>{{ data.label }}</span> <span>{{ data.label }}</span>
<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span> <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
</template> </template>
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<!-- <el-form-item label="市:">-->
<!-- <el-input v-model="query.city" placeholder="请输入市"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="区/县:">-->
<!-- <el-input v-model="query.district" placeholder="请输入区/县"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="品牌:"> <el-form-item label="品牌:">
<el-input v-model="query.brand" placeholder="请输入品牌"></el-input> <el-input v-model="query.brand" placeholder="请输入品牌"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="费用类型:"> <el-form-item label="费用类型:">
<!-- <el-input v-model="query.freightMark" placeholder="请输入费用标识"></el-input>-->
<el-select v-model="query.freightMark" class="m-2" placeholder="请选择客户类型"> <el-select v-model="query.freightMark" class="m-2" placeholder="请选择客户类型">
<el-option <el-option
v-for="item in clientType" v-for="item in clientType"
@ -46,23 +49,22 @@
<el-form-item label="末端仓:"> <el-form-item label="末端仓:">
<el-input v-model="query.goalGranary" placeholder="请输入末端仓"></el-input> <el-input v-model="query.goalGranary" placeholder="请输入末端仓"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="状态:">-->
<!-- <el-input v-model="query.condition" placeholder="请输入状态"></el-input>-->
<!-- </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 type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button> <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-row> </div>
<el-row> <el-row>
<div class="avue-crud__header"> <div class="avue-crud__header">
<!-- 头部左侧按钮模块 --> <!-- 头部左侧按钮模块 -->
<div class="avue-crud__left"> <div class="avue-crud__left">
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button> <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button> <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain
>删 除</el-button
>
</div> </div>
<!-- 头部右侧按钮模块 --> <!-- 头部右侧按钮模块 -->
<div class="avue-crud__right"> <div class="avue-crud__right">
@ -84,22 +86,39 @@
@selection="selectionChange" @selection="selectionChange"
> >
<template #default="slotProps"> <template #default="slotProps">
<el-text
<el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope.row)">查看</el-text> type="primary"
<el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope.row)">编辑</el-text> text
<el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope.row)">删除</el-text> icon="el-icon-view"
<el-text type="primary" text icon="el-icon-setting" @click="handleDrawer(slotProps.scope.row)">费用明细</el-text> @click="handleView(slotProps.scope.row)"
>查看</el-text
>
<el-text
type="primary"
text
icon="el-icon-edit"
@click="handleEdit(slotProps.scope.row)"
>编辑</el-text
>
<el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope.row)"
>删除</el-text
>
<el-text
type="primary"
text
icon="el-icon-setting"
@click="handleDrawer(slotProps.scope.row)"
>费用明细</el-text
>
</template> </template>
</tablecmt> </tablecmt>
</el-row> </el-row>
<el-row> <el-row>
<div class="avue-crud__pagination flex-c-sb" style="width:100%;"> <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<div style="font-size: 14px;"> <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
勾选数量: {{ selectionList.length }}
</div>
<!-- 分页模块 --> <!-- 分页模块 -->
<el-pagination align="right" <el-pagination
align="right"
background background
@size-change="sizeChange" @size-change="sizeChange"
@current-change="currentChange" @current-change="currentChange"
@ -107,21 +126,30 @@
:page-sizes="[30, 50, 80, 120]" :page-sizes="[30, 50, 80, 120]"
:page-size="page.pageSize" :page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="page.total"> :total="page.total"
>
</el-pagination> </el-pagination>
</div> </div>
</el-row> </el-row>
<!-- 表单模块 --> <!-- 表单模块 -->
<el-dialog :title="title" <el-dialog
:title="title"
v-model="box" v-model="box"
width="35%" width="35%"
:before-close="beforeClose" :before-close="beforeClose"
append-to-body> append-to-body
>
<el-form :disabled="view" ref="form" :model="form" label-width="120px" :rules="rules"> <el-form :disabled="view" ref="form" :model="form" label-width="120px" :rules="rules">
<!-- 表单字段 --> <!-- 表单字段 -->
<el-form-item label="始发仓地址" prop="province"> <el-form-item label="始发仓地址" prop="province">
<!-- <el-input v-model="form.province" placeholder="请输入省"/>--> <!-- <el-input v-model="form.province" placeholder="请输入省"/>-->
<el-cascader :options="optioner" v-model="form.province" style="width: 100%;" :props="{ checkStrictly: true }" popper-class='ca'> <el-cascader
:options="optioner"
v-model="form.province"
style="width: 100%"
:props="{ checkStrictly: true }"
popper-class="ca"
>
<template #default="{ node, data }"> <template #default="{ node, data }">
<span>{{ data.label }}</span> <span>{{ data.label }}</span>
<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span> <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
@ -130,7 +158,8 @@
</el-form-item> </el-form-item>
<el-form-item label="始发仓" prop="goalGranary"> <el-form-item label="始发仓" prop="goalGranary">
<!-- <el-input v-model="form.goalGranary" placeholder="请输入末端仓"/>--> <!-- <el-input v-model="form.goalGranary" placeholder="请输入末端仓"/>-->
<el-select style="width: 100%" <el-select
style="width: 100%"
v-model="form.beginGranary" v-model="form.beginGranary"
filterable filterable
remote remote
@ -146,13 +175,16 @@
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="目的仓地址" prop="province"> <el-form-item label="目的仓地址" prop="province">
<!-- <el-input v-model="form.province" placeholder="请输入省"/>--> <!-- <el-input v-model="form.province" placeholder="请输入省"/>-->
<el-cascader :options="optioner" v-model="form.provinceEnd" style="width: 100%;" :props="{ checkStrictly: true }" popper-class='ca'> <el-cascader
:options="optioner"
v-model="form.provinceEnd"
style="width: 100%"
:props="{ checkStrictly: true }"
popper-class="ca"
>
<template #default="{ node, data }"> <template #default="{ node, data }">
<span>{{ data.label }}</span> <span>{{ data.label }}</span>
<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span> <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
@ -161,7 +193,8 @@
</el-form-item> </el-form-item>
<el-form-item label="目的仓" prop="goalGranary"> <el-form-item label="目的仓" prop="goalGranary">
<!-- <el-input v-model="form.goalGranary" placeholder="请输入末端仓"/>--> <!-- <el-input v-model="form.goalGranary" placeholder="请输入末端仓"/>-->
<el-select style="width: 100%" <el-select
style="width: 100%"
v-model="form.goalGranary" v-model="form.goalGranary"
filterable filterable
remote remote
@ -177,9 +210,6 @@
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="市" prop="city">--> <!-- <el-form-item label="市" prop="city">-->
<!-- <el-input v-model="form.city" placeholder="请输入市"/>--> <!-- <el-input v-model="form.city" placeholder="请输入市"/>-->
@ -189,7 +219,8 @@
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="品类" prop="brand"> <el-form-item label="品类" prop="brand">
<!-- <el-input v-model="form.brand" placeholder="请输入品牌"/>--> <!-- <el-input v-model="form.brand" placeholder="请输入品牌"/>-->
<el-select style="width: 100%" <el-select
style="width: 100%"
v-model="form.brand" v-model="form.brand"
filterable filterable
remote remote
@ -205,8 +236,6 @@
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="费用类型" prop="freightMark"> <el-form-item label="费用类型" prop="freightMark">
<!-- <el-input v-model="form.freightMark" placeholder="请输入费用标识;1 运费 2 送货费用 3提货费用 4仓库管理费用 5 仓储费用 6装卸费用 7 其他费用 8仓储时间端费用"/>--> <!-- <el-input v-model="form.freightMark" placeholder="请输入费用标识;1 运费 2 送货费用 3提货费用 4仓库管理费用 5 仓储费用 6装卸费用 7 其他费用 8仓储时间端费用"/>-->
@ -226,11 +255,15 @@
:label="item.dictValue" :label="item.dictValue"
:value="item.dictKey" :value="item.dictKey"
>{{ item.dictValue }} >{{ item.dictValue }}
<el-input type="number" v-model="item.remark" placeholder="请输入费用" :disabled = !item.pitch @change="textbox($event,index)"/> <el-input
type="number"
v-model="item.remark"
placeholder="请输入费用"
:disabled="!item.pitch"
@change="textbox($event, index)"
/>
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<!-- <el-form-item label="费用" prop="cost">--> <!-- <el-form-item label="费用" prop="cost">-->
<!--&lt;!&ndash; <el-input v-model="form.cost" placeholder="请输入费用1111" v-for="(item,index) in costList" :key="index"/>&ndash;&gt;--> <!--&lt;!&ndash; <el-input v-model="form.cost" placeholder="请输入费用1111" v-for="(item,index) in costList" :key="index"/>&ndash;&gt;-->
@ -269,7 +302,9 @@
<!-- 表单按钮 --> <!-- 表单按钮 -->
<template #footer> <template #footer>
<span v-if="!view" class="dialog-footer"> <span v-if="!view" class="dialog-footer">
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')">提 交</el-button> <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> <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
</span> </span>
</template> </template>
@ -280,7 +315,8 @@
size="40%" size="40%"
v-model="drawer" v-model="drawer"
:direction="direction" :direction="direction"
:before-close="handleDrawerClose"> :before-close="handleDrawerClose"
>
<basicdata-cost-correlation :mainId="costCorrelationId"></basicdata-cost-correlation> <basicdata-cost-correlation :mainId="costCorrelationId"></basicdata-cost-correlation>
</el-drawer> </el-drawer>
</div> </div>
@ -288,18 +324,18 @@
</template> </template>
<script> <script>
import { getList, getDetail, add, update, remove } from "@/api/basicdata/basicZonePrice"; import { getList, getDetail, add, update, remove } from '@/api/basicdata/basicZonePrice';
import { getListBinName} from "@/api/basicdata/basicdataWarehouse"; import { getListBinName } from '@/api/basicdata/basicdataWarehouse';
import {getListName} from "@/api/basicdata/basicBrand"; import { getListName } from '@/api/basicdata/basicBrand';
import option from "@/option/basicdata/basicZonePrice"; import option from '@/option/basicdata/basicZonePrice';
import { mapGetters } from "vuex"; import { mapGetters } from 'vuex';
import { getLazyTreeAll } from '@/api/base/region'; import { getLazyTreeAll } from '@/api/base/region';
import { getDictionaryBiz } from '@/api/system/dict'; import { getDictionaryBiz } from '@/api/system/dict';
import BasicdataCostCorrelation from '@/views/basicdata/brand/basicdataCostCorrelation.vue' import BasicdataCostCorrelation from '@/views/basicdata/brand/basicdataCostCorrelation.vue';
export default { export default {
components: { components: {
BasicdataCostCorrelation BasicdataCostCorrelation,
}, },
data() { data() {
return { return {
@ -393,7 +429,7 @@ export default {
children: 'childrenList', //子元素字段名 children: 'childrenList', //子元素字段名
emitPath: false, emitPath: false,
checkStrictly: true, checkStrictly: true,
expandTrigger: 'hover' //设置鼠标悬浮展开，如果点击展开的话，会出现点击父节点后选择器直接关闭，不能选择子节点了 expandTrigger: 'hover', //设置鼠标悬浮展开，如果点击展开的话，会出现点击父节点后选择器直接关闭，不能选择子节点了
}, },
cascaderKey: 1, //防止搜索选项清空数据后出现报错,在加载级联选择器数据的时候+1 cascaderKey: 1, //防止搜索选项清空数据后出现报错,在加载级联选择器数据的时候+1
height: 0, height: 0,
@ -424,7 +460,7 @@ export default {
page: { page: {
currentPage: 1, currentPage: 1,
pageSize: 30, pageSize: 30,
total: 40 total: 40,
}, },
// 表单数据 // 表单数据
form: {}, form: {},
@ -443,63 +479,48 @@ export default {
{ required: true, message: '请选择地址', trigger: 'blur' }, { required: true, message: '请选择地址', trigger: 'blur' },
// { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' } // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
], ],
brand: [ brand: [{ required: true, message: '请选择品牌', trigger: 'change' }],
{ required: true, message: '请选择品牌', trigger: 'change' } freightMark: [{ required: true, message: '请选择费用类型', trigger: 'blur' }],
], cost: [{ required: true, message: '请输入费用', trigger: 'blur' }],
freightMark : [ warehousingTimeStatus: [{ required: true, message: '请选择时间段', trigger: 'change' }],
{ required: true, message: '请选择费用类型', trigger: 'blur' } warehousingTimeCharge: [{ required: true, message: '请选择时间段费用', trigger: 'blur' }],
], goalGranary: [{ required: true, message: '请选择末端仓', trigger: 'blur' }],
cost: [
{ required: true, message: '请输入费用', trigger: 'blur' }
],
warehousingTimeStatus: [
{ required: true, message: '请选择时间段', trigger: 'change' }
],
warehousingTimeCharge: [
{ required: true, message: '请选择时间段费用', trigger: 'blur' }
],
goalGranary: [
{ required: true, message: '请选择末端仓', trigger: 'blur' }
],
}, },
} };
}, },
watch: { watch: {
'form.province'() { 'form.province'() {
if (this.$refs.refHandle) { if (this.$refs.refHandle) {
this.$refs.refHandle.dropDownVisible = false; //监听值发生变化就关闭它 this.$refs.refHandle.dropDownVisible = false; //监听值发生变化就关闭它
} }
} },
}, },
created() { created() {
getLazyTreeAll().then(res => { getLazyTreeAll().then(res => {
if (res.data.success) { if (res.data.success) {
console.log("this.optioner>>>>>>>>>>>>>>"); console.log('this.optioner>>>>>>>>>>>>>>');
this.optioner = res.data.data; this.optioner = res.data.data;
this.onLoad(this.page); this.onLoad(this.page);
} }
}) });
}, },
mounted() { mounted() {
this.init(); this.init();
}, },
computed: { computed: {
...mapGetters(["permission"]), ...mapGetters(['permission']),
ids() { ids() {
let ids = []; let ids = [];
this.selectionList.forEach(ele => { this.selectionList.forEach(ele => {
ids.push(ele.id); ids.push(ele.id);
}); });
return ids.join(","); return ids.join(',');
} },
}, },
methods: { methods: {
//关闭浮层 //关闭浮层
hideCascaderInp() { hideCascaderInp() {
this.$refs.cascaderRef.value.togglePopperVisible(false);
this.$refs.cascaderRef.value.togglePopperVisible(false)
}, },
handleDrawerClose() { handleDrawerClose() {
this.costCorrelationId = ''; this.costCorrelationId = '';
@ -510,11 +531,11 @@ export default {
this.drawer = true; this.drawer = true;
}, },
textWarebox(e, index) { textWarebox(e, index) {
console.log(e,index) console.log(e, index);
this.costWraeList[index] = e; this.costWraeList[index] = e;
}, },
textbox(e, index) { textbox(e, index) {
console.log(e,index) console.log(e, index);
this.costList[index] = e; this.costList[index] = e;
}, },
handleCheckedCities(value) { handleCheckedCities(value) {
@ -563,28 +584,32 @@ export default {
}, },
remoteMethod(query) { remoteMethod(query) {
if (query) { if (query) {
this.loading = true this.loading = true;
setTimeout(async () => { setTimeout(async () => {
this.loading = false; this.loading = false;
let list = await getListName(this.page.currentPage, this.page.pageSize, { brandName: query }); let list = await getListName(this.page.currentPage, this.page.pageSize, {
this.optionsr = list.data.data.records.filter((item) => { brandName: query,
return item.brandName.toLowerCase().includes(query.toLowerCase()) });
}) this.optionsr = list.data.data.records.filter(item => {
}, 200) return item.brandName.toLowerCase().includes(query.toLowerCase());
});
}, 200);
} else { } else {
this.optionsr = []; this.optionsr = [];
} }
}, },
remoteMethodBin(query) { remoteMethodBin(query) {
if (query) { if (query) {
this.loading = true this.loading = true;
setTimeout(async () => { setTimeout(async () => {
this.loading = false; this.loading = false;
let list = await getListBinName(this.page.currentPage, this.page.pageSize, { name: query }); let list = await getListBinName(this.page.currentPage, this.page.pageSize, {
this.optionser = list.data.data.records.filter((item) => { name: query,
return item.name.toLowerCase().includes(query.toLowerCase()) });
}) this.optionser = list.data.data.records.filter(item => {
}, 200) return item.name.toLowerCase().includes(query.toLowerCase());
});
}, 200);
} else { } else {
this.optionser = []; this.optionser = [];
} }
@ -618,7 +643,10 @@ export default {
this.pan = false; this.pan = false;
// fei = []; // fei = [];
for (let i = 0; i < costListName.length; i++) { for (let i = 0; i < costListName.length; i++) {
if(!costList){ this.pan = true; return } if (!costList) {
this.pan = true;
return;
}
let zhi = costList[i]; let zhi = costList[i];
if (!zhi) { if (!zhi) {
this.pan = true; this.pan = true;
@ -628,14 +656,13 @@ export default {
if (it.dictValue == costListName[i]) { if (it.dictValue == costListName[i]) {
// console.log("进来了",it.dictValue , costListName[i]); // console.log("进来了",it.dictValue , costListName[i]);
//2.添加 //2.添加
fei.set(it.dictKey,zhi) fei.set(it.dictKey, zhi);
} }
}) });
} }
}, },
handleSubmit(from) { handleSubmit(from) {
this.$refs[from].validate(async (valid) => { this.$refs[from].validate(async valid => {
if (valid) { if (valid) {
if (!this.form.id) { if (!this.form.id) {
// console.log("提交的数据》》》",this.form); // console.log("提交的数据》》》",this.form);
@ -650,23 +677,21 @@ export default {
// // console.log("feishi",feishi); // // console.log("feishi",feishi);
// this.form.warehousingTimeStatus = undefined; // this.form.warehousingTimeStatus = undefined;
if (this.pan) { if (this.pan) {
this.$message.warning("请填写完整已勾选的数据费用"); this.$message.warning('请填写完整已勾选的数据费用');
return return;
} }
this.form.city = this.form.province[1]; this.form.city = this.form.province[1];
this.form.district = this.form.province[2]; this.form.district = this.form.province[2];
this.form.province = this.form.province[0]; this.form.province = this.form.province[0];
console.log("提交的数据》》》",this.form); console.log('提交的数据》》》', this.form);
add(this.form).then(() => { add(this.form).then(() => {
this.box = false; this.box = false;
this.onLoad(this.page); this.onLoad(this.page);
this.$message({ this.$message({
type: "success", type: 'success',
message: "操作成功!" message: '操作成功!',
}); });
}); });
} else { } else {
this.form.city = this.form.province[1]; this.form.city = this.form.province[1];
this.form.district = this.form.province[2]; this.form.district = this.form.province[2];
@ -681,14 +706,13 @@ export default {
this.box = false; this.box = false;
this.onLoad(this.page); this.onLoad(this.page);
this.$message({ this.$message({
type: "success", type: 'success',
message: "操作成功!" message: '操作成功!',
});
}); });
})
} }
} }
}) });
}, },
handleAdd() { handleAdd() {
// this.title = '新增' // this.title = '新增'
@ -696,15 +720,13 @@ export default {
// this.init (); // this.init ();
// this.box = true; // this.box = true;
this.$router.push({ this.$router.push({
path:"/basicdata/brand/basicZonePriceFrom", path: '/basicdata/brand/basicZonePriceFrom',
query: { query: {
id: '', id: '',
name: '新增', name: '新增',
type: 0 type: 0,
} },
}); });
}, },
handleEdit(row) { handleEdit(row) {
// this.title = '编辑' // this.title = '编辑'
@ -722,12 +744,12 @@ export default {
// this.form.brand = row.brandName; // this.form.brand = row.brandName;
// }); // });
this.$router.push({ this.$router.push({
path:"/basicdata/brand/basicZonePriceFrom", path: '/basicdata/brand/basicZonePriceFrom',
query: { query: {
id: row.id, id: row.id,
name: '编辑 — ' + row.brandName, name: '编辑 — ' + row.brandName,
type: 2 type: 2,
} },
}); });
}, },
handleView(row) { handleView(row) {
@ -749,24 +771,23 @@ export default {
// }); // });
this.$router.push({ this.$router.push({
path:"/basicdata/brand/basicZonePriceFrom", path: '/basicdata/brand/basicZonePriceFrom',
query: { query: {
id: row.id, id: row.id,
name: '查看 — ' + row.brandName, name: '查看 — ' + row.brandName,
type: 1 type: 1,
} },
}); });
}, },
handleDelete() { handleDelete() {
if (this.selectionList.length === 0) { if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据"); this.$message.warning('请选择至少一条数据');
return; return;
} }
this.$confirm("确定将选择数据删除?", { this.$confirm('确定将选择数据删除?', {
confirmButtonText: "确定", confirmButtonText: '确定',
cancelButtonText: "取消", cancelButtonText: '取消',
type: "warning" type: 'warning',
}) })
.then(() => { .then(() => {
return remove(this.ids); return remove(this.ids);
@ -775,16 +796,16 @@ export default {
this.selectionClear(); this.selectionClear();
this.onLoad(this.page); this.onLoad(this.page);
this.$message({ this.$message({
type: "success", type: 'success',
message: "操作成功!" message: '操作成功!',
}); });
}); });
}, },
rowDel(row) { rowDel(row) {
this.$confirm("确定将选择数据删除?", { this.$confirm('确定将选择数据删除?', {
confirmButtonText: "确定", confirmButtonText: '确定',
cancelButtonText: "取消", cancelButtonText: '取消',
type: "warning" type: 'warning',
}) })
.then(() => { .then(() => {
return remove(row.id); return remove(row.id);
@ -792,13 +813,13 @@ export default {
.then(() => { .then(() => {
this.onLoad(this.page); this.onLoad(this.page);
this.$message({ this.$message({
type: "success", type: 'success',
message: "操作成功!" message: '操作成功!',
}); });
}); });
}, },
beforeClose(done) { beforeClose(done) {
done() done();
this.form = {}; this.form = {};
this.view = false; this.view = false;
}, },
@ -828,13 +849,13 @@ export default {
this.clientType.forEach(it => { this.clientType.forEach(it => {
data.records.forEach(i => { data.records.forEach(i => {
if (parseInt(it.dictKey) == parseInt(i.freightMark)) { if (parseInt(it.dictKey) == parseInt(i.freightMark)) {
i.freightMark = it.dictValue i.freightMark = it.dictValue;
} }
if (i.freightMark == '-1') { if (i.freightMark == '-1') {
i.freightMark = '无' i.freightMark = '无';
} }
}) });
}) });
// this.wareType.forEach(it =>{ // this.wareType.forEach(it =>{
// data.records.forEach(i =>{ // data.records.forEach(i =>{
// if(parseInt( it.dictKey ) == parseInt(i.warehousingTimeStatus)){ // if(parseInt( it.dictKey ) == parseInt(i.warehousingTimeStatus)){
@ -847,49 +868,49 @@ export default {
// }) // })
this.page.total = data.total; this.page.total = data.total;
this.data = data.records; this.data = data.records;
let dz =""; let dz = '';
let mdz =""; let mdz = '';
data.records.forEach(it => { data.records.forEach(it => {
if (!!it.provinceEnd) { if (!!it.provinceEnd) {
let arrshe = this.optioner.filter((i) => { let arrshe = this.optioner.filter(i => {
return it.provinceEnd == i.value; return it.provinceEnd == i.value;
}); });
let moshi = arrshe[0].children.filter((i) => { let moshi = arrshe[0].children.filter(i => {
return it.cityEnd == i.value; return it.cityEnd == i.value;
}); });
if (!!it.districtEnd) { if (!!it.districtEnd) {
let moqu = moshi[0].children.filter((i) => { let moqu = moshi[0].children.filter(i => {
return it.districtEnd == i.value; return it.districtEnd == i.value;
}); });
mdz = arrshe[0].label+"/"+moshi[0].label+"/"+moqu[0].label; mdz = arrshe[0].label + '/' + moshi[0].label + '/' + moqu[0].label;
} else { } else {
mdz = arrshe[0].label+"/"+moshi[0].label mdz = arrshe[0].label + '/' + moshi[0].label;
} }
it.provinceEnd = mdz; it.provinceEnd = mdz;
} }
let arrsheng = this.optioner.filter((i) => { let arrsheng = this.optioner.filter(i => {
return it.province == i.value; return it.province == i.value;
}); });
// console.log("========",JSON.parse(JSON.stringify(arrsheng)) ); // console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
let arrshi = arrsheng[0].children.filter((i) => { let arrshi = arrsheng[0].children.filter(i => {
return it.city == i.value; return it.city == i.value;
}); });
if (!!it.district) { if (!!it.district) {
let arrqu = arrshi[0].children.filter((i) => { let arrqu = arrshi[0].children.filter(i => {
return it.district == i.value; return it.district == i.value;
}); });
dz = arrsheng[0].label+"/"+arrshi[0].label+"/"+arrqu[0].label; dz = arrsheng[0].label + '/' + arrshi[0].label + '/' + arrqu[0].label;
} else { } else {
dz = arrsheng[0].label+"/"+arrshi[0].label; dz = arrsheng[0].label + '/' + arrshi[0].label;
} }
it.province = dz; it.province = dz;
}) });
this.loading = false; this.loading = false;
this.selectionClear(); this.selectionClear();
}); });
} },
} },
}; };
</script> </script>
<style> <style>
@ -909,10 +930,9 @@ export default {
.ca .el-radio__input.is-checked .el-radio__inner { .ca .el-radio__input.is-checked .el-radio__inner {
background: transparent; background: transparent;
} }
</style> </style>
<style scoped lang='scss'> <style scoped lang="scss">
.fr-fm { .fr-fm {
width: 100%; width: 100%;
display: flex; display: flex;

16
src/views/basicdata/team/basicdataTeamGroup.vue
Unescape View File

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

27
src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
Unescape View File

@ -1,16 +1,12 @@
<template> <template>
<basic-container> <basic-container>
<div class="avue-crud"> <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-form-item label="启用状态:" prop="areaStatus">
<!-- <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>-->
<el-select <el-select
v-model="query.enableStatus" v-model="query.enableStatus"
clearable clearable
@ -26,6 +22,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="货区类型:" prop="areaStatus"> <el-form-item label="货区类型:" prop="areaStatus">
<el-select <el-select
v-model="query.areaType" v-model="query.areaType"
@ -42,17 +39,13 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</div>
<div> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchChange" <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
>搜 索</el-button
>
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button> <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
</div>
</el-col>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-row> </div>
<el-row> <el-row>
<div class="avue-crud__header"> <div class="avue-crud__header">
<!-- 头部左侧按钮模块 --> <!-- 头部左侧按钮模块 -->
@ -89,6 +82,7 @@
<el-row> <el-row>
<!-- 列表模块 --> <!-- 列表模块 -->
<tablecmt <tablecmt
class="tableNode"
:columnList="columnList" :columnList="columnList"
:tableData="data" :tableData="data"
:loading="loading" :loading="loading"
@ -276,7 +270,7 @@ import { getWarehouseList } from '@/api/basicdata/basicdataWarehouse';
import { getToken } from '@/utils/auth'; import { getToken } from '@/utils/auth';
import NProgress from 'nprogress'; import NProgress from 'nprogress';
import { exportBlob } from '@/api/common'; import { exportBlob } from '@/api/common';
import { downloadXls } from '@/utils/util'; import { downloadXls, setNodeHeight } from '@/utils/util';
import { dateNow } from '@/utils/date'; import { dateNow } from '@/utils/date';
export default { export default {
@ -548,6 +542,9 @@ export default {
searchHide() { searchHide() {
this.search = !this.search; this.search = !this.search;
const _tableNode = document.querySelector('.tableNode');
setNodeHeight(_tableNode, '', true);
}, },
searchChange() { searchChange() {
this.onLoad(this.page); this.onLoad(this.page);

29
src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
Unescape View File

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

26
src/views/distribution/deliverylist/distributionDeliveryList.vue
Unescape View File

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

31
src/views/distribution/deliverylist/distributionDeliveryListmar.vue
Unescape View File

@ -1,9 +1,9 @@
<template> <template>
<basic-container> <basic-container>
<div class="avue-crud"> <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-form-item label="配送车次:">
<el-input v-model="query.trainNumber" placeholder="请输入配送车次"></el-input> <el-input v-model="query.trainNumber" placeholder="请输入配送车次"></el-input>
</el-form-item> </el-form-item>
@ -14,18 +14,6 @@
<el-date-picker v-model="query.taskTime" type="date" placeholder="选择日期"> <el-date-picker v-model="query.taskTime" type="date" placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </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-form-item label="配送种类:">
<el-select v-model="query.deliveryKind" placeholder="请选择业务类型"> <el-select v-model="query.deliveryKind" placeholder="请选择业务类型">
<el-option :key="'1'" :value="'自主配送'">自主配送</el-option> <el-option :key="'1'" :value="'自主配送'">自主配送</el-option>
@ -70,7 +58,7 @@
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button> <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-row> </div>
<el-row> <el-row>
<!-- <el-col :xl="14" :lg="7" :md="8" :sm="24" >--> <!-- <el-col :xl="14" :lg="7" :md="8" :sm="24" >-->
<!-- <span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} </span>--> <!-- <span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} </span>-->
@ -125,8 +113,6 @@
<el-tab-pane label="配送中" name="third"> </el-tab-pane> <el-tab-pane label="配送中" name="third"> </el-tab-pane>
<el-tab-pane label="已完成" name="fourth"> </el-tab-pane> <el-tab-pane label="已完成" name="fourth"> </el-tab-pane>
</el-tabs> </el-tabs>
<el-row class="el-fy">
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<tablecmt <tablecmt
ref="tableNode" ref="tableNode"
:columnList="columnList" :columnList="columnList"
@ -160,12 +146,9 @@
<!-- <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>--> <!-- <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
</template> </template>
</tablecmt> </tablecmt>
</div>
<div class="el-fx-btn"> <div class="el-fx-btn">
<div class="el_fontsize" style="font-size: 14px"> <div class="el_fontsize" style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
勾选数量: {{ selectionList.length }}
</div>
<!-- 分页模块 --> <!-- 分页模块 -->
<el-pagination <el-pagination
align="right" align="right"
@ -180,7 +163,6 @@
> >
</el-pagination> </el-pagination>
</div> </div>
</el-row>
<!-- 打印模块 --> <!-- 打印模块 -->
<el-dialog title="二维码" :visible.sync="isShow" width="780px" v-model="isShow"> <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); console.log('this.tableNode :>> ', this.$refs.tableNode.$el);
const elNode = this.$refs.tableNode.$el; const elNode = this.$refs.tableNode.$el;
// getWinHeight // getWinHeight
console.log('getWinHeight() :>> ', getWinHeight());
setNodeHeight(elNode, getWinHeight() - elNode.getBoundingClientRect().top - 60 + 'px'); setNodeHeight(elNode, getWinHeight() - elNode.getBoundingClientRect().top - 60 + 'px');
}, },
@ -1150,6 +1131,10 @@ export default {
}, },
searchHide() { searchHide() {
this.search = !this.search; this.search = !this.search;
const elNode = this.$refs.tableNode.$el;
// getWinHeight
setNodeHeight(elNode, '', true);
}, },
searchChange() { searchChange() {
if (this.query.deliveryKind) { if (this.query.deliveryKind) {

Write Preview
Loading…
Cancel
Save