From b2ff4524ac1de01b14b9adeea1cea8347a80cd5b Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 30 Jan 2026 16:20:27 +0800
Subject: [PATCH] feat:更新工单
---
applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue | 4 ++--
applications/task-work-order/src/views/orderView/flyingHand/index.vue | 2 +-
applications/task-work-order/src/views/orderView/orderManage/operatingIncome/index.vue | 16 ++++++++--------
applications/task-work-order/src/styles/common/cockpit.scss | 22 ++++++++++++++++++++++
applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue | 11 ++++++-----
5 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/applications/task-work-order/src/styles/common/cockpit.scss b/applications/task-work-order/src/styles/common/cockpit.scss
index f5673b5..39ab188 100644
--- a/applications/task-work-order/src/styles/common/cockpit.scss
+++ b/applications/task-work-order/src/styles/common/cockpit.scss
@@ -31,6 +31,7 @@
&::placeholder {
color: var(--tips);
}
+ color: #383874;
}
&.is-disabled {
@@ -122,6 +123,7 @@
&::placeholder {
color: var(--tips);
}
+ color: #383874;
}
.el-range-separator {
@@ -1188,4 +1190,24 @@
}
}
}
+}
+
+.gd-dialog-form {
+ // 最后一排不需要设置 margin-bottom
+ // border: 1px solid red;
+ // 倒数第二个也设置为0
+ // .el-col:nth-last-child(2) {
+ // margin-bottom: 0;
+ // }
+ // .el-col:nth-last-child(1) {
+ // margin-bottom: 0;
+ // }
+
+ // .el-form-item:nth-last-child(2) {
+ // margin-bottom: 0;
+ // }
+ // .el-form-item:nth-last-child(1) {
+ // margin-bottom: 0;
+ // }
+
}
\ No newline at end of file
diff --git a/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue b/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
index f58c380..29fff53 100644
--- a/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
+++ b/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
@@ -191,7 +191,7 @@
color="#4C34FF"
@click="handleSubmit"
>
- 确定
+ 保存
</el-button>
</template>
</el-dialog>
@@ -234,7 +234,7 @@
const dialogTitle = computed(() => {
switch (props.dialogType) {
case 'add':
- return '新增'
+ return '飞手建档'
case 'edit':
return '编辑'
case 'view':
diff --git a/applications/task-work-order/src/views/orderView/flyingHand/index.vue b/applications/task-work-order/src/views/orderView/flyingHand/index.vue
index 8972b67..c499452 100644
--- a/applications/task-work-order/src/views/orderView/flyingHand/index.vue
+++ b/applications/task-work-order/src/views/orderView/flyingHand/index.vue
@@ -49,7 +49,7 @@
</el-form>
<div class="gd-table-toolbar">
- <el-button :icon="Plus" color="#4C34FF" type="primary" @click="addFlyingHand">新增</el-button>
+ <el-button :icon="Plus" color="#4C34FF" type="primary" @click="addFlyingHand">飞手建档</el-button>
</div>
<div class="gd-table-container" v-loading="loading">
diff --git a/applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue
index 4a13918..11c31a3 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue
@@ -31,12 +31,10 @@
<el-table-column prop="distributeUserName" show-overflow-tooltip label="分发人员" />
<el-table-column label="操作" class-name="operation-btns" width="140">
<template v-slot="{ row }">
- <el-link type="primary"
- @click="openDistributeDialog(row)"
- :disabled="!requester || (row.distributeStatus === 1 || currentRow.taskStatus !== '8')"
- >
+ <el-link type="primary" @click="openDistributeDialog(row)" v-if="permission.clueEvents_distribute && (row.distributeStatus === 0 || row.distributeStatus === 2)">
转为事件并分发
</el-link>
+ <el-button disabled type="text" v-else>转为事件并分发</el-button>
</template>
</el-table-column>
</el-table>
@@ -64,6 +62,9 @@
const requester = computed(() => store.state.user.userInfo?.role_id === '2014158512610869250')
const activeName = ref('all')
+const permission = computed(() => store.state.user.permission)
+console.log(permission.value.clueEvents_distribute, 'permission')
+
const visible = defineModel()
const loading = ref(false)
const list = ref([])
@@ -75,7 +76,7 @@
const distributeStatusOptions = [
{ label: '未分发', value: 0 },
{ label: '已分发', value: 1 },
- { label: '已驳回', value: 2 },
+ { label: '已退回', value: 2 },
{ label: '已确认', value: 3 },
]
diff --git a/applications/task-work-order/src/views/orderView/orderManage/operatingIncome/index.vue b/applications/task-work-order/src/views/orderView/orderManage/operatingIncome/index.vue
index 5e322fa..fd0cd13 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/operatingIncome/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/operatingIncome/index.vue
@@ -10,10 +10,10 @@
<el-table class="gd-table" :data="tableList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="46" />
<el-table-column label="序号" type="index" width="60"></el-table-column>
- <el-table-column prop="operatingIncome" label="营业收入" align="center"></el-table-column>
- <el-table-column prop="totalCost" label="综合总成本费用" align="center"></el-table-column>
- <el-table-column prop="netProfit" label="净利润" align="center"></el-table-column>
- <el-table-column prop="financialIrr" label="财务内部收益率" align="center"></el-table-column>
+ <el-table-column prop="operatingIncome" label="营业收入(元)" align="center"></el-table-column>
+ <el-table-column prop="totalCost" label="综合总成本费用(元)" align="center"></el-table-column>
+ <el-table-column prop="netProfit" label="净利润(元)" align="center"></el-table-column>
+ <el-table-column prop="financialIrr" label="财务内部收益率(%)" align="center"></el-table-column>
<el-table-column prop="marketSpace" label="市场空间" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
<el-table-column prop="nickName" label="创建人" align="center"></el-table-column>
@@ -36,12 +36,12 @@
<el-form class="gd-dialog-form" ref="ruleFormRef" :model="editParams" :rules="rules" label-width="140px">
<el-row>
<el-col :span="12">
- <el-form-item label="营业收入" prop="operatingIncome">
+ <el-form-item label="营业收入(元)" prop="operatingIncome">
<el-input class="gd-input" v-model="editParams.operatingIncome" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="综合总成本费用" prop="totalCost">
+ <el-form-item label="综合总成本费用(元)" prop="totalCost">
<el-input class="gd-input" v-model="editParams.totalCost" />
</el-form-item>
</el-col>
@@ -49,12 +49,12 @@
<el-row>
<el-col :span="12">
- <el-form-item label="净利润" prop="netProfit">
+ <el-form-item label="净利润(元)" prop="netProfit">
<el-input class="gd-input" v-model="editParams.netProfit" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="财务内部收益率" prop="financialIrr">
+ <el-form-item label="财务内部收益率(%)" prop="financialIrr">
<el-input class="gd-input" v-model="editParams.financialIrr" />
</el-form-item>
</el-col>
--
Gitblit v1.9.3