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

Merge remote-tracking branch 'origin/dev2.0' into dev2.0

Browse Source
20231126-yw
wj 1 year ago
parent b819d48351 0f72ded45d
commit f4c8838925
4 changed files with 52 additions and 50 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'
# 开发环境
VUE_APP_BASE_API = 'http://192.168.0.166:9991'
VUE_APP_BASE_API = 'http://127.0.0.1:9991'
VUE_APP_SYNC_API ="http://127.0.0.1:10001"

4
.env.production
Unescape Escape View File

@ -13,10 +13,10 @@ ENV = 'production'
刘恩典
# VUE_APP_BASE_API = 'http://192.168.0.242:9150/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://192.168.0.127:9150/UDI_WMS_MC/'
# 平潭正式
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_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'

1
src/views/purchase/purApply/purApplyEditDiaolog.vue
Unescape Escape View File

@ -108,6 +108,7 @@
<el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
<el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="商品名称" prop="spmc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
<el-table-column width="150" label="申购数量">

95
src/views/purchase/purApply/purOrderSelectProduct.vue
Unescape Escape View File

@ -102,21 +102,22 @@
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
<el-table-column label="第三方物资编码" prop="thirdId" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="医疗器械注册人" width="160" prop="ylqxzcrbarmc"></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="商品名称" prop="spmc" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="140" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="医疗器械注册人" width="160" prop="ylqxzcrbarmc"></el-table-column>
<el-table-column label="器械类别" prop="qxlb" width="100" show-overflow-tooltip></el-table-column>
<el-table-column label="供应商" prop="companyName" width="160" show-overflow-tooltip></el-table-column>
<el-table-column
v-if="productRemarkSet.remarkEnable1"
:label="productRemarkSet.remarkTitle1" prop="basicPrductRemak1" width="140"
show-overflow-tooltip></el-table-column>
v-if="productRemarkSet.remarkEnable1"
:label="productRemarkSet.remarkTitle1" prop="basicPrductRemak1" width="140"
show-overflow-tooltip></el-table-column>
<el-table-column
v-if="productRemarkSet.remarkEnable2"
:label="productRemarkSet.remarkTitle2" prop="basicPrductRemak2" width="140"
show-overflow-tooltip></el-table-column>
v-if="productRemarkSet.remarkEnable2"
:label="productRemarkSet.remarkTitle2" prop="basicPrductRemak2" width="140"
show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="80" fixed="right">
<template slot-scope="scope">
@ -126,23 +127,23 @@
</el-table>
<pagination
v-show="pageTotal>0"
:total="pageTotal"
:page.sync="listQuery.page"
:limit.sync="listQuery.limit"
@pagination="handleErpPageChange"
v-show="pageTotal>0"
:total="pageTotal"
:page.sync="listQuery.page"
:limit.sync="listQuery.limit"
@pagination="handleErpPageChange"
></pagination>
</el-card>
<el-dialog
title="耗材字典详情"
:visible.sync="udiRlDetailVisible"
width="80%"
:close-on-click-modal="false"
:close-on-press-escape="false"
append-to-body
v-if="udiRlDetailVisible"
title="耗材字典详情"
:visible.sync="udiRlDetailVisible"
width="80%"
:close-on-click-modal="false"
:close-on-press-escape="false"
append-to-body
v-if="udiRlDetailVisible"
>
<udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
</el-dialog>
@ -365,43 +366,43 @@ export default {
this.listQuery.customerId = store.getters.customerId;
this.listQuery.id = this.pId;
filterCompanyProductplanRelevance(this.listQuery)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.dataList = response.data.list || [];
this.pageTotal = response.data.total || 0;
} else {
this.$message.error(response.message);
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.dataList = response.data.list || [];
this.pageTotal = response.data.total || 0;
} else {
this.$message.error(response.message);
this.dataList = [];
this.pageTotal = 0;
}
})
.catch(() => {
this.loading = false;
this.dataList = [];
this.pageTotal = 0;
}
})
.catch(() => {
this.loading = false;
this.dataList = [];
this.pageTotal = 0;
});
});
},
getRationList() {
this.loading = true;
filterCompanyProductRationRelevance(this.listQuery)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.dataList = response.data.list || [];
this.pageTotal = response.data.total || 0;
} else {
this.$message.error(response.message);
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.dataList = response.data.list || [];
this.pageTotal = response.data.total || 0;
} else {
this.$message.error(response.message);
this.dataList = [];
this.pageTotal = 0;
}
})
.catch(() => {
this.loading = false;
this.dataList = [];
this.pageTotal = 0;
}
})
.catch(() => {
this.loading = false;
this.dataList = [];
this.pageTotal = 0;
});
});
},
intentBack() {
this.closeDialog();

Write Preview
Loading…
Cancel
Save