From c837caa78aa25bbb2bae052bfa9f107376d2ec65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Tue, 15 Jul 2025 19:29:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA=E3=80=81=E9=A2=84?=
 =?UTF-8?q?=E8=AE=A1=E5=AE=8C=E6=88=90=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/ems.js           |  2 +-
 src/views/ems/ticket/AddTicket.vue | 41 +++++++++++++++++++++++-------
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/store/modules/ems.js b/src/store/modules/ems.js
index 0c84ac1..cad9f32 100644
--- a/src/store/modules/ems.js
+++ b/src/store/modules/ems.js
@@ -12,7 +12,7 @@ const ems = {
     alarmStatusOptions:{'0':'待处理','1':'已处理','2':'处理中'},//告警状态
     deviceTypeOptions:{'TCP':'TCP','RTU':'RTU'},//设备类型
     ticketStatusOptions:{0:'待处理', 1:'已处理', 2:'处理中'},//工单处理状态
-    strategyStatusOptions:{'0':'未启用', 1:'已运行', 2:'已暂停', 3:'禁用', 4:'删除'},//策略状态
+    strategyStatusOptions:{'0':'未启用', '1':'已运行', '2':'已暂停', '3':'禁用', '4':'删除'},//策略状态
     chargeStatusOptions:{'1':'充电','2':'待机'},//冲放状态
   },
   mutations: {
diff --git a/src/views/ems/ticket/AddTicket.vue b/src/views/ems/ticket/AddTicket.vue
index d7385e3..c055201 100644
--- a/src/views/ems/ticket/AddTicket.vue
+++ b/src/views/ems/ticket/AddTicket.vue
@@ -1,6 +1,6 @@
 <template>
     <el-dialog v-loading="loading>0" :visible.sync="dialogTableVisible" class="ems-dialog" :title="mode === 'add'?'新增工单':`编辑工单` " :close-on-click-modal="false" :show-close="false">
-      <el-form ref="addTempForm" :model="formData" :rules="rules" size="medium" label-width="100px">
+      <el-form ref="addTempForm" :model="formData" :rules="rules" size="medium" label-width="120px">
         <el-form-item label="工单号" prop="ticketNo" v-if="mode !== 'add'">
           <el-input disabled v-model="formData.ticketNo" clearable :style="{width: '100%'}">
           </el-input>
@@ -28,11 +28,26 @@
             <el-option :label="item.userName" :value="item.userId" v-for="(item,index) in userList" :key="index+'updateUserList'"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="预计完成时间" prop="expectedCompleteTime" >
+          <el-date-picker
+            v-model="formData.expectedCompleteTime"
+            format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetime"
+            placeholder="请选择"
+            :style="{width: '100%'}"
+            >
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="提交时间" prop="createTime" v-if="mode !== 'add'">
           <el-input v-model="formData.createTime"  disabled :style="{width: '100%'}">
           </el-input>
         </el-form-item>
+        <el-form-item label="图片" v-if="mode !== 'add' && formData.images && formData.images.length>0">
+          <img v-for="item in formData.images" :key="item+'imgs'" :src="item" alt="" srcset="" class="ticket-imgs">
+        </el-form-item>
       </el-form>
+
       <div slot="footer">
         <el-button @click="closeDialog">取消</el-button>
         <el-button type="primary" @click="saveDialog">确定</el-button>
@@ -79,6 +94,8 @@ export default {
         updateBy: '',//处理人
         workUserId:'',//处理人id
         createTime: '',//提交时间
+        expectedCompleteTime:'',//预计完成时间
+        images:[],//图片列表
       },
       rules: {
         title:[
@@ -95,7 +112,10 @@ export default {
         ],
         workUserId:[
           { required: true, message: '请选择处理人', trigger: ['blur', 'change'] }
-        ]
+        ],
+        expectedCompleteTime:[
+          { required: true, message: '请选择预计完成时间', trigger: ['blur', 'change'] }
+        ],
       },
     }
   },
@@ -118,6 +138,8 @@ export default {
           this.loading+=1
           getTicket(newVal).then(response => {
             this.formData = JSON.parse(JSON.stringify(response?.data || {}));
+            const {images=''} = this.formData
+            this.formData.images = JSON.parse(images)
           }).finally(() => {this.loading-=1})
         }
       },
@@ -137,9 +159,9 @@ export default {
       this.$refs.addTempForm.validate(valid => {
         if (!valid) return
         this.loading+=1
-        const {title='',content='',status='',userId='',workUserId='',id=''} = this.formData;
+        const {title='',content='',status='',userId='',workUserId='',id='',expectedCompleteTime=''} = this.formData;
         if(this.mode === 'add'){
-          addTicket({title,content,status,userId,workUserId}).then(response => {
+          addTicket({title,content,status,userId,workUserId,expectedCompleteTime}).then(response => {
             if(response.code === 200){
               //新增成功
               // 关闭弹窗 更新表格
@@ -150,7 +172,7 @@ export default {
             this.loading-=1
           })
         }else{
-          updateTicket({title,content,status,userId,workUserId,id}).then(response => {
+          updateTicket({title,content,status,userId,workUserId,id,expectedCompleteTime}).then(response => {
             if(response.code === 200){
               //新增成功
               // 关闭弹窗 更新表格
@@ -178,6 +200,8 @@ export default {
         workUserId:'',//处理人id
         completeTime: '',//提交时间
         ticketNo:'',//工单号
+        expectedCompleteTime:'',
+        images: []
       }
       this.dialogTableVisible=false
     }
@@ -186,9 +210,8 @@ export default {
 
 </script>
 <style scoped>
-.ems-dialog{
-  .el-dialog{
-    max-width: 700px;
-  }
+.ticket-imgs{
+  width:150px;
+  height: 100px;
 }
 </style>