From aa6ae8ca97c2df99c9dd4d59d3ee8194236561eb Mon Sep 17 00:00:00 2001
From: rjg <746338628@qq.com>
Date: Wed, 23 Apr 2025 17:13:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature_0.1_04' into test
---
src/views/tickets/orderLog.vue | 87 +++++++++++++++++++++++++++++++++----------
1 files changed, 66 insertions(+), 21 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 29a0098..09e5af3 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -125,7 +125,7 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="工单名称" prop="name">
- <el-input v-model="form.name" placeholder="请输入工单名称"></el-input>
+ <el-input v-model="form.name" placeholder="请输入工单名称" maxlength="100" show-word-limit></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -140,9 +140,14 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="关联机巢" prop="device_sns">
+
<el-select v-model="form.device_sns" placeholder="请选择机巢" multiple>
- <el-option v-for="item in device_sns" :key="item.device_sn" :label="item.nickname"
- :value="item.device_sn" />
+ <el-option
+ v-for="item in device_sns"
+ :key="item.device_sn"
+ :label="item.nickname"
+ :value="item.device_sn"
+ />
</el-select>
</el-form-item>
</el-col>
@@ -159,7 +164,14 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="工单内容" prop="content">
- <el-input type="textarea" v-model="form.content" rows="4" placeholder="请输入工单内容"></el-input>
+ <el-input
+ type="textarea"
+ v-model="form.content"
+ rows="4"
+ placeholder="请输入工单内容"
+ maxlength="255"
+ show-word-limit
+ ></el-input>
</el-form-item>
</el-col>
@@ -197,7 +209,8 @@
</el-dialog>
<!-- 工单详情对话框 -->
- <el-dialog v-model="detailVisible" title="编辑工单" width="70%" :close-on-click-modal="false" @close="resetForm" >
+ <el-dialog v-model="detailVisible" :title="detailTitle" width="70%" :close-on-click-modal="false" @close="resetForm" >
+ <div class="event-title-center">{{ form.name}}</div>
<el-form :model="form" ref="testform" label-width="100px">
<div class="custom-steps-container">
<!-- 标题行 -->
@@ -255,8 +268,12 @@
<el-col :span="12">
<el-form-item label="关联机巢" prop="device_sns">
<el-select v-model="form.device_sns" placeholder="请选择机巢" multiple>
- <el-option v-for="item in device_sns" :key="item.device_sn" :label="item.nickname"
- :value="item.device_sn" />
+ <el-option
+ v-for="item in device_sns"
+ :key="item.device_sn"
+ :label="item.nickname"
+ :value="item.device_sn"
+ />
</el-select>
</el-form-item>
</el-col>
@@ -273,7 +290,14 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="工单内容" prop="content">
- <el-input type="textarea" v-model="form.content" rows="4" placeholder="请输入工单内容"></el-input>
+ <el-input
+ type="textarea"
+ v-model="form.content"
+ rows="4"
+ placeholder="请输入工单内容"
+ maxlength="255"
+ show-word-limit
+ ></el-input>
</el-form-item>
</el-col>
@@ -287,8 +311,8 @@
<el-button type="danger"
v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)"
@click="submitForm(1)">发布</el-button>
- <el-button type="primary" v-if="form.status == 0 || userInfo.user_id == form.create_user"
- @click="submitForm(0)">保存</el-button>
+ <!-- <el-button type="primary" v-if="form.status == 0 || userInfo.user_id == form.create_user"
+ @click="submitForm(0)">保存</el-button> -->
<el-button type="primary" v-if="form.status == 1 && this.permission.orderLogpass"
@click="orderLogPass(form.id)">通过</el-button>
@@ -373,6 +397,7 @@
device_sns: [],
ai_types: [],
wayLineList: [],
+ detailTitle:"编辑工单",
statuses: [
{ label: '草稿', value: '0' },
@@ -437,11 +462,16 @@
currentDetail: {},
form: {},
rules: {
- name: [{ required: true, message: '请输入工单名称', trigger: 'blur' }],
+ name: [{ required: true, message: '请输入工单名称', trigger: 'blur' },
+ { max: 100, message: '工单名称不能超过100个字', trigger: 'blur' },
+ ],
file_id: [{ required: true, message: '需要选择航线', trigger: 'change' }],
device_sns: [{ required: true, message: '请选择机巢', trigger: 'change' }],
ai_types: [{ required: true, message: '请选择算法', trigger: 'change' }],
- content: [{ required: true, message: '请输入工单内容', trigger: 'blur' }],
+ content: [
+ { required: true, message: '请输入工单内容', trigger: 'blur' },
+ { max: 255, message: '工单内容不能超过255个字', trigger: 'blur' },
+ ],
date_range: [{ required: true, message: '请选择时间不能为空', trigger: 'blur' }],
rep_fre_type: [{ required: true, message: '请选择周期', trigger: 'blur' }],
deal_time: [{ required: true, message: '请选择执行时间', trigger: 'blur' }],
@@ -751,15 +781,21 @@
return `${location[0].toFixed(6)}, ${location[1].toFixed(6)}`
},
async handleViewDetail(row) {
- const response = await orderLogDetails(row.id)
- this.form = {
- ...response.data.data,
- }
- this.detailVisible = true
+ console.log("工单名称1111:");
+ const response = await orderLogDetails(row.id);
+ const data = response.data.data;
- //航线列表
- this.asyncgetWaylineFileListByArea()
- this.device_sns = response.data.data.deviceList
+ this.form = {
+ ...data,
+ };
+
+
+ this.detailVisible = true;
+
+ // 更新机巢列表
+ this.device_sns = data.device_list;
+ (this.permission && (this.permission.order_log_review || this.permission.order_log_recall))&& (data.status==1||data.status==3||data.status==2) ? this.detailTitle="工单详情":this.detailTitle="编辑工单";
+ console.log("工单名称:"+this.detailTitle);
},
//导出
async exportData() {
@@ -1061,4 +1097,13 @@
color: #666;
line-height: 1.5;
}
-</style>
\ No newline at end of file
+.event-title-center {
+ text-align: center;
+ font-size: 20px;
+ font-weight: bold;
+ margin-bottom: 12px;
+ color: #333;
+}
+</style>
+`
+
--
Gitblit v1.9.3