From 7741517b295a7fde4994c94029fe39a0bb2d9259 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 30 Jan 2026 16:30:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue | 4 +-
applications/task-work-order/src/views/orderView/flyingHand/index.vue | 2
applications/drone-command/src/views/permissionManage/permissionDept/ShareDiaLog.vue | 4 +
applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue | 1
applications/task-work-order/src/views/orderView/orderManage/operatingIncome/index.vue | 48 +++++++++++++++--------
applications/task-work-order/src/styles/common/cockpit.scss | 22 +++++++++++
applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue | 11 +++--
7 files changed, 65 insertions(+), 27 deletions(-)
diff --git a/applications/drone-command/src/views/permissionManage/permissionDept/ShareDiaLog.vue b/applications/drone-command/src/views/permissionManage/permissionDept/ShareDiaLog.vue
index 793751e..5cf8bd3 100644
--- a/applications/drone-command/src/views/permissionManage/permissionDept/ShareDiaLog.vue
+++ b/applications/drone-command/src/views/permissionManage/permissionDept/ShareDiaLog.vue
@@ -61,6 +61,7 @@
const originalSharedIds = ref([]) // 原始已共享的设备ID集合
const originalSharedMap = ref({}) // 原始已共享的设备ID与shareId的映射
const currentDeptId = ref(null) // 当前操作的部门ID
+const regionCode = ref(null) // 当前操作的部门code
const dictObj = ref({
deviceType: [], // 设备类型
})
@@ -86,7 +87,7 @@
async function getDeviceList() {
loading.value = true
try {
- const res = await nonDeptAreaDevicesApi({ loanToDeptId: currentDeptId.value })
+ const res = await nonDeptAreaDevicesApi({ deptId: currentDeptId.value,regionCode: regionCode.value })
deviceList.value = res?.data?.data ?? []
// 记录原始已共享的设备ID和shareId映射
const sharedDevices = deviceList.value.filter(item => item.isShared)
@@ -158,6 +159,7 @@
// 打开弹框
async function open({ row } = {}) {
currentDeptId.value = row?.id
+ regionCode.value = row?.areaCode
selectedRows.value = []
getDictList()
await getDeviceList()
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..ddb03a1 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,11 @@
<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="evenueForecast" 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>
@@ -31,36 +32,35 @@
v-model:page-size="params.size" layout="total, prev, pager, next, sizes" :total="total" @change="getList" />
</div>
</div>
- <el-dialog class="gd-dialog" append-to-body v-model="isShowEditView" :title="titleTxt" :width="pxToRem(800)"
+ <el-dialog class="gd-dialog" append-to-body v-model="isShowEditView" :title="titleTxt"
:close-on-click-modal="false" :destroy-on-close="true" @close="handleClose">
- <el-form class="gd-dialog-form" ref="ruleFormRef" :model="editParams" :rules="rules" label-width="140px">
+ <el-form class="gd-dialog-form" ref="ruleFormRef" :model="editParams" :rules="rules" label-width="160px">
<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>
- </el-row>
-
- <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-col :span="12">
+ <el-form-item label="收益预测(元)" prop="evenueForecast">
+ <el-input class="gd-input" v-model="editParams.evenueForecast" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="财务内部收益率(%)" prop="financialIrr">
<el-input class="gd-input" v-model="editParams.financialIrr" />
</el-form-item>
</el-col>
- </el-row>
-
- <el-row>
<el-col :span="12">
<el-form-item label="市场空间" prop="marketSpace">
<el-input class="gd-input" v-model="editParams.marketSpace" />
@@ -103,6 +103,7 @@
operatingIncome: '',
totalCost: '',
netProfit: '',
+ evenueForecast: '',
financialIrr: '',
marketSpace: '',
})
@@ -147,6 +148,19 @@
trigger: 'blur'
}
],
+ evenueForecast: [
+ { required: true, message: '请输入', trigger: 'blur' },
+ {
+ validator: (rule, value, callback) => {
+ if (!/^\d+(\.\d+)?$/.test(value)) {
+ callback(new Error('请输入有效的数字（整数或小数）'))
+ } else {
+ callback()
+ }
+ },
+ trigger: 'blur'
+ }
+ ],
financialIrr: [
{ required: true, message: '请输入', trigger: 'blur' },
{
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
index da197d7..3f21b36 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
@@ -96,7 +96,6 @@
<div class="gd-table-container" v-loading="loading">
<div class="gd-table-content gd-table-content-bg">
<el-table class="gd-table" :data="list" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="46" v-if="permission.order_delete" />
<el-table-column type="index" width="64" label="序号" />
<el-table-column prop="workOrderName" show-overflow-tooltip label="工单名称" />
<el-table-column prop="workOrderCode" show-overflow-tooltip label="工单编号" />
--
Gitblit v1.9.3