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

Merge branch 'dev_ksck_z' into 20240912_adapter

Browse Source 
# Conflicts:
#	src/views/collect/CollectOrderNew.vue
#	src/views/collect/DealOrder.vue
20240912_adapter_z
yewj 7 months ago
parent 28c34d9a4b 34df04d874
commit f9b8a47e1e
8 changed files with 363 additions and 156 deletions
Show Stats Download Patch File Download Diff File

4
.env.production
Unescape Escape View File

@ -16,7 +16,7 @@ ENV = 'production'
# 诏安总医院
# VUE_APP_BASE_API = 'http://192.168.8.58:9150/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/'
# 平潭正式
# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
@ -54,7 +54,7 @@ VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.207:9160/UDI_WMS_MC/'
# 云霄妇幼保健
# VUE_APP_BASE_API = 'http://192.168.0.11:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.11:9160/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.67:9150/UDI_WMS_MC/'
# 东山

9
src/api/collect/splitCreateOrder.js
Unescape Escape View File

@ -46,6 +46,15 @@ export function draftOrder(query) {
});
}
export function cancelOrder(query) {
return axios({
url: "/udiwms/basic/collect/order/cancel",
method: "post",
data: query
});
}
export function updateOrder(query) {
return axios({
url: "/udiwms/basic/collect/order/update",

4
src/views/basic/workplace/addBusTypeDialog.vue
Unescape Escape View File

@ -458,7 +458,7 @@ export default {
this.closeDialog()
this.$message.success('更新成功')
} else {
this.$message.error('更新失败')
this.$message.error(res.message)
}
})
} else {
@ -467,7 +467,7 @@ export default {
this.$message.success('新增成功')
this.closeDialog()
} else {
this.$message.error('新增失败')
this.$message.error(res.message)
}
})
}

2
src/views/basic/workplace/workplaceManage.vue
Unescape Escape View File

@ -136,7 +136,7 @@
type="text"
size="small"
@click.native.stop="printLabel(scope.row)"
>打印
>工位标签
</el-button>
<el-button

425
src/views/collect/CollectOrderNew.vue
Unescape Escape View File

@ -108,113 +108,235 @@
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
@row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)" ref="multipleTable"
:default-sort="defaultSort"
:row-style="{ height: '32px' }"
@sort-change="handleSortChange">
<template v-for="(item, index) in tableHeader">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tabs type="border-card" style="margin-top: 55px">
<el-tab-pane label="原始单据">
<el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
@row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)" ref="multipleTable"
:default-sort="defaultSort"
:row-style="{ height: '32px' }"
@sort-change="handleSortChange">
<template v-for="(item, index) in tableHeader">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
item.lableRuleObj[scope.row[item.columnName]]
}}</span>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{
item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
}}</span>
</el-tag>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type"
:size="buttonItem.size"
:style="buttonItem.style"
:key="buttonItem"
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
>{{ buttonItem.name }}
</el-button>
</el-tag>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type"
:size="buttonItem.size"
:style="buttonItem.style"
:key="buttonItem"
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
>{{ buttonItem.name }}
</el-button>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
scope.row[item.columnName]
}}</span>
</template>
</el-table-column>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
</el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
></pagination>
</el-tab-pane>
<el-tab-pane label="异常单据">
<el-table v-loading="loading" :data="errList" style="width: 100%;" border highlight-current-row
@row-click="(row) => executeFuc(row,'0',tableObj1.handleChangeFuc)" ref="multipleTable"
:default-sort="defaultSort"
:row-style="{ height: '32px' }"
@sort-change="handleSortChange">
<template v-for="(item, index) in tableHeader1">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
item.lableRuleObj[scope.row[item.columnName]]
}}</span>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{
item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
}}</span>
</el-tag>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type"
:size="buttonItem.size"
:style="buttonItem.style"
:key="buttonItem"
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
>{{ buttonItem.name }}
</el-button>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
scope.row[item.columnName]
}}</span>
</template>
</el-table-column>
</template>
</el-table-column>
</template>
</el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
></pagination>
</el-table>
<pagination
v-show="errTotal>0"
:total="errTotal"
:limit.sync="errQuery.limit"
:page.sync="errQuery.page"
@pagination="handleCurrentChange"
></pagination>
</el-tab-pane>
</el-tabs>
</el-card>
<el-tabs type="border-card" style="margin: 15px">
<el-tab-pane label="单据明细">
@ -250,7 +372,7 @@ import {convertDate} from "@/utils/date";
import {detail} from "@/api/basic/sicker/prescribeApi";
import prescribeDownloadDialog from "@/views/collect/prescribe/prescribeDownloadDialog";
import prescribeOriginPanel from "./PannelOrderBiz";
import PannelOriginOrderDetail from "./PannelOriginOrderDetail"
import PannelOriginOrderDetail from "./PannelOriginOrderDetail"
import {
clearAllOrder,
deleteByOrder,
@ -281,36 +403,36 @@ export default {
return {
actDateRange: [],
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]);
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 * 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]);
{
text: "最近三个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit("pick", [start, end]);
},
},
},
],
},
],
},
//界面配置相关
//患者处方
tableHeader: [],
@ -337,6 +459,11 @@ export default {
page: 1,
limit: 10,
},
errQuery: {
page: 1,
limit: 10,
},
DataQuery: {
busType: null,
page: 1,
@ -346,6 +473,10 @@ export default {
loading: false,
list: [],
total: 0,
errList: [],
errTotal: 0,
downloadPrescriptionVisible: false,
deleteData: {
billNo: null,
@ -375,7 +506,7 @@ export default {
},
components: {
addOrder, errOrder, prescribeDownloadDialog, prescribeOriginPanel,PannelOriginOrderDetail
addOrder, errOrder, prescribeDownloadDialog, prescribeOriginPanel, PannelOriginOrderDetail
},
methods: {
@ -498,8 +629,30 @@ export default {
this.list = []
this.total = 0
})
}
,
},
getErrorList(_this) {
_this.loading = true;
if (_this.actDateRange !== null) {
_this.errQuery.startTime = _this.actDateRange[0];
_this.errQuery.endTime = _this.actDateRange[1];
} else {
_this.errQuery.startTime = null;
_this.errQuery.endTime = null;
}
_this.errQuery.tagStatus = 4;
orderPage(_this.errQuery).then(res => {
_this.loading = false
_this.errList = res.data.list || []
_this.errTotal = res.data.total || 0
}).catch(() => {
_this.loading = false
_this.errList = []
_this.errTotal = 0
})
},
getList2(_this) {
_this.loading = true;
if (_this.actDateRange !== null) {
@ -622,8 +775,14 @@ export default {
return
})
},
submitDialog() {
},
errorHandle(_this, row) {
_this.$confirm("此操作将重新下载该订单, 是否处理?", "提示", {
_this.$confirm("此操作将重新下载该订单, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
@ -667,6 +826,16 @@ export default {
this.fromList = re.data.fromList;
this.getList();
});
getHead("prescribeDownloadError", "1").then((re) => {
// 处理返回的数据
this.tableObj1 = re.data;
this.tableHeader1 = re.data.tableList;
// this.queryList1 = re.data.queryList;
this.fromList1 = re.data.fromList;
this.getErrorList(this);
});
this.filterQuery.tagStatus = this.tagStatus
this.filterQuery.tagStatusList = this.tagStatusList
this.findWorkPlace(this, '')

26
src/views/collect/CollectOrderNewParent.vue
Unescape Escape View File

@ -1,23 +1,23 @@
<template>
<div>
<CollectOrderNew
:tagStatusList=[0,1,2]
></CollectOrderNew>
<el-tabs type="border-card" style="margin: 15px">
<!-- <el-tabs type="border-card" style="margin: 15px">-->
<el-tab-pane label="原始单据">
<CollectOrderNew
style="margin: -15px"
:tagStatusList=[0,1,2]
></CollectOrderNew>
</el-tab-pane>
<!-- <el-tab-pane label="原始单据">-->
<!-- -->
<!-- </el-tab-pane>-->
<el-tab-pane label="异常单据">
<CollectOrderNew style="margin: -15px"
:tagStatus="'4'"
></CollectOrderNew>
</el-tab-pane>
<!-- <el-tab-pane label="异常单据">-->
<!-- <CollectOrderNew style="margin: -15px"-->
<!-- :tagStatus="'4'"-->
<!-- ></CollectOrderNew>-->
<!-- </el-tab-pane>-->
</el-tabs>
<!-- </el-tabs>-->
</div>
</template>

43
src/views/collect/DealOrder.vue
Unescape Escape View File

@ -17,25 +17,31 @@
type="primary"
:disabled="formData.billNo"
@click.native="nextCollectOrder()"
>下一单据
>下一单
</el-button>
<el-button
type="primary"
:disabled="formData.billNo"
@click.native="selectPrescribe()"
>选入单据
>选单
</el-button>
<el-button
type="primary"
:disabled="!formData.billNo"
@click.native="saveDraftOrder()"
>单据挂起
>挂起
</el-button>
<el-button
type="primary"
:disabled="!formData.billNo"
@click.native="cancelOrder()"
>放弃
</el-button>
<el-button
type="primary"
:disabled="!formData.billNo"
@click.native="confirmFinishOrder()"
>处理完成
>完成
</el-button>
<!-- <el-dropdown @command="handleCommand">-->
@ -168,7 +174,7 @@
icon="el-icon-plus"
@click.native.stop="addCode()"
style="margin-left: 15px"
>添加
>
</el-button>
<el-button
type="primary"
@ -274,7 +280,7 @@
append-to-body
>
<selectPrescribeDialog
:workPlaceCode="this.formData.workPlaceCode"
:workPlaceCode="null"
:busType="this.formData.busType"
:fromCorp="this.formData.fromCorp"
:confirmSelect="this.confirmSelect"
@ -348,8 +354,8 @@ import prescribeOriginPanel from "./PannelOrderBiz";
import prescribeCodePanel from "./PanelOrderTagCode";
import PannelOrderBiz from "./PannelOrderBiz";
import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage";
import {enterCodeWeb,batchVailCode} from "@/api/inout/order";
import {draftOrder, finishOrder, startSplit, tagCode, updateOrder} from "@/api/collect/splitCreateOrder";
import {enterCodeWeb} from "@/api/inout/order";
import {cancelOrder, draftOrder, finishOrder, startSplit, tagCode, updateOrder} from "@/api/collect/splitCreateOrder";
import {selectCorpList} from "@/api/basic/basicUnitMaintain";
import {getCurOrder, getNextOrder, findByBill, findFromCorp} from "@/api/collect/collectOrder";
import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
@ -620,6 +626,8 @@ export default {
getInputFocus(event) {
event.currentTarget.select();
},
//todo 前端执行区分分两个接口不要用同一个接口
enterKey() {
this.checkSuccess = true;
@ -763,6 +771,25 @@ export default {
});
},
cancelOrder() {
this.$confirm('此操作将取消当前正在处理单据，是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
cancelOrder(this.formData).then(res => {
this.loading = false
if (res.code == 20000) {
this.resetWork()
}
}).catch(() => {
this.loading = false
})
}).catch(() => {
});
},
confirmFinishOrder() {
this.$confirm('是否确定完成此单据?', '提示', {
confirmButtonText: '确定',

6
src/views/collect/PannelOriginOrderDetail.vue
Unescape Escape View File

@ -1,6 +1,8 @@
<template>
<div>
<el-table v-loading="preLoading" :data="preDetailList" style="width: 100%" border>
<el-table v-loading="preLoading" :data="preDetailList"
:row-style="{height: '32px'}"
style="width: 100%" border>
<template v-for="(item, index) in tableHeader1">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
@ -307,7 +309,7 @@ export default {
},
created() {
if (this.tableHeader1 == null || this.tableHeader1.length == 0) {
getHead("PannelOrderDetail", "1").then((re) => {
getHead("PannelOriginOrderDetail", "1").then((re) => {
// 处理返回的数据
this.tableObj1 = re.data;
this.tableHeader1 = re.data.tableList;

Write Preview
Loading…
Cancel
Save