From f90fbbc76d23340e4568dd4dadbab5f7f02a030f Mon Sep 17 00:00:00 2001
From: pengwei <2071057782@qq.com>
Date: 星期一, 24 三月 2025 14:49:24 +0800
Subject: [PATCH] 3.24功能新增
---
项目代码/client/src/views/tts/TheCurrentJob/Thecurrentjob.vue | 1110 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 640 insertions(+), 470 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/TheCurrentJob/Thecurrentjob.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/TheCurrentJob/Thecurrentjob.vue"
index 2b9cf43..8118f15 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/TheCurrentJob/Thecurrentjob.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/TheCurrentJob/Thecurrentjob.vue"
@@ -3,20 +3,23 @@
<div class="content">
<div class="checkbox">
<div
- :class="['item', isactive == 1 ? 'isactive' : '']"
- @click="changeactive(1)"
+ v-if="show == '瓒呯骇' || show == '鏈烘'"
+ :class="['item', isactive == '鏈烘' ? 'isactive' : '']"
+ @click="changeactive('鏈烘')"
>
鏈烘
</div>
<div
- :class="['item', isactive == 2 ? 'isactive' : '']"
- @click="changeactive(2)"
+ v-if="show == '瓒呯骇' || show == '鐢垫皵'"
+ :class="['item', isactive == '鐢垫皵' ? 'isactive' : '']"
+ @click="changeactive('鐢垫皵')"
>
鐢垫皵
</div>
<div
- :class="['item', isactive == 3 ? 'isactive' : '']"
- @click="changeactive(3)"
+ v-if="show == '瓒呯骇' || show == '鍦版矡'"
+ :class="['item', isactive == '鍦版矡' ? 'isactive' : '']"
+ @click="changeactive('鍦版矡')"
>
鍦版矡
</div>
@@ -24,13 +27,14 @@
<div class="serch">
<div class="time_box">
<el-select
- v-model="value"
+ v-model="queryForm.selectName"
+ :empty-values="[null, undefined]"
placeholder="璇烽�夋嫨"
size="small"
- style="width: 6.19rem; height: 2rem; margin-right: 0.98rem"
+ style="width: 8.19rem; height: 2rem; margin-right: 0.98rem"
>
<el-option
- v-for="item in options"
+ v-for="item in stateType"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -59,26 +63,44 @@
/>
</div>
<div class="serch_box">
- <div class="serchb">鍏ㄥ眬鎼滅储</div>
+ <div class="serchb">
+ <el-select
+ v-model="queryForm.selectType"
+ placeholder="璇烽�夋嫨"
+ size="small"
+ style="width: 100%; height: 100%; font-size: 0.15rem"
+ >
+ <el-option
+ v-for="item in selectoptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </div>
<input
- v-model="queryForm.selectName"
+ v-model="queryForm.inputcontent"
placeholder="璇疯緭鍏ュ叧閿瘝鎼滅储"
style="border-left: 0.06rem solid #e2e2e2"
/>
</div>
<el-button
+ @click="handleQuery"
type="primary"
size="small"
style="margin-left: 0.98rem; height: 2rem"
>鏌ヨ</el-button
>
- <el-button size="small" style="height: 2rem">閲嶇疆</el-button>
+ <el-button size="small" style="height: 2rem" @click="resetQuery"
+ >閲嶇疆</el-button
+ >
</div>
<div class="btns">
<div style="display: flex; align-items: center">
<el-button
size="small"
style="width: 5.5rem; height: 2rem; font-size: 0.88rem"
+ @click="printExcel"
>鎵归噺瀵煎嚭</el-button
>
<!-- <el-button
@@ -92,7 +114,9 @@
<div style="margin-top: 1rem; height: 100%">
<!-- 鏈烘 -->
<el-table
- v-if="isactive == 1"
+ empty-text="鏆傛棤鏁版嵁"
+ v-if="isactive == '鏈烘'"
+ height="450"
:data="tableData"
style="width: 100%"
:header-cell-style="{
@@ -109,56 +133,138 @@
}"
>
<el-table-column type="selection" align="center" />
- <el-table-column prop="address" label="浠诲姟鍚嶇О" align="center" />
- <el-table-column prop="name" label="鎶�鏈憳" align="center" />
- <el-table-column prop="address" label="妫�淇伐闀�" align="center" />
- <el-table-column prop="address" label="鏈烘璐ㄦ鍛�" align="center" />
- <el-table-column prop="address" label="鏈烘鐭╀綔涓氬憳" align="center" />
- <el-table-column prop="address" label="鏈烘杈呭姪鍛�" align="center" />
- <el-table-column prop="address" label="浠诲姟璇︽儏" align="center">
- <template #default="">
- <el-popover placement="right" :width="600" trigger="click">
+ <el-table-column prop="takename" label="浠诲姟鍚嶇О" align="center" />
+ <el-table-column prop="jishuyuan" label="鎶�鏈憳" align="center" />
+ <el-table-column prop="gonzhang" label="妫�淇伐闀�" align="center" />
+ <el-table-column
+ prop="zhijianyuan"
+ label="鏈烘璐ㄦ鍛�"
+ align="center"
+ />
+ <el-table-column
+ prop="lijuzouyeyuan"
+ label="鏈烘鐭╀綔涓氬憳"
+ align="center"
+ />
+ <el-table-column prop="fuzyuan" label="鏈烘杈呭姪鍛�" align="center" />
+ <el-table-column label="浠诲姟璇︽儏" align="center">
+ <template #default="scope">
+ <el-popover
+ placement="right"
+ :width="600"
+ trigger="click"
+ @show="showdata(scope.row)"
+ >
<template #reference>
<span style="color: blue; font-size: 0.88rem; cursor: pointer"
>鏌ョ湅</span
>
</template>
<el-table :data="gridData" width="100%">
- <el-table-column property="date" label="杞﹀瀷" />
- <el-table-column property="name" label="杞︾粍" />
- <el-table-column property="address" label="鑲￠亾" />
- <el-table-column property="address" label="杞﹀帰鍙蜂綅缃�" />
- <el-table-column property="address" label="杞悜鏋朵綅缃�" />
- <el-table-column property="address" label="妫�淇彮缁�" />
+ <el-table-column property="trainKind" label="杞﹀瀷" />
+ <el-table-column property="coachNum" label="杞︾粍" />
+ <el-table-column property="track" label="鑲￠亾" />
+ <el-table-column property="trainNum" label="杞﹀帰鍙蜂綅缃�" />
+ <el-table-column property="bogie" label="杞悜鏋朵綅缃�" />
+ <el-table-column property="processDept" label="妫�淇彮缁�" />
</el-table>
</el-popover>
</template>
</el-table-column>
- <el-table-column prop="address" label="浣滀笟鐘舵��" align="center" />
- <el-table-column prop="address" label="娲惧伐浜�" align="center" />
- <el-table-column prop="address" label="娲惧伐鏃ユ湡" align="center" />
- <el-table-column prop="address" label="瀹屾垚鏃ユ湡" align="center" />
- <el-table-column prop="address" label="鎿嶄綔" align="center">
- <template #default="">
- <el-button size="small" type="text" @click="claim"
+ <el-table-column prop="pustatus" label="浣滀笟鐘舵��" align="center">
+ <template #default="scope">
+ <span
+ style="color: #ffb200"
+ v-if="
+ scope.row.pustatus != 1 &&
+ scope.row.pustatus != 2 &&
+ scope.row.pustatus != 3 &&
+ scope.row.pustatus != 4
+ "
+ >寰呴绛�</span
+ >
+ <span style="color: #31cf15" v-if="scope.row.pustatus == 1"
+ >寰呬綔涓�</span
+ >
+ <span style="color: #e88715" v-if="scope.row.pustatus == 2"
+ >寰呭綊绛�</span
+ >
+ <span style="color: #ff0000" v-if="scope.row.pustatus == 3"
+ >寰呰川妫�</span
+ >
+ <span style="color: #cad2da" v-if="scope.row.pustatus == 4"
+ >宸插畬鎴�</span
+ >
+ </template>
+ </el-table-column>
+ <el-table-column prop="pupeople" label="娲惧伐浜�" align="center"
+ ><template #default=""> {{ userInfo }}</template></el-table-column
+ >
+ <el-table-column
+ prop="dispatchtime"
+ label="娲惧伐鏃ユ湡"
+ align="center"
+ />
+ <el-table-column prop="finishedtime" label="瀹屾垚鏃ユ湡" align="center">
+ <template #default="scope">
+ {{
+ scope.row.finishedtime != "1900-01-01 00:00:00"
+ ? scope.row.finishedtime
+ : ""
+ }}
+ </template></el-table-column
+ >
+ <el-table-column label="鎿嶄綔" align="center">
+ <template #default="scope">
+ <el-button
+ v-if="
+ scope.row.pustatus != 1 &&
+ scope.row.pustatus != 2 &&
+ scope.row.pustatus != 3 &&
+ scope.row.pustatus != 4
+ "
+ size="small"
+ type="text"
+ @click="claim(scope.row, 1)"
>纭棰嗗彇</el-button
>
- <!-- <el-button size="small" type="text" @click="Edit"
+ <el-button
+ v-if="scope.row.pustatus == 1"
+ size="small"
+ type="text"
+ @click="toDetail(scope.row, isactive)"
>寮�濮嬩綔涓�</el-button
>
- <el-button size="small" type="text" @click="Edit"
+ <el-button
+ v-if="scope.row.pustatus == 2"
+ size="small"
+ type="text"
+ @click="claim(scope.row, 3)"
>纭褰掕繕</el-button
>
- <el-button size="small" type="text" @click="Edit"
+ <el-button
+ v-if="scope.row.pustatus == 3"
+ size="small"
+ type="text"
+ @click="claim(scope.row, 4)"
>瀹屾垚璐ㄦ</el-button
- > -->
+ >
+ <el-button
+ :disabled="true"
+ v-if="scope.row.pustatus == 4"
+ size="small"
+ type="text"
+ >宸插畬鎴�</el-button
+ >
</template>
</el-table-column>
</el-table>
<!-- 鐢垫皵 -->
<el-table
- v-if="isactive == 2"
+ empty-text="鏆傛棤鏁版嵁"
+ height="450"
+ v-if="isactive == '鐢垫皵'"
:data="tableData"
style="width: 100%"
:header-cell-style="{
@@ -175,56 +281,138 @@
}"
>
<el-table-column type="selection" align="center" />
- <el-table-column prop="address" label="浠诲姟鍚嶇О" align="center" />
- <el-table-column prop="name" label="鎶�鏈憳" align="center" />
- <el-table-column prop="address" label="妫�淇伐闀�" align="center" />
- <el-table-column prop="address" label="鐢垫皵璐ㄦ鍛�" align="center" />
- <el-table-column prop="address" label="鐢垫皵鐭╀綔涓氬憳" align="center" />
- <el-table-column prop="address" label="鐢垫皵杈呭姪鍛�" align="center" />
- <el-table-column prop="address" label="浠诲姟璇︽儏" align="center">
- <template #default="">
- <el-popover placement="right" :width="600" trigger="click">
+ <el-table-column prop="takename" label="浠诲姟鍚嶇О" align="center" />
+ <el-table-column prop="jishuyuan" label="鎶�鏈憳" align="center" />
+ <el-table-column prop="gonzhang" label="妫�淇伐闀�" align="center" />
+ <el-table-column
+ prop="zhijianyuan"
+ label="鐢垫皵璐ㄦ鍛�"
+ align="center"
+ />
+ <el-table-column
+ prop="lijuzouyeyuan"
+ label="鐢垫皵鐭╀綔涓氬憳"
+ align="center"
+ />
+ <el-table-column prop="fuzyuan" label="鐢垫皵杈呭姪鍛�" align="center" />
+ <el-table-column label="浠诲姟璇︽儏" align="center">
+ <template #default="scope">
+ <el-popover
+ placement="right"
+ :width="600"
+ trigger="click"
+ @show="showdata(scope.row)"
+ >
<template #reference>
<span style="color: blue; font-size: 0.88rem; cursor: pointer"
>鏌ョ湅</span
>
</template>
<el-table :data="gridData" width="100%">
- <el-table-column property="date" label="杞﹀瀷" />
- <el-table-column property="name" label="杞︾粍" />
- <el-table-column property="address" label="鑲￠亾" />
- <el-table-column property="address" label="杞﹀帰鍙蜂綅缃�" />
- <el-table-column property="address" label="杞悜鏋朵綅缃�" />
- <el-table-column property="address" label="妫�淇彮缁�" />
+ <el-table-column property="trainKind" label="杞﹀瀷" />
+ <el-table-column property="coachNum" label="杞︾粍" />
+ <el-table-column property="track" label="鑲￠亾" />
+ <el-table-column property="trainNum" label="杞﹀帰鍙蜂綅缃�" />
+ <el-table-column property="bogie" label="杞悜鏋朵綅缃�" />
+ <el-table-column property="processDept" label="妫�淇彮缁�" />
</el-table>
</el-popover>
</template>
</el-table-column>
- <el-table-column prop="address" label="浣滀笟鐘舵��" align="center" />
- <el-table-column prop="address" label="娲惧伐浜�" align="center" />
- <el-table-column prop="address" label="娲惧伐鏃ユ湡" align="center" />
- <el-table-column prop="address" label="瀹屾垚鏃ユ湡" align="center" />
- <el-table-column prop="address" label="鎿嶄綔" align="center">
- <template #default="">
- <el-button size="small" type="text" @click="Edit"
+ <el-table-column prop="pustatus" label="浣滀笟鐘舵��" align="center">
+ <template #default="scope">
+ <span
+ style="color: #ffb200"
+ v-if="
+ scope.row.pustatus != 1 &&
+ scope.row.pustatus != 2 &&
+ scope.row.pustatus != 3 &&
+ scope.row.pustatus != 4
+ "
+ >寰呴绛�</span
+ >
+ <span style="color: #31cf15" v-if="scope.row.pustatus == 1"
+ >寰呬綔涓�</span
+ >
+ <span style="color: #e88715" v-if="scope.row.pustatus == 2"
+ >寰呭綊绛�</span
+ >
+ <span style="color: #ff0000" v-if="scope.row.pustatus == 3"
+ >寰呰川妫�</span
+ >
+ <span style="color: #cad2da" v-if="scope.row.pustatus == 4"
+ >宸插畬鎴�</span
+ >
+ </template>
+ </el-table-column>
+ <el-table-column prop="pupeople" label="娲惧伐浜�" align="center">
+ <template #default=""> {{ userInfo }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="dispatchtime"
+ label="娲惧伐鏃ユ湡"
+ align="center"
+ />
+ <el-table-column prop="finishedtime" label="瀹屾垚鏃ユ湡" align="center">
+ <template #default="scope">
+ {{
+ scope.row.finishedtime != "1900-01-01 00:00:00"
+ ? scope.row.finishedtime
+ : ""
+ }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center">
+ <template #default="scope">
+ <el-button
+ v-if="
+ scope.row.pustatus != 1 &&
+ scope.row.pustatus != 2 &&
+ scope.row.pustatus != 3 &&
+ scope.row.pustatus != 4
+ "
+ size="small"
+ type="text"
+ @click="claim(scope.row, 1)"
>纭棰嗗彇</el-button
>
- <!-- <el-button size="small" type="text" @click="Edit"
+ <el-button
+ v-if="scope.row.pustatus == 1"
+ size="small"
+ type="text"
+ @click="toDetail(scope.row, isactive)"
>寮�濮嬩綔涓�</el-button
>
- <el-button size="small" type="text" @click="Edit"
+ <el-button
+ v-if="scope.row.pustatus == 2"
+ size="small"
+ type="text"
+ @click="claim(scope.row, 3)"
>纭褰掕繕</el-button
>
- <el-button size="small" type="text" @click="Edit"
+ <el-button
+ v-if="scope.row.pustatus == 3"
+ size="small"
+ type="text"
+ @click="claim(scope.row, 4)"
>瀹屾垚璐ㄦ</el-button
- > -->
+ >
+ <el-button
+ :disabled="true"
+ v-if="scope.row.pustatus == 4"
+ size="small"
+ type="text"
+ >宸插畬鎴�</el-button
+ >
</template>
</el-table-column>
</el-table>
<!-- 鍦版矡 -->
<el-table
- v-if="isactive == 3"
+ empty-text="鏆傛棤鏁版嵁"
+ height="450"
+ v-if="isactive == '鍦版矡'"
:data="tableData"
style="width: 100%"
:header-cell-style="{
@@ -241,49 +429,129 @@
}"
>
<el-table-column type="selection" align="center" />
- <el-table-column prop="address" label="浠诲姟鍚嶇О" align="center" />
- <el-table-column prop="name" label="鎶�鏈憳" align="center" />
- <el-table-column prop="address" label="妫�淇伐闀�" align="center" />
- <el-table-column prop="address" label="鍦版矡璐ㄦ鍛�" align="center" />
- <el-table-column prop="address" label="鍦版矡鐭╀綔涓氬憳" align="center" />
- <el-table-column prop="address" label="鍦版矡杈呭姪鍛�" align="center" />
- <el-table-column prop="address" label="浠诲姟璇︽儏" align="center">
- <template #default="">
- <el-popover placement="right" :width="600" trigger="click">
+ <el-table-column prop="takename" label="浠诲姟鍚嶇О" align="center" />
+ <el-table-column prop="jishuyuan" label="鎶�鏈憳" align="center" />
+ <el-table-column prop="gonzhang" label="妫�淇伐闀�" align="center" />
+ <el-table-column
+ prop="zhijianyuan"
+ label="鍦版矡璐ㄦ鍛�"
+ align="center"
+ />
+ <el-table-column
+ prop="lijuzouyeyuan"
+ label="鍦版矡鐭╀綔涓氬憳"
+ align="center"
+ />
+ <el-table-column prop="fuzyuan" label="鍦版矡杈呭姪鍛�" align="center" />
+ <el-table-column label="浠诲姟璇︽儏" align="center">
+ <template #default="scope">
+ <el-popover
+ placement="right"
+ :width="600"
+ trigger="click"
+ @show="showdata(scope.row)"
+ >
<template #reference>
<span style="color: blue; font-size: 0.88rem; cursor: pointer"
>鏌ョ湅</span
>
</template>
<el-table :data="gridData" width="100%">
- <el-table-column property="date" label="杞﹀瀷" />
- <el-table-column property="name" label="杞︾粍" />
- <el-table-column property="address" label="鑲￠亾" />
- <el-table-column property="address" label="杞﹀帰鍙蜂綅缃�" />
- <el-table-column property="address" label="杞悜鏋朵綅缃�" />
- <el-table-column property="address" label="妫�淇彮缁�" />
+ <el-table-column property="trainKind" label="杞﹀瀷" />
+ <el-table-column property="coachNum" label="杞︾粍" />
+ <el-table-column property="track" label="鑲￠亾" />
+ <el-table-column property="trainNum" label="杞﹀帰鍙蜂綅缃�" />
+ <el-table-column property="bogie" label="杞悜鏋朵綅缃�" />
+ <el-table-column property="processDept" label="妫�淇彮缁�" />
</el-table>
</el-popover>
</template>
</el-table-column>
- <el-table-column prop="address" label="浣滀笟鐘舵��" align="center" />
- <el-table-column prop="address" label="娲惧伐浜�" align="center" />
- <el-table-column prop="address" label="娲惧伐鏃ユ湡" align="center" />
- <el-table-column prop="address" label="瀹屾垚鏃ユ湡" align="center" />
- <el-table-column prop="address" label="鎿嶄綔" align="center">
- <template #default="">
- <el-button size="small" type="text" @click="Edit"
+ <el-table-column prop="pustatus" label="浣滀笟鐘舵��" align="center">
+ <template #default="scope">
+ <span
+ style="color: #ffb200"
+ v-if="
+ scope.row.pustatus != 1 &&
+ scope.row.pustatus != 2 &&
+ scope.row.pustatus != 3 &&
+ scope.row.pustatus != 4
+ "
+ >寰呴绛�</span
+ >
+ <span style="color: #31cf15" v-if="scope.row.pustatus == 1"
+ >寰呬綔涓�</span
+ >
+ <span style="color: #e88715" v-if="scope.row.pustatus == 2"
+ >寰呭綊绛�</span
+ >
+ <span style="color: #ff0000" v-if="scope.row.pustatus == 3"
+ >寰呰川妫�</span
+ >
+ <span style="color: #cad2da" v-if="scope.row.pustatus == 4"
+ >宸插畬鎴�</span
+ >
+ </template>
+ </el-table-column>
+ <el-table-column prop="pupeople" label="娲惧伐浜�" align="center">
+ <template #default=""> {{ userInfo }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="dispatchtime"
+ label="娲惧伐鏃ユ湡"
+ align="center"
+ />
+ <el-table-column prop="finishedtime" label="瀹屾垚鏃ユ湡" align="center">
+ <template #default="scope">
+ {{
+ scope.row.finishedtime != "1900-01-01 00:00:00"
+ ? scope.row.finishedtime
+ : ""
+ }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center">
+ <template #default="scope">
+ <el-button
+ v-if="
+ scope.row.pustatus != 1 &&
+ scope.row.pustatus != 2 &&
+ scope.row.pustatus != 3 &&
+ scope.row.pustatus != 4
+ "
+ size="small"
+ type="text"
+ @click="claim(scope.row, 1)"
>纭棰嗗彇</el-button
>
- <!-- <el-button size="small" type="text" @click="Edit"
+ <el-button
+ v-if="scope.row.pustatus == 1"
+ size="small"
+ type="text"
+ @click="toDetail(scope.row, isactive)"
>寮�濮嬩綔涓�</el-button
>
- <el-button size="small" type="text" @click="Edit"
+ <el-button
+ v-if="scope.row.pustatus == 2"
+ size="small"
+ type="text"
+ @click="claim(scope.row, 3)"
>纭褰掕繕</el-button
>
- <el-button size="small" type="text" @click="Edit"
+ <el-button
+ v-if="scope.row.pustatus == 3"
+ size="small"
+ type="text"
+ @click="claim(scope.row, 4)"
>瀹屾垚璐ㄦ</el-button
- > -->
+ >
+ <el-button
+ :disabled="true"
+ v-if="scope.row.pustatus == 4"
+ size="small"
+ type="text"
+ >宸插畬鎴�</el-button
+ >
</template>
</el-table-column>
</el-table>
@@ -301,341 +569,14 @@
size="small"
background
layout="prev, pager, next"
- :total="1"
+ :current-page="pageQuery.page"
+ :page-size="pageQuery.rows"
+ :total="pageTotal"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
/>
</div>
</div>
-
- <!-- 鏂板缓缂栬緫寮瑰嚭妗� -->
- <el-dialog
- v-model="dialogVisible"
- title=""
- width="60%"
- :before-close="handleClose"
- top="2%"
- >
- <template #title>
- <div
- style="
- height: 3.63rem;
- display: flex;
- border-bottom: 1px solid #e6e6e6;
- "
- >
- <span
- style="color: rgb(16, 16, 16); font-size: 1rem; font-weight: bold"
- >娲句换鍔�</span
- >
- </div>
- </template>
- <el-form :model="form" label-width="auto" label-position="top">
- <el-row :gutter="20">
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >浠诲姟鍚嶇О</span
- >
- </div>
- </template>
- <el-input size="small" v-model="form.name" placeholder="璇疯緭鍏�" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鎶�鏈憳</span
- >
- </div>
- </template>
- <el-input size="small" v-model="form.name" placeholder="璇疯緭鍏�" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >妫�淇伐闀�</span
- >
- </div>
- </template>
- <el-input size="small" v-model="form.name" placeholder="璇疯緭鍏�" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <span
- style="
- color: rgb(16, 16, 16);
- font-size: 1rem;
- font-weight: bold;
- margin-bottom: 1.25rem;
- "
- >璐ㄦ缁�</span
- >
- </el-row>
- <el-row :gutter="20">
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鐢垫皵璐ㄦ</span
- >
- </div>
- </template>
- <el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鏈烘璐ㄦ</span
- >
- </div>
- </template>
- <el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鍦版矡璐ㄦ</span
- >
- </div>
- </template>
- <el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <span
- style="
- color: rgb(16, 16, 16);
- font-size: 1rem;
- font-weight: bold;
- margin-bottom: 1.25rem;
- "
- >鐢垫皵缁�</span
- >
- </el-row>
- <el-row :gutter="20">
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鐢垫皵鍔涚煩浣滀笟鍛�</span
- >
- </div>
- </template>
- <el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鐢垫皵杈呭姪鍛�</span
- >
- </div>
- </template>
- <el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <span
- style="
- color: rgb(16, 16, 16);
- font-size: 1rem;
- font-weight: bold;
- margin-bottom: 1.25rem;
- "
- >鏈烘缁�</span
- >
- </el-row>
- <el-row :gutter="20">
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鏈烘鍔涚煩浣滀笟鍛�</span
- >
- </div>
- </template>
- <el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鏈烘杈呭姪鍛�</span
- >
- </div>
- </template>
- <el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <span
- style="
- color: rgb(16, 16, 16);
- font-size: 1rem;
- font-weight: bold;
- margin-bottom: 1.25rem;
- "
- >鍦版矡缁�</span
- >
- </el-row>
- <el-row :gutter="20">
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鍦版矡鍔涚煩浣滀笟鍛�</span
- >
- </div>
- </template>
- <el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鍦版矡杈呭姪鍛�</span
- >
- </div>
- </template>
- <el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <template #footer>
- <div class="dialog-footer" style="text-align: center">
- <el-button
- size="small"
- @click="dialogVisible = false"
- style="height: 2rem; font-size: 0.88rem"
- >鍙栨秷</el-button
- >
-
- <el-button
- size="small"
- type="primary"
- @click="dialogVisible = false"
- style="height: 2rem; font-size: 0.88rem"
- >
- 淇濆瓨
- </el-button>
- </div>
- </template>
- </el-dialog>
-
<!-- 纭棰嗗彇寮瑰嚭妗� -->
<el-dialog
v-model="claimdialogVisible"
@@ -653,22 +594,20 @@
>
<el-icon color="#FAAD14"><WarningFilled /></el-icon>
<span style="color: rgba(0, 0, 0, 1); font-size: 1.25rem"
- >鏄惁纭瀹屾垚濂楃瓛鏁伴噺[5]鐨勯鍙栵紵</span
+ >鏄惁纭瀹屾垚濂楃瓛鏁伴噺[{{ TTnum }}]鐨勯鍙栵紵</span
>
</div>
<template #footer>
<div class="dialog-footer" style="text-align: right">
<el-button @click="claimdialogVisible = false">鍙栨秷</el-button>
- <el-button type="primary" @click="claimdialogVisible = false">
- 纭
- </el-button>
+ <el-button type="primary" @click="changeStatus"> 纭 </el-button>
</div>
</template>
</el-dialog>
<!-- 纭褰掕繕寮瑰嚭妗� -->
<el-dialog
- v-model="claimdialogVisible"
+ v-model="claimdialogVisible1"
title="纭瀹屾垚"
width="400"
align-center
@@ -683,22 +622,20 @@
>
<el-icon color="#FAAD14"><WarningFilled /></el-icon>
<span style="color: rgba(0, 0, 0, 1); font-size: 1.25rem"
- >鏄惁纭瀹屾垚濂楃瓛鏁伴噺[5]鐨勫綊杩橈紵</span
+ >鏄惁纭瀹屾垚濂楃瓛鏁伴噺[{{ TTnum }}]鐨勫綊杩橈紵</span
>
</div>
<template #footer>
<div class="dialog-footer" style="text-align: right">
- <el-button @click="claimdialogVisible = false">鍙栨秷</el-button>
- <el-button type="primary" @click="claimdialogVisible = false">
- 纭
- </el-button>
+ <el-button @click="claimdialogVisible1 = false">鍙栨秷</el-button>
+ <el-button type="primary" @click="changeStatus"> 纭 </el-button>
</div>
</template>
</el-dialog>
<!-- 瀹屾垚璐ㄦ寮瑰嚭妗� -->
<el-dialog
- v-model="claimdialogVisible"
+ v-model="claimdialogVisible2"
title="纭瀹屾垚"
width="400"
align-center
@@ -718,16 +655,14 @@
</div>
<template #footer>
<div class="dialog-footer" style="text-align: right">
- <el-button @click="claimdialogVisible = false">鍙栨秷</el-button>
- <el-button type="primary" @click="claimdialogVisible = false">
- 纭
- </el-button>
+ <el-button @click="claimdialogVisible2 = false">鍙栨秷</el-button>
+ <el-button type="primary" @click="changeStatus"> 纭 </el-button>
</div>
</template>
</el-dialog>
<!-- 浜鸿劯璇嗗埆寮瑰嚭妗� -->
- <el-dialog v-model="claimdialogVisible" title="" width="400" align-center>
+ <el-dialog v-model="claimdialogVisible3" title="" width="400" align-center>
<div
style="
display: flex;
@@ -766,49 +701,286 @@
</div>
</template>
<script setup>
-import { ref, reactive } from "vue";
+import { ref, reactive, onMounted, toRef } from "vue";
import { ElMessage, ElMessageBox } from "element-plus";
import { useRouter } from "vue-router";
-const router = useRouter();
+import { formatTime } from "@/utils/index.js";
+import {
+ GetDetail,
+ ChangeStatus,
+ GetPageData,
+ ExportApi,
+ GetPageDataNew,
+} from "@/api/newapi/Thecurrentjob";
+import { GetSleeveandStep } from "@/api/newapi/Process";
+import { GetUserInfo } from "@/api/user";
-const queryForm = reactive({
+const router = useRouter();
+const obj = {
selectName: "",
selectTime: [], // 鏃堕棿鑼冨洿
-});
-
+ selectType: "",
+ inputcontent: "",
+};
+const queryForm = toRef({ ...obj });
+const selectoptions = ref([
+ {
+ value: "takename",
+ label: "浠诲姟鍚嶇О",
+ },
+ {
+ value: "jishuyuan",
+ label: "鎶�鏈憳",
+ },
+ {
+ value: "gonzhang",
+ label: "妫�淇伐闀�",
+ },
+ {
+ value: "zhijianyuan",
+ label: "璐ㄦ鍛�",
+ },
+ {
+ value: "lijuzouyeyuan",
+ label: "鍔涚煩浣滀笟鍛�",
+ },
+]);
const tableData = ref([]);
-
+const gridData = ref([]);
const options = ref([]);
const props = { multiple: true };
-
const table = ref(false);
const form = reactive({});
-const isactive = ref(1);
+const isactive = ref("鏈烘");
const claimdialogVisible = ref(false);
+const claimdialogVisible1 = ref(false);
+const claimdialogVisible2 = ref(false);
+const claimdialogVisible3 = ref(false);
+const stateType = ref([
+ {
+ label: "鍏ㄩ儴鐘舵��",
+ value: "",
+ },
+ {
+ label: "寰呴绛�",
+ value: "0",
+ },
+ {
+ label: "寰呬綔涓�",
+ value: "1",
+ },
+ {
+ label: "寰呭綊绛�",
+ value: "2",
+ },
+ {
+ label: "寰呰川妫�",
+ value: "3",
+ },
+ {
+ label: "宸插畬鎴�",
+ value: "4",
+ },
+]);
-const changeactive = (index) => {
- isactive.value = index;
+const changeactive = (value) => {
+ isactive.value = value;
+ queryForm.selectType = value;
+ initData();
};
-function cancelClick() {
- table.value = false;
-}
-function confirmClick() {
- table.value = false;
-}
-//寮瑰嚭妗�
-const dialogVisible = ref(false);
-//鍒犻櫎鏂规硶
-const add = () => {
- dialogVisible.value = true;
+
+const claimdata = ref({
+ id: "",
+ gruops: "",
+ creater: JSON.parse(localStorage.getItem("user")).userName,
+ createDate: formatTime(new Date()),
+});
+const TTnum = ref(0);
+//椤甸潰鏁�
+const pageTotal = ref(0);
+//纭棰嗗彇/纭褰掕繕
+const claim = (val, num) => {
+ console.log(val, num);
+
+ claimdata.value.id = val.njtakeid;
+ claimdata.value.gruops = isactive.value;
+ GetSleeveandStep(claimdata.value.gruops).then((res) => {
+ TTnum.value = res.data[0].sumTorqueSum;
+ if (num == 1) {
+ claimdialogVisible.value = true;
+ return;
+ }
+ if (num == 2) {
+ return;
+ }
+ if (num == 3) {
+ claimdialogVisible1.value = true;
+ return;
+ }
+ if (num == 4) {
+ claimdialogVisible2.value = true;
+ return;
+ }
+ });
};
-//缂栬緫鏂规硶
-const Edit = () => {
- dialogVisible.value = true;
+//鏀瑰彉鐘舵��
+const changeStatus = () => {
+ ChangeStatus(claimdata.value).then((res) => {
+ ElMessage({
+ message: "鎴愬姛",
+ type: "success",
+ });
+ claimdialogVisible.value = false;
+ claimdialogVisible1.value = false;
+ claimdialogVisible2.value = false;
+ initData();
+ });
};
-//纭棰嗗彇
-const claim = () => {
- claimdialogVisible.value = true;
+
+//鏌ョ湅璇︽儏
+const showdata = (val) => {
+ gridData.value = [];
+ GetDetail(val.njtakeid).then((res) => {
+ gridData.value.push(res.data);
+ });
};
+
+//鍒嗛〉璇锋眰鍙傛暟
+const pageQuery = ref({
+ page: 1, //褰撳墠椤甸潰
+ rows: 10, //姣忛〉鏄剧ず鏉℃暟
+ order: "desc", //鎺掑簭鏂瑰紡
+ sort: "", //鎺掑簭瀛楁
+ wheres: "", //鏉′欢鏌ヨ
+});
+
+//鍒嗛〉椤甸潰澶у皬鏀瑰彉
+const handleSizeChange = (val) => {
+ pageQuery.value.rows = val;
+ initData();
+};
+
+//鍒嗛〉椤甸潰鏀瑰彉
+const handleCurrentChange = (val) => {
+ pageQuery.value.page = val;
+ initData();
+};
+//鏁版嵁鍒濆鍖�
+const initData = () => {
+ let obj = {
+ userId: JSON.parse(localStorage.getItem("user")).id,
+ group: isactive.value,
+ };
+ console.log(obj);
+
+ // GetPageDataNew(obj).then((res) => {
+ // tableData.value = res.data;
+ // pageTotal.value = res.data.length;
+ // });
+ // 鏌ヨ鏉′欢
+ const startTime = formatTime(queryForm.value.selectTime[0]);
+ const endTime = formatTime(queryForm.value.selectTime[1]);
+ const filter = [
+ {
+ name: "grouptype",
+ value: isactive.value,
+ displayType: "String",
+ },
+ {
+ name: queryForm.value.selectType,
+ value: queryForm.value.inputcontent,
+ displayType: "like",
+ },
+ {
+ name: "pustatus",
+ value: queryForm.value.selectName,
+ displayType: "String",
+ },
+ { name: "dispatchtime", value: startTime, displayType: "ThanOrEqual" },
+ { name: "dispatchtime", value: endTime, displayType: "LessOrEqual" },
+ ];
+ GetPageData({
+ ...pageQuery.value,
+ filter,
+ }).then((res) => {
+ tableData.value = res.rows;
+ pageTotal.value = res.total;
+ });
+};
+//鎵撳嵃鏁版嵁
+const printExcel = () => {
+ // 鏌ヨ鏉′欢
+ const startTime = formatTime(queryForm.value.selectTime[0]);
+ const endTime = formatTime(queryForm.value.selectTime[1]);
+ const filter = [
+ {
+ name: "grouptype",
+ value: isactive.value,
+ displayType: "String",
+ },
+ {
+ name: queryForm.value.selectType,
+ value: queryForm.value.selectInput,
+ displayType: "String",
+ },
+ {
+ name: "pustatus",
+ value: queryForm.value.selectName,
+ displayType: "String",
+ },
+ { name: "dispatchtime", value: startTime, displayType: "ThanOrEqual" },
+ { name: "dispatchtime", value: endTime, displayType: "LessOrEqual" },
+ ];
+ ExportApi({
+ ...pageQuery.value,
+ filter,
+ });
+};
+//鏁版嵁妫�绱簨浠�
+const handleQuery = () => {
+ pageQuery.value.page = 1;
+ initData();
+};
+
+//閲嶇疆妫�绱簨浠�
+const resetQuery = () => {
+ queryForm.value = Object.assign({}, obj);
+ pageQuery.value.page = 1;
+ initData();
+};
+//閲嶇疆琛ㄥ崟
+const resetForm = (formEl) => {
+ if (!formEl) return;
+ formEl.resetFields();
+};
+const userInfo = ref("");
+//璺敱璺宠浆
+const toDetail = (row, title) => {
+ router.push({
+ name: "Startjob",
+ state: { info: JSON.stringify(row), title: title },
+ });
+};
+const show = ref("");
+
+const getuserinfo = () => {
+ GetUserInfo().then((res) => {
+ console.log(res);
+ show.value = res.data.roleName.substring(0, 2);
+ if (show.value != "瓒呯骇") {
+ isactive.value = show.value;
+ initData();
+ }
+ });
+};
+
+//鏁版嵁鍒濆鍖�
+onMounted(() => {
+ initData();
+ getuserinfo();
+
+ userInfo.value = JSON.parse(localStorage.getItem("user")).userName;
+});
</script>
<style lang="scss" scoped>
.Thecurrentjob {
@@ -873,8 +1045,6 @@
width: 6.88rem;
height: 2rem;
text-align: center;
- border: 0.06rem solid rgba(222, 222, 222, 1);
- border-radius: 0.25rem 0 0 0.25rem;
font-size: 0.75rem;
display: flex;
align-items: center;
--
Gitblit v1.9.3