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

一些小问题以及bug修复，单据单号自动生成

Browse Source
master
anthonywj 3 years ago
parent 543ba9bd29
commit 76910d2aca
15 changed files with 260 additions and 242 deletions
Show Stats Download Patch File Download Diff File

5
public/config.json
Unescape Escape View File

@ -1,4 +1,5 @@
{
"BASE_URL": "http://139.159.187.130/SPMS_SERVER",
"SERVER_IP": "http://192.168.0.109:9996"
"BASE_URL": "http://192.168.0.109:9996",
"SERVER_IP": "http://192.168.0.109:9996",
"hosp_name": "诏安县总医院（测试）"
}

1
src/views/basic/UdiInfoSelectLocalUdi.vue
Unescape Escape View File

@ -94,7 +94,6 @@
<el-table
:data="udidlList"
style="width: 100%"
@row-click="intentDetail"
v-loading="loading"
highlight-current-row="true"
:row-class-name="tableRowClassName"

2
src/views/inventory/DialogInvProduct.vue
Unescape Escape View File

@ -74,7 +74,7 @@
</el-card>
<el-dialog
title="库存详情"
title="库存码详情"
:visible.sync="codeDetailVisible"
width="85%"
v-if="codeDetailVisible"

5
src/views/inventory/invUdiTraceOrder.vue
Unescape Escape View File

@ -585,6 +585,11 @@ export default {
getList() {
this.loading = true;
this.filterQuery.customerId = store.getters.customerId;
if (!this.$isBlank(this.filterQuery.code)) {
console.log(this.filterQuery.code)
let code = this.filterQuery.code;
this.filterQuery.code = code.replace("\r","")
}
filterOrderTrace(this.filterQuery)
.then((response) => {
if (response.code == 20000) {

396
src/views/login/index.vue
Unescape Escape View File

@ -3,7 +3,7 @@
<div>
<h3 class="toptitle">诏安县总医院</h3>
<h3 class="toptitle">{{hospName}}</h3>
</div>
<el-form
@ -57,16 +57,17 @@
</el-form-item>
<el-form-item prop="verificationCode" class="item" style="background-color: white">
<!--<el-input-->
<!--placeholder="验证码"-->
<!--name="verificationCode"-->
<!--v-model="ruleForm.verificationCode"-->
<!--autocomplete="on"-->
<!--placeholder="验证码"-->
<!--name="verificationCode"-->
<!--v-model="ruleForm.verificationCode"-->
<!--autocomplete="on"-->
<!--&gt;-->
<!--<i slot="prefix" class="el-input__icon">-->
<!--<icon-svg icon-class="tongyong"/>-->
<!--</i>-->
<!--<i slot="prefix" class="el-input__icon">-->
<!--<icon-svg icon-class="tongyong"/>-->
<!--</i>-->
<!--</el-input>-->
<Verify ref="checkV" :showButton="false" :barSize="{width:'305px',height:'37px'}" :vOffset="5" @success="verifyAlert('success')" @error="verifyAlert('error')" :type="3"></Verify>
<Verify ref="checkV" :showButton="false" :barSize="{width:'305px',height:'37px'}" :vOffset="5"
@success="verifyAlert('success')" @error="verifyAlert('error')" :type="3"></Verify>
</el-form-item>
<div style="text-align: center; margin-top: 15px">
<el-button
@ -87,224 +88,231 @@
</div>
</el-card>
</el-form>
<div style=" position: absolute; bottom: 0; left: 50%; transform: translate(-50%, -50%);" >
<a href="http://www.beian.gov.cn/portal/registerSystemInfo" style="color: white; font-size: 12px" >
厦门高立新鹏软件科技有限公司&nbsp; &nbsp;闽公网安备35020302034269号&nbsp;
</a>
<a href="http://beian.miit.gov.cn" style="color: white; font-size: 10px" >闽ICP备17019234号</a>
<div style=" position: absolute; bottom: 0; left: 50%; transform: translate(-50%, -50%);">
<a href="http://beian.miit.gov.cn" style="color: white; font-size: 10px">闽ICP备17019234号-4</a>
</div>
</div>
</template>
<script>
import Verify from 'vue2-verify'
import Verify from 'vue2-verify'
import axios from "axios";
export default {
data() {
let validatePwd = (rule, value, callback) => {
if (value === "") {
callback(new Error("请输入密码"));
} else {
callback();
}
};
return {
ruleForm: {
userName: "",
pwd: "",
checked: true,
verificationCode: false
},
rules: {
userName: [
{required: true, message: "请输入登录名", trigger: "blur"},
],
pwd: [{validator: validatePwd, trigger: "blur"}],
},
isShowPwd: false, // 是否显示密码
loading: false, // 登录loading
showDialog: false, // 显示dialog
redirect: null, // 回调地址
};
},
methods: {
verifyAlert(text) {
if (text === 'success') {
this.ruleForm.verificationCode = true;
}
export default {
data() {
let validatePwd = (rule, value, callback) => {
if (value === "") {
callback(new Error("请输入密码"));
} else {
callback();
}
};
return {
ruleForm: {
userName: "",
pwd: "",
checked: true,
verificationCode: false
},
handleLogin() {
if (!this.ruleForm.verificationCode) {
this.$message({
message: '请进行验证',
center: true,
type: 'warning'
});
return;
}
this.$refs["ruleForm"].validate((valid) => {
if (valid) {
this.loading = true;
this.$store
.dispatch("loginName", this.ruleForm)
.then((response) => {
this.loading = false;
if (response.code !== 20000) {
console.log("--code = " + response.code);
this.ruleForm.verificationCode = false;
this.$refs.checkV.refresh();
this.$message.error(response.message);
return;
}
let path = "/";
if (this.redirect) {
path = this.redirect;
}
console.log("path = " + path);
this.$router.push({
path: "../main",
});
// window.location.replace(path);
// this.showDialog = true
})
.catch(() => {
rules: {
userName: [
{required: true, message: "请输入登录名", trigger: "blur"},
],
pwd: [{validator: validatePwd, trigger: "blur"}],
},
isShowPwd: false, // 是否显示密码
loading: false, // 登录loading
showDialog: false, // 显示dialog
redirect: null, // 回调地址
hospName: "",
};
},
methods: {
verifyAlert(text) {
if (text === 'success') {
this.ruleForm.verificationCode = true;
}
},
handleLogin() {
if (!this.ruleForm.verificationCode) {
this.$message({
message: '请进行验证',
center: true,
type: 'warning'
});
return;
}
this.$refs["ruleForm"].validate((valid) => {
if (valid) {
this.loading = true;
this.$store
.dispatch("loginName", this.ruleForm)
.then((response) => {
this.loading = false;
if (response.code !== 20000) {
console.log("--code = " + response.code);
this.ruleForm.verificationCode = false;
this.$refs.checkV.refresh();
this.loading = false;
this.$message.error(response.message);
return;
}
let path = "/";
if (this.redirect) {
path = this.redirect;
}
console.log("path = " + path);
this.$router.push({
path: "../main",
});
} else {
return false;
}
});
},
},
components: {
Verify
// window.location.replace(path);
// this.showDialog = true
})
.catch(() => {
this.ruleForm.verificationCode = false;
this.$refs.checkV.refresh();
this.loading = false;
});
} else {
return false;
}
});
},
created() {
// 将参数拷贝进查询对象
let query = this.$route.query;
if (query.redirect) {
// URL Encode
this.redirect = decodeURIComponent(query.redirect);
}
},
components: {
Verify
},
created() {
// 将参数拷贝进查询对象
let query = this.$route.query;
if (query.redirect) {
// URL Encode
this.redirect = decodeURIComponent(query.redirect);
}
};
axios.get("./config.json").then(res => {
this.hospName = res.data.hosp_name;
});
}
};
</script>
<style type="text/scss" lang="scss">
@import "../../styles/mixin";
@import "../../styles/mixin";
$bg: #2d3a4b;
$dark_gray: #889aa4;
$light_gray: #eee;
.login-container {
$bg: #2d3a4b;
$dark_gray: #889aa4;
$light_gray: #eee;
.login-container {
@include relative;
background-color: white;
background-image: url("../../assets/login.jpg");
background-size: 100vw 100vh;
height: 100%;
@include relative;
background-color: white;
background-image: url("../../assets/login.jpg");
background-size: 100vw 100vh;
height: 100%;
input:-webkit-autofill {
-webkit-box-shadow: 0 0 0 1000px #293444 inset !important;
-webkit-text-fill-color: #fff !important;
}
input:-webkit-autofill {
-webkit-box-shadow: 0 0 0 1000px #293444 inset !important;
-webkit-text-fill-color: #fff !important;
}
.item {
width: 22em;
margin-left: 5em;
.item {
width: 22em;
margin-left: 5em;
.el-form-item__content {
display: flex;
flex-flow: row;
}
.el-form-item__content {
display: flex;
flex-flow: row;
}
}
input {
background: transparent;
border: 0;
-webkit-appearance: none;
border-radius: 0;
padding: 0.46rem 0.0666rem 0.16rem 0.2rem;
color: $dark_gray;
height: 100%;
}
input {
background: transparent;
border: 0;
-webkit-appearance: none;
border-radius: 0;
padding: 0.46rem 0.0666rem 0.16rem 0.2rem;
color: $dark_gray;
height: 100%;
}
.el-input {
display: inline-block;
}
.el-input {
display: inline-block;
}
.tips {
font-size: 14px;
color: #fff;
margin-bottom: 0.13333rem;
}
.tips {
font-size: 14px;
color: #fff;
margin-bottom: 0.13333rem;
}
.svg-container {
padding: 0.08rem 0.0666rem 0.08rem 0.2rem;
color: $dark_gray;
vertical-align: middle;
display: inline-block;
.svg-container {
padding: 0.08rem 0.0666rem 0.08rem 0.2rem;
color: $dark_gray;
vertical-align: middle;
display: inline-block;
&_login {
font-size: 20px;
}
&_login {
font-size: 20px;
}
}
.title {
font-size: 26px;
color: #2d3a4b;
margin: 0 auto 0.5333rem auto;
text-align: center;
font-weight: bold;
margin-bottom: 50px;
}
.title {
font-size: 26px;
color: #2d3a4b;
margin: 0 auto 0.5333rem auto;
text-align: center;
font-weight: bold;
margin-bottom: 50px;
}
.toptitle {
position: absolute;
font-size: 55px;
color: #FFFFFF;
margin: 50px auto 0.5333rem 50px;
text-align: center;
font-weight: bold;
}
.login-form {
//@include fxied-center;
margin: 0px 100px auto auto;
width: 50em;
/*background-color: silver;*/
/*background: #fff;*/
padding: 10em 10em 15em 10em;
}
.toptitle {
position: absolute;
font-size: 55px;
color: #FFFFFF;
margin: 50px auto 0.5333rem 50px;
text-align: center;
font-weight: bold;
}
.el-form-item {
border: 1px solid rgba(255, 255, 255, 0.1);
background: rgba(0, 0, 0, 0.1);
border-radius: 0.0666rem;
color: #454545;
}
.login-form {
//@include fxied-center;
margin: 0px 100px auto auto;
width: 50em;
/*background-color: silver;*/
/*background: #fff;*/
padding: 10em 10em 15em 10em;
}
.show-pwd {
position: absolute;
right: 0.1333rem;
top: 0.09333rem;
font-size: 16px;
color: $dark_gray;
cursor: pointer;
}
.el-form-item {
border: 1px solid rgba(255, 255, 255, 0.1);
background: rgba(0, 0, 0, 0.1);
border-radius: 0.0666rem;
color: #454545;
}
.thirdparty-button {
/*position: absolute;*/
/*right: .4666rem;*/
/*bottom: .37333rem;*/
}
.show-pwd {
position: absolute;
right: 0.1333rem;
top: 0.09333rem;
font-size: 16px;
color: $dark_gray;
cursor: pointer;
}
.box-card {
margin-top: -20px;
height: 550px;
width: 490px;
}
.thirdparty-button {
/*position: absolute;*/
/*right: .4666rem;*/
/*bottom: .37333rem;*/
}
.box-card {
margin-top: -20px;
height: 550px;
width: 490px;
}
}
</style>

2
src/views/userManage/param/systemPDFModule.vue
Unescape Escape View File

@ -391,8 +391,6 @@ import {
} from "../../../api/param/systemPDFTemplate";
import {saveAs} from 'file-saver';
import {BASE_URL, SERVER_IP} from "../../../config/app";
import {authRoleAuthList} from "../../../api/auth/authRole";
import {updateStockOrderDetail} from "@/api/warehouse/stockOrder";
const formJson = {
id: "",

2
src/views/warehouse/IOCheckErrOrder.vue
Unescape Escape View File

@ -593,7 +593,7 @@ export default {
curRow: null,
successOrderExportPDFSettingVisible: false,
total: 0,
loading: true,
loading: false,
index: null,
formName: null,
orderId: "",

5
src/views/warehouse/IOErrorOrder.vue
Unescape Escape View File

@ -286,7 +286,7 @@ export default {
action: null,
page: 1,
limit: 20,
locStorageCode:null,
locStorageCode: null,
},
checkStatus: {
'-1': "等待提交",
@ -546,6 +546,7 @@ export default {
this.storageList = response.data || [];
if (this.storageList.length > 0) {
this.filterQuery.locStorageCode = this.storageList[0].code;
this.getList();
}
})
.catch(() => {
@ -573,7 +574,7 @@ export default {
this.filterQuery = Object.assign(this.filterQuery, query);
this.filterQuery.limit = parseInt(this.filterQuery.limit);
// 加载表格数据
this.getList();
this.getStorage();
},
};

2
src/views/warehouse/IONewOrder.vue
Unescape Escape View File

@ -365,7 +365,7 @@ export default {
addOrderVisible: false,
addHosOrderVisible: false,
total: 0,
loading: true,
loading: false,
index: null,
formName: null,
errorDetail: "1111111111111",

2
src/views/warehouse/IOSearchOrder.vue
Unescape Escape View File

@ -498,7 +498,7 @@ export default {
codeDetailVisible: false,
successOrderExportPDFSettingVisible: false,
total: 0,
loading: true,
loading: false,
index: null,
formName: null,
orderId: "",

2
src/views/warehouse/IOWaitOrder.vue
Unescape Escape View File

@ -495,7 +495,7 @@ export default {
codeDetailVisible: false,
successOrderExportPDFSettingVisible: false,
total: 0,
loading: true,
loading: false,
index: null,
formName: null,
orderId: "",

1
src/views/warehouse/addHosOrder.vue
Unescape Escape View File

@ -196,6 +196,7 @@
@keypress.enter.native="enterKey($event)"
ref='inputRef'
style="ime-mode:disabled"
type="tel"
v-model="formData.code"
></el-input>
</el-form-item>

1
src/views/warehouse/addOrder.vue
Unescape Escape View File

@ -127,6 +127,7 @@
@keypress.enter.native="enterKey($event)"
ref='inputRef'
style="ime-mode:disabled"
type="tel"
v-model="formData.code"
></el-input>
</el-form-item>

38
src/views/warehouse/stockHospOrderNew.vue
Unescape Escape View File

@ -766,6 +766,7 @@ export default {
this.loading = false;
if (response.code === 20000) {
this.$message.success(tMessage + "成功");
this.formData.billNo = response.data;
this.closeDialog(true);
} else {
this.$message.error(response.message);
@ -1196,23 +1197,23 @@ export default {
intentBack() {
this.$router.go(-1);
},
generateBillNo() {
let tQuery = {
action: this.formData.billType
}
this.loading = true;
stockOrderGenerateBillNo(tQuery)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.formData.billNo = response.data;
// this.formData.billdate = parseTime(new Date(), '{y}{m}{d}');
this.formData.billdate = new Date();
} else {
this.closeDialog(true);
}
});
},
// generateBillNo() {
// let tQuery = {
// action: this.formData.billType
// }
// this.loading = true;
// stockOrderGenerateBillNo(tQuery)
// .then((response) => {
// this.loading = false;
// if (response.code === 20000) {
// this.formData.billNo = response.data;
// // this.formData.billdate = parseTime(new Date(), '{y}{m}{d}');
// this.formData.billdate = new Date();
// } else {
// this.closeDialog(true);
// }
// });
// },
getBusType(invCode) {
let query = {
enabled: true,
@ -1325,7 +1326,8 @@ export default {
};
this.iCount = 0;
this.orderEditor = false;
this.generateBillNo();
this.formData.billdate = new Date();
// this.generateBillNo();
}
},
};

38
src/views/warehouse/stockOrderNewDistribution.vue
Unescape Escape View File

@ -637,6 +637,7 @@ export default {
this.loading = false;
if (response.code === 20000) {
this.$message.success(tMessage + "成功");
this.formData.billNo = response.data;
this.closeDialog(true);
} else {
this.$message.error(response.message);
@ -1064,23 +1065,23 @@ export default {
intentBack() {
this.$router.go(-1);
},
generateBillNo() {
let tQuery = {
action: this.formData.billType
}
this.loading = true;
stockOrderGenerateBillNo(tQuery)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.formData.billNo = response.data;
// this.formData.billdate = parseTime(new Date(), '{y}{m}{d}');
this.formData.billdate = new Date();
} else {
this.closeDialog(true);
}
});
},
// generateBillNo() {
// let tQuery = {
// action: this.formData.billType
// }
// this.loading = true;
// stockOrderGenerateBillNo(tQuery)
// .then((response) => {
// this.loading = false;
// if (response.code === 20000) {
// this.formData.billNo = response.data;
// // this.formData.billdate = parseTime(new Date(), '{y}{m}{d}');
// this.formData.billdate = new Date();
// } else {
// this.closeDialog(true);
// }
// });
// },
getBusType() {
let query = {
enabled: true,
@ -1155,7 +1156,8 @@ export default {
};
this.iCount = 0;
this.orderEditor = false;
this.generateBillNo();
this.formData.billdate = new Date();
// this.generateBillNo();
}
},
};

Write Preview
Loading…
Cancel
Save