1.添加系统版本号信息

2.修复仓库和配货管理页面的bug
zhairh
x_z 3 years ago
parent e78c684357
commit 9dc5519a86

@ -899,6 +899,7 @@ export default {
thirdQuery: { thirdQuery: {
key: null, key: null,
page: 1, page: 1,
status: 1,
limit: 10, limit: 10,
thirdSysFk: "thirdId", thirdSysFk: "thirdId",
}, },

@ -13,7 +13,9 @@
src="../../assets/logo.png" src="../../assets/logo.png"
/> />
<!--文字logo--> <!--文字logo-->
<span>医院供应商自助平台</span> <div style="height: 50px;">
<span style="display: block; color: #1e6abc; font-size: 20px;">{{version}}</span>
</div>
</div> </div>
<el-menu <el-menu
class="menu" class="menu"
@ -332,6 +334,7 @@ export default {
true: "请选择送货仓库和分库", true: "请选择送货仓库和分库",
false: "请选择当前仓库和分库", false: "请选择当前仓库和分库",
}, },
version: null,
}; };
}, },
components: { components: {
@ -537,7 +540,6 @@ export default {
}, },
}, },
created() { created() {
this.getBreadcrumb(); this.getBreadcrumb();
this.getCompanyData(); this.getCompanyData();
// this.getStorage(); // this.getStorage();
@ -560,6 +562,7 @@ export default {
axios.get("./config.json").then(res => { axios.get("./config.json").then(res => {
// //
this.hospitalName = res.data.hosp_name; this.hospitalName = res.data.hosp_name;
this.version = res.data.version;
}); });
}, },
@ -830,5 +833,6 @@ export default {
.slide-toggle { .slide-toggle {
display: none; display: none;
} }
} }
</style> </style>

@ -62,7 +62,7 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="corpName"> <el-form-item prop="corpName">
<el-input v-if="formData.fromSubInvName !=null" v-model="formData.fromSubInvName" <el-input v-if="formData.corpName !=null" v-model="formData.corpName"
auto-complete="off" :disabled="true"></el-input> auto-complete="off" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -91,14 +91,14 @@
<el-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
<span>当前</span> <span>当前</span>
</div> </div>
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="invWarehouseCode"> <el-form-item prop="invWarehouseCode">
<el-select v-model="formData.invWarehouseCode" disabled <el-select v-model="formData.invWarehouseCode" disabled
placeholder="当前库信息" placeholder="当前库信息"
clearable> clearable>
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"

Loading…
Cancel
Save