Browse Source

样式优化

fix_bug_pro20231227
13208366016 1 year ago
parent
commit
9df59bbff9
  1. BIN
      public/favicon.png
  2. BIN
      public/img/bg/logo.png
  3. BIN
      public/img/logo.png
  4. 4
      src/components/tablecmt/tablecmt.vue
  5. 2
      src/option/basicdata/basicdataGoodsAllocation.js
  6. 10
      src/styles/login.scss
  7. 230
      src/views/addvalue/distributionAddvalue.vue
  8. 482
      src/views/basic/deline/basicDeline.vue
  9. 1196
      src/views/basic/forklift/basicForklift.vue
  10. 2
      src/views/basic/material/basicTripartiteMaterial.vue
  11. 927
      src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
  12. 1162
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
  13. 11
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
  14. 1950
      src/views/distribution/deliverylist/distributionDeliveryList.vue
  15. 26
      src/views/distribution/deliverylist/distributionDeliveryListdis.vue
  16. 3469
      src/views/distribution/turndelivery/deliveryDiscuss.vue

BIN
public/favicon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 46 KiB

BIN
public/img/bg/logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 64 KiB

BIN
public/img/logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 64 KiB

4
src/components/tablecmt/tablecmt.vue

@ -361,7 +361,6 @@ function handleNumberRange(column: TableColumnType, row: TableDataType) {
// }
//
if (row.residueNumber) {
console.log('上架为真');
if (row.enterNum > row.residueNumber) {
proxy.$message({
type: 'error',
@ -377,7 +376,6 @@ function handleNumberRange(column: TableColumnType, row: TableDataType) {
type: 'error',
message: '数量不能大于可下架总数,已调整为最大数量!',
});
console.log('大于了');
row.enterNum = row.num;
}
}
@ -674,6 +672,6 @@ function copyContent(content: string) {
max-width: 20% !important;
}
.el-input {
width: 200px !important;
// width: 200px !important;
}
</style>

2
src/option/basicdata/basicdataGoodsAllocation.js

@ -2,7 +2,7 @@ export default {
height: 'auto',
calcHeight: 30,
tip: false,
searchShow: true,
searchShow: false, //搜索展开
searchMenuSpan: 6,
border: true,
index: true,

10
src/styles/login.scss

@ -185,3 +185,13 @@
text-align: center;
cursor: pointer !important;
}
.el-input__suffix {
// width: 5px !important;
}
.inputLog span.el-input__suffix-inner {
width: 5px !important;
}
.el-form-item__error {
left: 2%;
color: #ff0000;
}

230
src/views/addvalue/distributionAddvalue.vue

@ -1,7 +1,7 @@
<template>
<basic-container>
<div class="avue-crud">
<el-row :hidden="!search" style="padding:6px 18px">
<el-row :hidden="!search" style="padding: 6px 18px">
<!-- 查询模块 -->
<el-form :inline="true" :model="query">
<!-- 查询按钮 -->
@ -16,7 +16,9 @@
<!-- 头部左侧按钮模块 -->
<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">
@ -27,93 +29,121 @@
</el-row>
<el-row>
<!-- 列表模块 -->
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data"
:height="height"
style="width: 100%"
:border="option.border">
<el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
<el-table
ref="table"
v-loading="loading"
@selection-change="selectionChange"
:data="data"
:height="height"
style="width: 100%"
:border="option.border"
>
<el-table-column
type="selection"
v-if="option.selection"
width="55"
align="center"
></el-table-column>
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
<el-table-column v-if="option.index" label="#" type="index" width="50" align="center">
</el-table-column>
<template v-for="(item,index) in option.column">
<template v-for="(item, index) in option.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index">
<el-table-column
v-if="item.hide !== true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index"
>
</el-table-column>
</template>
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
<el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
<template #="{ row }">
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)"
>查看</el-button
>
<el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)"
>编辑</el-button
>
<el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
</el-row>
<el-row>
<div class="avue-crud__pagination" style="width:100%">
<div class="avue-crud__pagination" style="width: 100%">
<!-- 分页模块 -->
<el-pagination align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[10, 20, 30, 40, 50, 100]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total">
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[10, 20, 30, 40, 50, 100]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
</el-pagination>
</div>
</el-row>
<!-- 表单模块 -->
<el-dialog :title="title"
v-model="box"
width="50%"
:before-close="beforeClose"
append-to-body>
<el-dialog
:title="title"
v-model="box"
width="50%"
:before-close="beforeClose"
append-to-body
>
<el-form :disabled="view" ref="form" :model="form" label-width="80px">
<!-- 表单字段 -->
<el-form-item label="增值服务关联码表;码表;1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货;" prop="addvalueId">
<el-input v-model="form.addvalueId" placeholder="请输入增值服务关联码表;码表;1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货;"/>
<el-form-item
label="增值服务关联码表;码表;1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货;"
prop="addvalueId"
>
<el-input
v-model="form.addvalueId"
placeholder="请输入增值服务关联码表;码表;1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货;"
/>
</el-form-item>
<el-form-item label="关联表ID" prop="refId">
<el-input v-model="form.refId" placeholder="请输入关联表ID"/>
<el-input v-model="form.refId" placeholder="请输入关联表ID" />
</el-form-item>
<el-form-item label="关联类型 1 预约单 2 配送单 3 ." prop="refType">
<el-input v-model="form.refType" placeholder="请输入关联类型 1 预约单 2 配送单 3 ."/>
<el-input v-model="form.refType" placeholder="请输入关联类型 1 预约单 2 配送单 3 ." />
</el-form-item>
<el-form-item label="编号" prop="code">
<el-input v-model="form.code" placeholder="请输入编号"/>
<el-input v-model="form.code" placeholder="请输入编号" />
</el-form-item>
<el-form-item label="预留1" prop="reserve1">
<el-input v-model="form.reserve1" placeholder="请输入预留1"/>
<el-input v-model="form.reserve1" placeholder="请输入预留1" />
</el-form-item>
<el-form-item label="预留2" prop="reserve2">
<el-input v-model="form.reserve2" placeholder="请输入预留2"/>
<el-input v-model="form.reserve2" placeholder="请输入预留2" />
</el-form-item>
<el-form-item label="预留3" prop="reserve3">
<el-input v-model="form.reserve3" placeholder="请输入预留3"/>
<el-input v-model="form.reserve3" placeholder="请输入预留3" />
</el-form-item>
<el-form-item label="预留4" prop="reserve4">
<el-input v-model="form.reserve4" placeholder="请输入预留4"/>
<el-input v-model="form.reserve4" placeholder="请输入预留4" />
</el-form-item>
<el-form-item label="预留5" prop="reserve5">
<el-input v-model="form.reserve5" placeholder="请输入预留5"/>
<el-input v-model="form.reserve5" placeholder="请输入预留5" />
</el-form-item>
<el-form-item label="费用" prop="fee">
<el-input v-model="form.fee" placeholder="请输入费用"/>
<el-input v-model="form.fee" placeholder="请输入费用" />
</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"> </el-button>
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
> </el-button
>
<el-button icon="el-icon-circle-close" @click="box = false"> </el-button>
</span>
</template>
@ -123,12 +153,12 @@
</template>
<script>
import { getList, getDetail, add, update, remove } from "@/api/addvalue/distributionAddvalue";
import option from "@/option/addvalue/distributionAddvalue";
import { mapGetters } from "vuex";
import { getList, getDetail, add, update, remove } from '@/api/addvalue/distributionAddvalue';
import option from '@/option/addvalue/distributionAddvalue';
import { mapGetters } from 'vuex';
export default {
data () {
data() {
return {
height: 0,
//
@ -147,7 +177,7 @@ export default {
page: {
currentPage: 1,
pageSize: 10,
total: 40
total: 40,
},
//
form: {},
@ -157,45 +187,45 @@ export default {
option: option,
//
data: [],
}
};
},
mounted () {
mounted() {
this.init();
this.onLoad(this.page);
},
computed: {
...mapGetters(["permission"]),
ids () {
...mapGetters(['permission']),
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
}
return ids.join(',');
},
},
methods: {
init () {
init() {
this.height = this.setPx(document.body.clientHeight - 340);
},
searchHide () {
searchHide() {
this.search = !this.search;
},
searchChange () {
searchChange() {
this.onLoad(this.page);
},
searchReset () {
searchReset() {
this.query = {};
this.page.currentPage = 1;
this.onLoad(this.page);
},
handleSubmit () {
handleSubmit() {
if (!this.form.id) {
add(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
type: 'success',
message: '操作成功!',
});
});
} else {
@ -203,41 +233,41 @@ export default {
this.box = false;
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
type: 'success',
message: '操作成功!',
});
})
});
}
},
handleAdd () {
this.title = '新增'
this.form = {}
this.box = true
handleAdd() {
this.title = '新增';
this.form = {};
this.box = true;
},
handleEdit (row) {
this.title = '编辑'
this.box = true
handleEdit(row) {
this.title = '编辑';
this.box = true;
getDetail(row.id).then(res => {
this.form = res.data.data;
});
},
handleView (row) {
this.title = '查看'
handleView(row) {
this.title = '查看';
this.view = true;
this.box = true;
getDetail(row.id).then(res => {
this.form = res.data.data;
});
},
handleDelete () {
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);
@ -246,16 +276,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"
rowDel(row) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return remove(row.id);
@ -263,32 +293,32 @@ export default {
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
type: 'success',
message: '操作成功!',
});
});
},
beforeClose (done) {
done()
beforeClose(done) {
done();
this.form = {};
this.view = false;
},
selectionChange (list) {
selectionChange(list) {
this.selectionList = list;
},
selectionClear () {
selectionClear() {
this.selectionList = [];
this.$refs.table.clearSelection();
},
currentChange (currentPage) {
currentChange(currentPage) {
this.page.currentPage = currentPage;
this.onLoad(this.page);
},
sizeChange (pageSize) {
sizeChange(pageSize) {
this.page.pageSize = pageSize;
this.onLoad(this.page);
},
onLoad (page, params = {}) {
onLoad(page, params = {}) {
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
@ -297,7 +327,7 @@ export default {
this.loading = false;
this.selectionClear();
});
}
}
},
},
};
</script>

482
src/views/basic/deline/basicDeline.vue

@ -1,278 +1,286 @@
<template>
<basic-container>
<avue-crud v-if="edit"
<avue-crud
v-if="edit"
:option="option"
v-model:search="search"
v-model:page="page"
v-model="form"
:table-loading="loading"
:data="data"
:permission="permissionList"
:before-open="beforeOpen"
ref="crud"
@row-update="rowUpdate"
@row-save="rowSave"
@row-del="rowDel"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad">
v-model:search="search"
v-model:page="page"
v-model="form"
:table-loading="loading"
:data="data"
:permission="permissionList"
:before-open="beforeOpen"
ref="crud"
@row-update="rowUpdate"
@row-save="rowSave"
@row-del="rowDel"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
>
<template #menu-left>
<el-button type="danger"
icon="el-icon-delete"
plain
v-if="permission.basicDeline_delete"
@click="handleDelete">
<el-button
type="danger"
icon="el-icon-delete"
plain
v-if="permission.basicDeline_delete"
@click="handleDelete"
>
</el-button>
<el-button type="primary" icon="el-icon-plus" @click="addEditDeline()"> </el-button>
<el-button type="primary" @click="nodeManagement()"> </el-button>
<!-- <el-button type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- @click="handleExport"> -->
<!-- </el-button>-->
<el-button type="primary" icon="el-icon-plus" @click="addEditDeline()"> </el-button>
<el-button type="primary" @click="nodeManagement()"> </el-button>
<!-- <el-button type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- @click="handleExport"> -->
<!-- </el-button>-->
</template>
<template #menu="{size,row,index}">
<el-button type="primary" text icon="el-icon-view" @click="addEditDeline(row)"> </el-button>
<el-button type="primary" text icon="el-icon-view" @click="viewDeline(row)"> </el-button>
<template #menu="{ size, row, index }">
<el-button type="primary" text icon="el-icon-view" @click="addEditDeline(row)"
> </el-button
>
<el-button type="primary" text icon="el-icon-view" @click="viewDeline(row)"
> </el-button
>
</template>
</avue-crud>
<basicDeLineform v-if="!edit" @returnDeline ="returnDeline" :delineformdata="delineformdata" />
<basicDeLineform v-if="!edit" @returnDeline="returnDeline" :delineformdata="delineformdata" />
</basic-container>
</template>
<script>
import {getList, getDetail, add, update, remove} from "@/api/basic/basicDeline";
import option from "@/option/basic/basicDeline";
import {mapGetters} from "vuex";
import {exportBlob} from "@/api/common";
import {getToken} from '@/utils/auth';
import {downloadXls} from "@/utils/util";
import {dateNow} from "@/utils/date";
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
import basicDeLineform from '/src/views/basic/deline/basicdeLineform.vue'
export default {
components: { basicDeLineform },
data() {
import { getList, getDetail, add, update, remove } from '@/api/basic/basicDeline';
import option from '@/option/basic/basicDeline';
import { mapGetters } from 'vuex';
import { exportBlob } from '@/api/common';
import { getToken } from '@/utils/auth';
import { downloadXls } from '@/utils/util';
import { dateNow } from '@/utils/date';
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
import basicDeLineform from '/src/views/basic/deline/basicdeLineform.vue';
export default {
components: { basicDeLineform },
data() {
return {
form: {},
query: {},
search: {},
loading: true,
edit: true,
delineformdata: {},
page: {
pageSize: 30,
currentPage: 1,
total: 0,
},
selectionList: [],
option: option,
data: [],
};
},
computed: {
...mapGetters(['permission']),
permissionList() {
return {
form: {},
query: {},
search: {},
loading: true,
edit:true,
delineformdata:{},
page: {
pageSize: 30,
currentPage: 1,
total: 0
},
selectionList: [],
option: option,
data: []
addBtn: this.validData(this.permission.basicDeline_add, false),
viewBtn: this.validData(this.permission.basicDeline_view, false),
delBtn: this.validData(this.permission.basicDeline_delete, false),
editBtn: this.validData(this.permission.basicDeline_edit, false),
};
},
computed: {
...mapGetters(["permission"]),
permissionList() {
return {
addBtn: this.validData(this.permission.basicDeline_add, false),
viewBtn: this.validData(this.permission.basicDeline_view, false),
delBtn: this.validData(this.permission.basicDeline_delete, false),
editBtn: this.validData(this.permission.basicDeline_edit, false)
};
},
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(',');
},
},
methods: {
//
nodeManagement() {
this.$router.push({
path: '/basic/delinenode/basicDelineNode',
query: {},
});
},
returnDeline(val) {
console.log('取消>>>>>', val);
this.edit = true;
},
addEditDeline(row) {
console.log('row>>>>>>>>>>>>>>>>>>>>', row);
this.delineformdata = {};
this.delineformdata.view = false;
if (!!row) {
this.delineformdata = row;
this.delineformdata.view = false;
this.delineformdata.delinenode = [{}];
this.delineformdata.end = [{}];
}
this.edit = false;
},
methods: {
//
nodeManagement(){
this.$router.push({
path: '/basic/delinenode/basicDelineNode',
query: {
}
});
},
returnDeline(val){
console.log("取消>>>>>",val);
this.edit = true;
},
addEditDeline(row){
console.log("row>>>>>>>>>>>>>>>>>>>>",row);
this.delineformdata={}
this.delineformdata.view =false;
if (!!row){
this.delineformdata = row
this.delineformdata.view =false;
this.delineformdata.delinenode = [{}]
this.delineformdata.end = [{}]
}
this.edit =false
},
viewDeline(row){
console.log("row>>>>>>>>>>>>>>>>>>>>",row);
this.delineformdata={}
viewDeline(row) {
console.log('row>>>>>>>>>>>>>>>>>>>>', row);
this.delineformdata = {};
// if (!!row){
this.delineformdata = row
this.delineformdata.view =true;
this.delineformdata.delinenode = [{}]
this.delineformdata.end = [{}]
// }
this.edit =false
},
rowSave(row, done, loading) {
add(row).then(() => {
this.delineformdata = row;
this.delineformdata.view = true;
this.delineformdata.delinenode = [{}];
this.delineformdata.end = [{}];
// }
this.edit = false;
},
rowSave(row, done, loading) {
add(row).then(
() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
type: 'success',
message: '操作成功!',
});
done();
}, error => {
},
error => {
loading();
window.console.log(error);
});
},
rowUpdate(row, index, done, loading) {
update(row).then(() => {
}
);
},
rowUpdate(row, index, done, loading) {
update(row).then(
() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
type: 'success',
message: '操作成功!',
});
done();
}, error => {
},
error => {
loading();
console.log(error);
});
},
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
);
},
rowDel(row) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return remove(row.id);
})
.then(() => {
return remove(this.ids);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
this.$refs.crud.toggleSelection();
.then(() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
},
handleExport() {
let downloadUrl = `/basic/basicDeline/export-basicDeline?${this.website.tokenHeader}=${getToken()}`;
const {
warehouseId,
} = this.query;
let values = {
warehouseId_equal: warehouseId,
};
this.$confirm("是否导出数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
NProgress.start();
exportBlob(downloadUrl, values).then(res => {
downloadXls(res.data, `提货路线${dateNow()}.xlsx`);
NProgress.done();
})
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getDetail(this.form.id).then(res => {
this.form = res.data.data;
},
handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning('请选择至少一条数据');
return;
}
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return remove(this.ids);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
}
done();
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
done();
},
selectionChange(list) {
this.selectionList = list;
},
selectionClear() {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
currentChange(currentPage){
this.page.currentPage = currentPage;
},
sizeChange(pageSize){
this.page.pageSize = pageSize;
},
refreshChange() {
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
this.loading = true;
this.$refs.crud.toggleSelection();
});
},
handleExport() {
let downloadUrl = `/basic/basicDeline/export-basicDeline?${
this.website.tokenHeader
}=${getToken()}`;
const { warehouseId } = this.query;
let values = {
warehouseId_equal: warehouseId,
};
this.$confirm('是否导出数据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
NProgress.start();
exportBlob(downloadUrl, values).then(res => {
downloadXls(res.data, `提货路线${dateNow()}.xlsx`);
NProgress.done();
});
});
},
beforeOpen(done, type) {
if (['edit', 'view'].includes(type)) {
getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
done();
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
done();
},
selectionChange(list) {
this.selectionList = list;
},
selectionClear() {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
},
sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
refreshChange() {
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
this.loading = true;
const {
warehouseId,
} = this.query;
const { warehouseId } = this.query;
let values = {
warehouseId_equal: warehouseId,
};
let values = {
warehouseId_equal: warehouseId,
};
getList(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.selectionClear();
});
}
}
};
getList(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.selectionClear();
});
},
},
};
</script>
<style>
</style>
<style></style>

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

File diff suppressed because it is too large Load Diff

2
src/views/basic/material/basicTripartiteMaterial.vue

@ -207,7 +207,7 @@ export default {
option: option,
//
data: [],
drawerShow:false,
drawerShow: false,
};
},
mounted() {

927
src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

11
src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue

@ -360,7 +360,6 @@
"
width="80%"
center
w
class="loadtc"
>
<div class="disbox">
@ -1267,7 +1266,7 @@ const showupt = value => {
values: '',
width: '200',
checkarr: [],
fixed: true,
fixed: false,
sortable: true,
head: false,
},
@ -1825,7 +1824,7 @@ const showdown = async value => {
values: '',
width: '200',
checkarr: [],
fixed: true,
fixed: false,
sortable: true,
head: false,
},
@ -1864,7 +1863,7 @@ const showdown = async value => {
},
{
prop: 'customerAddress',
label: '顾客电话',
label: '顾客地址',
type: 1,
values: '',
width: '150',
@ -2560,4 +2559,8 @@ const {
.loadtc {
margin-top: 2% !important;
}
.el-input__suffix {
width: 16px !important;
}
</style>

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

File diff suppressed because it is too large Load Diff

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

@ -155,20 +155,20 @@
<!-- </el-table>-->
</el-row>
<el-row>
<div class="avue-crud__pagination flex-c-sb" style="width:100%;">
<div style="font-size: 14px;">
勾选数量: {{ selectionList.length }}
</div>
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
<!-- 分页模块 -->
<el-pagination align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50,80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total">
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
</el-pagination>
</div>
</el-row>

3469
src/views/distribution/turndelivery/deliveryDiscuss.vue

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save