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

登录，bug修改，单据类型相关修改

Browse Source
ywj_dev
anthonywj 2 years ago
parent 37845e7d99
commit e228b4562e
7 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File

4
.env.production
Unescape Escape View File

@ -9,10 +9,10 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
# 吴总测试服务器
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
# 平潭
VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
# 文明点
# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'

BIN
src/assets/login.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 646 KiB

After

Width:  |  Height:  |  Size: 358 KiB

19
src/views/basic/busType/bussinessType.vue
Unescape Escape View File

@ -227,7 +227,7 @@ export default {
vailDispatch: null,
vailGroupBuy: null,
inStock: false,
actionType: 0,
actionType: 1,
fillCodeRel: false,
thrCheckEnable: null,
@ -240,9 +240,9 @@ export default {
thrCheckChange: null,
thrCheckBalance: null,
thrCheckCopy: null,
checkVailDate:true, //校验近效期
checkExpire:true, //校验过期
checkCertExpire:true, //校验证书过期
checkVailDate: false, //校验近效期
checkExpire: true, //校验过期
checkCertExpire: false, //校验证书过期
},
enableMap: {
@ -312,7 +312,7 @@ export default {
onAddSubmit() {
//默认初始化
if(this.inputQuery.corpType == null){
if (this.inputQuery.corpType == null) {
this.inputQuery.corpType = 2;
}
if (isBlank(this.inputQuery.name)) {
@ -473,7 +473,7 @@ export default {
vailDispatch: null,
vailGroupBuy: null,
inStock: false,
actionType: 0,
actionType: 1,
fillCodeRel: false,
thrCheckEnable: null,
thrCheckWebNew: null,
@ -486,14 +486,15 @@ export default {
thrCheckBalance: null,
thrCheckCopy: null,
checkVailDate:true, //校验近效期
checkExpire:true, //校验过期
checkCertExpire:true, //校验证书过期
checkVailDate: false, //校验近效期
checkExpire: true, //校验过期
checkCertExpire: false, //校验证书过期
}
this.addDialogVisible = true;
},
handleModifyClick(row) {
debugger
this.inputQuery = row;
this.modifyDialogVisible = true;
},

56
src/views/basic/busType/bussinessTypeModify.vue
Unescape Escape View File

@ -62,23 +62,16 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="内部单据自动平衡" prop="supplementOrderType">
<el-select :disabled="inputQuery.corpType !=3 || inputQuery.inStock!= true || inputQuery.actionType != 1"
<el-col :span="11" type="flex">
<el-form-item label="库存方式" prop="actionType">
<el-select v-model="inputQuery.actionType"
size="small"
style="width: 90%"
v-model="inputQuery.supplementOrderType"
clearable
placeholder="单据类型"
>
<el-option
v-for="item in orderTypeList"
:key="item.name"
:label="item.name"
:value="item.action"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
placeholder="请选择入库方式">
<el-option label="入账" :value="1"></el-option>
<el-option label="预验收" :value="2"></el-option>
<el-option label="寄售" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
@ -95,21 +88,29 @@
</el-select>
</el-form-item>
</el-col>
<!-- :disabled="inputQuery.mainAction!='WareHouseIn' || inputQuery.corpType!=2 "-->
<el-col :span="11" type="flex">
<el-form-item label="库存方式" prop="actionType">
<el-select v-model="inputQuery.actionType"
<el-col :span="11">
<el-form-item label="内部单据自动平衡" prop="supplementOrderType">
<el-select :disabled="inputQuery.corpType !=3 || inputQuery.inStock!= true || inputQuery.actionType != 1"
size="small"
style="width: 90%"
v-model="inputQuery.supplementOrderType"
clearable
placeholder="请选择入库方式">
<el-option label="无" :value="0"></el-option>
<el-option label="入账" :value="1"></el-option>
<el-option label="预验收" :value="2"></el-option>
<el-option label="寄售" :value="3"></el-option>
placeholder="单据类型"
>
<el-option
v-for="item in orderTypeList"
:key="item.name"
:label="item.name"
:value="item.action"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- :disabled="inputQuery.mainAction!='WareHouseIn' || inputQuery.corpType!=2 "-->
</el-row>
<el-row type="flex">
<el-col :span="11">
@ -301,7 +302,7 @@
<el-divider></el-divider>
</el-collapse-item>
<el-collapse-item title="医院使用出库设置" v-if="inputQuery.mainAction!='WareHouseIn'">
<el-collapse-item title="出库单据设置" v-if="inputQuery.mainAction!='WareHouseIn'">
<div style="width: 100%;margin-top: 15px">
<el-row>
<el-col span="5">
@ -1179,10 +1180,9 @@ export default {
}).catch(() => {
})
if (this.inputQuery.mainAction != 'WareHouseIn') {
this.inputQuery.actionType = null
}
// if (this.inputQuery.mainAction != 'WareHouseIn') {
// this.inputQuery.actionType = null
// }
},
// 单据类型高级设置弹窗

2
src/views/inout/IoDeliveryAuditOrder.vue
Unescape Escape View File

@ -835,7 +835,7 @@ export default {
this.loading = true;
this.currentRow = {billNo: ""};
this.clearDetailList();
this.filterQuery.vueType = "supDelivery";
this.filterQuery.vueType = "supDelAudit";
getOrderList(this.filterQuery)
.then((response) => {
this.loading = false;

4
src/views/myLogin.vue
Unescape Escape View File

@ -12,7 +12,7 @@
label-position="left"
>
<el-card class="box-card">
<div style="text-align: center; margin-top: 10px">
<div style="text-align: center; margin-top: 10px;margin-bottom: 15px">
<img alt="element-logo" src="@/assets/logo/logo.png"/>
</div>
<h3 class="title">用户登录</h3>
@ -326,7 +326,7 @@ $light_gray: #eee;
.login-form {
//@include fxied-center;
margin: 0px 100px auto auto;
margin: 0px 80px auto auto;
width: 50em;
/*background-color: silver;*/
/*background: #fff;*/

2
vue.config.js
Unescape Escape View File

@ -35,7 +35,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://192.168.0.166:9993/`,
target: `http://127.0.0.1:9993/`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''

Write Preview
Loading…
Cancel
Save