UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
prod
anthonywj 2 years ago
parent 51d0dcf4af 3bfc612522
commit 5c6fca4e80
9 changed files with 194 additions and 125 deletions
Show Stats Download Patch File Download Diff File

102
src/views/inout/DialogCreateOrder.vue
Unescape Escape View File

@ -188,11 +188,20 @@
<el-row v-if="documentShow"> <el-row v-if="documentShow">
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="acceptance" label="预验收单据:"> <el-form-item prop="acceptance" label="预验收单据:">
<el-input <el-select
style="width:90%" style="width: 90%"
:disabled="true"
v-model="orderFormData.checkPreInOrders" v-model="orderFormData.checkPreInOrders"
></el-input> multiple
placeholder="请选入单据"
>
<el-option
v-for="(item, index) in orderFormData.checkPreInOrders"
:key="item.index"
:label="item"
:value="item"
>
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -292,6 +301,7 @@
<dialog-create-order-select <dialog-create-order-select
@giveselectbox="giveselectbox" @giveselectbox="giveselectbox"
:closeDialogtwo="closeDialogtwo" :closeDialogtwo="closeDialogtwo"
:checkPreInOrders="orderFormData.checkPreInOrders"
> >
</dialog-create-order-select> </dialog-create-order-select>
</el-dialog> </el-dialog>
@ -308,9 +318,9 @@ import {
updateCodeBindSup, updateCodeBindSup,
enterCodeWeb, enterCodeWeb,
} from "../../api/inout/order"; } from "../../api/inout/order";
import {findByFrom, findInvByUser} from "../../api/system/invSubWarehouse"; import { findByFrom, findInvByUser } from "../../api/system/invSubWarehouse";
import {parseTime} from "../../utils/coTools"; import { parseTime } from "../../utils/coTools";
import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"; import { getBasicUnitMaintains } from "../../api/basic/basicUnitMaintain";
import editCodeDialog from "./DialogEditCode"; import editCodeDialog from "./DialogEditCode";
import DialogCreateOrderSelect from "./DialogCreateOrderSelect"; import DialogCreateOrderSelect from "./DialogCreateOrderSelect";
@ -318,7 +328,7 @@ import codesPanel from "./PanelCreateOrderCodes";
import codeDetailPanel from "./PanelCreateOrderCodeDetail"; import codeDetailPanel from "./PanelCreateOrderCodeDetail";
import bizDetailPanel from "./PanelCreateOrderBizDetail"; import bizDetailPanel from "./PanelCreateOrderBizDetail";
import A from "../../plugins/KeyScaner"; import A from "../../plugins/KeyScaner";
import {findByInvUser} from "@/api/basic/busType"; import { findByInvUser } from "@/api/basic/busType";
export default { export default {
name: "ioCreateOrder", name: "ioCreateOrder",
@ -388,20 +398,20 @@ export default {
formRules: { formRules: {
corpOrderId: [ corpOrderId: [
{required: true, message: "请输入单据号", trigger: "blur"}, { required: true, message: "请输入单据号", trigger: "blur" },
], ],
createTime: [ createTime: [
{required: true, message: "请选择创建时间", trigger: "blur"}, { required: true, message: "请选择创建时间", trigger: "blur" },
], ],
invCode: [ invCode: [
{required: true, message: "请选择当前仓库", trigger: "change"}, { required: true, message: "请选择当前仓库", trigger: "change" },
], ],
action: [ action: [
{required: true, message: "请选择单据类型", trigger: "change"}, { required: true, message: "请选择单据类型", trigger: "change" },
], ],
acceptance: [ acceptance: [
{required: true, message: "请选入预验收单据", trigger: "blur"}, { required: true, message: "请选入预验收单据", trigger: "blur" },
] ],
}, },
isScan: true, isScan: true,
scanText: "扫码录入：", scanText: "扫码录入：",
@ -430,8 +440,7 @@ export default {
viewBizVisible: false, viewBizVisible: false,
viewCodeVisible: false, viewCodeVisible: false,
viewCodeDetailVisible: false, viewCodeDetailVisible: false,
documentShow: false, //控制预选单显示隐藏
documentShow: false,//控制预选单显示隐藏
}; };
}, },
components: { components: {
@ -457,18 +466,18 @@ export default {
this.getBusTypeByInv(); this.getBusTypeByInv();
} }
}) })
.catch(() => { .catch(() => {});
});
}, },
//接收预选单传值 //接收预验单传值
giveselectbox(val) { giveselectbox(val) {
this.orderFormData.checkPreInOrders = val; this.orderFormData.checkPreInOrders = JSON.parse(JSON.stringify(val));
}, },
//仓库改变 //仓库改变
changeInv() { changeInv() {
this.orderFormData.action = null; this.orderFormData.action = null;
if (this.documentShow = true) { this.orderFormData.checkPreInOrders = null;
this.documentShow = false if ((this.documentShow = true)) {
this.documentShow = false;
} }
this.getBusTypeByInv(); this.getBusTypeByInv();
}, },
@ -482,8 +491,7 @@ export default {
.then((response) => { .then((response) => {
this.busTypeOptions = response.data || []; this.busTypeOptions = response.data || [];
}) })
.catch(() => { .catch(() => {});
});
}, },
//关闭预选单弹框 //关闭预选单弹框
closeDialogtwo() { closeDialogtwo() {
@ -515,8 +523,7 @@ export default {
this.bizShow = true; this.bizShow = true;
} else this.bizShow = false; } else this.bizShow = false;
}) })
.catch(() => { .catch(() => {});
});
}, },
//获取往来单位候选列表 //获取往来单位候选列表
@ -550,6 +557,8 @@ export default {
//单据类型改变 //单据类型改变
actionChange(item) { actionChange(item) {
this.orderFormData.checkPreInOption = null;
this.orderFormData.checkPreInOrders = null;
this.curAction = this.getActionItem(item); this.curAction = this.getActionItem(item);
if ( if (
(this.curAction.checkEnable && this.curAction.checkWebNew) || (this.curAction.checkEnable && this.curAction.checkWebNew) ||
@ -571,13 +580,13 @@ export default {
this.orderFormData.fromInvCode = null; this.orderFormData.fromInvCode = null;
this.findFromInvList(); this.findFromInvList();
} }
if (this.curAction.scanPreIn && this.curAction.backPreinType == 1) { if (
this.documentShow = true (this.curAction.scanPreIn = true && this.curAction.backPreinType == 1)
) {
this.documentShow = true;
} else { } else {
this.documentShow = false this.documentShow = false;
} }
this.giveselectbox();
}, },
//获取往来仓库列表 //获取往来仓库列表
@ -592,8 +601,7 @@ export default {
this.orderFormData.fromInvCode = this.fromInvOptions[0].code; this.orderFormData.fromInvCode = this.fromInvOptions[0].code;
} }
}) })
.catch(() => { .catch(() => {});
});
}, },
//获取当前单据类型 //获取当前单据类型
@ -666,8 +674,7 @@ export default {
confirmButtonText: "确定", confirmButtonText: "确定",
type: "warning", type: "warning",
closeOnClickModal: true, closeOnClickModal: true,
callback: (action) => { callback: (action) => {},
},
}); });
} }
this.corpOrderIdDisabled = true; this.corpOrderIdDisabled = true;
@ -697,8 +704,7 @@ export default {
tQuery.ignoreExpire = true; tQuery.ignoreExpire = true;
this.addCodeSubmit(tQuery); this.addCodeSubmit(tQuery);
}) })
.catch(() => { .catch(() => {});
});
} else if (response.code == 505) { } else if (response.code == 505) {
this.$confirm(response.message, "提示", { this.$confirm(response.message, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -709,29 +715,24 @@ export default {
tQuery.ignoreRecentExpire = true; tQuery.ignoreRecentExpire = true;
this.addCodeSubmit(tQuery); this.addCodeSubmit(tQuery);
}) })
.catch(() => { .catch(() => {});
});
} else if (response.code == 605) { } else if (response.code == 605) {
this.$confirm(response.message, "提示", { this.$confirm(response.message, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}).then(() => { })
.then(() => {})
}).catch(() => { .catch(() => {});
});
return; return;
} else if (response.code == 604) { } else if (response.code == 604) {
this.$confirm(response.message, "提示", { this.$confirm(response.message, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}).then(() => { })
.then(() => {})
}).catch(() => { .catch(() => {});
});
return; return;
} else if (response.code == 507) { } else if (response.code == 507) {
this.editOriginCodeVisible = true; this.editOriginCodeVisible = true;
@ -925,8 +926,7 @@ export default {
this.$message.error(response.message); this.$message.error(response.message);
} }
}) })
.catch(() => { .catch(() => {});
});
}, },
closeCodeDialog() { closeCodeDialog() {
this.editOriginCodeVisible = false; this.editOriginCodeVisible = false;

65
src/views/inout/DialogCreateOrderSelect.vue
Unescape Escape View File

@ -64,15 +64,20 @@
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table <el-table
ref="multipleTable" ref="multipleTable"
@select="select" @select-all="handleAll"
:header-cell-class-name="leftheaderStyle"
@selection-change="handleSelectionChange"
v-loading="loading" v-loading="loading"
:data="list" :data="list"
style="width: 100%" style="width: 100%"
highlight-current-row highlight-current-row
border border
@row-click="handleSelectionChange"
> >
<!-- <el-table-column type="selection" width="55"></el-table-column> --> <el-table-column
type="selection"
:selectable="checkSelection"
width="55"
></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
label="扫码单据类型" label="扫码单据类型"
@ -192,6 +197,10 @@ export default {
type: Function, type: Function,
required: true, required: true,
}, },
checkPreInOrders: {
type: Array,
required: true,
},
}, },
data() { data() {
return { return {
@ -306,8 +315,9 @@ export default {
resultTotal: 0, resultTotal: 0,
resultDetailLoading: false, resultDetailLoading: false,
resultDetailList: [], resultDetailList: [],
selectboxs: [], multipleSelection: [],
selectbox: "", selectbox: [],
selectRow: null,
}; };
}, },
components: {}, components: {},
@ -345,20 +355,23 @@ export default {
//选入 //选入
combine() { combine() {
this.closeDialogtwo(); this.closeDialogtwo();
this.$emit("giveselectbox", this.currentRow.billNo); this.$emit("giveselectbox", this.selectbox);
}, },
// //选择
// select(selection,row){
// // console.log(row); //选择框根据已选入判断禁用方法
// this.selectboxs.push(row) checkSelection(row, index) {
// let nerArr = JSON.parse(JSON.stringify(this.selectboxs)) let flag = true;
// let qwe = nerArr.map(item=>{ if (this.checkPreInOrders.length === 0) {
// // 每一项的单号 flag = true;
// return item.billNo } else {
// }) if (this.checkPreInOrders.includes(row.billNo)) {
// this.selectbox=qwe flag = false;
// }, } else {
flag = true;
}
}
return flag;
},
//关闭对话框 //关闭对话框
closeLocalDialog() { closeLocalDialog() {
}, },
@ -377,10 +390,21 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
//多行勾选
handleSelectionChange(val) { handleSelectionChange(val) {
this.currentRow = val; let checkboxs = JSON.parse(JSON.stringify(val));
console.log(this.currentRow.billNo); this.multipleSelection = checkboxs.map((item) => {
this.getOrderDetails(); return item.billNo;
});
let hebin = [...this.checkPreInOrders, ...this.multipleSelection];
let boxarry = Array.from(new Set(hebin));
this.selectbox = boxarry;
},
//全选
handleAll(selection) {
if(selection.length==0){
this.$refs.multipleTable.clearSelection()
}
}, },
// 获取单据 业务详情、扫码详情、扫码明细 // 获取单据 业务详情、扫码详情、扫码明细
getOrderDetails() { getOrderDetails() {
@ -644,4 +668,5 @@ export default {
</script> </script>
<style type="text/scss" lang="scss"> <style type="text/scss" lang="scss">
</style> </style>

1
src/views/system/dept/authDept.vue
Unescape Escape View File

@ -255,6 +255,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
:disabled="scope.row.userId == 1"
@click.native.stop="removeUserDialog(scope.row)" @click.native.stop="removeUserDialog(scope.row)"
>移除 >移除
</el-button> </el-button>

121
src/views/system/dept/invWarehouse.vue
Unescape Escape View File

@ -9,6 +9,20 @@
placeholder="仓库名称" placeholder="仓库名称"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item class="query-form-item" label="仓库类型:">
<el-input
clearable
placeholder="仓库类型"
></el-input>
</el-form-item> -->
<el-form-item label="仓库类型" prop="advanceType">
<el-select v-model="subDataType.advanceType" placeholder="请选择仓库类型" style="width: 80%">
<el-option label="入账库" :value="1"/>
<el-option label="预验收库" :value="2"/>
<el-option label="寄售库" :value="3"/>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button-group style="margin-left: 10px;display:flex;"> <el-button-group style="margin-left: 10px;display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
@ -28,34 +42,48 @@
> >
<el-table-column label="序号" type="index" ref="dataForm"></el-table-column> <el-table-column label="序号" type="index" ref="dataForm"></el-table-column>
<el-table-column <el-table-column
prop="name" prop="code"
label="仓库名称" width="140"
label="仓库编码"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="code" width="160"
label="仓库编码" prop="name"
label="仓库名称"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="parentName" prop="parentName"
width="180"
label="所属部门" label="所属部门"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column width="160"
prop="parentInvName" prop="parentInvName"
label="上级仓库" label="上级仓库"
> >
</el-table-column> </el-table-column>
<!--<el-table-column label="允许供应商使用" prop="spUse">--> <el-table-column
<!-- <template slot-scope="scope">--> width="140"
<!-- <el-tag :type="scope.row.spUse | spUerFilterType">{{--> prop="advanceType"
<!-- scope.row.spUse | spUerFilterName--> label="仓库类型"
<!-- }}--> >
<!-- </el-tag>-->
<!-- </template>--> <template slot-scope="scope">
<!--</el-table-column>--> <span>{{ advanceTypeTypeMap[scope.row.advanceType] }}</span>
<el-table-column label="操作" class-name="small-padding fixed-width"> </template>
</el-table-column>
<el-table-column label="允许供应商使用" prop="spUse" width="140">
<template slot-scope="scope">
<el-tag :type="scope.row.spUse | spUerFilterType">{{
scope.row.spUse | spUerFilterName
}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="220">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -168,11 +196,12 @@
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="仓库类型" prop="advanceType" > <el-form-item label="仓库类型" prop="advanceType">
<el-select v-model="subData.advanceType" :disabled="invWouse != null" placeholder="请选择仓库类型" style="width: 80%"> <el-select v-model="subData.advanceType" :disabled="invWouse != null" placeholder="请选择仓库类型"
style="width: 80%">
<el-option label="入账库" value="1"/> <el-option label="入账库" value="1"/>
<el-option label="寄售库" value="2"/> <el-option label="预验收库" value="2"/>
<el-option label="预验收库" value="3"/> <el-option label="寄售库" value="3"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -395,17 +424,22 @@ export default {
// page: 1, // page: 1,
// limit: 10, // limit: 10,
}, },
isAdvanceTypeShow:false, isAdvanceTypeShow: false,
isShow:false, isShow: false,
loading: true, loading: true,
list: [], list: [],
isExpandAll: true, isExpandAll: true,
total: 0, total: 0,
advanceTypeTypeMap: {
1: "入账库",
3: "寄售库",
2: "预验收库",
},
formMap: { formMap: {
add: "仓库信息-新增", add: "仓库信息-新增",
edit: "仓库信息-编辑" edit: "仓库信息-编辑"
}, },
invWouse:{}, invWouse: {},
formName: null, formName: null,
configParms: {}, configParms: {},
currentCode: null, currentCode: null,
@ -424,6 +458,7 @@ export default {
] ]
}, },
subData: {}, subData: {},
subDataType:{},
fromDeptOptions: [], fromDeptOptions: [],
invOptions: [], invOptions: [],
thirdSubQuery: { thirdSubQuery: {
@ -448,6 +483,7 @@ export default {
}, },
sysList: [], sysList: [],
sysSubList: [], sysSubList: [],
advanceTypese: [],
}; };
}, },
methods: { methods: {
@ -460,6 +496,7 @@ export default {
name: "", name: "",
status: "", status: "",
}; };
this.subDataType.advanceType=null;
this.getList(); this.getList();
//置空用户列表和货位信息列表的参数 //置空用户列表和货位信息列表的参数
@ -472,6 +509,7 @@ export default {
}, },
onSubmit() { //提交查询 onSubmit() { //提交查询
this.query.advanceType=this.subDataType.advanceType;
this.getList(); this.getList();
}, },
@ -483,6 +521,7 @@ export default {
this.loading = false; this.loading = false;
let invlist = response.data || []; let invlist = response.data || [];
this.list = this.handleTree(invlist, "code", "parentCode"); this.list = this.handleTree(invlist, "code", "parentCode");
console.log(this.list);
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
@ -491,34 +530,38 @@ export default {
}); });
}, },
handleSubForm(data, formName) { //新增，编辑 handleSubForm(data, formName) { //新增，编辑
if(data != null ){ if (data != null) {
this.invWouse=data; this.invWouse = data;
} }
this.formName = formName; this.formName = formName;
if (formName === "edit") { if (formName === "edit") {
this.subData = JSON.parse(JSON.stringify(data)); this.subData = JSON.parse(JSON.stringify(data));
this.subData.advanceType=this.subData.advanceType.toString(); this.subData.advanceType = this.subData.advanceType.toString();
if(this.subData.parentCode!=null && this.subData.parentCode!=""){ if (this.subData.parentCode != null && this.subData.parentCode != "") {
this.isAdvanceTypeShow=true; this.isAdvanceTypeShow = true;
this.isShow=false; this.isShow = false;
}else{ } else {
this.isAdvanceTypeShow=false; this.isAdvanceTypeShow = false;
this.isShow=true this.isShow = true
this.subData.parentCode=null; this.subData.parentCode = null;
} }
} else if (formName === "add") { } else if (formName === "add") {
this.isShow=true this.isShow = true
if(data==null){ if (data == null) {
this.isAdvanceTypeShow=false; this.isAdvanceTypeShow = false;
this.subData = {advanceType: '1', spUse: false,parentCode:null}; this.subData = {advanceType: '1', spUse: false, parentCode: null};
}else{ } else {
this.isAdvanceTypeShow=true; this.isAdvanceTypeShow = true;
this.subData = {advanceType: data.advanceType.toString(), spUse: false,parentCode:data.code}; this.subData = {advanceType: data.advanceType.toString(), spUse: false, parentCode: data.code};
} }
} }
//转换
let advanceTypese = this.subData.advanceType
this.subFormVisible = true; this.subFormVisible = true;
this.getSubThrsysDetailData(); this.getSubThrsysDetailData();
if(this.subData.parentCode!=null && this.subData.parentCode!=""){ if (this.subData.parentCode != null && this.subData.parentCode != "") {
filterSubAll(this.query) filterSubAll(this.query)
.then((response) => { .then((response) => {
let invList = response.data || []; let invList = response.data || [];

2
src/views/system/print/pdfBizPrintSet.vue
Unescape Escape View File

@ -474,7 +474,7 @@ export default {
}; };
this.moduleFormVisible = true; this.moduleFormVisible = true;
this.selectTemplateQuery = { this.selectTemplateQuery = {
module: row.templateType, module: 2,
busRlId: row.id, busRlId: row.id,
type: 1, type: 1,
name: "", name: "",

2
src/views/system/print/pdfCodePrintSet.vue
Unescape Escape View File

@ -474,7 +474,7 @@ export default {
}; };
this.moduleFormVisible = true; this.moduleFormVisible = true;
this.selectTemplateQuery = { this.selectTemplateQuery = {
module: row.templateType, module: 2,
busRlId: row.id, busRlId: row.id,
type: 1, type: 1,
name: "", name: "",

2
src/views/system/print/pdfLabelPrintSet.vue
Unescape Escape View File

@ -473,7 +473,7 @@ export default {
}; };
this.moduleFormVisible = true; this.moduleFormVisible = true;
this.selectTemplateQuery = { this.selectTemplateQuery = {
module: row.templateType, module: 0,
busRlId: row.id, busRlId: row.id,
type: 1, type: 1,
name: "", name: "",

2
src/views/system/print/pdfStatementPrintSet.vue
Unescape Escape View File

@ -473,7 +473,7 @@ export default {
}; };
this.moduleFormVisible = true; this.moduleFormVisible = true;
this.selectTemplateQuery = { this.selectTemplateQuery = {
module: row.templateType, module: 1,
busRlId: row.id, busRlId: row.id,
type: 1, type: 1,
name: "", name: "",

2
vue.config.js
Unescape Escape View File

@ -35,7 +35,7 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: `http://127.0.0.1:9991/`, target: `http://192.168.0.166:9991/`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "", ["^" + process.env.VUE_APP_BASE_API]: "",

Write Preview
Loading…
Cancel
Save