Skip to content

Z
zhongtong-avi-web
Commit 41310379 authored by 李志鸣's avatar 李志鸣
Browse files
Options

fea(报工点查询): 功能联调(80%)

parent 7a6c0f56
Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 22 deletions
src/assets/icons/svg/dutyStationSearch.svg 0 → 100644
View file @ 41310379
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1583891891451" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3460" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M732.397131 248.979608c0 12.216229-9.901511 22.118763-22.116717 22.118763l-398.62586 0c-12.216229 0-22.116717-9.903557-22.116717-22.118763l0 0c0-12.214183 9.901511-22.11467 22.116717-22.11467l398.62586 0C722.49562 226.863914 732.397131 236.765425 732.397131 248.979608L732.397131 248.979608z" p-id="3461"></path><path d="M732.397131 492.75161c0 12.216229-9.901511 22.118763-22.116717 22.118763l-398.62586 0c-12.216229 0-22.116717-9.903557-22.116717-22.118763l0 0c0-12.214183 9.901511-22.11467 22.116717-22.11467l398.62586 0C722.49562 470.63694 732.397131 480.538451 732.397131 492.75161L732.397131 492.75161z" p-id="3462"></path><path d="M522.023796 721.126948c0 12.216229-9.901511 22.118763-22.11467 22.118763l-188.254571 0c-12.216229 0-22.116717-9.903557-22.116717-22.118763l0 0c0-12.214183 9.901511-22.11467 22.116717-22.11467l188.254571 0C512.122285 699.012278 522.023796 708.913788 522.023796 721.126948L522.023796 721.126948z" p-id="3463"></path><path d="M836.266803 0.455371l-648.536676 0c-71.937402 0-130.463354 58.525951-130.463354 130.463354l0 762.109338c0 71.939449 58.525951 130.4654 130.463354 130.4654l355.275539 0c0.473791 0.029676 0.951675 0.050142 1.430582 0.050142 12.447497 0 22.538319-10.090822 22.538319-22.538319 0-12.007475-9.393951-21.818935-21.231557-22.496363-0.00614-0.014326-0.01228-0.027629-0.01842-0.039909l-357.995487 0c-47.109947 0-85.437881-38.327934-85.437881-85.439928l0-762.109338c0-47.109947 38.327934-85.437881 85.437881-85.437881l648.536676 0c47.111994 0 85.439928 38.327934 85.439928 85.437881l0 467.611024c-0.029676 0.471744-0.050142 0.947582-0.050142 1.425466 0 12.447497 10.090822 22.538319 22.538319 22.538319 12.44545 0 22.536272-10.090822 22.536272-22.538319l0-469.036489C966.732204 58.982346 908.206252 0.455371 836.266803 0.455371z" p-id="3464"></path><path d="M964.788945 987.043297l-83.433224-83.429131c6.541997-9.18622 11.983939-19.088754 16.244986-29.594015 7.091512-17.488303 10.688433-35.964096 10.688433-54.914704s-3.597945-37.428448-10.688433-54.914704c-7.347339-18.113543-18.134009-34.360576-32.060183-48.288796-13.928221-13.926174-30.175253-24.714891-48.288796-32.060183-17.49035-7.091512-35.964096-10.686387-54.914704-10.686387-18.949584 0-37.426401 3.595898-54.912657 10.686387-18.113543 7.345292-34.360576 18.134009-48.290843 32.060183-13.926174 13.928221-24.712845 30.175253-32.058137 48.288796-7.091512 17.486256-10.688433 35.964096-10.688433 54.914704s3.597945 37.426401 10.688433 54.914704c7.345292 18.11559 18.131963 34.360576 32.060183 48.288796 13.928221 13.926174 30.173207 24.712845 48.288796 32.060183 17.488303 7.091512 35.96512 10.686387 54.914704 10.686387 18.947538 0 37.422308-3.595898 54.912657-10.686387 10.262738-4.160763 19.954471-9.451256 28.960589-15.791661l83.523275 83.521229C929.735591 1022.098697 975.868281 1030.513344 964.788945 987.043297zM844.671217 901.43657c-21.992897 21.992897-51.230802 34.104749-82.334193 34.104749-31.103392-0.002047-60.343343-12.111852-82.332147-34.104749-21.99085-21.99085-34.104749-51.230802-34.104749-82.332147s12.111852-60.33925 34.104749-82.332147c21.99085-21.992897 51.230802-34.104749 82.332147-34.104749 31.103392 0 60.341297 12.111852 82.334193 34.104749 21.99085 21.99085 34.102702 51.230802 34.102702 82.332147S866.662067 879.44572 844.671217 901.43657z" p-id="3465"></path></svg>
\ No newline at end of file
src/router/modules/dutyStation.js
View file @ 41310379
......@@ -5,13 +5,13 @@ export default {
path: '/dutyStation',
component: () => import('@/views/Layout'),
redirect: '/dutyStation/index',
meta: { title: 'Laboratory', icon: 'deal' },
meta: { title: 'Laboratory', icon: 'dutyStationSearch' },
children: [
{
path: 'index',
component: () => import('@/views/DutyStation/list'),
name: 'DutyStationIndex',
meta: { title: 'DutyStationIndex', icon: 'template', noCache: false }
meta: { title: 'DutyStationIndex', icon: 'dutyStationSearch', noCache: false }
}
]
}
src/views/DutyStation/components/AutoMakeUpDialog.vue 0 → 100644
View file @ 41310379
<template>
<el-dialog
title="开启自动补扫"
:show-close="false"
:close-on-press-escape="false"
:close-on-click-modal="false"
:visible.sync="dialogToggle"
width="400px">
<el-form
label-width="100px"
label-position="top"
ref="form"
:model="formData">
<el-row :gutter="30">
<el-col :span="24">
<el-form-item
label="时长(分钟)"
required>
<el-row :gutter="10">
<el-col :span="11">
<el-input-number
v-model="formData.beginTimeInt"
:min="0"
:max="999999999"
style="width: 100%;">
</el-input-number>
</el-col>
<el-col :span="2">至</el-col>
<el-col :span="11">
<el-input-number
v-model="formData.endTimeInt"
:min="0"
:max="999999999"
style="width: 100%;">
</el-input-number>
</el-col>
</el-row>
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button :loading="loadingToggle" size="small" type="primary" icon="el-icon-check" @click="doConfirmClick">确认</el-button>
<el-button size="small" icon="el-icon-close" @click="doCancelClick">取消</el-button>
</span>
</el-dialog>
</template>
<script>
export default {
name: 'AutoMakeUpDialog',
data () {
return {
// 数据提交开关
loadingToggle: false,
// 弹窗开关
dialogToggle: false,
// 表单数据
formData: {
beginTimeInt: '',
endTimeInt: ''
},
// 表单校验规则
formRules: {}
}
},
methods: {
// 点击确认按钮
async doConfirmClick () {
let durationJudge = await this.durationJudge();
if (durationJudge) {
// 自动补扫开启
this.startAutoMakeUp();
}
},
// 自动补扫开启
async startAutoMakeUp () {
this.loadingToggle = true;
let params = { ...this.formData };
let response = await this.$service('GET', '/pass/startReplenishScan', params);
if (Array.isArray(response)) {
this.$message.success('开启成功');
this.loadingToggle = false;
this.dialogToggle = false;
this.$emit('doAutoMakeUpDialogConfirmClick');
for (let key in this.formData) {
this.formData[key] = '';
}
}
},
// 时长判断
durationJudge () {
return new Promise((resolve, reject) => {
if (this.formData.beginTimeInt === this.formData.endTimeInt) {
this.$message.warning('开始时长和结束时长不能相同');
resolve(false);
}
if (this.formData.beginTimeInt > this.formData.endTimeInt) {
this.$message.warning('开始时长不能大于结束时长');
resolve(false);
}
resolve(true);
})
},
// 点击取消按钮
doCancelClick () {
this.dialogToggle = false;
for (let key in this.formData) {
this.formData[key] = '';
}
}
}
}
</script>
<style lang="scss" scoped>
</style>
\ No newline at end of file
src/views/DutyStation/components/DutyStationMakeUpDialog.vue
View file @ 41310379
......@@ -71,10 +71,10 @@
<el-col :span="24">
<el-form-item
label="过站时间"
prop="createTime"
prop="passTime"
required>
<el-date-picker
v-model="formData.createTime"
v-model="formData.passTime"
size="small"
type="datetime"
style="width: 100%;"
......@@ -131,7 +131,7 @@
vin: '',
stationName: '',
stationNo: '',
createTime: ''
passTime: ''
},
// 表单校验规则
formRules: {
......@@ -140,7 +140,7 @@
{
validator: (rule, value, callback) => {
if (_.trim(value) === '') {
callback(new Error('请输入工单号'))
callback(new Error('工单号应自动带出'))
}
callback()
},
......@@ -152,7 +152,7 @@
{
validator: (rule, value, callback) => {
if (_.trim(value) === '') {
callback(new Error('请输入报工点'))
callback(new Error('报工点应自动带出'))
}
callback()
},
......@@ -172,7 +172,7 @@
}
],
// 过站时间
createTime: [
passTime: [
{
validator: (rule, value, callback) => {
if (_.trim(value) === '') {
......@@ -209,7 +209,9 @@
async saveDutyStationInfo (formName) {
try {
this.loadingToggle = true;
let params = { ...this.formData };
// 获取当前登录人名称
let loginUserName = window.sessionStorage.getItem('Admin-Name');
let params = { ...this.formData, createBy: loginUserName };
let response = await this.$service('POST', '/pass/savePassInfo', params);
if (Array.isArray(response)) {
this.loadingToggle = false;
......
src/views/DutyStation/list.vue
View file @ 41310379
......@@ -19,16 +19,13 @@
</Search>
<div class="float-left">
<el-button
type="primary"
size="small">
报工点补扫
</el-button>
<el-button
@click="doOpenAutoMakeUpClick"
type="primary"
size="small">
开启自动补扫
</el-button>
<el-button
@click="doStopAutoMakeUpClick"
type="primary"
size="small">
关闭自动补扫
......@@ -41,14 +38,14 @@
:tableConfig="tableConfig"
@onPageSizeChange="onPageSizeChange"
@onCurrentPageChange="onCurrentPageChange">
<template slot="createTime">
<template slot="passTime">
<el-table-column
label="过站时间"
prop="createTime"
prop="passTime"
show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.createTime === '' || scope.row.createTime === null || scope.row.createTime === undefined">暂无</span>
<span v-else>{{ formatTime(scope.row.createTime, 'YYYY-MM-DD HH:mm:ss') }}</span>
<span v-if="scope.row.passTime === '' || scope.row.passTime === null || scope.row.passTime === undefined">暂无</span>
<span v-else>{{ formatTime(scope.row.passTime, 'YYYY-MM-DD HH:mm:ss') }}</span>
</template>
</el-table-column>
</template>
......@@ -77,6 +74,12 @@
:stationName="stationName"
@doDutyStationMakeUpConfirmClick="doDutyStationMakeUpConfirmClick">
</DutyStationMakeUpDialog>
<!-- 自动补扫开启弹窗 -->
<AutoMakeUpDialog
ref="AutoMakeUpDialog"
@doAutoMakeUpDialogConfirmClick="doAutoMakeUpDialogConfirmClick">
</AutoMakeUpDialog>
</div>
</template>
......@@ -86,13 +89,15 @@
import Search from '@/components/Search';
import DutyStationMakeUpDialog from './components/DutyStationMakeUpDialog';
import AutoMakeUpDialog from './components/AutoMakeUpDialog';
export default {
name: 'DutyStationIndex',
components: {
Search,
Table,
DutyStationMakeUpDialog
DutyStationMakeUpDialog,
AutoMakeUpDialog
},
data () {
return {
......@@ -106,7 +111,7 @@
{ label: '工单号', value: 'vin' },
{ label: '报工点', value: 'stationName' },
{ label: '工位编码', value: 'stationNo' },
{ label: '过站时间', value: 'createTime', slot: 'createTime' },
{ label: '过站时间', value: 'passTime', slot: 'passTime' },
{ label: '操作人', value: 'createBy' }
],
paginationToggle: true,
......@@ -134,9 +139,20 @@
// 点击刷新按钮
doRefreshClick () {},
// 点击搜索按钮
doSearchClick () {},
doSearchClick (searchValue) {
this.searchList = searchValue;
this.tableConfig.paginationConfig.currentPage = 1;
// 获取报工点记录
this.getDutyStationResult();
},
// 点击重置按钮
doResetClick () {},
doResetClick (searchValue) {
this.searchList = { ...searchValue, filters: [] };
this.tableConfig.paginationConfig.currentPage = 1;
this.tableConfig.paginationConfig.pageSize = 20;
// 获取报工点记录
this.getDutyStationResult();
},
// 触发表格分页数量改变事件
onPageSizeChange (pageSize) {
this.tableConfig.paginationConfig.currentPage = 1;
......@@ -176,6 +192,24 @@
doDutyStationMakeUpConfirmClick () {
// 获取报工点记录
this.getDutyStationResult();
},
// 点击开启自动补扫弹窗确认按钮
doAutoMakeUpDialogConfirmClick () {
// 获取报工点记录
this.getDutyStationResult();
},
// 点击开启自动补扫
doOpenAutoMakeUpClick () {
this.$refs.AutoMakeUpDialog.dialogToggle = true;
},
// 点击关闭自动补扫
async doStopAutoMakeUpClick () {
let response = await this.$service('GET', '/pass/stopReplenishScan');
if (Array.isArray(response)) {
this.$message.success('关闭成功');
// 获取报工点记录
this.getDutyStationResult();
}
}
},
mounted () {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment