From 1772fc5e211f9e9e0ab4cdc6c29b436aac178c2a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 23 二月 2024 12:19:55 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/sys/task/stay-task.vue | 121 +++++++++++++++++++++++++---------------
1 files changed, 75 insertions(+), 46 deletions(-)
diff --git a/web/src/views/modules/sys/task/stay-task.vue b/web/src/views/modules/sys/task/stay-task.vue
index 208f476..1dd29cd 100644
--- a/web/src/views/modules/sys/task/stay-task.vue
+++ b/web/src/views/modules/sys/task/stay-task.vue
@@ -3,10 +3,10 @@
<!-- <zt-table-wraper ref="tableObj" query-url="/newPlan/taskCenter/page" :paging="false" :lazy="true" v-slot="{ table }"
paging-layout="total, prev, pager, next">-->
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getQuery()">
- <el-input type="text" v-model="dataForm.djxlSystem" v-if="false" />
+ <el-input type="text" v-model="dataForm.djxlSystem" v-if="false"/>
</el-form>
<el-table ref="table"
- :height="getTransformHeight(transformHeight)"
+ :height="getTransformHeight()"
v-loading="dataLoading"
:data="dataList"
style='margin-top:10px;transition: .5s;'
@@ -19,7 +19,7 @@
</el-table-column>
<el-table-column align="left" prop="topic" label="宸ョ▼" width="150"/>
<!-- <el-table-column align="left" prop="title" label="娴佺▼鍚嶇О" width="180"/>-->
- <el-table-column align="left" prop="remark" label="鎽樿" />
+ <el-table-column align="left" prop="remark" label="鎽樿"/>
<el-table-column align="center" prop="stepName" label="褰撳墠鐜妭" width="150px"/>
<el-table-column align="center" prop="receiveTime" label="涓婁竴鐜妭鍔炵悊鏃堕棿" width="180px"/>
@@ -27,10 +27,17 @@
<el-table-column align="center" prop="finishTime" label="璁″垝瀹屾垚鏃堕棿" width="160px"/>
<!-- <el-table-column align="center" prop="statusName" label="鐘舵��" width="100px"/>-->
<el-table-column align="center" prop="idleDays" label="鍋滅暀鏃堕棿锛堝ぉ锛�" width="150px"/>
- <zt-table-column-handle fixed="right" :table="table" :has-edit="false" :has-delete="false" :has-view="false" width="120px">
+ <zt-table-column-handle fixed="right" :table="table" :has-edit="false" :has-delete="false" :has-view="false"
+ width="120px">
<template v-slot="{ row }">
- <zt-table-button v-if="row.stepMarker!='hxsy_czsp'&&row.stepMarker!='hxsy_bzsp'&&row.stepMarker!='xbsy_czsp'&&row.stepMarker!='xbsy_bzsp'" @click="createTask(row)">鍔炵悊</zt-table-button>
- <zt-table-button v-if="row.stepMarker=='hxsy_czsp'||row.stepMarker=='hxsy_bzsp'||row.stepMarker=='xbsy_czsp'||row.stepMarker=='xbsy_bzsp'" @click="createTask(row)">鏌ラ槄</zt-table-button>
+ <zt-table-button
+ v-if="row.stepMarker!='hxsy_czsp'&&row.stepMarker!='hxsy_bzsp'&&row.stepMarker!='xbsy_czsp'&&row.stepMarker!='xbsy_bzsp'"
+ @click="createTask(row)">鍔炵悊
+ </zt-table-button>
+ <zt-table-button
+ v-if="row.stepMarker=='hxsy_czsp'||row.stepMarker=='hxsy_bzsp'||row.stepMarker=='xbsy_czsp'||row.stepMarker=='xbsy_bzsp'"
+ @click="createTask(row)">鏌ラ槄
+ </zt-table-button>
<zt-table-button @click="flowChart(row)">娴佺▼鍥�</zt-table-button>
<zt-table-button v-if="row.flowCode === 'yearPlan2'" @click="getFlowTrack (row)">娴佺▼杞ㄨ抗</zt-table-button>
</template>
@@ -43,11 +50,18 @@
@infinite="infiniteHandler"
ref="infiniteLoading"
force-use-infinite-wrapper=".alreadyTaskPushTable .el-table__body-wrapper">
- <div slot="no-more" style="margin-top: 10px;margin-bottom: 10px;"><span v-if="dataListAll.length > pageSize">娌℃湁鏇村浜�</span></div>
+ <div slot="no-more" style="margin-top: 10px;margin-bottom: 10px;"><span v-if="dataListAll.length > pageSize">娌℃湁鏇村浜�</span>
+ </div>
</infinite-loading>
</el-table>
<!-- 寰呭姙浠诲姟寮圭獥寮圭獥, 鏂板 / 淇敼 -->
<ItemCirculatOrder ref="itemCirculatOrder" @refreshDataList="getQuery()"></ItemCirculatOrder>
+ <ConfigItemWarehouse ref="configItemWarehouse" @refreshDataList="getQuery()"></ConfigItemWarehouse>
+ <ConfigItemChange ref="configItemChange" @refreshDataList="getQuery()"></ConfigItemChange>
+ <ConfigItemOutbound ref="configItemOutbound" @refreshDataList="getQuery()"></ConfigItemOutbound>
+ <TestCheckOrder ref="testCheckOrder" @refreshDataList="getQuery()"></TestCheckOrder>
+ <BaselineRelease ref="baselineRelease" @refreshDataList="getQuery()"></BaselineRelease>
+ <QaAuditReport ref="qaAuditReport" @refreshDataList="getQuery()"></QaAuditReport>
<!-- </zt-table-wraper>-->
</div>
</template>
@@ -56,6 +70,12 @@
import Cookies from "js-cookie";
import InfiniteLoading from 'vue-infinite-loading'
import ItemCirculatOrder from '@/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate'
+ import ConfigItemWarehouse from '@/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate'
+ import TestCheckOrder from '@/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate'
+ import ConfigItemChange from '@/views/modules/configItemChange/ConfigItemChange-AddOrUpdate'
+ import ConfigItemOutbound from '@/views/modules/configItemOutbound/ConfigItemOutbound-AddOrUpdate'
+ import BaselineRelease from '@/views/modules/baselineRelease/BaselineRelease-AddOrUpdate'
+ import QaAuditReport from '@/views/modules/qaAuditReport/QaAuditReport-AddOrUpdate'
export default {
data() {
@@ -63,22 +83,22 @@
page: 1,
pageSize: 30,
dataLoading: false,
- dataList:[],
- dataListAll:[],
+ dataList: [],
+ dataListAll: [],
dataForm: {
- djxlSystem:''
+ djxlSystem: ''
},
dialogVisible: false,
existConstructionInfo: false
}
},
- props:{
- system:{
- type:String
+ props: {
+ system: {
+ type: String
},
- transformHeight:{
- type:Boolean,
- default:false
+ transformHeight: {
+ type: Boolean,
+ default: false
}
},
watch: {
@@ -87,21 +107,25 @@
// this.getIsExistConstructionInfo()
this.getQuery()
},
- 'tableBottomOffset'(){
- console.log(this.tableBottomOffset,'tableBottomOffset')
+ 'tableBottomOffset'() {
+ console.log(this.tableBottomOffset, 'tableBottomOffset')
}
},
- computed:{
-
- },
+ computed: {},
components: {
InfiniteLoading,
- ItemCirculatOrder
+ ItemCirculatOrder,
+ ConfigItemWarehouse,
+ TestCheckOrder,
+ ConfigItemChange,
+ ConfigItemOutbound,
+ BaselineRelease,
+ QaAuditReport
},
created() {
- if (this.$route.path.indexOf('taskCenter')>0 || this.system=='smj'){
+ if (this.$route.path.indexOf('taskCenter') > 0 || this.system == 'smj') {
this.transformHeight = true
- }else{
+ } else {
this.transformHeight = false
}
},
@@ -111,7 +135,7 @@
}
this.dataForm.djxlSystem = Cookies.get('djxlSystem')
this.getQuery()
- this.$EventBus.$on('newProject',()=>{
+ this.$EventBus.$on('newProject', () => {
this.getQuery()
})
},
@@ -159,13 +183,13 @@
this.$refs.infiniteLoading.$emit('$InfiniteLoading:reset');
});
},
- async getQuery(){
+ async getQuery() {
this.handleInfiniteLoadingBeforeGet()
this.dataLoading = true
let params = {
djxlSystem: this.dataForm.djxlSystem,
}
- let res = await this.$http.get(`/task/taskCenter/page`,{
+ let res = await this.$http.get(`/task/taskCenter/page`, {
params: params
})
if (res.success) {
@@ -176,13 +200,9 @@
this.dataLoading = true
}
},
- getTransformHeight(transformHeight){
- let Height=document.documentElement.clientHeight
- if(transformHeight){
- return Height-(650-403)
- }else{
- return Height-650
- }
+ getTransformHeight() {
+ let Height = document.documentElement.clientHeight
+ return Height - (650 - 403)
},
async reCall(row) {
if (await this.$tip.confirm('纭畾瑕佽繘琛屾挙鍥炲悧?')) {
@@ -194,14 +214,14 @@
this.getQuery()
},
flowChart(row) {
- this.$emit('fatherMethod',row)
+ this.$emit('fatherMethod', row)
},
- async getFlowTrack(row){
- console.log(row,'getFlowTrack row')
- if(row){
- let params={
- flowCode:row.flowCode,
- bizId:row.bizId
+ async getFlowTrack(row) {
+ console.log(row, 'getFlowTrack row')
+ if (row) {
+ let params = {
+ flowCode: row.flowCode,
+ bizId: row.bizId
}
this.$refs.processTrajectory.$refs.dialog.init(params)
}
@@ -209,11 +229,20 @@
async createTask(row) {
console.log(row, "task row");
if (row.flowCode === 'wplz') {
- this.$refs.itemCirculatOrder.$refs.dialog.init(row)
- } else if (row.flowCode === 'aaa') {
- //this.$refs.itemCirculatOrder.$refs.dialog.init(row)
- }
- else {
+ this.$refs.itemCirculatOrder.$refs.dialog.init(row.bizId, row)
+ } else if (row.flowCode === 'pzxrk') {
+ this.$refs.configItemWarehouse.$refs.dialog.init(row.bizId, row)
+ }else if (row.flowCode === 'csjcd') {
+ this.$refs.testCheckOrder.$refs.dialog.init(row.bizId, row)
+ } else if (row.flowCode === 'pzxbg') {
+ this.$refs.configItemChange.$refs.dialog.init(row.bizId, row)
+ }else if (row.flowCode === 'pzxck') {
+ this.$refs.configItemOutbound.$refs.dialog.init(row.bizId, row)
+ }else if (row.flowCode === 'jxfb') {
+ this.$refs.baselineRelease.$refs.dialog.init(row.bizId, row)
+ }else if (row.flowCode === 'qashbg') {
+ this.$refs.qaAuditReport.$refs.dialog.init(row.bizId, row)
+ }else {
if (row.stepRouterId === null) {
this.$tip.alert("娌℃湁閰嶇疆鑿滃崟id")
return;
--
Gitblit v1.9.1