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

Merge remote-tracking branch 'origin/busUser' into zhairh

Browse Source 
# Conflicts:
#	public/config.js
#	public/config.json
feature-order-fix
x_z 3 years ago
parent 12e3bcbce9 46571d6261
commit 03ee2da1ed
10 changed files with 104 additions and 37 deletions
Show Stats Download Patch File Download Diff File

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

@ -393,6 +393,7 @@ export default {
key: query, key: query,
onlyMain: true, onlyMain: true,
} }
getOriginBusType(tQuery) getOriginBusType(tQuery)
.then((response) => { .then((response) => {
this.originTypes = response.data.list || []; this.originTypes = response.data.list || [];

3
src/views/basic/BussinessTypeModify.vue
Unescape Escape View File

@ -256,7 +256,7 @@
</el-checkbox> </el-checkbox>
<el-checkbox v-model="inputQuery.scanPreIn" :disabled="inputQuery.corpType!='2'">出库时必须校验预验收库存 <el-checkbox v-model="inputQuery.scanPreIn" :disabled="inputQuery.corpType!='2'">出库时必须校验预验收库存
</el-checkbox> </el-checkbox>
<el-checkbox v-model="inputQuery.vailInv">是否允许无库存出库 <el-checkbox v-model="inputQuery.vailInv" :disabled="inputQuery.mainAction!='WareHouseOut'">是否允许无库存出库
</el-checkbox> </el-checkbox>
<el-checkbox v-model="inputQuery.codeFillCheck">采集UDI码时进行三期校验 <el-checkbox v-model="inputQuery.codeFillCheck">采集UDI码时进行三期校验
</el-checkbox> </el-checkbox>
@ -579,6 +579,7 @@ export default {
, ,
//获取单据类型 //获取单据类型
getOrderType() { getOrderType() {
this.orderTypeList = []; this.orderTypeList = [];
let query = { let query = {
mainAction: this.inputQuery.mainAction, mainAction: this.inputQuery.mainAction,

9
src/views/basic/invWarehouse.vue
Unescape Escape View File

@ -897,7 +897,7 @@ export default {
bussinessTypeQuery: { bussinessTypeQuery: {
enabled: true, enabled: true,
page: 1, page: 1,
limit: 100 limit: 10
}, },
bussinessTypeTotal: 0, bussinessTypeTotal: 0,
curSeleUser: null, curSeleUser: null,
@ -1049,7 +1049,9 @@ export default {
} }
this.$message.success("操作成功"); this.$message.success("操作成功");
this.formVisible = false; this.formVisible = false;
if (this.formName !== "edit") { if (this.formName !== "edit") {
if (response.data && response.data.id) { if (response.data && response.data.id) {
data.id = response.data.id; data.id = response.data.id;
if (this.pidData) { if (this.pidData) {
@ -1379,6 +1381,7 @@ export default {
if (val != null) { if (val != null) {
this.bussinessTypeQuery.page = val; this.bussinessTypeQuery.page = val;
} }
this.bussinessTypeQuery.code=this.busQuery.code;
getJoinBussinessType(this.bussinessTypeQuery).then((res) => { getJoinBussinessType(this.bussinessTypeQuery).then((res) => {
this.selectBussinessTypeList = []; this.selectBussinessTypeList = [];
this.bussinessTypeList = res.data.list; this.bussinessTypeList = res.data.list;
@ -1389,10 +1392,8 @@ export default {
that.$refs.typeList.clearSelection(); that.$refs.typeList.clearSelection();
} }
that.bussinessTypeList.forEach(row => { that.bussinessTypeList.forEach(row => {
for (let j in that.bussinessTypeData) { if (row.checkSelect==true) {
if (row.action == that.bussinessTypeData[j].action) {
that.$refs.typeList.toggleRowSelection(row, true); that.$refs.typeList.toggleRowSelection(row, true);
}
} }
}); });
}); });

5
src/views/business/stockOrderDelSearch.vue
Unescape Escape View File

@ -24,7 +24,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item" v-if="isSp ==110"> <el-form-item class="query-form-item" >
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input> <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
@ -147,7 +147,6 @@
</el-button> </el-button>
</div> </div>
<el-button <el-button
v-if="isSp ==110"
type="text" type="text"
size="small" size="small"
@click.native="rollback(scope.row)" @click.native="rollback(scope.row)"
@ -420,7 +419,7 @@ export default {
"2": "第三方系统", "2": "第三方系统",
"3": "扫码单据转换", "3": "扫码单据转换",
}, },
isSp: store.getters.customerId,
detailFormVisible: false, detailFormVisible: false,
stockOrderEditVisible: false, stockOrderEditVisible: false,
stockChangeVisible: false, stockChangeVisible: false,

56
src/views/business/stockOrderSearch.vue
Unescape Escape View File

@ -129,7 +129,7 @@
type="text" type="text"
size="small" size="small"
@click.native="receiveFinish(scope.row)" @click.native="receiveFinish(scope.row)"
>完成验收 >验收
</el-button </el-button
> >
<el-button <el-button
@ -284,7 +284,7 @@
<StockOrderEdit <StockOrderEdit
:closeDialog="closeDialog" :closeDialog="closeDialog"
:detailList="detailList" :detailList="detailList"
v-on:childByValue="parentByFn"
></StockOrderEdit> ></StockOrderEdit>
</el-dialog> </el-dialog>
@ -458,6 +458,20 @@
:idQuery="idQuery" :idQuery="idQuery"
></stockQRCodeExport> ></stockQRCodeExport>
</el-dialog> </el-dialog>
<el-dialog
title="单据验收"
:visible.sync="acceptOrderVisible"
width="80%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="acceptOrderVisible"
>
<acceptOrder
:closeDialog="closeAcceptDialog"
:orderQuery="acceptQuery"
v-on:childByValue="acceptOrderFn"
></acceptOrder>
</el-dialog>
</div> </div>
</template> </template>
@ -474,6 +488,7 @@ import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
import stockOrderEditDistribution from "./stockOrderEditDistribution"; import stockOrderEditDistribution from "./stockOrderEditDistribution";
import stockQRCodeExport from "./stockQRCodeExport"; import stockQRCodeExport from "./stockQRCodeExport";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import acceptOrder from "@/views/inout/acceptOrder";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf"; import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
import store from "../../store"; import store from "../../store";
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType"; import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
@ -554,8 +569,10 @@ export default {
detailFormLoading: false, detailFormLoading: false,
haveDistributionVisible: true, haveDistributionVisible: true,
qrcodeDetailVisible: false, qrcodeDetailVisible: false,
acceptOrderVisible: false,
qrcodeExportVisible: false, qrcodeExportVisible: false,
actDateRange: [], actDateRange: [],
acceptQuery: null,
isReceAble: false, isReceAble: false,
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [
@ -739,6 +756,12 @@ export default {
this.detailList = []; this.detailList = [];
}); });
}, },
parentByFn: function (childValue) {
this.getList();
},
acceptOrderFn: function (childValue) {
this.getList();
},
distributionForm(index, row) { distributionForm(index, row) {
this.idQuery.id = ''; this.idQuery.id = '';
if (this.$isNotBlank(row.id)) { if (this.$isNotBlank(row.id)) {
@ -916,6 +939,10 @@ export default {
} }
} }
}, },
closeAcceptDialog() {
this.acceptOrderVisible = false;
},
getBusType() { getBusType() {
let query = { let query = {
code: this.query.invWarehouseCode, code: this.query.invWarehouseCode,
@ -1016,18 +1043,20 @@ export default {
let query = { let query = {
stockOrderId: row.billNo, stockOrderId: row.billNo,
}; };
updateStatus(query) this.acceptQuery = row;
.then((response) => { this.acceptOrderVisible = true;
if (response.code == 20000) { // updateStatus(query)
this.getList(); // .then((response) => {
this.$message.success("验收成功！"); // if (response.code == 20000) {
} else { // this.getList();
this.$message.error(response.message); // this.$message.success("验收成功！");
} // } else {
// this.$message.error(response.message);
// }
}) // })
.catch(() => { // .catch(() => {
}); // });
}, },
rollback(row) { rollback(row) {
this.$confirm('此操作将回退单据, 是否继续?', '提示', { this.$confirm('此操作将回退单据, 是否继续?', '提示', {
@ -1054,6 +1083,7 @@ export default {
stockOrderEditDistribution, stockOrderEditDistribution,
stockOrderQRCodeDetail, stockOrderQRCodeDetail,
stockQRCodeExport, stockQRCodeExport,
acceptOrder,
} }
, ,
filters: { filters: {

32
src/views/home/index.vue
Unescape Escape View File

@ -62,12 +62,8 @@
</div> </div>
<div class="header-tabs-box"> <div class="header-tabs-box">
<el-breadcrumb class="app-levelbar" separator="/"> <el-breadcrumb class="app-levelbar" separator="/">
<el-breadcrumb-item <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path" >
v-for="(item, index) in levelList" <span v-if="
:key="item.path"
>
<span
v-if="
item.redirect === 'noredirect' || item.redirect === 'noredirect' ||
index == levelList.length - 1 index == levelList.length - 1
" "
@ -82,10 +78,21 @@
</el-breadcrumb> </el-breadcrumb>
</div> </div>
<div class="header-right"> <div class="header-right">
<div>
<h3>
<span style=" margin-top: 2px ;
font-weight: bold;color: #303133;">{{ hospitalName }}</span>
<span
style="margin-top: 2px;margin-right: 18px;color: #2d8cf0;font-size: 12px;">({{
curInv
}})</span>
</h3>
</div>
<!-- <span style="margin-right: 10px; margin-top: 2px">{{ username }}</span>--> <!-- <span style="margin-right: 10px; margin-top: 2px">{{ username }}</span>-->
<el-dropdown trigger="click"> <el-dropdown trigger="click">
<!--<i class="el-icon-setting" style="margin-right: 15px"></i>--> <!--<i class="el-icon-setting" style="margin-right: 15px"></i>-->
<span>{{ title }}<i class="el-icon-arrow-down el-icon--right"></i></span> <span style=" font-size: 14px;font-weight: bold;color: #303133;">{{ title }}<i class="el-icon-arrow-down el-icon--right"></i></span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item><span @click="changeInv">切换仓库</span></el-dropdown-item> <el-dropdown-item><span @click="changeInv">切换仓库</span></el-dropdown-item>
<el-dropdown-item><span @click="handlePassword">修改密码</span></el-dropdown-item> <el-dropdown-item><span @click="handlePassword">修改密码</span></el-dropdown-item>
@ -264,6 +271,7 @@ import {filterAllByUser} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse"; import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {updateInv} from "@/api/auth/authAdmin"; import {updateInv} from "@/api/auth/authAdmin";
import * as types from "../../store/mutation-types"; import * as types from "../../store/mutation-types";
import axios from "axios";
export default { export default {
data() { data() {
@ -294,6 +302,7 @@ export default {
passwordLoading: false, passwordLoading: false,
passwordFormVisible: false, passwordFormVisible: false,
company: "", company: "",
curInv: "",
passwordFormData: { passwordFormData: {
oldPassword: "", oldPassword: "",
newPassword: "", newPassword: "",
@ -329,6 +338,7 @@ export default {
userInfo: {}, userInfo: {},
storageList: [], storageList: [],
subInvList: [], subInvList: [],
hospitalName:"",
selInvVisible: false, selInvVisible: false,
locInvName: "", locInvName: "",
locSubInvName: "", locSubInvName: "",
@ -450,7 +460,8 @@ export default {
this.$store.commit(types.RECEIVE_LOCINVNAME, this.locInvName); this.$store.commit(types.RECEIVE_LOCINVNAME, this.locInvName);
this.$store.commit(types.RECEIVE_LOCSUBINVNAME, this.locInvName); this.$store.commit(types.RECEIVE_LOCSUBINVNAME, this.locInvName);
let username = this.$store.getters.employeeName; let username = this.$store.getters.employeeName;
this.title = username + "(" + this.locInvName + " " + this.locSubInvName + ")"; this.curInv = "仓库:" + this.locInvName + "; 分库:" + this.locSubInvName + " ";
this.title = username + "（" + this.userInfo.userName + "）";
this.getStorage(); this.getStorage();
} }
} }
@ -550,6 +561,11 @@ export default {
this.findSubInvByInv(); this.findSubInvByInv();
this.getUserInfo(); this.getUserInfo();
socket.init(this) socket.init(this)
axios.get("./config.json").then(res => {
// 基础地址
this.hospitalName = res.data.hosp_name;
});
}, },
watch: { watch: {
$route() { $route() {

5
src/views/inout/IOAddOrder.vue
Unescape Escape View File

@ -200,7 +200,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20" v-if="enableDept">
<el-col :span="2"> <el-col :span="2">
<div class="ao-text"> <div class="ao-text">
<span>使用科室：</span> <span>使用科室：</span>
@ -651,6 +651,7 @@ export default {
code: this.formData.code.trim(), code: this.formData.code.trim(),
} }
enterCodeWeb(tQuery).then((response) => { enterCodeWeb(tQuery).then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
this.$refs.inputRef.focus(); this.$refs.inputRef.focus();
this.$refs.inputRef.select(); this.$refs.inputRef.select();
@ -926,6 +927,7 @@ export default {
} }
getLocalJoinByUser(query) getLocalJoinByUser(query)
.then((response) => { .then((response) => {
this.busTypes = response.data.list || []; this.busTypes = response.data.list || [];
if (this.formData.action != null) { if (this.formData.action != null) {
this.curAction = this.getActionItem(this.formData.action); this.curAction = this.getActionItem(this.formData.action);
@ -1215,6 +1217,7 @@ export default {
} }
, ,
created() { created() {
this.formData.code = ''; this.formData.code = '';
this.formData.actDate = new Date(); this.formData.actDate = new Date();
this.codeArray = []; this.codeArray = [];

7
src/views/inout/acceptOrder.vue
Unescape Escape View File

@ -170,9 +170,9 @@
<script> <script>
import A from "@/plugin/KeyScaner"; import A from "@/plugin/KeyScaner";
import {stockOrderDetail, updateStatus} from "@/api/warehouse/stockOrder"; import {stockOrderDetail, updateStatus} from "@/api/inout/stockOrder";
import {getAcceptOrder, acceptClear, acceptAddCode} from "@/api/warehouse/acceptOrder"; import {getAcceptOrder, acceptClear, acceptAddCode} from "@/api/inout/acceptOrder";
import {enterCodeWeb} from "@/api/warehouse/order"; import {enterCodeWeb} from "@/api/inout/order";
export default { export default {
@ -341,6 +341,7 @@ export default {
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.$message.success("验收成功！"); this.$message.success("验收成功！");
this.$emit('childByValue', 1)
this.closeDialog(); this.closeDialog();
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);

7
src/views/thrsys/SysUdimsConfig.vue
Unescape Escape View File

@ -188,7 +188,7 @@
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
单据(单据状态) 单据(单据状态)
</template> </template>addBusTypeDialog
<el-checkbox v-model="configQuery.orderUnCheck" :disabled="configQuery.downstreamEnable">待校验单据 <el-checkbox v-model="configQuery.orderUnCheck" :disabled="configQuery.downstreamEnable">待校验单据
</el-checkbox> </el-checkbox>
<el-checkbox v-model="configQuery.orderUnReceive" :disabled="configQuery.downstreamEnable">未验收单据 <el-checkbox v-model="configQuery.orderUnReceive" :disabled="configQuery.downstreamEnable">未验收单据
@ -338,6 +338,7 @@ export default {
getConfig() { getConfig() {
findConfig() findConfig()
.then((response) => { .then((response) => {
this.configQuery = response.data; this.configQuery = response.data;
this.checkedBusTypes = this.configQuery.busTypes; this.checkedBusTypes = this.configQuery.busTypes;
if (this.configQuery.busTypes != null) { if (this.configQuery.busTypes != null) {
@ -418,7 +419,7 @@ export default {
.then((response) => { .then((response) => {
this.busTypes = response.data.list || []; this.busTypes = response.data.list || [];
this.total = response.data.total || 0; this.total = response.data.total || 0;
this.getConfig(); // this.getConfig();
}) })
.catch(() => { .catch(() => {
}); });
@ -455,6 +456,7 @@ export default {
handleCurrentChange(val) { handleCurrentChange(val) {
this.busQuery.page = val; this.busQuery.page = val;
this.getBusType(); this.getBusType();
}, },
}, },
created() { created() {
@ -464,6 +466,7 @@ export default {
}; };
this.getBusType(); this.getBusType();
this.getConfig();
}, },
} }
</script> </script>

14
src/views/thrsys/ThrCorps.vue
Unescape Escape View File

@ -49,7 +49,7 @@
<el-table-column label="联系电话" prop="mobile" show-overflow-tooltip></el-table-column> <el-table-column label="联系电话" prop="mobile" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" fixed="right" v-if="thirdSysDetail.fromType!=0"> <el-table-column label="操作" fixed="right" v-if="thirdSysDetail.fromType!=0">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" :disabled="!delFalg"
>删除 >删除
</el-button> </el-button>
</template> </template>
@ -73,6 +73,7 @@ import {
import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys"; import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys";
import {ucloudUnit} from "../../api/basic/basicUnitMaintain"; import {ucloudUnit} from "../../api/basic/basicUnitMaintain";
import {selectIp} from "../../api/param/systemParamConfig"; import {selectIp} from "../../api/param/systemParamConfig";
import {findConfig} from "../../api/thrsys/spsSyncStatus";
export default { export default {
data() { data() {
@ -88,6 +89,7 @@ export default {
list: [], list: [],
thirdSys: [], thirdSys: [],
thirdSysDetail: null, thirdSysDetail: null,
delFalg:true,
uploadFileUrl: null, uploadFileUrl: null,
fileList: [], fileList: [],
uploadData: { uploadData: {
@ -252,6 +254,15 @@ export default {
}); });
}, },
getConFig(){
findConfig().then((response) =>{
if (response.code == 20000) {
this.delFalg=response.data.basicThirdCorp;
} else {
this.$message.error(response.message);
}
});
},
downloadDatas() { downloadDatas() {
let query = { let query = {
thirdSysFk: this.filterQuery.thirdSys thirdSysFk: this.filterQuery.thirdSys
@ -270,6 +281,7 @@ export default {
mounted() { mounted() {
}, },
created() { created() {
this.getConFig();
this.getBasicThirdSys(); this.getBasicThirdSys();
}, },
}; };

Write Preview
Loading…
Cancel
Save