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

9/10 优化1.0

Browse Source
20240912_adapter_z
wangwei 10 months ago
parent 4cc05a80f6
commit cc31d125ed
9 changed files with 433 additions and 76 deletions
Show Stats Download Patch File Download Diff File

6
src/views/basic/product/drug/chooseHouseDrug.vue
Unescape Escape View File

@ -415,14 +415,14 @@ export default {
.then((response) => {
if (response.code == 20000) {
this.$message.success(response.data);
this.$emit("closeUdi", true);
this.closeDialog()
} else {
this.$message.error(response.message);
this.$emit("closeUdi", false);
this.closeDialog()
}
})
.catch(() => {
this.$emit("closeUdi", false);
this.closeDialog()
});
})
.catch(() => {

13
src/views/basic/product/drug/drugMaintain.vue
Unescape Escape View File

@ -128,6 +128,13 @@
</template>
</el-table-column>
</el-table>
<pagination
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="getList"
>
</pagination>
<el-dialog
:title="fromMap[fromName]"
@ -177,7 +184,7 @@
:isImport="isImport"
:data="thisData"
:defaultSys="defaultSys"
@closeUdi="closeUdi"
@closeUdi="closeDialog"
:supEnable="false"
></chooseHouseDrug>
</el-dialog>
@ -260,6 +267,7 @@ export default {
allowNoSerial: null,
pId: null,
},
total: 0
}
},
@ -355,6 +363,9 @@ export default {
this.editFormat = JSON.parse(JSON.stringify(row));
this.rowData = row
this.addDrugVisible = true;
},
closeUdi(){
},
closeDialog() {
this.addDrugVisible = false;

2
src/views/basic/product/udiInfoselectErpUdi.vue
Unescape Escape View File

@ -321,6 +321,7 @@ export default {
measname: null,
page: 1,
limit: 10,
productType:1
};
this.getErpList();
},
@ -354,6 +355,7 @@ export default {
searchErpList() {
this.erpQuery.page = 1;
this.erpQuery.productType = 1;
this.getErpList();
},

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

@ -15,7 +15,7 @@
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="是否配套系统:" prop="isMatching" class="query-form-item">
<el-select v-model="formData.isMatching" style="width: 80%" placeholder="选择扫码方式"
<el-select v-model="formData.isMatching" style="width: 80%" placeholder="是否配套系统"
@change="change"
>
<el-option label="否" :value="0"></el-option>
@ -23,7 +23,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="单据类型:" prop="documentTypeCode" class="query-form-item">
<el-select v-model="formData.documentTypeCode" placeholder="请选择单据类型"
@ -49,6 +48,7 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="队列管理:" prop="autoTag" class="query-form-item">
<el-select v-model="formData.autoTag" style="width: 80%" placeholder="请选择是否队列设备"
@ -76,16 +76,16 @@
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="是否常用:" prop="isPopular" class="query-form-item">
<el-select v-model="formData.isPopular" style="width: 80%" placeholder="单据是否常用">
<el-form-item label="业务类型是否常用:" prop="isPopular" class="query-form-item">
<el-select v-model="formData.isPopular" style="width: 80%" placeholder="业务类型是否常用">
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row :gutter="24" class="el-row">
<el-divider></el-divider>
<!--<el-col :span="12" class="el-col">-->
<!-- <el-form-item label="作业类型:" prop="workplaceType" class="query-form-item">-->
<!-- <el-select v-model="formData.workplaceType" style="width: 80%" placeholder="作业类型">-->
@ -96,6 +96,7 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--</el-col>-->
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="扫码方式:" prop="scanType" class="query-form-item">
<el-select v-model="formData.scanType" style="width: 80%" placeholder="选择扫码方式"
@ -107,9 +108,18 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="单据完成条件:" prop="monopoly" class="query-form-item" v-if="formData.scanType != 1">
<el-select v-model="formData.orderFinishVerify" style="width: 80%" placeholder="单据完成条件" >
<el-option label="完全赋码" :value="0"></el-option>
<el-option label="部分赋码" :value="1"></el-option>
<el-option label="赋码超出" :value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="结果处理:" prop="checkInsert" class="query-form-item">
<el-select v-model="formData.checkInsert" style="width: 80%" placeholder="选择扫码方式"
<el-select v-model="formData.checkInsert" style="width: 80%" placeholder="结果处理"
:disabled="formData.scanType == 1"
>
<el-option label="自动添加" :value="1"></el-option>
@ -120,24 +130,13 @@
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="异常提醒方式:" prop="warnType" class="query-form-item">
<el-select v-model="formData.warnType" style="width: 80%" placeholder="选择扫码方式">
<el-select v-model="formData.warnType" style="width: 80%" placeholder="请选择异常提醒方式">
<el-option label="信息提醒" :value="1"></el-option>
<el-option label="信息弹框提醒" :value="2"></el-option>
<el-option label="不提醒" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="单据完成条件:" prop="monopoly" class="query-form-item">
<el-select v-model="formData.orderFinishVerify" style="width: 80%" placeholder="单据完成条件">
<el-option label="完全赋码" :value="0"></el-option>
<el-option label="部分赋码" :value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="往来单位类型:" prop="corpType" class="query-form-item">
<el-select v-model="formData.corpType" style="width: 80%" placeholder="选择往来单位类型"
@ -177,7 +176,6 @@
</el-form-item>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row :gutter="24" class="el-row">
<el-col class="el-col">
<el-form-item label="备注:" prop="remark" class="query-form-item">
@ -298,13 +296,14 @@ export default {
],
workplaceType: [
{required: true, message: '请选择作业类型', trigger: 'blur'}
]
// corpType: [
// // { required: true, message: '请选择往来单位类型', trigger: 'blur' }
// ],
// unitTittle: [
// // { required: true, message: '请输入往来类型标题', trigger: 'blur' }
// ],
],
invCode: [],
corpType: [
// { required: true, message: '请选择往来单位类型', trigger: 'blur' }
],
unitTittle: [
// { required: true, message: '请输入往来类型标题', trigger: 'blur' }
],
}
}
},
@ -406,34 +405,34 @@ export default {
,
formSubmit() {
this.formData.workplaceCode = this.workplaceId
if (this.upData != null) {
updateType(this.formData).then(res => {
if (res.code == 20000) {
this.closeDialog()
this.$message.success('更新成功')
} else {
this.$message.error('更新失败')
}
})
} else {
if (this.formData.scanType == 1){
this.formData.orderFinishVerify = null
}
this.$refs['dataForm'].validate((rules) => {
if (rules) {
addBusType(this.formData).then(res => {
if (res.code == 20000) {
this.$message.success('新增成功')
this.closeDialog()
} else {
this.$message.error('新增失败')
}
})
if (this.upData != null){
updateType(this.formData).then(res => {
if (res.code == 20000) {
this.closeDialog()
this.$message.success('更新成功')
} else {
this.$message.error('更新失败')
}
})
}else {
addBusType(this.formData).then(res => {
if (res.code == 20000) {
this.$message.success('新增成功')
this.closeDialog()
} else {
this.$message.error('新增失败')
}
})
}
}
})
// this.formData
}
}
,
})
},
hideForm() {
this.closeDialog()
}
@ -441,13 +440,14 @@ export default {
// 当scanType改变时调用此方法来更新校验规则
updateFormRules() {
if (this.formData.scanType === 1) {
// 当scanType为1时，不校验corpType和unitTittle
this.$set(this.formRules.corpType, 0, {required: false});
this.$set(this.formRules.unitTittle, 0, {required: false});
} else {
// 其他情况，设置校验规则
// 设置校验规则
this.$set(this.formRules.corpType, 0, {required: true, message: '请选择往来单位类型', trigger: 'blur'});
this.$set(this.formRules.unitTittle, 0, {required: true, message: '请输入往来类型标题', trigger: 'blur'});
this.$set(this.formRules.invCode, 0, {required: true, message: '请选择仓库', trigger: 'blur'});
} else {
this.$set(this.formRules.corpType, 0, {required: false});
this.$set(this.formRules.unitTittle, 0, {required: false});
this.$set(this.formRules.invCode, 0, {required: false});
}
}
,
@ -470,12 +470,15 @@ export default {
if (this.upData != null) {
console.log(this.upData)
this.formData = this.upData
if (this.formData.invCode != 0) {
if (this.formData.invCode != 0){
this.formData.invCode = this.upData.invCode + ''
}
if (this.formData.invCode == 0) {
this.formData.invCode = ''
}
if (this.formData.orderFinishVerify == 4) {
this.formData.orderFinishVerify = null
}
if (isBlank(this.formData.invCode) || this.formData.invCode == null) {
this.formData.invCode = ''
}
@ -488,6 +491,7 @@ export default {
this.getBusTypeList()
}
this.getInvList()
this.updateFormRules()
}
}

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

@ -155,12 +155,12 @@
</el-table-column>
</el-table>
<pagination
:total="total"
:limit.sync="query.limit"
:page.sync="query.page"
@pagination="getList"
>
</pagination>
:total="total"
:limit.sync="query.limit"
:page.sync="query.page"
@pagination="getList"
>
</pagination>
</el-card>
<!--<el-card>-->
<el-tabs type="border-card" style="margin: 15px">
@ -209,8 +209,8 @@
<span>{{ isMatchings[scope.row.isMatching] }}</span>
</template>
</el-table-column>
<el-table-column label="单据类型" prop="thrBusName" width="140"></el-table-column>
<el-table-column label="单据完成条件" prop="orderFinishVerify" width="120">
<el-table-column label="单据类型" prop="thrBusName" width="100"></el-table-column>
<el-table-column label="单据完成条件" prop="orderFinishVerify" width="100">
<template slot-scope="scope">
<span>{{ orderFinishVerifys[scope.row.orderFinishVerify] }}</span>
</template>
@ -812,6 +812,8 @@ export default {
orderFinishVerifys: {
0: '完全赋码',
1: '部分赋码',
2: '赋码超出',
4: '',
},
warnTypeMap: {
1: '信息提醒',

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

@ -218,10 +218,10 @@
</el-card>
<el-tabs type="border-card" style="margin: 15px">
<el-tab-pane label="单据明细">
<prescribeOriginPanel
<PannelOrderDetail
v-if="panelALive"
:prescribeData="curRow"
></prescribeOriginPanel>
></PannelOrderDetail>
</el-tab-pane>
</el-tabs>
@ -250,6 +250,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 PannelOrderDetail from "./PannelOrderDetail"
import {
clearAllOrder,
deleteByOrder,
@ -334,7 +335,7 @@ export default {
},
components: {
addOrder, errOrder, prescribeDownloadDialog, prescribeOriginPanel
addOrder, errOrder, prescribeDownloadDialog, prescribeOriginPanel,PannelOrderDetail
},
methods: {

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

@ -278,6 +278,7 @@
:fromCorp="this.formData.fromCorp"
:confirmSelect="this.confirmSelect"
:closeDialog="this.closeDialog"
:viewType="viewType"
></selectPrescribeDialog>
</el-dialog>
@ -444,6 +445,7 @@ export default {
busTypeTotal: 0,
invList: [],
viewType:1
}
},

330
src/views/collect/PannelOrderDetail.vue
Unescape Escape View File

@ -0,0 +1,330 @@
<template>
<div>
<el-table v-loading="preLoading" :data="preDetailList" style="width: 100%" border>
<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' && !(item.columnName == 'productDate' || item.columnName == 'expireDate') && 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>
<el-table-column
v-if="item.columnType == 'text' && (item.columnName == 'productDate' || item.columnName == 'expireDate') && 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])}">{{
convertDateFun(scope.row[item.columnName])
}}</span>
</template>
</el-table-column>
</template>
</el-table>
<pagination
v-show="preTotal>0"
:total="preTotal"
:limit.sync="preQuery.limit"
:page.sync="preQuery.page"
@pagination="preHandleCurrentChange"
></pagination>
<el-dialog
title="扫码明细"
:visible.sync="scanDetailVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="scanDetailVisible"
width="65%"
append-to-body
>
<PanelOrderManuTagCode
:fifoSplit="3"
:prescribeData="prescribeData"
:bizId="bizId"
:closeScanDialog="closeScanDialog"
></PanelOrderManuTagCode>
</el-dialog>
</div>
</template>
<script>
import {convertDate} from "@/utils/date";
import {detail} from "@/api/basic/sicker/prescribeApi";
import {executeFuc, getHead} from "@/utils/customConfig";
import {orderDetail, codeRemove} from "@/api/collect/collectOrder";
import PanelOrderManuTagCode from "@/views/collect/PanelOrderManuTagCode";
/**
* 原始处方明细
*/
export default {
name: "PannelOrderDetail",
props: {
prescribeData: {
type: Object,
default: null,
required: true
},
//上货方式：1:拆零上货；2:整取上货;
fifoSplit: {
type: Object,
default: null,
required: true
},
dealStatus: {
type: Number,
default: 1,
required: true
},
},
data() {
return {
//界面配置相关
//原始处方明细
tableHeader1: [],
queryList1: [],
tableObj1: [],
fromList1: [],
convertDateFun: convertDate,
preLoading: false,
preDetailList: [],
preTotal: 0,
preQuery: {
orderIdFk: null,
page: 1,
limit: 10,
},
countVisible: false,
scanDetailVisible: false,
bizId: null,
}
},
methods: {
deleteMan(_this, row) {
_this.$confirm("是否确定删除该条扫码?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
_this.loading = true;
_this.codeRemoveMan(row.id, 2);
})
},
deleteCode(_this, row) {
_this.$confirm("是否确定移除一个条码?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
_this.loading = true;
_this.codeRemoveMan(row.id, 1);
})
},
codeRemoveMan(codeManId, delType) {
let post = {
codeManId: codeManId,
delType: delType
}
codeRemove(post).then((response) => {
if (response.code === 20000) {
this.$message.success("操作成功！");
this.getList(this)
} else {
this.$message.error(response.message);
}
this.loading = false;
}).catch(() => {
this.loading = false;
})
},
//界面配置-------------end
executeFuc(row, type, clickFuc, value) {
return executeFuc(this, row, type, clickFuc, value);
},
executeEval(row, expression, defaultRet) {
if (expression) {
return eval(expression);
}
return defaultRet;
},
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.query.sort = 'desc'
} else {
this.query.sort = 'asc'
}
this.query.orderBy = column.prop;
this.getList();
},
///界面配置相关------------end
preHandleCurrentChange(val) {
this.filterQuery.page = val.page;
this.getPrescribeDetail(this, null);
},
getPrescribeDetail(_this) {
if (_this.prescribeData == null)
return
if (_this.prescribeData != null) {
_this.preQuery.page = 1
_this.preQuery.orderIdFk = this.prescribeData.billNo
}
_this.preLoading = true;
orderDetail(_this.preQuery).then(res => {
_this.preLoading = false
if (res.code != 20000) {
_this.$message.error(res.message)
return
}
_this.preDetailList = res.data.list
_this.preLoading = false
}).catch(() => {
_this.preLoading = false
_this.$message.error("数据加载失败")
})
},
scanDetail(_this, row) {
_this.bizId = row.id;
_this.scanDetailVisible = true;
},
closeScanDialog() {
this.getPrescribeDetail(this);
this.refreshPanel(this)
},
},
components: {
PanelOrderManuTagCode
},
created() {
if (this.tableHeader1 == null || this.tableHeader1.length == 0) {
getHead("PannelOrderDetail", "1").then((re) => {
// 处理返回的数据
this.tableObj1 = re.data;
this.tableHeader1 = re.data.tableList;
this.queryList1 = re.data.queryList;
this.fromList1 = re.data.fromList;
this.getPrescribeDetail(this);
});
}
this.getPrescribeDetail(this);
if (this.dealStatus == 1) {
this.countVisible = false;
} else {
this.countVisible = true;
}
}
}
</script>
<style scoped>
</style>

13
src/views/collect/selectCollectOrderDialog.vue
Unescape Escape View File

@ -167,7 +167,7 @@
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
v-if="item.columnType == 'button' && executeEval(row,item.expression,true) && viewType != 1"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
@ -215,10 +215,10 @@
</el-card>
<el-tabs type="border-card" style="margin: 15px">
<el-tab-pane label="单据明细">
<prescribeOriginPanel
<PannelOrderDetail
v-if="panelALive"
:prescribeData="curRow"
></prescribeOriginPanel>
></PannelOrderDetail>
</el-tab-pane>
</el-tabs>
@ -233,6 +233,7 @@ import {executeFuc, getHead} from "@/utils/customConfig";
import {convertDate} from "@/utils/date";
import prescribeDownloadDialog from "@/views/collect/prescribe/prescribeDownloadDialog";
import prescribeOriginPanel from "./PannelOrderBiz";
import PannelOrderDetail from "./PannelOrderDetail"
import {orderPage} from "@/api/collect/collectOrder";
import { selectCorpList } from '@/api/basic/basicUnitMaintain'
import {filterWorkOptimize} from "@/api/basic/workPlace/sysWorkplaceManage";
@ -261,6 +262,10 @@ export default {
type: String,
required: true,
},
viewType: {
type: Object,
required: false,
},
},
data() {
return {
@ -307,7 +312,7 @@ export default {
},
components: {
addOrder, errOrder, prescribeDownloadDialog, prescribeOriginPanel
addOrder, errOrder, prescribeDownloadDialog, prescribeOriginPanel,PannelOrderDetail
},
methods: {

Write Preview
Loading…
Cancel
Save