Merge remote-tracking branch 'origin/master'

master
schry 2 years ago
commit b4cf299f8c

@ -5,9 +5,9 @@ VUE_APP_TITLE = UDI管理系统
ENV = 'development' ENV = 'development'
# 开发环境 # 开发环境
VUE_APP_BASE_API = 'http://127.0.0.1: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://192.168.0.166:10001"
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/' VUE_APP_CONTEXT_PATH = '/'

@ -8,7 +8,7 @@ ENV = 'production'
#林纪裕cd #林纪裕cd
# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/UDI_WMS_MC/' VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/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/'
@ -31,7 +31,10 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
# 漳州中医院 # 漳州中医院
VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
# 片仔癀诊断
# VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/

@ -2,7 +2,7 @@ import axios from "@/utils/request";
export function filterDepts(query) { export function filterDepts(query) {
return axios({ return axios({
url: "/udi/auth/dept/filter", url: "/spms/inv/warehouse/filterAll",
method: "get", method: "get",
params: query params: query
}); });
@ -39,3 +39,8 @@ export function getDeptListByUser(params) {
params: params params: params
}); });
} }

@ -307,56 +307,56 @@
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="备注字段1" :label="productRemarkSet.remarkTitle1"
prop="basicPrductRemak1" prop="basicPrductRemak1"
width="180" width="180"
show-overflow-tooltip show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak1')" v-if="$auth.hasPermi('basic:basicPrductRemak1')"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="备注字段2" :label="productRemarkSet.remarkTitle2"
prop="basicPrductRemak2" prop="basicPrductRemak2"
width="180" width="180"
show-overflow-tooltip show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak2')" v-if="$auth.hasPermi('basic:basicPrductRemak2')"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="备注字段3" :label="productRemarkSet.remarkTitle3"
prop="basicPrductRemak3" prop="basicPrductRemak3"
width="180" width="180"
show-overflow-tooltip show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak3')" v-if="$auth.hasPermi('basic:basicPrductRemak3')"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="备注字段4" :label="productRemarkSet.remarkTitle4"
prop="basicPrductRemak4" prop="basicPrductRemak4"
width="180" width="180"
show-overflow-tooltip show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak4')" v-if="$auth.hasPermi('basic:basicPrductRemak4')"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="备注字段5" :label="productRemarkSet.remarkTitle5"
prop="basicPrductRemak5" prop="basicPrductRemak5"
width="180" width="180"
show-overflow-tooltip show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak5')" v-if="$auth.hasPermi('basic:basicPrductRemak5')"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="备注字段6" :label="productRemarkSet.remarkTitle6"
prop="basicPrductRemak6" prop="basicPrductRemak6"
width="180" width="180"
show-overflow-tooltip show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak6')" v-if="$auth.hasPermi('basic:basicPrductRemak6')"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="备注字段7" :label="productRemarkSet.remarkTitle7"
prop="basicPrductRemak7" prop="basicPrductRemak7"
width="180" width="180"
show-overflow-tooltip show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak7')" v-if="$auth.hasPermi('basic:basicPrductRemak7')"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="备注字段8" :label="productRemarkSet.remarkTitle8"
prop="basicPrductRemak8" prop="basicPrductRemak8"
width="180" width="180"
show-overflow-tooltip show-overflow-tooltip
@ -401,6 +401,7 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="180" label="操作" fixed="right"> <el-table-column width="180" label="操作" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -1644,7 +1645,16 @@ export default {
false: "不可配送", false: "不可配送",
}, },
pId: 0, pId: 0,
productRemarkSet: {}, productRemarkSet: {
remarkTitle1: "备注字段1",
remarkTitle2: "备注字段2",
remarkTitle3: "备注字段3",
remarkTitle4: "备注字段4",
remarkTitle5: "备注字段5",
remarkTitle6: "备注字段6",
remarkTitle7: "备注字段7",
remarkTitle8: "备注字段8",
},
relevanceEdit: { relevanceEdit: {
id: null, id: null,
thirdId: "", thirdId: "",
@ -2148,50 +2158,6 @@ export default {
} }
}); });
}, },
// selectSysParam() {
// let query = {
// paramKey: "smp_isUploadProuct",
// };
// spcombie().then((response) => {
// if (response.code == 20000) {
// if (response.data.paramValue == "1") {
// this.isSpCombine = true;
// } else {
// this.isSpCombine = false;
// }
// }
// });
//
// selectSysParamByKey(query).then((response) => {
// if (response.code == 20000) {
// if (response.data.paramValue == "1") {
// this.isUploadSmp = true;
// } else {
// this.isUploadSmp = false;
// }
// }
// });
// let query1 = {
// paramKey: "upload_pi_file_enabled",
// };
// selectSysParamByKey(query1).then((response) => {
// if (response.code == 20000) {
// if (response.data.paramValue == "1") {
// this.isImportFile = true;
// }
// }
// });
// let query2 = {
// paramKey: "upload_pi_file_url",
// };
// selectSysParamByKey(query2).then((response) => {
// if (response.code == 20000) {
// this.uploadFileUrl = response.data.paramValue;
// }
// });
// },
editUdiType() { editUdiType() {
this.selectUdiTypeVisible = true; this.selectUdiTypeVisible = true;
}, },

@ -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.targetDeptCode" placeholder="请选择申购部门" @change="getInvList" style="width: 90%"> <el-select v-model="filterQuery.targetDeptCode" placeholder="请选择申购部门" @change="getInvList"
style="width: 90%">
<el-option <el-option
v-for="item in deptList" v-for="item in deptList"
:key="item.code" :key="item.code"
@ -74,24 +75,26 @@
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmitFind"></el-button> <el-button type="primary" icon="el-icon-search" @click="onSubmitFind"></el-button>
<el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增单据</el-button> <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增单据
</el-button>
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleDetail" border highlight-current-row <el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleDetail" border
highlight-current-row
: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="emergency" > <el-table-column label="紧急程度" prop="emergency">
<template slot-scope="scope"> <template slot-scope="scope">
{{ emergencyMap[scope.row.emergency] }} {{ emergencyMap[scope.row.emergency] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货截止" prop="arrivalTime" ></el-table-column> <el-table-column label="到货截止" prop="arrivalTime"></el-table-column>
<el-table-column label="单据状态" prop="status"> <el-table-column label="单据状态" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="(scope.row.status) | statusFilterType"> <el-tag :type="(scope.row.status) | statusFilterType">
@ -104,7 +107,8 @@
sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column> sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
<el-table-column label="操作" width="120px"> <el-table-column label="操作" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑</el-button> <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑
</el-button>
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button> <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -142,7 +146,7 @@
@close='closeDialog' @close='closeDialog'
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
:before-close ="handleClose" :before-close="handleClose"
> >
<pureApplyEdit <pureApplyEdit
:closeDialog="closeDialog" :closeDialog="closeDialog"
@ -156,16 +160,16 @@
<script> <script>
import pureApplyEdit from "./purApplyEditDiaolog"; import pureApplyEdit from "./purApplyEditDiaolog";
import {delApply, delApplyDetailAll, inserThrOrderWeb, listApply, listApplyDetail} from "@/api/purchase/purApply"; import {delApply, delApplyDetailAll, inserThrOrderWeb, listApply, listApplyDetail} from "@/api/purchase/purApply";
import { getInvListByUser } from '@/api/system/invWarehouse' import {getInvListByUser} from '@/api/system/invWarehouse'
import { getDeptListByUser } from '@/api/auth/authDept' import {filterDepts, getDeptListByUser} from '@/api/auth/authDept'
import {filterSubAll} from "@/api/system/invSubWarehouse"; import {filterGroupBySpuse, filterSubAll} from "@/api/system/invSubWarehouse";
export default { export default {
data() { data() {
return { return {
defaultSort: {prop: 'createTime', order: 'desc'}, defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true, showSearch: true,
pId:null, pId: null,
filterQuery: { filterQuery: {
billAction: null, billAction: null,
billNo: "", billNo: "",
@ -176,11 +180,11 @@ export default {
corpName: null, corpName: null,
type: 1, type: 1,
editStatus: 1, editStatus: 1,
emergency:'', emergency: '',
targetDeptCode:'', targetDeptCode: '',
targetInvCode:null targetInvCode: null
}, },
isChang:false, isChang: false,
formName: null, formName: null,
formMap: { formMap: {
add: "新增申购单据", add: "新增申购单据",
@ -192,7 +196,7 @@ export default {
3: "已审核", 3: "已审核",
4: "已拒绝" 4: "已拒绝"
}, },
emergencyMap:{ emergencyMap: {
1: "正常", 1: "正常",
2: "较急", 2: "较急",
3: "特急", 3: "特急",
@ -200,14 +204,14 @@ export default {
idQuery: {}, idQuery: {},
total: 0, total: 0,
thirdSys: [], thirdSys: [],
invList:{}, invList: {},
invCodebe:null, invCodebe: null,
deptList:{}, deptList: {},
thirdSysDetail: null, thirdSysDetail: null,
busTypes: [], busTypes: [],
originTypes: [], originTypes: [],
list: [], list: [],
createTimes:null, createTimes: null,
detailLoading: false, detailLoading: false,
detailList: [], detailList: [],
loading: false, loading: false,
@ -266,29 +270,29 @@ export default {
type: 1, type: 1,
editStatus: 1, editStatus: 1,
targetDeptCode: this.invCodebe, targetDeptCode: this.invCodebe,
targetInvCode:null targetInvCode: null
}; };
this.initActDateRange() this.initActDateRange()
if(deptCode!=this.invCodebe){ if (deptCode != this.invCodebe) {
this.getInvList() this.getInvList()
} }
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
}, },
getId(id){ getId(id) {
if( this.formName=='add' && id!=null){ if (this.formName == 'add' && id != null) {
var data={ var data = {
id:id id: id
} }
this.pId=id this.pId = id
// //
delApplyDetailAll(data).then((response)=>{ delApplyDetailAll(data).then((response) => {
if(response.code==20000){ if (response.code == 20000) {
this.newSpDistributionVisible=false this.newSpDistributionVisible = false
} }
}); });
}else{ } else {
this.newSpDistributionVisible=false this.newSpDistributionVisible = false
} }
}, },
@ -325,7 +329,7 @@ export default {
if (response.code == 20000) { if (response.code == 20000) {
this.list = response.data.list || []; this.list = response.data.list || [];
this.total = response.data.total || 0; this.total = response.data.total || 0;
this.detailList=[] this.detailList = []
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
@ -350,11 +354,11 @@ export default {
this.detailList = []; this.detailList = [];
}); });
}, },
handleClose(){ handleClose() {
if( this.formName=='add'){ if (this.formName == 'add') {
this.isChang=!this.isChang this.isChang = !this.isChang
}else{ } else {
this.newSpDistributionVisible=false this.newSpDistributionVisible = false
} }
}, },
submitOrder(row) { submitOrder(row) {
@ -425,27 +429,31 @@ export default {
this.newSpDistributionVisible = true; this.newSpDistributionVisible = true;
}, },
getInvList() { getInvList() {
var query={ var query = {
parentId:this.filterQuery.targetDeptCode parentId: this.filterQuery.targetDeptCode,
spUse: true,
} }
this.filterQuery.targetInvCode = null this.filterQuery.targetInvCode = null
this.$forceUpdate() this.$forceUpdate()
filterSubAll(query).then((res) => { filterGroupBySpuse(query).then((res) => {
this.invList = res.data || []; this.invList = res.data || [];
}) })
}, },
getDeptList() { getDeptList() {
getDeptListByUser().then((res) => { let query = {
spUse: true,
};
filterDepts(query).then((res) => {
this.deptList = res.data || []; this.deptList = res.data || [];
if(this.deptList.length>0){ if (this.deptList.length > 0) {
this.filterQuery.targetDeptCode=this.deptList[0].code this.filterQuery.targetDeptCode = this.deptList[0].code
this.invCodebe=this.filterQuery.targetDeptCode this.invCodebe = this.filterQuery.targetDeptCode
} }
this.getList(); this.getList();
this. getInvList(); this.getInvList();
}); });
}, },
initActDateRange(){ initActDateRange() {
let end = new Date(); let end = new Date();
let start = new Date(); let start = new Date();

@ -11,7 +11,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="申购部门"> <el-form-item label="申购部门">
<el-select v-model="filterQuery.targetDeptCode" placeholder="请选择申购部门" style="width: 90%" <el-select v-model="filterQuery.deptCode" placeholder="请选择申购部门" style="width: 90%"
@change="getInvList" @change="getInvList"
> >
<el-option <el-option
@ -28,7 +28,8 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="申购仓库"> <el-form-item label="申购仓库">
<el-select v-model="filterQuery.targetInvCode" @change="getList" style="width: 90%" clearable placeholder="请选择所属仓库"> <el-select v-model="filterQuery.invCode" @change="getList" style="width: 90%" clearable
placeholder="请选择所属仓库">
<el-option <el-option
v-for="item in invList" v-for="item in invList"
:key="item.name" :key="item.name"
@ -80,18 +81,19 @@
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row @current-change="handleDetail" <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
@current-change="handleDetail"
: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="deptName"></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] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货截止" prop="arrivalTime" ></el-table-column> <el-table-column label="到货截止" prop="arrivalTime"></el-table-column>
<el-table-column label="单据状态" prop="status"> <el-table-column label="单据状态" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="(scope.row.status) | statusFilterType"> <el-tag :type="(scope.row.status) | statusFilterType">
@ -103,7 +105,9 @@
sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column> sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
<el-table-column label="操作" width="60px"> <el-table-column label="操作" width="60px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" :disabled="scope.row.status!=2" @click.native="newDistributionForm(scope.$index, scope.row)">审核</el-button> <el-button type="text" :disabled="scope.row.status!=2"
@click.native="newDistributionForm(scope.$index, scope.row)">审核
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -170,9 +174,11 @@ export default {
corpName: null, corpName: null,
type: 1, type: 1,
editStatus: 1, editStatus: 1,
emergency:'', emergency: '',
targetDeptCode:'', targetDeptCode: '',
targetInvCode: null targetInvCode: null,
deptCode: null,
invCode: null,
}, },
formName: null, formName: null,
formMap: { formMap: {
@ -185,7 +191,7 @@ export default {
3: "已审核", 3: "已审核",
4: "已拒绝" 4: "已拒绝"
}, },
emergencyMap:{ emergencyMap: {
1: "正常", 1: "正常",
2: "较急", 2: "较急",
3: "特急", 3: "特急",
@ -194,12 +200,12 @@ export default {
editType: 1, editType: 1,
total: 0, total: 0,
thirdSys: [], thirdSys: [],
invCodebe:null, invCodebe: null,
thirdSysDetail: null, thirdSysDetail: null,
busTypes: [], busTypes: [],
originTypes: [], originTypes: [],
invList:{}, invList: {},
deptList:{}, deptList: {},
list: [], list: [],
detailList: [], detailList: [],
loading: false, loading: false,
@ -260,7 +266,7 @@ export default {
targetDeptCode: this.invCodebe, targetDeptCode: this.invCodebe,
targetInvCode: null targetInvCode: null
}; };
if(deptCode!=this.invCodebe){ if (deptCode != this.invCodebe) {
this.getInvList() this.getInvList()
} }
this.actDateRange = []; this.actDateRange = [];
@ -298,7 +304,7 @@ export default {
if (response.code == 20000) { if (response.code == 20000) {
this.list = response.data.list || []; this.list = response.data.list || [];
this.total = response.data.total || 0; this.total = response.data.total || 0;
this.detailList=[] this.detailList = []
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
@ -391,14 +397,14 @@ export default {
this.formName = "add"; this.formName = "add";
this.newSpDistributionVisible = true; this.newSpDistributionVisible = true;
}, },
deptChange(){ deptChange() {
this. getInvList(); this.getInvList();
this.getList(); this.getList();
}, },
getInvList() { getInvList() {
var query={ var query = {
parentId:this.filterQuery.targetDeptCode parentId: this.filterQuery.targetDeptCode
} }
this.filterQuery.targetInvCode = null this.filterQuery.targetInvCode = null
filterSubAll(query).then((res) => { filterSubAll(query).then((res) => {
@ -408,7 +414,7 @@ export default {
getDeptList() { getDeptList() {
filterAll().then((res) => { filterAll().then((res) => {
this.deptList = res.data || []; this.deptList = res.data || [];
this. getInvList(); this.getInvList();
this.getList(); this.getList();
}); });
}, },

@ -104,18 +104,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货截止" prop="arrivalTime" ></el-table-column> <el-table-column label="到货截止" prop="arrivalTime" ></el-table-column>
<el-table-column label="单据状态" prop="status">
<template slot-scope="scope">
<el-tag :type="(scope.row.status) | statusFilterType">
{{ statusMap[scope.row.status] }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="创建时间" prop="createTime" <el-table-column label="创建时间" prop="createTime"
sortable="custom" :sort-orders="['ascending', 'descending']" ></el-table-column> sortable="custom" :sort-orders="['ascending', 'descending']" ></el-table-column>
<el-table-column label="审核时间" prop="auditTime" <el-table-column label="审核时间" prop="auditTime"
sortable="custom" :sort-orders="['ascending', 'descending']" ></el-table-column> sortable="custom" :sort-orders="['ascending', 'descending']" ></el-table-column>
<el-table-column label="状态" prop="status"> <el-table-column label="审核人" prop="auditByName"></el-table-column>
<el-table-column label="审核状态" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="(scope.row.status) | statusFilterType"> <el-tag :type="(scope.row.status) | statusFilterType">
{{ statusMap[scope.row.status] }} {{ statusMap[scope.row.status] }}

@ -81,18 +81,19 @@
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
@current-change="handleDetail" :default-sort="defaultSort" @sort-change="handleSortChange"> @current-change="handleDetail" :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" width="160"></el-table-column>
<el-table-column label="采购部门" prop="deptName"></el-table-column> <el-table-column label="采购部门" prop="deptName" width="120"></el-table-column>
<el-table-column label="采购仓库" prop="invName"></el-table-column> <el-table-column label="采购仓库" prop="invName" width="120"></el-table-column>
<el-table-column label="申购人" prop="applyCreateBy"></el-table-column> <el-table-column label="申购仓库" prop="applyInvName" width="120"></el-table-column>
<el-table-column label="供应商" prop="supName"></el-table-column> <el-table-column label="申购人" prop="applyCreateBy" width="120"></el-table-column>
<el-table-column label="紧急程度" prop="emergency"> <el-table-column label="供应商" prop="supName" width="180"></el-table-column>
<el-table-column label="紧急程度" prop="emergency" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ emergencyMap[scope.row.emergency] }} {{ emergencyMap[scope.row.emergency] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货截止" prop="arrivalTime"></el-table-column> <el-table-column label="到货截止" prop="arrivalTime" width="160"></el-table-column>
<el-table-column label="单据状态" prop="status"> <el-table-column label="单据状态" prop="status" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="(scope.row.status) | statusFilterType"> <el-tag :type="(scope.row.status) | statusFilterType">
{{ statusMap[scope.row.status] }} {{ statusMap[scope.row.status] }}
@ -100,10 +101,10 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="createTime" <el-table-column label="创建时间" prop="createTime"
sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column> sortable="custom" :sort-orders="['ascending', 'descending']" width="160"></el-table-column>
<el-table-column label="操作" width="120"> <el-table-column label="操作" width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑 <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑
</el-button> </el-button>

@ -80,18 +80,20 @@
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
@current-change="handleDetail" :default-sort="defaultSort" @sort-change="handleSortChange"> @current-change="handleDetail" :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" width="160"></el-table-column>
<el-table-column label="采购部门" prop="deptName"></el-table-column> <el-table-column label="采购部门" prop="deptName" width="120"></el-table-column>
<el-table-column label="采购仓库" prop="invName"></el-table-column> <el-table-column label="采购仓库" prop="invName" width="120"></el-table-column>
<el-table-column label="申购人" prop="applyCreateBy"></el-table-column> <el-table-column label="申购仓库" prop="applyInvName" width="120"></el-table-column>
<el-table-column label="供应商" prop="supName"></el-table-column> <el-table-column label="申购人" prop="applyCreateBy" width="120"></el-table-column>
<el-table-column label="紧急程度" prop="emergency"> <el-table-column label="审核人" prop="auditUserName"></el-table-column>
<el-table-column label="供应商" prop="supName" width="180"></el-table-column>
<el-table-column label="紧急程度" prop="emergency" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ emergencyMap[scope.row.emergency] }} {{ emergencyMap[scope.row.emergency] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货截止" prop="arrivalTime"></el-table-column> <el-table-column label="到货截止" prop="arrivalTime" width="160"></el-table-column>
<el-table-column label="单据状态" prop="status"> <el-table-column label="单据状态" prop="status" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="(scope.row.status) | statusFilterType"> <el-tag :type="(scope.row.status) | statusFilterType">
{{ statusMap[scope.row.status] }} {{ statusMap[scope.row.status] }}
@ -99,8 +101,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="createTime" <el-table-column label="创建时间" prop="createTime"
sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column> sortable="custom" :sort-orders="['ascending', 'descending']" width="160"></el-table-column>
<el-table-column label="操作" width="60px"> <el-table-column label="操作" width="60px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" :disabled="scope.row.status!=2" <el-button type="text" :disabled="scope.row.status!=2"
@click.native="newDistributionForm(scope.$index, scope.row)">审核 @click.native="newDistributionForm(scope.$index, scope.row)">审核
@ -174,11 +176,11 @@ export default {
corpName: null, corpName: null,
type: 1, type: 1,
editStatus: 1, editStatus: 1,
emergency:'', emergency: '',
deptCode:'', deptCode: '',
}, },
formName: null, formName: null,
invCodebe:null, invCodebe: null,
formMap: { formMap: {
add: "新增采购计划", add: "新增采购计划",
update: "采购计划审核", update: "采购计划审核",
@ -189,7 +191,7 @@ export default {
3: "已审核", 3: "已审核",
4: "已拒绝" 4: "已拒绝"
}, },
emergencyMap:{ emergencyMap: {
1: "正常", 1: "正常",
2: "较急", 2: "较急",
3: "特急", 3: "特急",
@ -298,7 +300,7 @@ export default {
if (response.code == 20000) { if (response.code == 20000) {
this.list = response.data.list || []; this.list = response.data.list || [];
this.total = response.data.total || 0; this.total = response.data.total || 0;
this.detailList=[] this.detailList = []
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
@ -359,8 +361,8 @@ export default {
this.detailList = []; this.detailList = [];
}, },
getInvList() { getInvList() {
var query={ var query = {
parentId:this.filterQuery.deptCode parentId: this.filterQuery.deptCode
} }
filterSubAll(query).then((res) => { filterSubAll(query).then((res) => {
this.invList = res.data || []; this.invList = res.data || [];
@ -369,12 +371,12 @@ export default {
getDeptList() { getDeptList() {
getDeptListByUser().then((res) => { getDeptListByUser().then((res) => {
this.deptList = res.data || []; this.deptList = res.data || [];
if(this.deptList.length>0){ if (this.deptList.length > 0) {
this.filterQuery.deptCode=this.deptList[0].code this.filterQuery.deptCode = this.deptList[0].code
this.invCodebe=this.filterQuery.deptCode this.invCodebe = this.filterQuery.deptCode
} }
this.getList(); this.getList();
this. getInvList(); this.getInvList();
}); });
}, },

@ -94,20 +94,22 @@
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true" <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true"
@current-change="handleDetail" :default-sort="defaultSort" @sort-change="handleSortChange" > @current-change="handleDetail" :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" width="160"></el-table-column>
<el-table-column label="采购部门" prop="deptName"></el-table-column> <el-table-column label="采购部门" prop="deptName" width="120"></el-table-column>
<el-table-column label="采购仓库" prop="invName"></el-table-column> <el-table-column label="采购仓库" prop="invName" width="120"></el-table-column>
<el-table-column label="申购人" prop="applyCreateBy"></el-table-column> <el-table-column label="申购仓库" prop="applyInvName" width="120"></el-table-column>
<el-table-column label="供应商" prop="supName"></el-table-column> <el-table-column label="申购人" prop="applyCreateBy" width="120"></el-table-column>
<el-table-column label="紧急程度" prop="emergency"> <el-table-column label="审核人" prop="auditUserName"></el-table-column>
<el-table-column label="供应商" prop="supName" width="180"></el-table-column>
<el-table-column label="紧急程度" prop="emergency" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ emergencyMap[scope.row.emergency] }} {{ emergencyMap[scope.row.emergency] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货截止" prop="arrivalTime"></el-table-column> <el-table-column label="到货截止" prop="arrivalTime" width="160"></el-table-column>
<el-table-column label="状态" prop="status"> <el-table-column label="单据状态" prop="status" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="(scope.row.status) | statusFilterType"> <el-tag :type="(scope.row.status) | statusFilterType">
{{ statusMap[scope.row.status] }} {{ statusMap[scope.row.status] }}
@ -115,12 +117,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="createTime" <el-table-column label="创建时间" prop="createTime"
sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column> sortable="custom" :sort-orders="['ascending', 'descending']" width="160"></el-table-column>
<el-table-column label="审核时间" prop="auditTime" <el-table-column label="审核时间" prop="auditTime"
sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column> sortable="custom" :sort-orders="['ascending', 'descending']" width="160"></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作" width="60px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
>删除 >删除

@ -102,7 +102,8 @@
<el-row type="flex"> <el-row type="flex">
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="用户账号" prop="userName"> <el-form-item label="用户账号" prop="userName">
<el-input v-model="formData.userName" size="small" style="width: 90%" :disabled="formData.id == 1"></el-input> <el-input v-model="formData.userName" size="small" style="width: 90%"
:disabled="formData.id == 1"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
@ -206,7 +207,7 @@
<el-row :gutter="20" type="flex"> <el-row :gutter="20" type="flex">
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="角色" prop="roles"> <el-form-item label="角色" prop="roles">
<el-checkbox-group v-model="formData.roles" :disabled="formData.id == 1" > <el-checkbox-group v-model="formData.roles" :disabled="formData.id == 1">
<el-checkbox <el-checkbox
v-for="item in roles" v-for="item in roles"
:key="item.roleId" :key="item.roleId"
@ -258,7 +259,7 @@ import {findConfig} from "@/api/sync/spsSyncStatus";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {listRole} from "@/api/system/role"; import {listRole} from "@/api/system/role";
import {selectSysParamByKey} from "@/api/system/systemParamConfig"; import {selectSysParamByKey} from "@/api/system/systemParamConfig";
import {filterList, selectInvById,getDeptById} from '@/api/system/invWarehouse' import {filterList, selectInvById, getDeptById} from '@/api/system/invWarehouse'
const formJson = { const formJson = {
id: "", id: "",
@ -384,7 +385,7 @@ export default {
this.query.page = 1; this.query.page = 1;
this.getList(); this.getList();
}, },
change(){ change() {
this.$forceUpdate(); this.$forceUpdate();
}, },
findInv(val) { findInv(val) {
@ -403,7 +404,7 @@ export default {
}, },
getList() { getList() {
this.loading = true; this.loading = true;
this.query.key='key'; this.query.key = 'key';
authAdminList(this.query) authAdminList(this.query)
.then(response => { .then(response => {
this.loading = false; this.loading = false;
@ -465,7 +466,7 @@ export default {
roles: row.roles, roles: row.roles,
depts: row.depts, depts: row.depts,
dept: row.dept, dept: row.dept,
locInvCode:row.locInvCode locInvCode: row.locInvCode
}; };
} }
this.formName = "add"; this.formName = "add";
@ -570,10 +571,10 @@ export default {
}; };
filterList(query) filterList(query)
.then((response) => { .then((response) => {
var deptList=[]; var deptList = [];
this.loading = false; this.loading = false;
for(var i=0;i<response.data.list.length;i++){ for (var i = 0; i < response.data.list.length; i++) {
if(response.data.list[i].id!=1){ if (response.data.list[i].id != 1) {
deptList.push(response.data.list[i]); deptList.push(response.data.list[i]);
} }
} }

Loading…
Cancel
Save