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

代码备份

Browse Source
20240912_adapter_z
yewj 8 months ago
parent e4f342e844
commit 6baee8400f
2 changed files with 100 additions and 85 deletions
Show Stats Download Patch File Download Diff File

108
src/views/collect/CollectOrderAllotCardComponents.vue
Unescape Escape View File

@ -216,12 +216,15 @@
<el-card v-if="changeViewDisabled"> <el-card v-if="changeViewDisabled">
<div> <div>
<!-- 分割线 --> <!-- 分割线 -->
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" :inline="true" style="margin-top: 15px"> <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" :inline="true"
style="margin-top: 15px">
<el-form-item prop="key" label="采集工位:"> <el-form-item prop="key" label="采集工位:">
<el-input v-model="filterQuery.workPlaceCode" clearable placeholder="请输入或扫描采集工位二维码" style="width: 400px" ref="inputField" ></el-input> <el-input v-model="filterQuery.workPlaceCode" clearable placeholder="请输入或扫描采集工位二维码" style="width: 400px"
ref="inputField"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="key" label="往来单位:"> <el-form-item prop="key" label="往来单位:">
<el-input v-model="filterQuery.fromCorp" clearable placeholder="请输入往来单位" style="width: 300px" ref="inputField" ></el-input> <el-input v-model="filterQuery.fromCorp" clearable placeholder="请输入往来单位" style="width: 300px"
ref="inputField"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -233,60 +236,61 @@
</el-form> </el-form>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col v-for="(info, index) in list" :key="index" :xs="12" :sm="8" :md="8" :lg="6"> <el-col v-for="(info, index) in list" :key="index" :xs="12" :sm="8" :md="8" :lg="6">
<el-card :body-style="{margin:'20px'}" <el-card :body-style="{margin:'20px'}"
style="margin:10px 10px 5px 5px;height: 200px;background-color: #e1f3fb;border-radius: 12px; position: relative;" style="margin:10px 10px 5px 5px;height: 200px;background-color: #e1f3fb;border-radius: 12px; position: relative;"
> >
<el-row :gutter="24"> <el-row :gutter="24">
<el-form class="query-form" size="mini" style="height: 200px;width: 100%;" > <el-form class="query-form" size="mini" style="height: 200px;width: 100%;">
<el-col :span="24"> <el-col :span="24">
<el-form-item class="query-form-item" label-width="35%" label="往来单位:"> <el-form-item class="query-form-item" label-width="35%" label="往来单位:">
<el-input <el-input
v-model="info.fromCorpName" v-model="info.fromName"
placeholder="" placeholder=""
clearable clearable
class="custom-disabled-input" class="custom-disabled-input"
disabled disabled
style="width: 100%;" style="width: 100%;"
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item class="query-form-item" label-width="35%" label="业务类型:"> <el-form-item class="query-form-item" label-width="35%" label="业务类型:">
<el-input <el-input
v-model="info.busTypeName" v-model="info.busTypeName"
placeholder="" placeholder=""
clearable clearable
style="width: 100%;" style="width: 100%;"
class="custom-disabled-input" class="custom-disabled-input"
disabled disabled
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item class="query-form-item" label-width="35%" label="单据编号:"> <el-form-item class="query-form-item" label-width="35%" label="单据编号:">
<el-input <el-input
v-model="info.billNo" v-model="info.billNo"
placeholder="" placeholder=""
clearable clearable
style="width: 100%;" style="width: 100%;"
class="custom-disabled-input" class="custom-disabled-input"
disabled disabled
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label-width="60%" > <el-form-item label-width="60%">
<el-button-group style=" float: right;"> <el-button-group style=" float: right;">
<el-button type="primary" @click="handleClick(index)" style="margin-left: 10px ;margin-bottom: 20px" <el-button type="primary" @click="handleClick(index)"
icon="el-icon-thumb" style="margin-left: 10px ;margin-bottom: 20px"
>开始处理 icon="el-icon-thumb"
</el-button> >开始处理
</el-button-group> </el-button>
</el-form-item> </el-button-group>
</el-form-item>
</el-col> </el-col>
</el-form> </el-form>
</el-row> </el-row>
@ -309,9 +313,6 @@
</el-card> </el-card>
<el-tabs type="border-card" style="margin: 15px" v-if="!this.changeViewDisabled"> <el-tabs type="border-card" style="margin: 15px" v-if="!this.changeViewDisabled">
<el-tab-pane label="单据详情"> <el-tab-pane label="单据详情">
<prescribeOriginDiPanel <prescribeOriginDiPanel
@ -376,7 +377,7 @@ export default {
data() { data() {
return { return {
isLinkDisabled: false, isLinkDisabled: false,
changeViewDisabled: false, changeViewDisabled: true,
userInfo: { userInfo: {
inv: this.$store.getters.locInvName, inv: this.$store.getters.locInvName,
deptName: this.$store.getters.locDeptName, deptName: this.$store.getters.locDeptName,
@ -448,17 +449,17 @@ export default {
addOrder, errOrder, bindWorkDialog, prescribeOriginPanel, prescribeOriginDiPanel addOrder, errOrder, bindWorkDialog, prescribeOriginPanel, prescribeOriginDiPanel
}, },
methods: { methods: {
changeView(){ changeView() {
this.changeViewDisabled = !this.changeViewDisabled this.changeViewDisabled = !this.changeViewDisabled
}, },
handleClick(index) { handleClick(index) {
let url = window.location.origin + `#/tagCodeBlank?workplaceId=` + this.list[index].workplaceId+"&billNo="+this.list[index].billNo let url = window.location.origin + `#/tagCodeBlank?workplaceId=` + this.list[index].workPlaceCode + "&billNo=" + this.list[index].billNo
// this.$router.push( workplaceId) // this.$router.push( workplaceId)
window.open(url, '_blank'); window.open(url, '_blank');
}, },
linkPage(_this, row) { linkPage(_this, row) {
let url = window.location.origin + `#/tagCodeBlank?workplaceId=` + row.workPlaceCode+"&billNo="+row.billNo let url = window.location.origin + `#/tagCodeBlank?workplaceId=` + row.workPlaceCode + "&billNo=" + row.billNo
window.open(url, '_blank'); window.open(url, '_blank');
}, },
//界面配置相关------------ //界面配置相关------------
@ -616,6 +617,7 @@ export default {
.custom-disabled-input input.el-input__inner:disabled { .custom-disabled-input input.el-input__inner:disabled {
color: #000000; /* 修改为需要的颜色 */ color: #000000; /* 修改为需要的颜色 */
} }
.query-form { .query-form {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;

77
src/views/collect/DealOrderBlank.vue
Unescape Escape View File

@ -104,27 +104,28 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" > <el-col :span="6">
<el-form-item prop="busType" class="query-form-item" label="单据类型:"> <el-form-item prop="busType" class="query-form-item" label="业务类型:">
<el-select v-model="formData.busType" <el-select v-model="formData.busType"
filterable filterable
remote remote
@change="busTypeChange"
reserve-keyword reserve-keyword
placeholder="请选择单据类型" clearable style="width: 90%"> placeholder="请选择业务类型" clearable style="width: 90%">
<el-option <el-option
v-for="item in busTypeList" v-for="item in busTypeList"
:key="item.code" :key="item.documentTypeCode"
:label="item.name" :label="item.busName"
:value="item.code" :value="item.documentTypeCode"
> >
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.busName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.documentTypeCode }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" v-if="this.formDataVisible != null && this.formDataVisible.operationType == 1"> <el-col :span="6" v-if="this.formDataVisible != null && this.formDataVisible.scanType == 1">
<el-form-item class="query-form-item" :label="this.formDataVisible.unitTittle + ':'"> <el-form-item class="query-form-item" :label="this.formDataVisible.unitTittle + ':'">
<el-select v-model="formData.fromCorp" <el-select v-model="formData.fromCorp"
filterable filterable
@ -258,8 +259,6 @@
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="选择作业单据类型" title="选择作业单据类型"
:visible.sync="selectBusTypeDisabled" :visible.sync="selectBusTypeDisabled"
@ -270,17 +269,20 @@
width="65%" width="65%"
append-to-body append-to-body
> >
<el-row > <el-row>
<!-- <el-button v-for="(item, index) in busTypeList" :key="index" type="primary" plain @click="selectBusType(item.code)">{{ item.name }}</el-button>--> <!-- <el-button v-for="(item, index) in busTypeList" :key="index" type="primary" plain @click="selectBusType(item.code)">{{ item.name }}</el-button>-->
<el-col v-for="(info, index) in busTypeList" :key="index" :xs="12" :sm="8" :md="8" :lg="6"> <el-col v-for="(info, index) in busTypeList" :key="index" :xs="12" :sm="8" :md="8" :lg="6">
<el-card :body-style="{margin:'20px'}" <el-card :body-style="{margin:'20px'}"
style="margin:20px 20px 20px 20px;height: 200px;background-color: #e1f3fb;border-radius: 12px; position: relative;" style="margin:20px 20px 20px 20px;height: 200px;background-color: #e1f3fb;border-radius: 12px; position: relative;"
> >
<div style="display: flex; justify-content: space-between; align-items: center; height: 66px; /* 约为 200px 的 1/3 */" @click="selectBusType(info.code)" > <div
<p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.name }}</p> <!-- 假设你的信息对象中包含一个title属性 --> style="display: flex; justify-content: space-between; align-items: center; height: 66px; /* 约为 200px 的 1/3 */"
@click="selectBusType(info.code)">
<p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.name }}</p>
<!-- 假设你的信息对象中包含一个title属性 -->
<!-- <div style="width: 60px; height: 60px; display: flex; justify-content: center; align-items: center;">--> <!-- <div style="width: 60px; height: 60px; display: flex; justify-content: center; align-items: center;">-->
<!-- &lt;!&ndash; 二维码占位，这里用灰色方块代替 &ndash;&gt;--> <!-- &lt;!&ndash; 二维码占位，这里用灰色方块代替 &ndash;&gt;-->
<!--&lt;!&ndash; <span>QR</span>&ndash;&gt;--> <!--&lt;!&ndash; <span>QR</span>&ndash;&gt;-->
@ -288,22 +290,23 @@
<!-- </div>--> <!-- </div>-->
</div> </div>
<div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;" @click="selectBusType(info.code)"> <div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;"
@click="selectBusType(info.code)">
<!-- 假设这里有一些信息内容 --> <!-- 假设这里有一些信息内容 -->
<p style="font-size: 14px;background-color: #e1f3fb">{{ info.code }}</p> <p style="font-size: 14px;background-color: #e1f3fb">{{ info.code }}</p>
<el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb" @click="selectBusType(info.code)">开始作业</el-button> <el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb"
@click="selectBusType(info.code)">开始作业
</el-button>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
</el-dialog> </el-dialog>
</el-form> </el-form>
</div> </div>
</template> </template>
@ -325,7 +328,7 @@ import {selectCorpList} from "@/api/basic/basicUnitMaintain";
import {delDrugLevel} from "@/api/basic/product/drugUdiinfos"; import {delDrugLevel} from "@/api/basic/product/drugUdiinfos";
import {getCurOrder, getNextOrder} from "@/api/collect/collectOrder"; import {getCurOrder, getNextOrder} from "@/api/collect/collectOrder";
import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail"; import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
import { getWorkBindBusTypes,removeBusTypeById } from '@/api/basic/workPlace/sysWorkplaceDocuments' import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
export default { export default {
/** /**
@ -355,7 +358,7 @@ export default {
total: 0, total: 0,
defaultSort: {prop: 'createTime', order: 'desc'}, defaultSort: {prop: 'createTime', order: 'desc'},
formDataVisible: { formDataVisible: {
operationType: null, scanType: null,
unitTittle: "往来单位", unitTittle: "往来单位",
corpType: 1, corpType: 1,
}, },
@ -413,8 +416,7 @@ export default {
PanelOrderAllDetail PanelOrderAllDetail
}, },
methods: { methods: {
selectBusType(val){ selectBusType(val) {
this.formData.busType = val this.formData.busType = val
this.selectBusTypeDisabled = false this.selectBusTypeDisabled = false
if (this.formData.workPlaceCode != null) { if (this.formData.workPlaceCode != null) {
@ -428,8 +430,14 @@ export default {
this.busTypeList = res.data.list this.busTypeList = res.data.list
this.busTypeTotal = res.data.total this.busTypeTotal = res.data.total
if (this.busTypeList.length == 1) { if (this.busTypeList.length == 1) {
this.formData.busType = this.busTypeList[0].code
let busType = this.busTypeList[0]
this.formData.busType = this.busTypeList[0].documentTypeCode
this.selectBusTypeDisabled = false this.selectBusTypeDisabled = false
this.formDataVisible = busType
if (this.formDataVisible.scanType == 1) {
this.findFromInvList("");
}
this.findCurOrder(); this.findCurOrder();
} else { } else {
this.formData.busType = null this.formData.busType = null
@ -450,17 +458,21 @@ export default {
}); });
}, },
workPlaceCodeChange(value) { workPlaceCodeChange(value) {
this.curWorkPlaces.forEach(item => {
if (item.workplaceId == value) {
this.formDataVisible = item
}
})
this.getWorkBindBusTypes(value) this.getWorkBindBusTypes(value)
if (this.formDataVisible.operationType == 1) { return
},
busTypeChange(value) {
let busType = this.busTypeList.find(item => item.documentTypeCode === value);
this.formData.busType = busType.documentTypeCode
this.selectBusTypeDisabled = false
this.formDataVisible = busType
if (this.formDataVisible.scanType == 1) {
this.findFromInvList(""); this.findFromInvList("");
} }
return this.findCurOrder();
}, },
handleClick(blankName) { handleClick(blankName) {
// let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId // let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId
let url = window.location.origin + `#/` + blankName + `?workplaceId=` + this.workplaceId let url = window.location.origin + `#/` + blankName + `?workplaceId=` + this.workplaceId
@ -606,7 +618,8 @@ export default {
fromCorp: this.formData.fromCorp, fromCorp: this.formData.fromCorp,
billNo: this.formData.billNo, billNo: this.formData.billNo,
code: this.filterQuery.code.trim(), code: this.filterQuery.code.trim(),
insert: this.formData.insert insert: this.formData.insert,
busType: this.formData.busType,
}; };
tagCode(tagQuery).then(res => { tagCode(tagQuery).then(res => {
this.loading = false this.loading = false

Write Preview
Loading…
Cancel
Save