11

src/views/modules/shequzhili/issue/cpts/issue-info.vue

@@ -64,7 +64,7 @@
                   </div>
                   <div class="detail">
                     <div class="detail-field">回复内容：</div>
-                    <div class="detail-value">{{ item.publicReply }}</div>
+                    <div class="detail-value">{{ item.publicReply|| item.progressDesc}}</div>
                   </div>
                 </div>
 

src/views/modules/shequzhili/xiangmu/cpts/project-info.vue

@@ -308,11 +308,11 @@
                     </el-input>
                   </el-form-item>
 
-                  <el-form-item 
-                                label="图片/附件："
+                  <el-form-item label="图片/附件："
                                 :class="{'form-item':source==='visiual'}"
                                 prop="internalFile">
-                    <el-upload :headers="$getElUploadHeaders()"  class="avatar-uploader"
+                    <el-upload :headers="$getElUploadHeaders()"
+                               class="avatar-uploader"
                                :action="uploadUrl"
                                :data="{ customerId: customerId }"
                                :show-file-list="true"
@@ -439,9 +439,17 @@
     </div>
 
     <div v-if="pageType == 'origin-info'">
-      <issue-info v-if="projectInfo.origin == 'issue'"
+      <issue-info-origin v-if="projectInfo.origin == 'issue'"
+                         ref="eleEditForm"
+                         :pageType="issuePageType"
+                         :issueId="projectInfo.originId"
+                         :issueDetailData="issueDetailData"
+                         @handleClose="handleBackInfo"
+                         @handleOk="handleBackInfo"
+                         @dialogOk="handleBackInfo" />
+      <!-- <issue-info v-if="projectInfo.origin == 'issue'"
                   @close="handleBackInfo"
-                  :issue-id="projectInfo.originId" />
+                  :issue-id="projectInfo.originId" /> -->
       <event-info v-if="projectInfo.origin == 'resi_event'"
                   @close="handleBackInfo"
                   :event-id="projectInfo.originId" />
@@ -470,6 +478,7 @@ import issueInfo from "./issue-info";
 import eventInfo from "./event-info";
 import projectEvaluation from "./project-evaluation";
 import dateFormat from "dai-js/tools/dateFormat";
+import issueInfoOrigin from "../../issue/cpts/issue-info";
 
 function iniData () {
   return {
@@ -587,6 +596,9 @@ function iniData () {
     tagOptions: [],
     visibleTagPanel: false,
     selectedTagData: [],
+
+    issuePageType: '',
+    issueDetailData: {},
   };
 }
 
@@ -613,6 +625,7 @@ export default {
     eventInfo,
     projectEvaluation,
     selectStaff,
+    issueInfoOrigin
   },
 
   data: iniData,
@@ -853,8 +866,30 @@ export default {
       }
     },
 
-    handleWatchOrigin () {
+    async handleWatchOrigin () {
+
+
+      const url = "/gov/issue/manage/votingissuedetail";
+
+      const { data, code, msg } = await requestPost(url, {
+        issueId: this.projectInfo.originId,
+      });
+
+      if (code === 0) {
+
+        this.issueDetailData = { ...data };
+
+      } else {
+        this.$message.error(msg);
+      }
       this.pageType = "origin-info";
+      if (this.issueDetailData.issueStatus === 'voting') {
+        this.issuePageType = 'dispose'
+      } else {
+        this.issuePageType = 'info'
+      }
+      this.pageTypeCopy = 'issue'
+
     },
     handleBackInfo () {
       this.pageType = "info";