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", "BASE_URL": "http://192.168.0.109:9996",
"SERVER_IP": "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 <el-table
:data="udidlList" :data="udidlList"
style="width: 100%" style="width: 100%"
@row-click="intentDetail"
v-loading="loading" v-loading="loading"
highlight-current-row="true" highlight-current-row="true"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"

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

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

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

@ -585,6 +585,11 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
this.filterQuery.customerId = store.getters.customerId; 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) filterOrderTrace(this.filterQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {

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

@ -3,7 +3,7 @@
<div> <div>
<h3 class="toptitle">诏安县总医院</h3> <h3 class="toptitle">{{hospName}}</h3>
</div> </div>
<el-form <el-form
@ -66,7 +66,8 @@
<!--<icon-svg icon-class="tongyong"/>--> <!--<icon-svg icon-class="tongyong"/>-->
<!--</i>--> <!--</i>-->
<!--</el-input>--> <!--</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> </el-form-item>
<div style="text-align: center; margin-top: 15px"> <div style="text-align: center; margin-top: 15px">
<el-button <el-button
@ -87,19 +88,17 @@
</div> </div>
</el-card> </el-card>
</el-form> </el-form>
<div style=" position: absolute; bottom: 0; left: 50%; transform: translate(-50%, -50%);" > <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" > <a href="http://beian.miit.gov.cn" style="color: white; font-size: 10px">闽ICP备17019234号-4</a>
厦门高立新鹏软件科技有限公司&nbsp; &nbsp;闽公网安备35020302034269号&nbsp;
</a>
<a href="http://beian.miit.gov.cn" style="color: white; font-size: 10px" >闽ICP备17019234号</a>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import Verify from 'vue2-verify' import Verify from 'vue2-verify'
import axios from "axios";
export default { export default {
data() { data() {
let validatePwd = (rule, value, callback) => { let validatePwd = (rule, value, callback) => {
if (value === "") { if (value === "") {
@ -125,6 +124,7 @@
loading: false, // 登录loading loading: false, // 登录loading
showDialog: false, // 显示dialog showDialog: false, // 显示dialog
redirect: null, // 回调地址 redirect: null, // 回调地址
hospName: "",
}; };
}, },
methods: { methods: {
@ -188,17 +188,24 @@
// URL Encode // URL Encode
this.redirect = decodeURIComponent(query.redirect); this.redirect = decodeURIComponent(query.redirect);
} }
axios.get("./config.json").then(res => {
this.hospName = res.data.hosp_name;
});
} }
}; };
</script> </script>
<style type="text/scss" lang="scss"> <style type="text/scss" lang="scss">
@import "../../styles/mixin"; @import "../../styles/mixin";
$bg: #2d3a4b; $bg: #2d3a4b;
$dark_gray: #889aa4; $dark_gray: #889aa4;
$light_gray: #eee; $light_gray: #eee;
.login-container { .login-container {
@include relative; @include relative;
background-color: white; background-color: white;
@ -270,6 +277,7 @@
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
} }
.login-form { .login-form {
//@include fxied-center; //@include fxied-center;
margin: 0px 100px auto auto; margin: 0px 100px auto auto;
@ -306,5 +314,5 @@
height: 550px; height: 550px;
width: 490px; width: 490px;
} }
} }
</style> </style>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Write Preview
Loading…
Cancel
Save