Merge remote-tracking branch 'origin/master'

prod
schry 2 years ago
commit d8b354d397

@ -11,6 +11,7 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_WMS_MC/'
# 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://r.jiyuudims.cloud:5004/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/'
# VUE_APP_SYNC_API ="http://r.jiyuudims.cloud:5008/SP_SYNC_SERVER"
# 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.0.66:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/'
@ -18,10 +19,10 @@ ENV = 'production'
# 文明东1 # 文明东1
# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
# 文明东2 # 文明东2
VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER" # VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER"
# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# VUE_APP_SYNC_API ="http://55.55.0.24:9150/SP_SYNC_SERVER" VUE_APP_SYNC_API ="http://55.55.0.24:9150/SP_SYNC_SERVER"
# 吴总测试服务器 # 吴总测试服务器
# 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/'

@ -15,3 +15,11 @@ export function getInvPlaceOrderDetailList(params) {
params: params params: params
}); });
} }
export function selectPlaceList(params) {
return axios({
url: "/spms/inv/product/selectPlaceList",
method: "get",
params: params
});
}

@ -159,7 +159,8 @@ export default {
page: 1, page: 1,
limit: 20, limit: 20,
addType: 1, addType: 1,
diType: 1 diType: 1,
bindType: 1
}; };
this.getList(); this.getList();
}, },

@ -2134,13 +2134,12 @@ export default {
margin-bottom: 0px; margin-bottom: 0px;
} }
/* .el-row { .el-row {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: nowrap;
margin-bottom: 6px;
} }
.el-col { /* .el-col {
border-radius: 4px; border-radius: 4px;
flex-wrap: wrap; flex-wrap: wrap;
} */ } */

@ -392,7 +392,6 @@ export default {
let query = { let query = {
code: this.filterQuery.invCode, code: this.filterQuery.invCode,
enabled: true, enabled: true,
vueType: "supDelivery",
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
.then((response) => { .then((response) => {
@ -425,7 +424,6 @@ export default {
// //
getList() { getList() {
this.loading = true; this.loading = true;
this.filterQuery.vueType = "supDelivery";
getOrderList(this.filterQuery) getOrderList(this.filterQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;

@ -440,33 +440,34 @@ export default {
} }
}, },
deleteCodeArray(index, row) { deleteCodeArray(index, row) {
let _this = this
this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", { this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}).then(() => { }).then(() => {
if (this.orderEditor) { if (_this.formData.billNo) {
this.detailLoading = true; _this.detailLoading = true;
if (this.$isNotBlank(row.id)) { if (_this.$isNotBlank(row.id)) {
delReceiveDetail({id: row.id}) delReceiveDetail({id: row.id})
.then(response => { .then(response => {
this.detailLoading = false; _this.detailLoading = false;
if (response.code === 20000) { if (response.code === 20000) {
this.getOrderDetailList(); _this.getOrderDetailList();
} else { } else {
this.$message.error(response.message); _this.$message.error(response.message);
} }
}) })
.catch(() => { .catch(() => {
this.detailLoading = false; _this.detailLoading = false;
}) })
} else { } else {
this.$message.success('删除成功'); _this.$message.success('删除成功');
this.codeArray.splice(index, 1); _this.codeArray.splice(index, 1);
} }
} else { } else {
this.$message.success('删除成功'); _this.$message.success('删除成功');
this.codeArray.splice(index, 1); _this.codeArray.splice(index, 1);
} }
}).catch(() => { }).catch(() => {

@ -122,7 +122,7 @@
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="单号" v-if="filterQuery.type === 2" prop="orderId" width="120"></el-table-column> <el-table-column label="单号" v-if="filterQuery.type === 2" prop="orderId" width="120"></el-table-column>
<!-- <el-table-column label="产品标识" prop="nameCode" width="150"></el-table-column>--> <!-- <el-table-column label="产品标识" prop="nameCode" width="150"></el-table-column>-->
<el-table-column label="DI/物资编码" prop="relId" width="150"></el-table-column> <el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
<el-table-column label="物资名称" prop="productName" width="200" show-overflow-tooltip></el-table-column> <el-table-column label="物资名称" prop="productName" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="数量" prop="count" width="150" show-overflow-tooltip></el-table-column> <el-table-column label="数量" prop="count" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="150" show-overflow-tooltip></el-table-column> <el-table-column label="规格型号" prop="ggxh" width="150" show-overflow-tooltip></el-table-column>

@ -92,7 +92,7 @@
<el-table-column label="序号" type="index" width="50"></el-table-column> <el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column <el-table-column
label="DI/物资编码" label="DI/物资编码"
prop="relId" prop="nameCode"
width="150" width="150"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column

@ -115,7 +115,7 @@
<el-table-column label="操作前货位" prop="invSpaceName" width="180"></el-table-column> <el-table-column label="操作前货位" prop="invSpaceName" width="180"></el-table-column>
<el-table-column label="操作后货位" prop="invSpaceName" width="180"></el-table-column> <el-table-column label="操作后货位" prop="invSpaceName" width="180"></el-table-column>
<el-table-column label="单号" v-if="filterQuery.type === 2" prop="orderId" width="120"></el-table-column> <el-table-column label="单号" v-if="filterQuery.type === 2" prop="orderId" width="120"></el-table-column>
<el-table-column label="DI/物资编码" prop="relId" width="150"></el-table-column> <el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
<el-table-column label="物资名称" prop="productName" width="200" show-overflow-tooltip></el-table-column> <el-table-column label="物资名称" prop="productName" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="数量" prop="count" width="150" show-overflow-tooltip></el-table-column> <el-table-column label="数量" prop="count" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="150" show-overflow-tooltip></el-table-column> <el-table-column label="规格型号" prop="ggxh" width="150" show-overflow-tooltip></el-table-column>

@ -123,7 +123,7 @@
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="单号" v-if="filterQuery.type === 2" prop="orderId" width="120"></el-table-column> <el-table-column label="单号" v-if="filterQuery.type === 2" prop="orderId" width="120"></el-table-column>
<!-- <el-table-column label="产品标识" prop="nameCode" width="150"></el-table-column>--> <!-- <el-table-column label="产品标识" prop="nameCode" width="150"></el-table-column>-->
<el-table-column label="DI/物资编码" prop="relId" width="150"></el-table-column> <el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
<el-table-column label="物资名称" prop="productName" width="200" show-overflow-tooltip></el-table-column> <el-table-column label="物资名称" prop="productName" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="数量" prop="count" width="150" show-overflow-tooltip></el-table-column> <el-table-column label="数量" prop="count" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="150" show-overflow-tooltip></el-table-column> <el-table-column label="规格型号" prop="ggxh" width="150" show-overflow-tooltip></el-table-column>

@ -103,7 +103,7 @@
<el-table-column label="序号" type="index" width="50"></el-table-column> <el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column <el-table-column
label="DI/物资编码" label="DI/物资编码"
prop="relId" prop="nameCode"
width="150" width="150"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column

@ -0,0 +1,135 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="18">
<el-form-item class="query-form-item" label="编码:">
<el-input v-model="filterQuery.code" placeholder="请扫描或输入编码" ref="inputRef" clearable style="width: 97%" @keyup.enter.native="keyup_submit($event)"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group>
<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-search" @click="onSubmit"></el-button>
</el-button-group>
</div>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="部门" prop="deptName" width="180"></el-table-column>
<el-table-column label="仓库" prop="invName" width="180"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
<el-table-column label="单号" v-if="filterQuery.type === 2" prop="orderId" width="120"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
<el-table-column label="物资名称" prop="productName" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="数量" prop="count" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="计量单位" prop="measname" width="120"></el-table-column>
<el-table-column label="注册备案号" prop="zczbhhzbapzbh" show-overflow-tooltip
width="200"></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip
width="200"></el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip
width="200"></el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="getList"
></pagination>
</el-card>
</div>
</template>
<script>
import {getInvPlaceOrderList, selectPlaceList} from "@/api/inventory/invPlaceOrder";
export default {
name: "InvProducts",
data() {
return {
filterQuery: {
code: null,
page: 1,
limit: 20,
},
list: [],
total: 0,
invList: [],
spaceList: [],
loading: false,
showSearch: true
};
},
methods: {
hideSearch() {
this.showSearch = !this.showSearch;
},
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
code:null,
page: 1,
limit: 20,
};
this.getList();
},
onSubmit() {
this.filterQuery.page = 1;
this.getList();
},
getList() {
this.loading = true;
selectPlaceList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data.list || [];
this.total = res.data.total || 0;
} else {
this.$message.error(res.message);
this.list = [];
this.total = 0;
}
}).catch((error) => {
this.loading = false;
this.$message.error(error.message);
this.list = [];
this.total = 0;
});
},
keyup_submit(event) {
this.getList();
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
},
},
components: {},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
},
};
</script>
<style type="text/scss" lang="scss">
</style>

@ -72,7 +72,7 @@
<el-table v-loading="loading" :data="list" style="width: 100%; margin-top: 20px" highlight-current-row border max-height="300" height="300"> <el-table v-loading="loading" :data="list" style="width: 100%; margin-top: 20px" highlight-current-row border max-height="300" height="300">
<el-table-column label="序号" type="index" width="50"></el-table-column> <el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="DI/物资编码" prop="relId" width="150"></el-table-column> <el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
<el-table-column label="物资名称" prop="productName" width="150" show-tooltip-when-overflow></el-table-column> <el-table-column label="物资名称" prop="productName" width="150" show-tooltip-when-overflow></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="150"></el-table-column> <el-table-column label="规格型号" prop="ggxh" width="150"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="150"></el-table-column> <el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>

@ -174,6 +174,7 @@ export default {
editStatus: 1, editStatus: 1,
emergency:'', emergency:'',
targetDeptCode:'', targetDeptCode:'',
targetInvCode:null
}, },
isChang:false, isChang:false,
formName: null, formName: null,
@ -247,6 +248,7 @@ export default {
this.$router.push({ this.$router.push({
path: "", path: "",
}); });
let deptCode = this.filterQuery.targetDeptCode
this.filterQuery = { this.filterQuery = {
billNo: "", billNo: "",
thirdSysFk: "", thirdSysFk: "",
@ -260,7 +262,12 @@ export default {
type: 1, type: 1,
editStatus: 1, editStatus: 1,
targetDeptCode: this.invCodebe, targetDeptCode: this.invCodebe,
targetInvCode:null
}; };
this.initActDateRange()
if(deptCode!=this.invCodebe){
this.getInvList()
}
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
}, },
@ -405,6 +412,8 @@ export default {
var query={ var query={
parentId:this.filterQuery.targetDeptCode parentId:this.filterQuery.targetDeptCode
} }
this.filterQuery.targetInvCode = null
this.$forceUpdate()
filterSubAll(query).then((res) => { filterSubAll(query).then((res) => {
this.invList = res.data || []; this.invList = res.data || [];
}) })
@ -420,6 +429,13 @@ export default {
this. getInvList(); this. getInvList();
}); });
}, },
initActDateRange(){
let end = new Date();
let start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
this.actDateRange = [start, end];
}
} }
, ,
@ -442,10 +458,7 @@ export default {
} }
, ,
created() { created() {
let end = new Date(); this.initActDateRange()
let start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
this.actDateRange = [start, end];
this.getDeptList(); this.getDeptList();
} }
, ,

@ -286,7 +286,7 @@ export default {
return this.$message.error("单据日期不能为空!"); return this.$message.error("单据日期不能为空!");
} }
if (this.formData.targetInvCode == "" || this.formData.targetInvCode == null) { if (this.formData.targetInvCode == "" || this.formData.targetInvCode == null) {
return this.$message.error("采购科室不能为空!"); return this.$message.error("申购仓库不能为空!");
} }
if (this.formData.emergency == "" || this.formData.emergency == null) { if (this.formData.emergency == "" || this.formData.emergency == null) {
return this.$message.error("紧急程度不能为空!"); return this.$message.error("紧急程度不能为空!");

@ -11,7 +11,9 @@
<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.targetDeptCode" placeholder="请选择申购部门" style="width: 90%"
@change="getInvList"
>
<el-option <el-option
v-for="item in deptList" v-for="item in deptList"
:key="item.code" :key="item.code"
@ -26,7 +28,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="申购仓库"> <el-form-item label="申购仓库">
<el-select v-model="filterQuery.targetInvCode" @change="getInvList" style="width: 90%" clearable placeholder="请选择所属仓库"> <el-select v-model="filterQuery.targetInvCode" @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"
@ -167,6 +169,7 @@ export default {
editStatus: 1, editStatus: 1,
emergency:'', emergency:'',
targetDeptCode:'', targetDeptCode:'',
targetInvCode: null
}, },
formName: null, formName: null,
formMap: { formMap: {
@ -238,6 +241,7 @@ export default {
this.$router.push({ this.$router.push({
path: "", path: "",
}); });
let deptCode = this.filterQuery.targetDeptCode
this.filterQuery = { this.filterQuery = {
billNo: "", billNo: "",
thirdSysFk: "", thirdSysFk: "",
@ -251,7 +255,11 @@ export default {
type: 1, type: 1,
editStatus: 1, editStatus: 1,
targetDeptCode: this.invCodebe, targetDeptCode: this.invCodebe,
targetInvCode: null
}; };
if(deptCode!=this.invCodebe){
this.getInvList()
}
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
}, },
@ -370,10 +378,16 @@ export default {
this.formName = "add"; this.formName = "add";
this.newSpDistributionVisible = true; this.newSpDistributionVisible = true;
}, },
deptChange(){
this. getInvList();
this.getList();
},
getInvList() { getInvList() {
var query={ var query={
parentId:this.filterQuery.targetDeptCode parentId:this.filterQuery.targetDeptCode
} }
this.filterQuery.targetInvCode = null
filterSubAll(query).then((res) => { filterSubAll(query).then((res) => {
this.invList = res.data || []; this.invList = res.data || [];
}) })
@ -385,8 +399,8 @@ export default {
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. getInvList(); this. getInvList();
this.getList();
}); });
}, },
} }

@ -311,6 +311,7 @@ export default {
targetDeptCode: this.invCodebe, targetDeptCode: this.invCodebe,
}; };
this.actDateRange = []; this.actDateRange = [];
this.actAuditDateRange = [];
this.getList(); this.getList();
}, },
@ -330,10 +331,10 @@ export default {
this.filterQuery.endDate = null; this.filterQuery.endDate = null;
} }
if (this.actAuditDateRange != null) { if (this.actAuditDateRange != null) {
this.filterQuery.starAuditDate = this.actAuditDateRange[0]; this.filterQuery.startAuditDate = this.actAuditDateRange[0];
this.filterQuery.endAuditDate = this.actAuditDateRange[1]; this.filterQuery.endAuditDate = this.actAuditDateRange[1];
} else { } else {
this.filterQuery.starAuditDate = null; this.filterQuery.startAuditDate = null;
this.filterQuery.endAuditDate = null; this.filterQuery.endAuditDate = null;
} }
this.loading = true; this.loading = true;

@ -179,6 +179,7 @@ export default {
editStatus: 1, editStatus: 1,
emergency:'', emergency:'',
deptCode:'', deptCode:'',
invCode:null
}, },
invCodebe:null, invCodebe:null,
formName: null, formName: null,
@ -262,8 +263,10 @@ export default {
type: 1, type: 1,
editStatus: 1, editStatus: 1,
deptCode: this.invCodebe, deptCode: this.invCodebe,
invCode:null
}; };
this.actDateRange = []; this.actDateRange = [];
this.getInvList()
this.getList(); this.getList();
}, },
handleClose() { handleClose() {
@ -406,6 +409,7 @@ export default {
var query={ var query={
parentId:this.filterQuery.deptCode parentId:this.filterQuery.deptCode
} }
this.filterQuery.invCode = null
filterSubAll(query).then((res) => { filterSubAll(query).then((res) => {
this.invList = res.data || []; this.invList = res.data || [];
}) })

Loading…
Cancel
Save