暂存

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

@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="051ae1e0-ece1-4622-91c0-3f05ac339943" name="Default Changelist" comment="">
       <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" />
+      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/ticket/details.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/ticket/details.vue" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../smart-community/eureka-sever/target/" />
     <ignored path="$PROJECT_DIR$/../smart-community/app-api/target/" />
@@ -23,19 +23,37 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <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="1430">
+            <state relative-caret-position="7776">
               <caret line="307" selection-start-line="307" selection-end-line="307" />
             </state>
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="3267">
+              <caret line="143" column="43" selection-start-line="143" selection-start-column="38" selection-end-line="143" selection-end-column="56" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="3">
+              <caret line="296" lean-forward="true" selection-start-line="296" selection-end-line="296" />
+            </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">
+            <state relative-caret-position="2403">
               <caret line="104" selection-start-line="104" selection-end-line="104" />
             </state>
           </provider>
@@ -75,6 +93,7 @@
       <find>ticketDetails</find>
       <find>ticketId</find>
       <find>queryWrapper</find>
+      <find>content</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -109,8 +128,8 @@
     <option name="vmOptions" value="-DarchetypeCatalog=internal" />
   </component>
   <component name="ProjectFrameBounds" extendedState="7">
-    <option name="x" value="435" />
-    <option name="y" value="19" />
+    <option name="x" value="197" />
+    <option name="y" value="131" />
     <option name="width" value="1687" />
     <option name="height" value="1061" />
   </component>
@@ -134,6 +153,85 @@
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
               <item name="app-api" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="assembly" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="community" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="community" type="462c0819:PsiDirectoryNode" />
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="community" type="462c0819:PsiDirectoryNode" />
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
@@ -245,7 +343,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="1550651720852" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550663036257" />
     <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" />
@@ -375,18 +473,19 @@
       <workItem from="1550547757316" duration="45000" />
       <workItem from="1550547903821" duration="17904000" />
       <workItem from="1550580590425" duration="175000" />
-      <workItem from="1550625046867" duration="10290000" />
+      <workItem from="1550625046867" duration="10953000" />
+      <workItem from="1550663154868" duration="247000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="29411000" />
+    <option name="totallyTimeSpent" value="30321000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.037846483" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24200426" />
       <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" />
@@ -396,15 +495,15 @@
       <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 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 active="true" anchor="bottom" id="Run" order="2" sideWeight="0.70042646" visible="true" weight="0.96659243" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.91518134" weight="0.12624584" />
       <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" sideWeight="0.08422175" side_tool="true" visible="true" weight="0.2817372" />
+      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.29957357" side_tool="true" visible="true" weight="0.96659243" />
       <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" />
@@ -495,6 +594,27 @@
         </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="7776">
+          <caret line="307" selection-start-line="307" selection-end-line="307" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3267">
+          <caret line="143" column="43" selection-start-line="143" selection-start-column="38" selection-end-line="143" selection-end-column="56" />
+        </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="2403">
+          <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/model/TpTicketRecordComment.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="432">
@@ -516,17 +636,10 @@
         </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">
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1430">
-          <caret line="307" selection-start-line="307" selection-end-line="307" />
+        <state relative-caret-position="3">
+          <caret line="296" lean-forward="true" selection-start-line="296" selection-end-line="296" />
         </state>
       </provider>
     </entry>

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

@@ -1,7 +1,8 @@
 <template>
+<div id="app" style="margin-top:20px;">
  <el-form :inline="true" :model="listQuery" class="form-listQuery">
-      <div id="app">
-         <span>工单详情</span>
+      <div >
+         <span style="padding-left:1%;font-weight:bold;font-size:12px;">工单详情</span>
      </div>
  <div class="sizeWhits">
       <el-form-item style="padding-left:1%;" label="工单号">
@@ -52,7 +53,7 @@
 
       <div style="padding-left:200px;">
     <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  width="200" height="200"  style="margin:5px;">
        <!-- <img v-for="sr in listQuery.contentImageUrl" :src="sr" preview="ss" preview-text="ss" width="200" height="200"> -->
     </template>
     </div>
@@ -69,21 +70,28 @@
           <el-step :title="item.statusName+'__________'+formatDate(item.createDate)" v-for="item in approvalProcessProject">
             <template slot="description">
              <div class="step-row">
+               <tr v-if="item.status - 0 === 5"><td>评价：</td><td><el-rate
+                v-model="listQuery.score"
+                disabled
+                show-score
+                text-color="#ff9900"
+                score-template="{value}">
+              </el-rate></td></tr>
+              <tr v-if="item.status - 0 === 5"><td>评语：</td><td>{{listQuery.comment}}</td></tr>
+               <!-- <div v-if="item.status - 0 === 5" style="float:left">评价<el-rate
+                v-model="value5"
+                disabled
+                show-score
+                text-color="#ff9900"
+                score-template="{value}">
+              </el-rate>
+              </div> -->
                <table width="100%" border="0" cellspacing="0" cellpadding="0" class="processing_content"  v-for="itemContent in item.statusContent" >
-                         <tr>
-                            <td style="color9:#98A6BE">
+                         <tr> 
+                           <td>                        
                             	<div class="processing_content_detail" style="float:left;width:70%">
-                                    <span >{{itemContent.userName}}:{{itemContent.content}}
-                                     <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>{{itemContent.userName}}:{{itemContent.content}}                                 
+                                    <span style="color:#219AFF">'sssss'</span>
                                     </span>
                                     </div>
                               <div class="processing_content_detail" style="float:right;"><span ><i class="el-icon-time"></i>{{formatDate(itemContent.createDate)}}</span> </div>
@@ -94,21 +102,19 @@
                             	<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" preview preview-text="描述"  width="200" style="margin:5px;"> -->
-                                <img v-for="contentImgURL in itemContent.imgURL" :src="contentImgURL.imageUrl" preview width="200" height="200">
-                            
-                        
-                                </div> 
-                                
+                                <img v-for="contentImgURL in itemContent.imgURL" :src="contentImgURL.imageUrl" preview width="200" height="200"  style="margin:5px;">                                                      
+                                </div>                           
                             </td>
                           </tr>
                 </table>
                 
+               
            </div>
          </template>
            </el-step>
         </el-steps>
   </div>
-        <div>
+        <div v-if="listQuery.status==='0'||listQuery.status==='3'">
         <div>
         <span>参与沟通</span>
         </div>
@@ -186,9 +192,9 @@
         <div  v-if="listQuery.status==='0'">
         <el-form-item style="width:1000  px" >
          <el-select v-model="listQuery.userNmaeIds" placeholder="请选择工单由谁负责,然后点击受理分配"  >
-         <el-option label="请选择工单由谁负责,然后点击受理分配" :value="-1"/>
-         <el-option label="我自己" :value="listQuery.CurrentUserName"/>
-         <el-option  v-for="user in listQuery.userList" :label="user.userName" :value="user.id"/>
+          <el-option label="请选择工单由谁负责,然后点击受理分配" value="-1" />
+          <el-option label="我自己" :value="listQuery.currentUserName"/>
+          <el-option  v-for="user in listQuery.userList" :label="user.userName" :value="user.id"/>
         </el-select>
       </el-form-item>
        <el-button type="primary" @click="addRecord">受理分配</el-button>
@@ -196,6 +202,7 @@
         </div>
 </div>
 </el-form>
+</div>
 </template>
 <script>
 import { mapActions } from 'vuex'
@@ -252,7 +259,7 @@ export default {
        contentImgList: [],//图片集合
        contents:[],
        Ass: true,
-       value5 :5
+       value5: 5
     }
   },
   mounted() {
@@ -430,7 +437,9 @@ export default {
         this.listQuery.img=this.contentImgAA
         this.$store.dispatch('AddRecordComment', this.listQuery,).then((res) => {
             this.Ass=false
+            this.contentImgAA=[]
           this.dataQuery()
+         
           this.Ass=true
           loading.close()
       }).catch(() => {