task 44112 实施过程公开

src/api/sunVillage_info/fixedAssets.js

@@ -1256,6 +1256,22 @@ export function listSiyigongkaiOpen(query) {
   })
 }
 
+// 查询四议两公开详细
+export function otherPublicDetailN(id) {
+  return request({
+    url: '/open/villageAffairs/public/otherPublicDetail' + id,
+    method: 'get'
+  })
+}
+
+// 查询四议两公开详细
+export function otherPublicDetailOpen(id) {
+  return request({
+    url: '/open/villageAffairs/public/otherPublicDetail' + id,
+    method: 'get'
+  })
+}
+
 // 查询四议两公开详细
 export function getSiyigongkai(id) {
   return request({

src/views/sunVillage_info/list_process.vue

@@ -31,11 +31,11 @@
         <div class="item" v-for="(item,index) in applicationList" :key="index" @click="viewItem(item.id)" >
           <div class="info">
             <div class="title">
-              <p class="news_title">{{item.openName}}</p>
+              <p class="news_title">{{item.otherName}}</p>
             </div>
             <div class="time">
               <div class="icon_time"></div>
-              {{item.jueyiAt}}
+              {{item.openAt}}
             </div>
           </div>
           <div class="operation" v-show="showBtn">

src/views/sunVillage_info/list_process_detail.vue

@@ -11,28 +11,31 @@
        <van-form  ref="formData" :readonly="true">
          <div class="list_main">
 
-           <van-field name="otherName" :value="form.openName" label="公开标题" input-align="right" :border="false" />
-           <van-field name="openAt" :value="form.jueyiAt" label="決议公开日期" input-align="right" :border="false" />
+           <van-field name="otherName" :value="form.otherName" label="公开名称" input-align="right" :border="false" />
+           <van-field name="openAt" :value="form.openAt" label="公开时间" input-align="right" :border="false" />
+
+           <van-field name="openContent" label="公开内容" input-align="right" :border="false" />
+           <div class="open-content" v-html="form.openContent"></div>
+
            <van-field
-             name="jueyiPic"
-             label="决议公开图片"
+             name="openPic"
+             label="公开图片"
              input-align="right"
              :border="false"
            >
            </van-field>
-           <CommonUpload style="padding-left: 10PX;" name="jueyiPic" :value="form.jueyiPic" multiple :deletable="false" :show-upload="false"/>
+           <CommonUpload name="openPic" :value="form.openPic" multiple :deletable="false" :show-upload="false"/>
 
-           <van-field name="otherName" :value="form.shishiAt" label="实施公开日期" input-align="right" :border="false" />
            <van-field
-             name="shishiPic"
-             label="实施公开图片"
+             name="openFile"
+             label="公开文件"
              input-align="right"
              :border="false"
            >
            </van-field>
-           <CommonUpload style="padding-left: 10PX;" name="shishiPic" :value="form.shishiPic" multiple :deletable="false" :show-upload="false"/>
+           <CommonUpload name="openFile" :value="form.openFile" multiple :deletable="false" :show-upload="false"/>
 
-           <van-field name="remake" :value="form.remark" label="备注"  input-align="right" :border="false"/>
+           <van-field name="remake" :value="form.remark" label="备注" input-align="left" :border="false"/>
 
          </div>
 
@@ -41,7 +44,7 @@
  </template>
  <script>
    import CommonUpload from "@/components/form/CommonUpload.vue";
-   import {getSiyigongkai,getSiyigongkaiOpen} from "@/api/sunVillage_info/fixedAssets";
+   import {otherPublicDetailN,otherPublicDetailOpen} from "@/api/sunVillage_info/fixedAssets";
    import Cookies from "js-cookie";
    export default {
      name: "otherOpenDetail",
@@ -63,11 +66,11 @@
      methods: {
        getDetail() {
          if (this.showBtn){
-           getSiyigongkai(this.id).then((resp) => {
+           otherPublicDetailN(this.id).then((resp) => {
              this.form = resp.data;
            });
          }else{
-           getSiyigongkaiOpen(this.id,Cookies.get('bookId')).then((resp) => {
+           otherPublicDetailOpen(this.id,Cookies.get('bookId')).then((resp) => {
              this.form = resp.data;
            });
          }