提交

CODE/smart-community-word/.idea/workspace.xml

@@ -2,11 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="051ae1e0-ece1-4622-91c0-3f05ac339943" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TpTicketController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TpTicketController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpTicketRecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpTicketRecord.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpTicketService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpTicketService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../smart-community/eureka-sever/target/" />
@@ -30,8 +26,17 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="39">
-              <caret line="146" column="9" lean-forward="true" selection-start-line="146" selection-start-column="9" selection-end-line="146" selection-end-column="9" />
+            <state relative-caret-position="1430">
+              <caret line="307" selection-start-line="307" selection-end-line="307" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="jar://F:/maven3.5/maven/serverRepository/org/springframework/spring-core/5.0.8.RELEASE/spring-core-5.0.8.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="185">
+              <caret line="104" selection-start-line="104" selection-end-line="104" />
             </state>
           </provider>
         </entry>
@@ -39,7 +44,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpTicketRecordComment.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="252">
+            <state relative-caret-position="432">
               <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
             </state>
           </provider>
@@ -48,8 +53,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TpTicketController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="434">
-              <caret line="109" column="60" lean-forward="true" selection-start-line="109" selection-start-column="53" selection-end-line="109" selection-end-column="65" />
+            <state relative-caret-position="2511">
+              <caret line="109" column="60" selection-start-line="109" selection-start-column="53" selection-end-line="109" selection-end-column="65" />
             </state>
           </provider>
         </entry>
@@ -57,8 +62,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpTicketService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="554">
-              <caret line="68" lean-forward="true" selection-start-line="68" selection-end-line="68" />
+            <state relative-caret-position="1782">
+              <caret line="68" selection-start-line="68" selection-end-line="68" />
             </state>
           </provider>
         </entry>
@@ -69,6 +74,7 @@
     <findStrings>
       <find>ticketDetails</find>
       <find>ticketId</find>
+      <find>queryWrapper</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -102,11 +108,11 @@
     <option name="jreName" value="1.8" />
     <option name="vmOptions" value="-DarchetypeCatalog=internal" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="43" />
-    <option name="y" value="59" />
+  <component name="ProjectFrameBounds" extendedState="7">
+    <option name="x" value="435" />
+    <option name="y" value="19" />
     <option name="width" value="1687" />
-    <option name="height" value="1036" />
+    <option name="height" value="1061" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -115,6 +121,7 @@
     </navigator>
     <panes>
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -229,7 +236,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -239,7 +245,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550580292173" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550651720852" />
     <property name="last_opened_file_path" value="D:/java/workspace/heishi/wx_project" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -367,17 +373,20 @@
       <updated>1550546576183</updated>
       <workItem from="1550546577888" duration="997000" />
       <workItem from="1550547757316" duration="45000" />
-      <workItem from="1550547903821" duration="17630000" />
+      <workItem from="1550547903821" duration="17904000" />
+      <workItem from="1550580590425" duration="175000" />
+      <workItem from="1550625046867" duration="10290000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="18672000" />
+    <option name="totallyTimeSpent" value="29411000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="43" y="59" width="1687" height="1036" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
+    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1573448" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.037846483" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -387,16 +396,16 @@
       <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.68678814" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.64236903" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.7009595" weight="0.7082405" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.9157783" visible="true" weight="0.2817372" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Spring" order="7" />
       <window_info anchor="bottom" id="Terminal" order="8" />
       <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" order="11" weight="0.77060133" />
+      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.08422175" side_tool="true" visible="true" weight="0.2817372" />
+      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49969268" weight="0.7696567" />
       <window_info anchor="bottom" id="Java Enterprise" order="12" />
       <window_info anchor="bottom" id="Database Changes" order="13" />
       <window_info anchor="bottom" id="Version Control" order="14" />
@@ -479,13 +488,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpTicketService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="554">
-          <caret line="68" lean-forward="true" selection-start-line="68" selection-end-line="68" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="4752">
@@ -495,22 +497,36 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpTicketRecordComment.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
+        <state relative-caret-position="432">
           <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TpTicketController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="434">
-          <caret line="109" column="60" lean-forward="true" selection-start-line="109" selection-start-column="53" selection-end-line="109" selection-end-column="65" />
+        <state relative-caret-position="2511">
+          <caret line="109" column="60" selection-start-line="109" selection-start-column="53" selection-end-line="109" selection-end-column="65" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpTicketService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1782">
+          <caret line="68" selection-start-line="68" selection-end-line="68" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://F:/maven3.5/maven/serverRepository/org/springframework/spring-core/5.0.8.RELEASE/spring-core-5.0.8.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="185">
+          <caret line="104" selection-start-line="104" selection-end-line="104" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="39">
-          <caret line="146" column="9" lean-forward="true" selection-start-line="146" selection-start-column="9" selection-end-line="146" selection-end-column="9" />
+        <state relative-caret-position="1430">
+          <caret line="307" selection-start-line="307" selection-end-line="307" />
         </state>
       </provider>
     </entry>

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java

@@ -136,7 +136,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
                RecordCommentImg.lambda().eq(TdImages::getUuid,tpTicketRecordComment.getId());
             /*注意reply用于标记工单回复类的图片*/
                RecordCommentImg.lambda().eq(TdImages::getType,"reply");
-               List<TdImages> ticketRecordCommentImages= tdImagesMapper.selectList(queryWrapper);
+               List<TdImages> ticketRecordCommentImages= tdImagesMapper.selectList(RecordCommentImg);
                tpTicketRecordComment.setImgURL(ticketRecordCommentImages);
            }
        }
@@ -267,15 +267,14 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
                  tpTicket.setId(ticketId);
                  tpTicket.setStatus("4");
                  tpTicket.setUpdateDate(LocalDateTime.now());
-                 tpTicket.setUpdateUser(id);
                  tpTicketMapper.updateById(tpTicket);
                  /**维护工单处理表**/
        TpTicketRecord tpTicketRecord = new TpTicketRecord();
         tpTicketRecord.setCommunityId(communityId);
         tpTicketRecord.setTicketId(ticketId);
-        tpTicketRecord.setContent(content);
-        User userNameTpUserId= userMapper.selectById(ticketId);
-        tpTicketRecord.setStatus("物业工作人员"+userNameTpUserId.getUserName()+"已为处理");
+       TpTicket tpTicketUserID= tpTicketMapper.selectById(ticketId);
+        User userNameTpUserId= userMapper.selectById(tpTicketUserID.getTpUserId());
+        tpTicketRecord.setStatus("4");
         tpTicketRecord.setCreateUser(id);
         tpTicketRecord.setCreateDate(LocalDateTime.now());
         tpTicketRecordMapper.insert(tpTicketRecord);
@@ -286,9 +285,10 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         tpTicketRecordComment.setTicketRecordId(tpTicketRecord.getId());
         tpTicketRecordComment.setUuid(id);
         tpTicketRecordComment.setUserType("0");
-        tpTicketRecordComment.setContent(content);
+        tpTicketRecordComment.setContent("处理结果如下，原因——"+content);
         tpTicketRecordComment.setUserName(userName);
         tpTicketRecordComment.setCreateDate(LocalDateTime.now());
+        tpTicketRecordCommentMapper.insert(tpTicketRecordComment);
         /* 传入图片*/
         JSONArray contentImg = object.getJSONArray("imageUrl");
         if (null!=contentImg){

VUECODE/smart-property-manage/package.json

@@ -24,6 +24,7 @@
     "qs": "^6.6.0",
     "vue": "2.5.17",
     "vue-amap": "^0.5.8",
+    "vue-photo-preview": "^1.1.3",
     "vue-router": "3.0.1",
     "vuex": "3.0.1",
     "wangeditor": "^3.1.1",

VUECODE/smart-property-manage/src/api/ticket.js

@@ -34,7 +34,7 @@ export function addRecordComment(data) {
     data: {
       ticketId: data.id,
       content: data.textContent,
-      imageUrl: data.contentImg
+      imageUrl: data.img
     }
   })
 }
@@ -67,7 +67,7 @@ export function updateTicket(data) {
     data: {
       ticketId: data.id,
       content: data.relationContent,
-      imageUrl: data.contentImgList
+      imageUrl: data.imgIO
     }
   })
 }

VUECODE/smart-property-manage/src/main.js

@@ -19,9 +19,13 @@ import VueAMap from 'vue-amap'
 // Vue.use(ElementUI, { locale })
 Vue.use(ElementUI)
 Vue.use(VueAMap)
+import preview from 'vue-photo-preview'
+import 'vue-photo-preview/dist/skin.css'
+Vue.use(preview)
 
-Vue.config.productionTip = false
+import 'vue-photo-preview/dist/skin.css'
 
+Vue.config.productionTip = false
 VueAMap.initAMapApiLoader({
   key: 'f0d1d4f82432504003ebf46e5e36ff03',
   plugin: ['AMap.Autocomplete', 'AMap.PlaceSearch', 'AMap.Scale', 'AMap.OverView', 'AMap.ToolBar', 'AMap.MapType', 'AMap.PolyEditor', 'AMap.CircleEditor', 'AMap.DistrictLayer'],

VUECODE/smart-property-manage/src/views/ticket/details.vue

@@ -1,6 +1,6 @@
 <template>
  <el-form :inline="true" :model="listQuery" class="form-listQuery">
-      <div>
+      <div id="app">
          <span>工单详情</span>
      </div>
  <div class="sizeWhits">
@@ -51,9 +51,10 @@
       </div>
 
       <div style="padding-left:200px;">
-      <template v-for="site in listQuery.contentImageUrl">
-        <img :src="site" width="200" height="200" >
-      </template>
+    <template >
+      <img v-for="sr in listQuery.contentImageUrl" :src="sr" preview  width="200" height="200">
+       <!-- <img v-for="sr in listQuery.contentImageUrl" :src="sr" preview="ss" preview-text="ss" width="200" height="200"> -->
+    </template>
     </div>
 
         <hr width="100%"/>
@@ -65,7 +66,7 @@
     <!-- 一下状态是数据库的所有状态，如需要加状态，页面得加相同状态的div -->
     <div class="approvalProcess" >
         <el-steps :active="7" finish-status="success" direction="vertical">
-          <el-step :title="item.statusName" v-for="item in approvalProcessProject">
+          <el-step :title="item.statusName+'__________'+formatDate(item.createDate)" v-for="item in approvalProcessProject">
             <template slot="description">
              <div class="step-row">
                <table width="100%" border="0" cellspacing="0" cellpadding="0" class="processing_content"  v-for="itemContent in item.statusContent" >
@@ -73,8 +74,16 @@
                             <td style="color9:#98A6BE">
                             	<div class="processing_content_detail" style="float:left;width:70%">
                                     <span >{{itemContent.userName}}:{{itemContent.content}}
-                                    <span style="color:#219AFF"></span>
-                                   
+                                     <div style="float:left;">
+                                     <span >{{'评分'}}<el-rate
+                                        v-model="value5"
+                                        disabled
+                                        show-score
+                                        text-color="#ff9900"
+                                        score-template="{value}">
+                                      </el-rate></span>
+                                     </div> 
+                                    <span style="color:#219AFF"></span>              
                                     </span>
                                     </div>
                               <div class="processing_content_detail" style="float:right;"><span ><i class="el-icon-time"></i>{{formatDate(itemContent.createDate)}}</span> </div>
@@ -84,7 +93,10 @@
                             <td>
                             	<div class="processing_content_detail" style="float:left;width:70%">
                                 <div style="float:left;width: 2px;height: 20px; background:#C7D4E9;margin-left:10px;margin-right:10px"></div> 
-                                <img :src="contentImgURL.imageUrl" v-for="contentImgURL in itemContent.imgURL" width="50" style="margin:5px;">
+                                <!-- <img :src="contentImgURL.imageUrl"  v-for="contentImgURL in itemContent.imgURL" preview preview-text="描述"  width="200" style="margin:5px;"> -->
+                                <img v-for="contentImgURL in itemContent.imgURL" :src="contentImgURL.imageUrl" preview width="200" height="200">
+                            
+                        
                                 </div> 
                                 
                             </td>
@@ -107,9 +119,12 @@
         <div>
         <el-form-item label="图片附件">
         <el-upload
+          :limit="8"
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"
           :on-success="handleSuccessContentImg"
+          :file-list="listQuery.img"
+          :show-file-list="Ass"
           name="uploadFiles"
           action="http://106.14.20.193:8086/property-api/uploadimage"
           list-type="picture-card">
@@ -129,7 +144,7 @@
         </div>
         <br>
           <div>   
-          <textarea v-model="listQuery.relationContent" placeholder="回复TA或向TA提问" class="textarea-inherit" id="message_textarea" rows="4"></textarea> 
+          <textarea v-model="listQuery.relationContent" placeholder="请输入内容" class="textarea-inherit" id="message_textarea" rows="4"></textarea> 
         </div>
         <div>
         <!-- <el-form-item label="图片附件">
@@ -147,12 +162,28 @@
           <img :src="dialogImageUrl" width="100%" alt="">
           </el-dialog>
         </el-form-item> -->
+        <el-form-item label="图片附件">
+        <el-upload
+          :limit="8"
+          :on-preview="handlePictureCardPreviewIO"
+          :on-remove="handleRemoveIO"
+          :on-success="handleSuccessContentImgIO"
+          :file-list="listQuery.imgIO"
+          :show-file-list="Ass"
+          name="uploadFiles"
+          action="http://106.14.20.193:8086/property-api/uploadimage"
+          list-type="picture-card">
+          <i class="el-icon-plus"/>
+        </el-upload>
+        <el-dialog :visible.sync="dialogVisible">
+          <img :src="dialogImageUrlIO" width="100%" alt="">
+        </el-dialog>
+      </el-form-item>
         <el-button type="primary" @click="succeedClick">提交</el-button>
         </div>
         </div>
         
         <div  v-if="listQuery.status==='0'">
-        <div><span>流程操作</span></div><br>
         <el-form-item style="width:1000  px" >
          <el-select v-model="listQuery.userNmaeIds" placeholder="请选择工单由谁负责,然后点击受理分配"  >
          <el-option label="请选择工单由谁负责,然后点击受理分配" :value="-1"/>
@@ -167,7 +198,7 @@
 </el-form>
 </template>
 <script>
- import { mapActions } from 'vuex'
+import { mapActions } from 'vuex'
 export default {
   data() {
     return {
@@ -195,10 +226,11 @@ export default {
         tpUserId: '',
         tpUserNmae: '',
         type: '',
+        img: [],
+        imgIO: [],
         updateDate: '',
         updateUser: '',
         statusList: [],
-        contentImg: [],
         userList:[],
         textContent: '',
         userNmaeIds : '-1',
@@ -210,10 +242,17 @@ export default {
        active:2,
        dialogVisible: false, // 内容配图,
        dialogImageUrl:'',
-       contentImgList: [],
+       dialogImageUrlIO :'',
        approvalProcessProject:[     
        ],
-       content:[]
+       imgURL:[],
+       content:[],
+       contentImgAA: [],
+       contentImgIO: [],
+       contentImgList: [],//图片集合
+       contents:[],
+       Ass: true,
+       value5 :5
     }
   },
   mounted() {
@@ -226,6 +265,10 @@ export default {
         const resDate=res.data
         this.listQuery=resDate
         this.approvalProcessProject = resDate.recordList
+        //  for(let i = 0;i<resDate.recordListzz;i++){
+        //      this.imgURL=resDate.recordList[i]
+        //  }
+      // console.log('this.imgURL',this.imgURL)
       }).catch(() => {
         console.log('error TicketEdit')
       })
@@ -235,28 +278,44 @@ export default {
       this.dialogVisible = true
     },
     handleRemove(file, fileList) { // 配图移除时
-      this.listQuery.contentImg = []
+      this.contentImgAA = []
       for (let i = 0; i < fileList.length; i++) {
-      this.listQuery.contentImg.push(fileList[i].response.data[0])
+      this.contentImgAA.push(fileList[i].response.data[0])
       }
-      console.log(file, fileList)
+      console.log('file',file, fileList)
     },
     handleSuccessContentImg(response, file, fileList) { // 配图上传成功时回调
       const resImg = response.data[0]
-      this.listQuery.contentImg.push(resImg)
+      this.contentImgAA.push(resImg)
+    },
+    //流程
+    handlePictureCardPreviewIO(file) { // 流程
+      this.dialogImageUrlIO = file.url
+      this.dialogVisible = true
+    },
+    handleRemoveIO(file, fileList) { // 流程配图移除时
+      this.contentImgIO = []
+      for (let i = 0; i < fileList.length; i++) {
+      this.contentImgIO.push(fileList[i].response.data[0])
+      }
+      console.log('file',file, fileList)
     },
-    // handleRemove(file, fileList) { // 活动配图移除时
+    handleSuccessContentImgIO(response, file, fileList) { // 流程配图上传成功时回调
+      const resImg = response.data[0]
+      this.contentImgIO.push(resImg)
+    },
+    // handleRemove(file, fileList) { // 配图移除时
     //   this.listQuery.contentImg = []
     //   for (let i = 0; i < fileList.length; i++) {
     //     this.listQuery.contentImg.push(fileList[i].response.data[0])
     //   }
     //   console.log(file, fileList)
     // },
-    // handlePictureCardPreview(file) { // 点击活动配图文件列表中已上传的文件时的钩子
+    // handlePictureCardPreview(file) { // 点击配图文件列表中已上传的文件时的钩子
     //   this.dialogImageUrl = file.url
     //   this.dialogVisible = true
     // },
-    // handleSuccessContentImg(response, file, fileList) { // 活动配图上传成功时回调
+    // handleSuccessContentImg(response, file, fileList) { // 活动上传成功时回调
     //   const resImg = response.data[0]
     //   this.listQuery.contentImg.push(resImg)
     // },
@@ -368,8 +427,11 @@ export default {
       }
         //  console.log("contentImg",this.listQuery.contentImg)
         console.log('sss',this.listQuery.textContent)
-        this.$store.dispatch('AddRecordComment', this.listQuery).then((res) => {
+        this.listQuery.img=this.contentImgAA
+        this.$store.dispatch('AddRecordComment', this.listQuery,).then((res) => {
+            this.Ass=false
           this.dataQuery()
+          this.Ass=true
           loading.close()
       }).catch(() => {
         console.log('error addRecordComment')
@@ -428,9 +490,31 @@ export default {
           this.noAccept()
       },
       // 流程提交
-    succeedClick(){   
+    succeedClick(){
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)' 
+        })
+
+        if(this.listQuery.relationContent===undefined){
+         this.$message.error('请填写内容')
+         loading.close()
+         return
+      }    
         console.log('sss',this.listQuery.textContent)
+         this.listQuery.imgIO=this.contentImgIO
+         console.log('imgIO',this.listQuery.imgIO)
         this.$store.dispatch('UpdateTicket', this.listQuery).then((res) => {
+          this.Ass=false
+          this.dataQuery()
+          this.Ass=true
+          this.$message({
+          message: '提交成功',
+          type: 'success',
+        })
+          loading.close()
       }).catch(() => {
         console.log('error addRecordComment')
       })