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

申购仓库修改

Browse Source
20231126-yw
anthonywj 1 year ago
parent 28d2fa74a3
commit 1f7b3a0557
6 changed files with 163 additions and 53 deletions
Show Stats Download Patch File Download Diff File

2
.env.development
Unescape Escape View File

@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
ENV = 'development' ENV = 'development'
# 开发环境 # 开发环境
VUE_APP_BASE_API = 'http://192.168.1.11:9991' VUE_APP_BASE_API = 'http://192.168.0.166:9991'
VUE_APP_SYNC_API ="http://127.0.0.1:10001" VUE_APP_SYNC_API ="http://127.0.0.1:10001"

3
.env.production
Unescape Escape View File

@ -29,6 +29,9 @@ VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
# 长泰医院
# VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/' VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'

55
src/views/purchase/purApply/purApply.vue
Unescape Escape View File

@ -9,8 +9,25 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="申购仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择申购仓库" @change="getInvList"
style="width: 90%">
<el-option
v-for="item in invList"
:key="item.code"
:label="item.name"
:value="item.code"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="申购部门:"> <el-form-item label="到货部门:">
<el-select v-model="filterQuery.targetDeptCode" placeholder="请选择申购部门" @change="getInvList" <el-select v-model="filterQuery.targetDeptCode" placeholder="请选择申购部门" @change="getInvList"
style="width: 90%"> style="width: 90%">
<el-option <el-option
@ -26,10 +43,10 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="申购仓库:"> <el-form-item label="到货仓库:">
<el-select v-model="filterQuery.targetInvCode" style="width: 90%" clearable placeholder="请选择所属仓库"> <el-select v-model="filterQuery.targetInvCode" style="width: 90%" clearable placeholder="请选择所属仓库">
<el-option <el-option
v-for="item in invList" v-for="item in targetInvList"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
@ -38,9 +55,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="紧急程度:" prop="emergency"> <el-form-item label="紧急程度:" prop="emergency">
<el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable> <el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>
@ -87,8 +101,9 @@
:default-sort="defaultSort" @sort-change="handleSortChange"> :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column label="序号" type="index" width="60"></el-table-column> <el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="申购单号" prop="billNo"></el-table-column> <el-table-column label="申购单号" prop="billNo"></el-table-column>
<el-table-column label="申购部门" prop="targetDeptName"></el-table-column> <el-table-column label="到货部门" prop="targetDeptName"></el-table-column>
<el-table-column label="申购仓库" prop="targetInvName"></el-table-column> <el-table-column label="到货仓库" prop="targetInvName"></el-table-column>
<el-table-column label="申购仓库" prop="invName"></el-table-column>
<el-table-column label="紧急程度" prop="emergency"> <el-table-column label="紧急程度" prop="emergency">
<template slot-scope="scope"> <template slot-scope="scope">
{{ emergencyMap[scope.row.emergency] }} {{ emergencyMap[scope.row.emergency] }}
@ -204,9 +219,10 @@ export default {
idQuery: {}, idQuery: {},
total: 0, total: 0,
thirdSys: [], thirdSys: [],
invList: {}, invList: [],
targetInvList: [],
deptList: [],
invCodebe: null, invCodebe: null,
deptList: {},
thirdSysDetail: null, thirdSysDetail: null,
busTypes: [], busTypes: [],
originTypes: [], originTypes: [],
@ -323,7 +339,7 @@ export default {
this.filterQuery.endDate = null; this.filterQuery.endDate = null;
} }
this.loading = true; this.loading = true;
this.filterQuery.isUser=true this.filterQuery.isUser = true
console.log(this.filterQuery) console.log(this.filterQuery)
listApply(this.filterQuery) listApply(this.filterQuery)
.then((response) => { .then((response) => {
@ -430,6 +446,20 @@ export default {
this.formName = "add"; this.formName = "add";
this.newSpDistributionVisible = true; this.newSpDistributionVisible = true;
}, },
getCurInvCode() {
},
getCurInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
})
.catch(() => {
});
},
getInvList() { getInvList() {
var query = { var query = {
parentId: this.filterQuery.targetDeptCode, parentId: this.filterQuery.targetDeptCode,
@ -438,7 +468,7 @@ export default {
this.filterQuery.targetInvCode = null this.filterQuery.targetInvCode = null
this.$forceUpdate() this.$forceUpdate()
filterGroupBySpuse(query).then((res) => { filterGroupBySpuse(query).then((res) => {
this.invList = res.data || []; this.targetInvList = res.data || [];
}) })
}, },
getDeptList() { getDeptList() {
@ -485,6 +515,7 @@ export default {
, ,
created() { created() {
this.initActDateRange() this.initActDateRange()
this.getCurInvList();
this.getDeptList(); this.getDeptList();
} }
, ,

40
src/views/purchase/purApply/pureApplyAudit.vue
Unescape Escape View File

@ -40,9 +40,22 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row> <el-col :span="8">
<el-form-item label="到货仓库">
<el-select v-model="filterQuery.targetInvCode" @change="getList" style="width: 90%" clearable
placeholder="请选择到货仓库">
<el-option
v-for="item in targetInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="紧急程度：" prop="emergency"> <el-form-item label="紧急程度：" prop="emergency">
<el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable> <el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>
@ -88,6 +101,7 @@
<el-table-column label="申购单号" prop="billNo"></el-table-column> <el-table-column label="申购单号" prop="billNo"></el-table-column>
<el-table-column label="申购部门" prop="deptName"></el-table-column> <el-table-column label="申购部门" prop="deptName"></el-table-column>
<el-table-column label="申购仓库" prop="invName"></el-table-column> <el-table-column label="申购仓库" prop="invName"></el-table-column>
<el-table-column label="到货仓库" prop="targetInvName"></el-table-column>
<el-table-column label="紧急程度" prop="emergency"> <el-table-column label="紧急程度" prop="emergency">
<template slot-scope="scope"> <template slot-scope="scope">
{{ emergencyMap[scope.row.emergency] }} {{ emergencyMap[scope.row.emergency] }}
@ -159,7 +173,7 @@ import pureApplyDetail from "./pureApplyDetailDialog";
import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply"; import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply";
import {filterAll, getInvListByUser} from "@/api/system/invWarehouse"; import {filterAll, getInvListByUser} from "@/api/system/invWarehouse";
import {getDeptListByUser} from "@/api/auth/authDept"; import {getDeptListByUser} from "@/api/auth/authDept";
import {filterSubAll} from "@/api/system/invSubWarehouse"; import {filterGroupBySpuse, filterSubAll} from "@/api/system/invSubWarehouse";
export default { export default {
data() { data() {
@ -207,8 +221,9 @@ export default {
thirdSysDetail: null, thirdSysDetail: null,
busTypes: [], busTypes: [],
originTypes: [], originTypes: [],
invList: {}, invList: [],
deptList: {}, targetInvList: [],
deptList: [],
list: [], list: [],
detailList: [], detailList: [],
loading: false, loading: false,
@ -302,8 +317,8 @@ export default {
this.filterQuery.endDate = null; this.filterQuery.endDate = null;
} }
this.loading = true; this.loading = true;
this.filterQuery.status=2 this.filterQuery.status = 2
this.filterQuery.isInvCode=true this.filterQuery.isInvCode = true
auditListApply(this.filterQuery) auditListApply(this.filterQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
@ -423,6 +438,16 @@ export default {
this.getList(); this.getList();
}); });
}, },
getCurInvList() {
var query = {
spUse: true,
}
this.filterQuery.targetInvCode = null
this.$forceUpdate()
filterGroupBySpuse(query).then((res) => {
this.targetInvList = res.data || [];
})
},
} }
, ,
components: { components: {
@ -450,6 +475,7 @@ export default {
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
this.actDateRange = [start, end]; this.actDateRange = [start, end];
this.getDeptList(); this.getDeptList();
this.getCurInvList();
} }
, ,
} }

52
src/views/purchase/purApply/pureApplyMySearch.vue
Unescape Escape View File

@ -10,8 +10,25 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="申购部门"> <el-form-item label="申购仓库:">
<el-select v-model="filterQuery.targetDeptCode" clearable @change="getInvList" placeholder="请选择申购部门" style="width: 90%"> <el-select v-model="filterQuery.invCode" placeholder="请选择申购仓库" @change="getInvList"
style="width: 90%">
<el-option
v-for="item in invList"
:key="item.code"
:label="item.name"
:value="item.code"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="到货部门">
<el-select v-model="filterQuery.targetDeptCode" clearable @change="getInvList" placeholder="请选择申购部门"
style="width: 90%">
<el-option <el-option
v-for="item in deptList" v-for="item in deptList"
:key="item.code" :key="item.code"
@ -24,10 +41,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="申购仓库"> <el-form-item label="到货仓库">
<el-select v-model="filterQuery.targetInvCode" style="width: 90%" clearable placeholder="请选择所属仓库"> <el-select v-model="filterQuery.targetInvCode" style="width: 90%" clearable placeholder="请选择所属仓库">
<el-option <el-option
v-for="item in invList" v-for="item in targetInvList"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
@ -36,9 +53,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="紧急程度：" prop="emergency"> <el-form-item label="紧急程度：" prop="emergency">
<el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable> <el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>
@ -97,8 +111,9 @@
:default-sort="defaultSort" @sort-change="handleSortChange"> :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column label="序号" type="index" width="60"></el-table-column> <el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="申购单号" prop="billNo"></el-table-column> <el-table-column label="申购单号" prop="billNo"></el-table-column>
<el-table-column label="申购部门" prop="targetDeptName"></el-table-column> <el-table-column label="到货部门" prop="targetDeptName"></el-table-column>
<el-table-column label="申购仓库" prop="targetInvName"></el-table-column> <el-table-column label="到货仓库" prop="targetInvName"></el-table-column>
<el-table-column label="申购仓库" prop="invName"></el-table-column>
<el-table-column label="紧急程度" prop="emergency"> <el-table-column label="紧急程度" prop="emergency">
<template slot-scope="scope"> <template slot-scope="scope">
{{ emergencyMap[scope.row.emergency] }} {{ emergencyMap[scope.row.emergency] }}
@ -217,8 +232,9 @@ export default {
thirdSysDetail: null, thirdSysDetail: null,
busTypes: [], busTypes: [],
originTypes: [], originTypes: [],
invList: {}, invList: [],
deptList: {}, targetInvList: [],
deptList: [],
list: [], list: [],
detailList: [], detailList: [],
loading: false, loading: false,
@ -355,7 +371,7 @@ export default {
} }
this.loading = true; this.loading = true;
this.filterQuery.status = 3; this.filterQuery.status = 3;
this.filterQuery.isUser=true this.filterQuery.isUser = true
listApply(this.filterQuery) listApply(this.filterQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
@ -442,7 +458,14 @@ export default {
this.getList(); this.getList();
this.detailList = []; this.detailList = [];
}, },
getCurInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
})
.catch(() => {
});
},
newDistributionForm(index, row) { newDistributionForm(index, row) {
this.idQuery.id = ''; this.idQuery.id = '';
@ -459,7 +482,7 @@ export default {
parentId: this.filterQuery.targetDeptCode parentId: this.filterQuery.targetDeptCode
} }
filterSubAll(query).then((res) => { filterSubAll(query).then((res) => {
this.invList = res.data || []; this.targetInvList = res.data || [];
}) })
}, },
getDeptList() { getDeptList() {
@ -499,6 +522,7 @@ export default {
, ,
created() { created() {
this.getDeptList(); this.getDeptList();
this.getCurInvList();
} }
, ,
} }

64
src/views/purchase/purApply/pureApplySearch.vue
Unescape Escape View File

@ -11,7 +11,8 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="申购部门:"> <el-form-item label="申购部门:">
<el-select v-model="filterQuery.deptCode" clearable @change="getInvList" placeholder="请选择申购部门" style="width: 90%"> <el-select v-model="filterQuery.deptCode" clearable @change="getInvList" placeholder="请选择申购部门"
style="width: 90%">
<el-option <el-option
v-for="item in deptList" v-for="item in deptList"
:key="item.code" :key="item.code"
@ -36,9 +37,20 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="8">
<el-form-item label="到货仓库">
<el-row> <el-select v-model="filterQuery.targetInvCode" @change="getList" style="width: 90%" clearable
placeholder="请选择到货仓库">
<el-option
v-for="item in targetInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="紧急程度:" prop="emergency"> <el-form-item label="紧急程度:" prop="emergency">
<el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable> <el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>
@ -51,15 +63,15 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="创建时间:"> <el-form-item label="创建时间:">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
type="daterange" type="daterange"
format="yyyy 年 MM 月 dd 日" format="yyyy 年 MM 月 dd 日"
style="width: 90%" style="width: 90%"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -97,8 +109,9 @@
:default-sort="defaultSort" @sort-change="handleSortChange"> :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column label="序号" type="index" width="60"></el-table-column> <el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="申购单号" prop="billNo"></el-table-column> <el-table-column label="申购单号" prop="billNo"></el-table-column>
<el-table-column label="申购部门" prop="targetDeptName"></el-table-column> <el-table-column label="到货部门" prop="targetDeptName"></el-table-column>
<el-table-column label="申购仓库" prop="targetInvName"></el-table-column> <el-table-column label="到货仓库" prop="targetInvName"></el-table-column>
<el-table-column label="申购仓库" prop="invName"></el-table-column>
<el-table-column label="紧急程度" prop="emergency"> <el-table-column label="紧急程度" prop="emergency">
<template slot-scope="scope"> <template slot-scope="scope">
{{ emergencyMap[scope.row.emergency] }} {{ emergencyMap[scope.row.emergency] }}
@ -172,7 +185,7 @@ import pureApplyDetail from "./pureApplyDetailDialog";
import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply"; import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply";
import {filterAll, getInvListByUser} from "@/api/system/invWarehouse"; import {filterAll, getInvListByUser} from "@/api/system/invWarehouse";
import {getDeptListByUser} from "@/api/auth/authDept"; import {getDeptListByUser} from "@/api/auth/authDept";
import {filterSubAll} from "@/api/system/invSubWarehouse"; import {filterGroupBySpuse, filterSubAll} from "@/api/system/invSubWarehouse";
export default { export default {
data() { data() {
@ -217,8 +230,9 @@ export default {
thirdSysDetail: null, thirdSysDetail: null,
busTypes: [], busTypes: [],
originTypes: [], originTypes: [],
invList: {}, invList: [],
deptList: {}, targetInvList: [],
deptList: [],
list: [], list: [],
detailList: [], detailList: [],
loading: false, loading: false,
@ -355,7 +369,7 @@ export default {
} }
this.loading = true; this.loading = true;
this.filterQuery.status = 12; this.filterQuery.status = 12;
this.filterQuery.isInvCode=true this.filterQuery.isInvCode = true
auditListApply(this.filterQuery) auditListApply(this.filterQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
@ -474,6 +488,16 @@ export default {
this.getInvList(); this.getInvList();
}); });
}, },
getCurInvList() {
var query = {
spUse: true,
}
this.filterQuery.targetInvCode = null
this.$forceUpdate()
filterGroupBySpuse(query).then((res) => {
this.targetInvList = res.data || [];
})
},
} }
, ,
components: { components: {
@ -497,6 +521,8 @@ export default {
, ,
created() { created() {
this.getDeptList(); this.getDeptList();
this.getCurInvList();
} }
, ,
} }

Write Preview
Loading…
Cancel
Save