Browse Source

修改部分页面样式

dev-xx
qb 1 year ago
parent
commit
d53340c056
  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

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

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

@ -1,10 +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">
<div class="fr-fm">
<el-form :inline="true" :model="query" class="header_search">
<el-form-item label="编码类型:">
<el-select type="text" v-model="query.codeType" placeholder="请选择编码类型">
<el-option
@ -27,14 +26,13 @@
</el-option>
</el-select>
</el-form-item>
</div>
<!-- 查询按钮 -->
<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);

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

@ -1,10 +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">
<div class="mr-f">
<el-form :inline="true" :model="query" class="header_search">
<el-form-item label="请选择事业线:">
<el-select v-model="query.businessLine" clearable placeholder="请选择事业线">
<el-option
@ -40,14 +39,13 @@
<!-- <el-form-item label="租赁结束时间">-->
<!-- <el-input v-model="query.leaseEndTime" placeholder="请输入租赁结束时间"></el-input>-->
<!-- </el-form-item>-->
</div>
<!-- 查询按钮 -->
<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);

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

@ -1,21 +1,18 @@
<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-form-item label="承接时间:" class="el-times">
<el-date-picker
class="h100"
v-model="dataShi"
type="daterange"
unlink-panels
@ -23,18 +20,15 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
:size="'default'"
/>
</div>
</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,12 +81,11 @@
</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"
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
@ -99,7 +93,8 @@
:page-sizes="[30, 50, 80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total">
: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>
<!-- 表单按钮 -->
<template #footer>
<span v-if="!view" class="dialog-footer">
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')"
> </el-button
>
<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>
</span>
</template>
</div>
</el-form-item>
</el-form>
</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: {
@ -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,17 +516,23 @@ export default {
this.$message({
type: 'success',
message: '操作成功!',
}).finally(() => {
this.loadingObj.detailLoading = false;
});
this.imageUrl = null;
});
} else {
update(this.form).then(() => {
update(this.form)
.then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
})
.finally(() => {
this.loadingObj.detailLoading = false;
});
}
}
@ -530,16 +548,29 @@ export default {
handleEdit(row) {
this.title = '编辑';
this.box = true;
getDetail(row.id).then(res => {
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.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) {
@ -634,18 +665,13 @@ 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 {
@ -656,6 +682,9 @@ export default {
.el-btn {
margin-right: 0;
}
.header_search :deep(.el-range-editor.el-input__wrapper) {
height: 100% !important;
}
</style>
<style>

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

@ -1,15 +1,14 @@
<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 :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.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"
@ -19,8 +18,8 @@
/>
</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>
@ -29,18 +28,7 @@
</el-cascader>
</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-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"
@ -53,19 +41,17 @@
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 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>

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

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

16
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 :inline="true" :model="query" class="header_search">
<el-form-item label="班组名称:">
<el-input v-model="query.groupName" placeholder="请输入班组名称"></el-input>
</el-form-item>
</div>
<!-- 查询按钮 -->
<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);

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

@ -1,16 +1,12 @@
<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
@ -26,6 +22,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="货区类型:" prop="areaStatus">
<el-select
v-model="query.areaType"
@ -42,17 +39,13 @@
</el-option>
</el-select>
</el-form-item>
</div>
<div>
<el-button type="primary" icon="el-icon-search" @click="searchChange"
> </el-button
>
<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>
</div>
</el-col>
</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);

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

@ -1,14 +1,10 @@
<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
@ -22,24 +18,15 @@
<!-- </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-form-item>
<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>
</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;

31
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,8 +113,6 @@
<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"
@ -160,12 +146,9 @@
<!-- <el-button size="small" @click="costadd(slotProps.scope)"> </el-button>-->
</template>
</tablecmt>
</div>
<div class="el-fx-btn">
<div class="el_fontsize" style="font-size: 14px">
勾选数量: {{ selectionList.length }}
</div>
<div class="el_fontsize" style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
<!-- 分页模块 -->
<el-pagination
align="right"
@ -180,7 +163,6 @@
>
</el-pagination>
</div>
</el-row>
<!-- 打印模块 -->
<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