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

9/27 现场管理界面优化

Browse Source
yanshishuju
wangwei 9 months ago
parent d2579f3938
commit 6b9791df4c
12 changed files with 137 additions and 57 deletions
Show Stats Download Patch File Download Diff File

2
src/views/basic/collectPoint/userWorkplace.vue
Unescape Escape View File

@ -415,6 +415,7 @@ export default {
deptCode: this.$store.getters.locDeptCode, deptCode: this.$store.getters.locDeptCode,
} }
this.getUsers() this.getUsers()
this.workList = []
}, },
onSubmit() { onSubmit() {
this.workList = [] this.workList = []
@ -536,6 +537,7 @@ export default {
}, },
changeUsers() { changeUsers() {
this.getUsers() this.getUsers()
this.workList = []
} }
}, },
created() { created() {

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

@ -974,6 +974,7 @@ export default {
workplaceId: null, workplaceId: null,
workplaceName: null, workplaceName: null,
workplaceStatus: 1, workplaceStatus: 1,
workPlaceClass: 1,
deptCode: null, deptCode: null,
chargeUser: null, chargeUser: null,
constituencies: "1001", constituencies: "1001",

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

@ -730,6 +730,7 @@ export default {
}; };
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
this.panelALive = false
}, },
bindWorkPlace(_this, row) { bindWorkPlace(_this, row) {
@ -748,14 +749,14 @@ export default {
_this = this _this = this
_this.filterQuery.page = 1; _this.filterQuery.page = 1;
_this.selectLoading = true; _this.selectLoading = true;
const loading = _this.$loading({ // const loading = _this.$loading({
lock: true, // lock: true,
text: 'Loading', // text: 'Loading',
spinner: 'el-icon-loading', // spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)' // background: 'rgba(0, 0, 0, 0.7)'
}); // });
_this.getList(); _this.getList();
loading.close(); // loading.close();
}, },
getList() { getList() {

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

@ -576,6 +576,7 @@ export default {
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
this.getErrorList(this); this.getErrorList(this);
this.panelALive = false
}, },
downloadPrescription() { downloadPrescription() {
this.downloadPrescriptionVisible = true this.downloadPrescriptionVisible = true

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

@ -310,6 +310,7 @@
append-to-body append-to-body
> >
<selectPrescribeDialog <selectPrescribeDialog
ref="childRef"
:workPlaceCode="null" :workPlaceCode="null"
:busType="this.formData.busType" :busType="this.formData.busType"
:fromCorp="this.formData.fromCorp" :fromCorp="this.formData.fromCorp"
@ -560,8 +561,10 @@ export default {
this.selectBusTypeDisabled = false this.selectBusTypeDisabled = false
this.findCurOrder(); this.findCurOrder();
} else { } else {
this.formData.busType = this.$route.query.busType if (this.$route.query.busType != null){
this.findCurOrder(); this.formData.busType = this.$route.query.busType
this.findCurOrder();
}
this.$refs.inputRef.focus(); this.$refs.inputRef.focus();
busType = this.busTypeList.find(item => item.documentTypeCode === this.formData.busType); busType = this.busTypeList.find(item => item.documentTypeCode === this.formData.busType);
} }
@ -1032,9 +1035,11 @@ export default {
this.startDeal(); this.startDeal();
}).catch(() => { }).catch(() => {
}); });
} else if (temp.tagStatus === 2 || temp.tagStatus === 1) { }
else if (temp.tagStatus === 2 || temp.tagStatus === 1) {
this.formData = temp; this.formData = temp;
this.panelALive = true
this.startDeal(); this.startDeal();
// this.$confirm('检测到当前工位存在正在处理单据，是否继续上一次单据处理?', '提示', { // this.$confirm('检测到当前工位存在正在处理单据，是否继续上一次单据处理?', '提示', {
// confirmButtonText: '确定', // confirmButtonText: '确定',
@ -1061,7 +1066,7 @@ export default {
}, },
confirmSelect(row) { confirmSelect(row) {
this.selectPrescriptionVisible = false;
this.formData = row; this.formData = row;
this.startDeal(); this.startDeal();
}, },
@ -1091,8 +1096,14 @@ export default {
startSplit(this.formData).then(res => { startSplit(this.formData).then(res => {
this.loading = false this.loading = false
if (res.code == 20000) { if (res.code == 20000) {
this.selectPrescriptionVisible = false;
this.refreshCodesPanel(this); this.refreshCodesPanel(this);
} else { }else if (res.code == 501){
this.$refs.childRef.getList();
this.$refs.childRef.getDraftList();
this.$refs.childRef.getOtherList();
this.$message.warning(res.message)
} }
}).catch(() => { }).catch(() => {
@ -1198,6 +1209,8 @@ export default {
this.scanCode = ""; this.scanCode = "";
this.scanTitle = "扫码结果："; this.scanTitle = "扫码结果：";
this.result = ""; this.result = "";
this.warnResult = ""
this.errResult = ""
}, },
/** /**
@ -1212,6 +1225,8 @@ export default {
this.curRow = null this.curRow = null
this.formData.confirmFinish = false; this.formData.confirmFinish = false;
this.refreshCodesPanel(this) this.refreshCodesPanel(this)
this.clearCode()
}, },
toggleBusType() { toggleBusType() {
//隐藏下拉框内容 //隐藏下拉框内容
@ -1339,7 +1354,7 @@ export default {
} }
// 如果没有任何条件满足，返回 false // 如果没有任何条件满足，返回 false
return false; return false;
} },
}, },
mounted() { mounted() {
this.$refs.inputRef.focus(); this.$refs.inputRef.focus();
@ -1377,8 +1392,6 @@ export default {
this.formData.workPlaceCode = Number(this.$route.query.workplaceId); this.formData.workPlaceCode = Number(this.$route.query.workplaceId);
this.getWorkBindBusTypes(this.formData.workPlaceCode); this.getWorkBindBusTypes(this.formData.workPlaceCode);
} }
} }
} }

4
src/views/collect/IoSplitOperateCode.vue
Unescape Escape View File

@ -957,6 +957,8 @@ export default {
}; };
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
this.codeDetailList = []
this.resultDetailList = []
}, },
onSubmit(_this) { onSubmit(_this) {
if (_this == null) if (_this == null)
@ -970,6 +972,8 @@ export default {
} }
_this.filterQuery.page = 1; _this.filterQuery.page = 1;
_this.getList(); _this.getList();
_this.codeDetailList = []
_this.resultDetailList = []
}, },
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;

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

@ -471,6 +471,7 @@ export default {
}; };
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
this.panelALive = false
}, },
downloadPrescription() { downloadPrescription() {
this.downloadPrescriptionVisible = true this.downloadPrescriptionVisible = true
@ -493,6 +494,7 @@ export default {
_this = this _this = this
_this.filterQuery.page = 1; _this.filterQuery.page = 1;
_this.getList(); _this.getList();
_this.panelALive = false
}, },
getList() { getList() {

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

@ -468,12 +468,14 @@ export default {
} }
this.actDateRange = [] this.actDateRange = []
this.getList() this.getList()
this.panelALive = false
}, },
onSubmit(_this) { onSubmit(_this) {
if (_this == null) if (_this == null)
_this = this _this = this
_this.filterQuery.page = 1 _this.filterQuery.page = 1
_this.getList() _this.getList()
_this.panelALive =false
}, },
getList() { getList() {

39
src/views/collect/PanelOrderUpload.vue
Unescape Escape View File

@ -340,6 +340,38 @@ export default {
fromList1: [], fromList1: [],
convertDateFun: convertDate, convertDateFun: convertDate,
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: [],
//界面配置-------------end //界面配置-------------end
showSearch: false, showSearch: false,
@ -460,6 +492,13 @@ export default {
getList() { getList() {
this.loading = true this.loading = true
if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0];
this.filterQuery.endTime = this.actDateRange[1];
} else {
this.filterQuery.startTime = null;
this.filterQuery.endTime = null;
}
orderFinish(this.filterQuery).then(res => { orderFinish(this.filterQuery).then(res => {
this.loading = false this.loading = false
this.list = res.data.list || [] this.list = res.data.list || []

22
src/views/collect/bindWorkDialog.vue
Unescape Escape View File

@ -3,11 +3,11 @@
<el-card style="margin-top: -20px"> <el-card style="margin-top: -20px">
<el-form :model="query" label-width="auto" v-show="showSearch" size="mini"> <el-form :model="query" label-width="auto" v-show="showSearch" size="mini">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <!--<el-col :span="8">-->
<el-form-item label="当前仓库:" class="query-form-item"> <!-- <el-form-item label="当前仓库:" class="query-form-item">-->
<invSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/> <!-- <invSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!--</el-col>-->
<el-col :span="8"> <el-col :span="8">
<el-form-item label="编码/名称:" class="query-form-item"> <el-form-item label="编码/名称:" class="query-form-item">
<el-input v-model="query.key" placeholder="请输入编码/工位名称" clearable> <el-input v-model="query.key" placeholder="请输入编码/工位名称" clearable>
@ -40,6 +40,13 @@
<!--<el-table-column label="所属仓库" prop="invName"></el-table-column>--> <!--<el-table-column label="所属仓库" prop="invName"></el-table-column>-->
<el-table-column label="备注" prop="remake"></el-table-column> <el-table-column label="备注" prop="remake"></el-table-column>
</el-table> </el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="query.limit"
:page.sync="query.page"
@pagination="getList"
></pagination>
</el-card> </el-card>
</div> </div>
@ -73,7 +80,8 @@ export default {
query: { query: {
invCode: null,//this.$store.getters.locInvCode invCode: null,//this.$store.getters.locInvCode
page: 1, page: 1,
limit: 20 limit: 10,
workPlaceClass:1
}, },
showSearch: true, showSearch: true,
loading: false, loading: false,
@ -90,6 +98,7 @@ export default {
filterBadInv: true, filterBadInv: true,
radioCheck: null, radioCheck: null,
currentRow: {}, currentRow: {},
total:0
} }
}, },
methods: { methods: {
@ -116,6 +125,7 @@ export default {
return this.$message.error('错误错误') return this.$message.error('错误错误')
} }
this.list = res.data.list || [] this.list = res.data.list || []
this.total = res.data.total || 0
}) })
}, },
addWorkplace() { addWorkplace() {

71
src/views/collect/fieldOperation.vue
Unescape Escape View File

@ -1,51 +1,52 @@
<template> <template>
<div> <div>
<div style=" display: flex;justify-content: center;"> <!--<div style=" display: flex;justify-content: center;">-->
<h2 style="color: #0aa6e0">欢迎使用现场作业工作台</h2> <!-- <h2 style="color: #0aa6e0">欢迎使用现场作业工作台</h2>-->
</div> <!--</div>-->
<el-divider/> <!--<el-divider/>-->
<!-- 分割线 --> <!-- 分割线 -->
<el-form :model="query" class="query-form" size="mini" label-width="100px" :inline="true"> <!--<el-form :model="query" class="query-form" size="mini" label-width="100px" :inline="true">-->
<el-form-item prop="key" label="工位信息:"> <!--<el-form-item prop="key" label="工位信息:">-->
<el-input v-model="query.workKey" clearable placeholder="请输入或扫描工位二维码" style="width: 400px" ref="inputField" ></el-input> <!-- <el-input v-model="query.workKey" clearable placeholder="请输入或扫描工位二维码" style="width: 400px" ref="inputField" ></el-input>-->
</el-form-item> <!--</el-form-item>-->
<!--<el-form-item>-->
<!-- <el-button-group style="margin-left: 10px;display:flex;">-->
<!-- <el-button type="primary" icon="el-icon-search" @click.native.stop="getStationList()">搜索</el-button>-->
<!-- </el-button-group>-->
<!--</el-form-item>-->
<el-form-item> <!--</el-form>-->
<el-button-group style="margin-left: 10px;display:flex;">
<el-button type="primary" icon="el-icon-search" @click.native.stop="getStationList()">搜索</el-button>
</el-button-group>
</el-form-item>
</el-form>
<el-row :gutter="8">
<el-col v-for="(info, index) in stationList" :key="index" :xs="12" :sm="8" :md="8" :lg="6" >
<el-card :body-style="{margin:'20px'}"
style="margin:20px 20px 20px 20px;height: 200px;background-color: #e1f3fb;border-radius: 12px; position: relative;"
>
<el-row :gutter="8"> <div style="display: flex; justify-content: space-between; align-items: center; height: 66px; /* 约为 200px 的 1/3 */" >
<el-col v-for="(info, index) in stationList" :key="index" :xs="12" :sm="8" :md="8" :lg="6" > <p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.workplaceName }}</p> <!-- 假设你的信息对象中包含一个title属性 -->
<el-card :body-style="{margin:'20px'}" <!-- <div style="width: 60px; height: 60px; display: flex; justify-content: center; align-items: center;">-->
style="margin:20px 20px 20px 20px;height: 200px;background-color: #e1f3fb;border-radius: 12px; position: relative;" <!-- &lt;!&ndash; 二维码占位，这里用灰色方块代替 &ndash;&gt;-->
> <!--&lt;!&ndash; <span>QR</span>&ndash;&gt;-->
<!-- <div ref="qrcode" :id="'qrcode-'+index" style="width: 60px;height: 60px;"></div>-->
<div style="display: flex; justify-content: space-between; align-items: center; height: 66px; /* 约为 200px 的 1/3 */" > <!-- </div>-->
<p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.workplaceName }}</p> <!-- 假设你的信息对象中包含一个title属性 --> </div>
<!-- <div style="width: 60px; height: 60px; display: flex; justify-content: center; align-items: center;">--> <div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;" >
<!-- &lt;!&ndash; 二维码占位，这里用灰色方块代替 &ndash;&gt;--> <!-- 假设这里有一些信息内容 -->
<!--&lt;!&ndash; <span>QR</span>&ndash;&gt;--> <p style="font-size: 14px;background-color: #e1f3fb" >{{ info.remake }}</p>
<!-- <div ref="qrcode" :id="'qrcode-'+index" style="width: 60px;height: 60px;"></div>--> <el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb" @click="handleClick(index)">开始作业</el-button>
<!-- </div>--> </div>
</div>
<div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;" >
<!-- 假设这里有一些信息内容 -->
<p style="font-size: 14px;background-color: #e1f3fb" >{{ info.remake }}</p>
<el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb" @click="handleClick(index)">开始作业</el-button>
</div>
</el-card>
</el-col>
</el-row>
</el-card>
</el-col>
</el-row>
</div> </div>

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

@ -631,6 +631,8 @@ export default {
}, },
getList() { getList() {
this.panelALive = false
this.loading = true; this.loading = true;
if (this.actDateRange !== null) { if (this.actDateRange !== null) {
@ -647,7 +649,7 @@ export default {
this.filterQuery.tagStatus = 1 this.filterQuery.tagStatus = 1
let query = JSON.parse(JSON.stringify(this.filterQuery)); let query = JSON.parse(JSON.stringify(this.filterQuery));
query.workPlaceCode = null // query.workPlaceCode = null
orderPage(query).then(res => { orderPage(query).then(res => {
this.loading = false this.loading = false
this.list = res.data.list || [] this.list = res.data.list || []
@ -660,6 +662,7 @@ export default {
}, },
getDraftList() { getDraftList() {
this.loading = true; this.loading = true;
this.panelALive = false
this.filterQuery.busType = this.busType this.filterQuery.busType = this.busType
this.filterQuery.excludeWorkCode = null this.filterQuery.excludeWorkCode = null
// this.filterQuery.fromCorp = this.fromCorp // this.filterQuery.fromCorp = this.fromCorp
@ -675,6 +678,7 @@ export default {
}) })
}, },
getOtherList() { getOtherList() {
this.panelALive = false
this.loading = true; this.loading = true;
this.filterQuery.busType = this.busType this.filterQuery.busType = this.busType
// this.filterQuery.fromCorp = this.fromCorp // this.filterQuery.fromCorp = this.fromCorp

Write Preview
Loading…
Cancel
Save