科室出库修改

dev_ksck2.0
anthonywj 12 months ago
parent e892b1794e
commit 7c1485060c

@ -70,7 +70,7 @@ VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'https://test.udims.com/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.20.128:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.125:9150/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://192.168.0.132:9150/UDI_WMS_MC/'
# 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'

@ -4,32 +4,37 @@
>
<template #header>
<el-form class="query-form" size="mini">
<el-form-item class="query-form-item" label-width="23%" label="姓 名:" >
<el-input
v-model="info.name"
placeholder="请输入姓名"
clearable
disabled
class="custom-disabled-input"
>
</el-input>
</el-form-item>
<el-form-item class="query-form-item" label-width="23%" label="住院号:" >
<el-input
v-model="info.adNum"
placeholder="请输入住院号"
clearable
disabled
class="custom-disabled-input"
>
</el-input>
</el-form-item>
<el-form-item class="query-form-item" label-width="23%" label="姓 名:">
<el-input
v-model="info.name"
placeholder="请输入姓名"
clearable
disabled
class="custom-disabled-input"
>
</el-input>
</el-form-item>
<el-form-item class="query-form-item" label-width="23%" label="住院号:">
<el-input
v-model="info.adNum"
placeholder="请输入住院号"
clearable
disabled
class="custom-disabled-input"
>
</el-input>
</el-form-item>
<el-form-item class="query-form-item" label-width="23%" label="状态:">
<el-tag v-if="info.status==1" :type="statusFilterType(info.status)"> {{
checkStatus[info.status]
}}
</el-tag>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button type="primary" @click="onCodeSubmit"
icon="el-icon-search"
<el-button-group style=" float: right;">
<el-button type="primary" @click="onCodeSubmit" style="margin-left: 10px ;"
icon="el-icon-thumb"
>处理单据
</el-button>
</el-button-group>
@ -45,7 +50,12 @@ export default {
name: '',
data() {
return {
info:{}
info: {},
checkStatus: {
1: "未完成",
0: "已完成",
null: "无"
},
}
},
props: {
@ -56,9 +66,17 @@ export default {
mounted() {
},
methods: {
onCodeSubmit(){
this.$emit('baziPanel',this.info)
}
onCodeSubmit() {
this.$emit('baziPanel', this.info)
},
statusFilterType(status) {
const statusMap = {
1: 'warning',
2: 'success',
null: 'success'
}
return statusMap[status]
},
},
computed: {}
}

@ -113,7 +113,7 @@
<el-select
v-model="orderFormData.action"
placeholder="请选择单据类型"
:disabled="corpOrderIdDisabled"
:disabled="corpOrderIdDisabled|| viewTypeKsck"
style="width: 90%"
filterable
@change="actionChange"
@ -191,7 +191,6 @@
</el-select>
</el-form-item>
<el-form-item
prop="fromCorp"
label="往来信息:"
v-if="curAction.corpType == 1 && curAction.genUnit "
>
@ -201,7 +200,7 @@
auto-complete="off"
clearable
style="width: 90%"
:disabled="corpOrderIdDisabled"
:disabled="corpOrderIdDisabled || viewTypeKsck"
placeholder="请输入病人住院号"
></el-input>
@ -218,7 +217,7 @@
:loading="loading"
@change="sickChange"
@keyup.enter.native="remoteFindSickMethod"
:disabled="corpOrderIdDisabled"
:disabled="corpOrderIdDisabled || viewTypeKsck"
>
<el-option
v-for="item in fromSickOptions"
@ -679,6 +678,10 @@ export default {
type: Object,
required: true,
},
sickerAdName: {
type: Object,
required: true,
},
viewTypeKsck: {
type: Boolean,
required: false,
@ -888,7 +891,7 @@ export default {
code: this.orderFormData.invCode,
editType: 2, //
};
if (this.viewTypeKsck){
if (this.viewTypeKsck) {
query = {
code: this.orderFormData.invCode,
editType: 2, //
@ -1792,6 +1795,7 @@ export default {
},
created() {
//
debugger
this.codeFormData.code = "";
//
if (this.viewType == 2) {
@ -1843,14 +1847,14 @@ export default {
this.orderFormData.deptCode = this.$store.getters.deptCode;
this.orderFormData.invCode = this.$store.getters.locInvCode;
this.findInvListByUser();
if (this.orderFormData.sickerAdNum != null){
if (this.orderFormData.sickerAdNum != null) {
this.findSickMethod(this.orderFormData.sickerAdNum)
this.orderFormData.fromCorp = this.sickerAdNum
}
}
if (this.viewTypeKsck) {
this.curAction.corpType = 1,
this.curAction.corpType = 1
this.curAction.genUnit = true
this.curAction.inputSick = true
}

@ -11,7 +11,26 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 90%"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group>
@ -36,19 +55,19 @@
<el-divider style="margin: 15px"></el-divider>
<el-card class="el-card">
<el-row>
<el-col :span="6" v-for="(bazi,key) in list" :key="key" class="text-center">
<el-row :gutter="8">
<el-col :span="6" v-for="(bazi,key) in list" :key="key" :xs="12" :sm="8" :md="6" :lg="6">
<BaziPanel :info="bazi" @baziPanel="getValue"></BaziPanel>
</el-col>
</el-row>
<pagination style="height: 20px"
v-show="total>0"
:total="total"
:page-sizes=[12,24,36]
:page.sync="filterQuery.page"
:limit.sync="filterQuery.limit"
@pagination="getList"
/>
<!-- <pagination style="height: 20px"-->
<!-- v-show="total>0"-->
<!-- :total="total"-->
<!-- :page-sizes=[12,24,36]-->
<!-- :page.sync="filterQuery.page"-->
<!-- :limit.sync="filterQuery.limit"-->
<!-- @pagination="getList"-->
<!-- />-->
</el-card>
<el-dialog
:title=title
@ -62,8 +81,9 @@
>
<addOrder
:closeDialog="closeDialog"
:orderQuery="this.idQuery"
:sickerAdNum="this.sickerAdNum"
:orderQuery="idQuery"
:sickerAdNum="sickerAdNum"
:sickerAdName="sickerAdName"
:viewType="2"
:errView="0"
:viewTypeKsck=true
@ -82,14 +102,14 @@
@close='closeDialog'
>
<el-form class="query-form" size="mini">
<!-- <el-form-item class="query-form-item" label-width="18%" label="患者编码:" :required="true">-->
<!-- <el-input-->
<!-- v-model="addInfo.code"-->
<!-- placeholder="请输入患者编码"-->
<!-- clearable-->
<!-- >-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item class="query-form-item" label-width="18%" label="患者编码:" :required="true">-->
<!-- <el-input-->
<!-- v-model="addInfo.code"-->
<!-- placeholder="请输入患者编码"-->
<!-- clearable-->
<!-- >-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<el-form-item class="query-form-item" label-width="18%" label="姓 名:" :required="true">
<el-input
v-model="addInfo.name"
@ -108,7 +128,7 @@
</el-input>
</el-form-item>
<el-form-item class="query-form-item" label-width="18%" label="身份证号:" >
<el-form-item class="query-form-item" label-width="18%" label="身份证号:">
<el-input
v-model="addInfo.idNum"
placeholder="请输入身份证号"
@ -117,7 +137,7 @@
</el-input>
</el-form-item>
<el-form-item class="query-form-item" label-width="18%" label="手机号:" >
<el-form-item class="query-form-item" label-width="18%" label="手机号:">
<el-input
v-model="addInfo.phone"
placeholder="请输入手机号"
@ -126,22 +146,22 @@
</el-input>
</el-form-item>
<el-form-item class="query-form-item" label-width="18%" label="性别:" >
<el-select v-model="addInfo.gender" placeholder="请输入性别">
<el-option label="男" value="男"></el-option>
<el-option label="女" value="女"></el-option>
</el-select>
<el-form-item class="query-form-item" label-width="18%" label="性别:">
<el-select v-model="addInfo.gender" placeholder="请输入性别">
<el-option label="男" value="男"></el-option>
<el-option label="女" value="女"></el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item" label-width="18%" label="出生年月:" >
<el-date-picker
v-model="addInfo.bornDate"
type="date"
placeholder="请输入出生年月"
clearable
value-format="yyyy-MM-dd"
>
</el-date-picker>
<el-form-item class="query-form-item" label-width="18%" label="出生年月:">
<el-date-picker
v-model="addInfo.bornDate"
type="date"
placeholder="请输入出生年月"
clearable
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<el-form-item class="query-form-item" label-width="18%" label="备注:">
@ -171,16 +191,16 @@
<script>
import BaziPanel from '@/components/inout/baziPanel.vue'
import { getSkSickerList,getOrderListbyCode,addInfoSkSicker,clickToTriggerbyCode } from '@/api/inout/ioDepartmentOrder'
import {getSkSickerList, getOrderListbyCode, addInfoSkSicker, clickToTriggerbyCode} from '@/api/inout/ioDepartmentOrder'
import addOrder from "@/views/inout/DialogCreateOrder";
import {isBlank} from "@/utils/strUtil";
export default {
components: { BaziPanel,addOrder },
components: {BaziPanel, addOrder},
name: 'IoDepartmentOrder',
data() {
return {
title:"新增单据",
title: "新增单据",
resultQuery: {
orderId: null,
code: null,
@ -193,13 +213,16 @@ export default {
filterQuery: {
name: '',
page: 1,
limit: 12
limit: 12,
startTime: null,
endTime: null,
},
sickerAdNum:null,
screenWidth: window.innerWidth,
sickerAdNum: null,
sickerAdName: null,
addOrderVisible: false,
enterPatientInfoVisible: false,
idQuery:{
idQuery: {
billNo: null,
corpOrderId: null,
action: null,
@ -219,8 +242,8 @@ export default {
preCurSpaceCode: null, //
sickerAdNum: null,
},
orderListDate:[],
addInfo:{
orderListDate: [],
addInfo: {
code: null,
name: null,
adNum: null,
@ -231,16 +254,63 @@ export default {
remark: null,
deptName: this.$store.getters.locDeptName,
deptCode: this.$store.getters.locDeptCode
}
},
span: 6,
pickerOptions: {
shortcuts: [
{
text: "最近一周",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近一个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近三个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit("pick", [start, end]);
},
},
],
},
actDateRange: [],
}
},
computed: {
cols() {
const colCount = Math.floor(this.screenWidth / 200); // 100px
this.span = 24 / colCount; // 24
console.log(this.span)
// return Array.from({length: colCount}, (_, index) => ({span}));
},
},
mounted() {
window.addEventListener('resize', this.handleResize);
},
beforeDestroy() {
window.removeEventListener('resize', this.handleResize);
},
methods: {
getValue(info) {
console.log(info)
let query = {
adNum: info.adNum
}
clickToTriggerbyCode(query).then( (response) => {
clickToTriggerbyCode(query).then((response) => {
}).catch((error) => {
@ -248,19 +318,24 @@ export default {
getOrderListbyCode(query)
.then((response) => {
if (response.code === 20000) {
this.orderListDate = response.data || []
this.idQuery = this.orderListDate[0]
this.sickerAdNum = info.adNum
this.addOrderVisible = true
} else {
this.$message.error(response.message)
}
}).catch((error) => {
this.$message.error(error.message)
this.list = []
this.total = 0
})
if (response.code === 20000) {
if (this.orderListDate.length > 0) {
this.idQuery = this.orderListDate[0]; //
} else {
//
}
this.sickerAdNum = info.adNum;
this.sickerAdName = info.name;
this.addOrderVisible = true;
this.list = response.data || [];
} else {
this.$message.error(response.message)
}
}).catch((error) => {
this.$message.error(error.message)
this.list = []
this.total = 0
})
console.log("this.idQuery" + this.idQuery)
console.log("this.sickerAdNum" + this.sickerAdNum)
},
@ -270,6 +345,10 @@ export default {
this.getList();
},
getList() {
if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0];
this.filterQuery.endTime = this.actDateRange[1];
}
getSkSickerList(this.filterQuery)
.then((response) => {
if (response.code === 20000) {
@ -288,7 +367,7 @@ export default {
onSubmit() {
this.getList()
},
onInfoSubmit(){
onInfoSubmit() {
if (isBlank(this.addInfo.name)) {
this.$message.error('姓名不能为空')
return
@ -323,7 +402,7 @@ export default {
})
},
enterPatientInfo(){
enterPatientInfo() {
this.enterPatientInfoVisible = !this.enterPatientInfoVisible;
},
onReset() {
@ -336,10 +415,13 @@ export default {
},
hideSearch() {
this.showSearch = !this.showSearch
}
},
mounted() {
},
handleResize() {
this.screenWidth = window.innerWidth;
const colCount = Math.floor(this.screenWidth / 600); // 100px
this.span = 24 / colCount; // 24
console.log(this.span)
},
},
created() {
this.getList()

Loading…
Cancel
Save