合并分支

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

@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <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/controller/ImageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/ImageController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/api/ticket.js" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/api/ticket.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/store/modules/ticket.js" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/store/modules/ticket.js" 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>
+    <list default="true" id="051ae1e0-ece1-4622-91c0-3f05ac339943" name="Default Changelist" comment="" />
     <ignored path="$PROJECT_DIR$/../smart-community/eureka-sever/target/" />
     <ignored path="$PROJECT_DIR$/../smart-community/app-api/target/" />
     <ignored path="$PROJECT_DIR$/../smart-community/operate-api/target/" />
@@ -26,11 +20,20 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <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="-2918">
+              <caret line="157" column="58" selection-start-line="157" selection-start-column="58" selection-end-line="157" selection-end-column="58" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/ImageController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="275">
-              <caret line="62" column="48" lean-forward="true" selection-start-line="62" selection-start-column="48" selection-end-line="62" selection-end-column="48" />
+            <state relative-caret-position="347">
+              <caret line="60" selection-start-line="60" selection-end-line="60" />
               <folding>
                 <element signature="e#2452#2460#0" expanded="true" />
               </folding>
@@ -240,7 +243,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="1550743197830" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550750053253" />
     <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" />
@@ -372,18 +375,18 @@
       <workItem from="1550580590425" duration="175000" />
       <workItem from="1550625046867" duration="10953000" />
       <workItem from="1550663154868" duration="404000" />
-      <workItem from="1550711362440" duration="13311000" />
+      <workItem from="1550711362440" duration="16065000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="43789000" />
+    <option name="totallyTimeSpent" value="46543000" />
   </component>
   <component name="ToolWindowManager">
     <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" weight="0.15242778" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19669509" />
       <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" />
@@ -394,7 +397,7 @@
       <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.6998934" weight="0.36302894" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.91518134" visible="true" weight="0.3530067" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.91518134" visible="true" weight="0.31403118" />
       <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" />
@@ -576,13 +579,6 @@
         </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="79">
-          <caret line="157" column="58" lean-forward="true" selection-start-line="157" selection-start-column="58" selection-end-line="157" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/BillController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="246">
@@ -611,10 +607,17 @@
         </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="-2918">
+          <caret line="157" column="58" selection-start-line="157" selection-start-column="58" selection-end-line="157" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/ImageController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="275">
-          <caret line="62" column="48" lean-forward="true" selection-start-line="62" selection-start-column="48" selection-end-line="62" selection-end-column="48" />
+        <state relative-caret-position="347">
+          <caret line="60" selection-start-line="60" selection-end-line="60" />
           <folding>
             <element signature="e#2452#2460#0" expanded="true" />
           </folding>

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.contentImgAA
+      imageUrl: data.img
     }
   })
 }

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

@@ -8,7 +8,7 @@
       <el-form-item style="padding-left:1%;" label="工单号">
         <span>{{listQuery.id}}</span>
       </el-form-item>
-      <el-form-item style='padding-left:16%' label="工单类型">
+      <el-form-item style='padding-left:240px' label="工单类型">
         <span v-if="listQuery.type==='1'">{{'投诉'}}</span>
         <span v-if="listQuery.type==='2'">报修
           <span v-if="listQuery.repairType==='0'">{{'(公共区域)'}}</span>
@@ -17,14 +17,14 @@
         </span>
         <span v-if="listQuery.type==='3'">{{'联系物业'}}</span>
       </el-form-item>
-      <el-form-item style='padding-left:16%' label="发起时间">
+      <el-form-item style='padding-left:240px' label="发起时间">
         <span>{{ formatDate(listQuery.createDate) }}</span>
            <!-- <span>{{ listQuery.createDate }}</span> -->
       </el-form-item>
-      <el-form-item style='padding-left:16%' label="发起人">
+      <el-form-item style='padding-left:240px' label="发起人">
         <span>{{listQuery.createUserNmae}}</span>
       </el-form-item>
-      <el-form-item style='padding-left:300px' label="发起人联系方式">
+      <el-form-item style='padding-left:200px' label="发起人联系方式">
         <span>{{listQuery.loginName}}</span>
       </el-form-item>
       </div>
@@ -114,8 +114,7 @@
            </el-step>
         </el-steps>
   </div>
-  <!-- v-if="listQuery.status==='0'||listQuery.status==='3'" -->
-        <div >
+        <div v-if="listQuery.status==='0'||listQuery.status==='3'">
         <div>
         <span>参与沟通</span>
         </div>
@@ -127,11 +126,11 @@
         <el-form-item label="图片附件">
         <el-upload
           :limit="8"
+          :before-upload="handleCompress"
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"
           :on-success="handleSuccessContentImg"
-          name="uploadFiles"
-          action="http://106.14.20.193:8086/property-api/uploadimage"
+          action=""
           :file-list="listQuery.img"
           :show-file-list="Ass"
           list-type="picture-card">
@@ -144,8 +143,7 @@
         <el-button type="primary" @click="submitContent">提交</el-button>
         </div>
         </div>
-      <!-- //v-if="listQuery.status==='3'" -->
-        <div >
+        <div v-if="listQuery.status==='3'">
         <div>
         <span>流程操作(压缩测试)</span>
         </div>
@@ -157,10 +155,11 @@
         <el-form-item label="图片附件">
         <el-upload
           :before-upload="handleCompress"
-          :on-preview="handlePictureCardPreview"
-          :on-remove="handleRemove"
-          :on-success="handleSuccessContentImg"
-          :file-list="contentImgList"
+          :on-preview="handlePictureCardPreviewIO"
+          :on-remove="handleRemoveIO"
+          :on-success="handleSuccessContentImgIO"
+          :file-list="listQuery.imgIO"
+          :show-file-list="Ass"
            action=""
           list-type="picture-card">
           <i class="el-icon-plus"/>
@@ -332,28 +331,18 @@ export default {
             console.log(formData.get("file"));
             console.log('formData',formData) 
 
-                console.log(formData)
-                let data = {"uploadFiles": newdata }
-
-                self.$store.dispatch('ImgAdd', Qs.stringify(data)).then((res) => {
-                if (res.data.code == 200) {
-                self.$emit(
-                  "getImgsrc",
-                  res.data.data.resultftphost,
-                  res.data.data.resulturl
-                );
-              } else {
-                self.$message({
-                  message: "图片上传失败，请重试",
-                  type: "warning"
-                });
-              }  
-          }).catch(() => {
-            console.log('imgAdd error')
-          })
-
-
-
+            console.log(formData)
+            let data = {"uploadFiles": newdata }
+              self.$store.dispatch('ImgAdd', Qs.stringify(data)).then((res) => {
+               self.contentImgIO.push(res.data[0])
+               self.contentImgAA.push(res.data[0])
+               console.log('this.contentImgIO',res.data[0])
+               console.log('this.listQuery.contentImgIO',self.contentImgIO)
+          
+                // this.console.log('this.listQuery.contentImgIO=res.data[0]',this.listQuery.contentImgIO=res.data[0])
+              //  console.log('reaDate',reaDate[0])
+              //  this.contentImgIO.push(reaDate)         
+             })
           }
           image.src = data
         }
@@ -423,7 +412,7 @@ export default {
       })
       console.log()
       if(this.listQuery.textContent===undefined){
-         this.$message.error('请填写沟通内容')
+         this.$message.error('请填写拒绝内容')
          loading.close()
          return
       }
@@ -507,11 +496,14 @@ export default {
          loading.close()
          return
       }    
-        console.log('sss',this.listQuery.textContent)
+        console.log('sss',this.listQuery.relationContent)
+        console.log('this.contentImgIO[0]',  this.contentImgIO)
+      
          this.listQuery.imgIO=this.contentImgIO
          console.log('imgIO',this.listQuery.imgIO)
         this.$store.dispatch('UpdateTicket', this.listQuery).then((res) => {
           this.Ass=false
+          this.contentImgIO=''
           this.dataQuery()
           this.Ass=true
           this.$message({