Merge remote-tracking branch 'origin/master'

src/api/sunVillage_info/fixedAssets.js

@@ -142,6 +142,14 @@ export function tempWorkerPublicDetail(query) {
     params: query
   })
 }
+// 重大事项公开详情
+export function majorEventPublicDetail(query) {
+  return request({
+    url: '/villageAffairs/public/majorEventPublicDetail',
+    method: 'get',
+    params: query
+  })
+}
 
 //获取区、镇、村地区
 export function treeselectByUser(query) {

src/router/index.js

@@ -2932,6 +2932,7 @@ export const constantRoutes = [
     meta: {
       title: '详情页',
       hidden: true,
+      keepAlive: true
     },
     component: (resolve) => require(['@/views/sunVillage_info/details'], resolve)
   },

src/views/sunVillage_info/details.vue

@@ -19,7 +19,7 @@
 </template>
 
 <script>
-  import { financePublicDetail , tempWorkerPublicDetail } from "@/api/sunVillage_info/fixedAssets";
+  import { financePublicDetail , tempWorkerPublicDetail , majorEventPublicDetail } from "@/api/sunVillage_info/fixedAssets";
   import Cookies from "js-cookie";
   import request from '@/utils/request'
   export default {
@@ -72,6 +72,16 @@
               }
             });
           }
+          if (this.type == 'issues'){
+            majorEventPublicDetail(this.queryParams).then(response => {
+              if (response.code == 200){
+                if (response.data.openFile){response.data.openFile = response.data.openFile.split(',');}
+                if (response.data.openPic){response.data.openPic = response.data.openPic.split(',');}
+                response.data.createTime = response.data.createTime.substr(0,10)
+                this.form = response.data;
+              }
+            });
+          }
 
         }, 1000);
       },

src/views/sunVillage_info/list_finance_add.vue

@@ -5,18 +5,160 @@
              <div class="return_btn"></div>
              <div class="add_btn"></div>
          </div>
-         <div class="release_head">
-            <div class="people"><i class="icon"></i>发布人:李铁根</div>
-            <div class="time"><i class="icon"></i>发布日期:2022-10-12</div>
+       <van-form @submit="onSubmit">
+         <div class="list_main">
+
+           <van-field
+             readonly
+             clickable
+             placeholder="请选择"
+             v-model="form.openNy"
+             @click="showBuildTime = true"
+             input-align="right"
+             right-icon="arrow-down"
+             label-width="auto"
+             required
+             :border="false"
+             :rules="[{ required: true , message:'请选择购建时间' }]"
+           >
+             <template #label>
+               <img src="../../assets/images/sunVillage_info/add_tit_icon_01.png" width="18">
+               <p style="margin-left: 5px;">公开年月</p>
+             </template>
+           </van-field>
+           <van-popup v-model="showBuildTime" position="bottom">
+             <van-datetime-picker
+               v-model="openNy"
+               type="year-month"
+               title="选择年月日"
+               @confirm="onConfirmOpenNy"
+               @cancel="showBuildTime = false"
+             />
+           </van-popup>
+
+           <van-field required v-model="form.openName" placeholder="请输入名称" input-align="right" :border="false" >
+             <template #label>
+               <img src="../../assets/images/sunVillage_info/add_tit_icon_02.png" width="18">
+               <p style="margin-left: 5px;">公开名称</p>
+             </template>
+           </van-field>
+
+           <van-field required readonly v-model="form.openPic" input-align="right" :border="false" >
+             <template #label>
+               <img src="../../assets/images/sunVillage_info/add_tit_icon_03.png" width="18">
+               <p style="margin-left: 5px;">公开图片</p>
+             </template>
+           </van-field>
+
+           <van-uploader v-model="fileList" :after-read="afterRead" @delete="deleteFile1" multiple style="margin-top: 10PX" />
+
+           <div style="border-top: 1px solid #ededed;margin-top: 10PX;">
+             <van-field readonly v-model="form.openFile" input-align="right" :border="false" >
+               <template #label>
+                 <img src="../../assets/images/sunVillage_info/add_tit_icon_04.png" width="18">
+                 <p style="margin-left: 5px;">附件</p>
+               </template>
+             </van-field>
+
+             <div>
+               <div v-for="(item,index) in openFile" :key="index" style="display: flex;align-items: center;margin-top: 10px;">
+                 <img src="../../assets/images/sunVillage_info/WORD.png" width="30" v-if="item.type == 'word'"/>
+                 <img src="../../assets/images/sunVillage_info/ECEL.png" width="30" v-if="item.type == 'excel'" />
+                 <p style="margin-left: 10px;">{{item.name}}</p>
+               </div>
+             </div>
+             <van-uploader accept="*" :after-read="afterReadOpenFile" style="margin-top: 10PX">
+               <img src="../../assets/images/sunVillage_info/addFile.png" width="120" />
+             </van-uploader>
+           </div>
+           <van-field v-model="form.remark" placeholder="请输入备注" input-align="right" :border="false" >
+             <template #label>
+               <img src="../../assets/images/sunVillage_info/add_tit_icon_05.png" width="18">
+               <p style="margin-left: 5px;">备注</p>
+             </template>
+           </van-field>
+
          </div>
-         <div class="release_conetnt">
-            <img src="../../assets/images/sunVillage_info/img_1.png" />
-            <img src="../../assets/images/sunVillage_info/img_1.png" />
-            <p>本月公示已上传，有异议请致电  81451296  ，联系人王书记。</p>
+
+         <div style="margin: 16px;">
+           <van-button round block type="primary" native-type="submit">
+             保存
+           </van-button>
          </div>
+       </van-form>
     </div>
 </template>
- <style scoped lang="scss">
+
+<script>
+  import { commonAttach , tempWorkerPublicDetail , majorEventPublicDetail } from "@/api/sunVillage_info/fixedAssets";
+  import Cookies from "js-cookie";
+  import request from '@/utils/request'
+  export default {
+    name: "certificateList",
+    data() {
+      return {
+        showBuildTime:false,
+        form:{
+          openNy:this.format(new Date(),'yyyy-MM'),
+        },
+        fileList:[],
+        openNy:new Date(),
+        type:'',
+        openFile:[]
+      };
+    },
+    created() {
+      this.houseGetDicts("asset_status").then((response) => {
+        this.assetStatusOptions = response.data;
+      });
+      this.houseGetDicts("asset_type").then((response) => {
+        this.assetTypeOptions = response.data;
+      });
+      this.houseGetDicts("use_type").then((response) => {
+        this.useTypeOptions = response.data;
+      });
+      this.queryParams.id = this.$route.query.id;
+      this.type = this.$route.query.type;
+      this.queryParams.bookId = Cookies.get('bookId');
+      this.queryParams.deptId = Cookies.get('deptId');
+      this.getDetail()
+    },
+    methods: {
+      onSubmit(){},
+      onConfirmOpenNy(data){
+        this.form.openNy = this.format(data,'yyyy-MM');
+        this.openNy = data;
+        this.showBuildTime = false;
+      },
+      afterRead(file) {
+        // 此时可以自行将文件上传至服务器
+        this.form.openPic.push(file.file);
+        // let params1 = new FormData();
+        // params1.append("tableId", this.projectId);
+        // params1.append("tableName", "t_asset_permanent");
+        // params1.append("bizPath", "asset");
+        // params1.append("fileType", this.projectIndex);
+        // params1.append("file", file.file);
+        // commonAttach(params1).then((r1) => {
+        //   this.$notify({ type: 'success', message: '上传成功' });
+        // })
+      },
+      afterReadOpenFile(file){
+        console.log(file)
+        let name = file.file.name;
+        let type = '';
+        if (name.indexOf('.doc') > -1){
+          type = 'word';
+        }else if(name.indexOf('.xls') > -1){
+          type = 'excel';
+        }
+        this.openFile.push({name:file.file.name,type:type})
+      }
+    },
+  }
+</script>
+
+<style scoped lang="scss">
 .home_wrapper{
     background: #e9e9e9;
     min-height: 100vh;
@@ -90,8 +232,38 @@
             margin-bottom: 16px;
         }
         p{
-            margin-bottom: 16px;   
+            margin-bottom: 16px;
         }
     }
+  .list_main{
+    padding:25px;
+    background: #ffffff;
+    width: 94%;
+    margin: 25px auto 0;
+    border-radius: 15PX;
+    box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+  }
+  .titBox{
+    display: flex;
+    align-items: center;
+  }
+  .tit{
+    font-size: 36px;
+    font-weight: bold;
+  }
+  /deep/ .van-cell{
+    padding-left: 0!important;
+    padding-right: 0!important;
+    padding-bottom: 0!important;
+  }
+  /deep/ .van-field__label{
+    /*padding-left: 10PX;*/
+    width: auto;
+    display: flex;
+    align-items: center;
+  }
+  /deep/ .van-cell--required::before{
+    left: 85PX;
+  }
 }
-</style>
+</style>

src/views/sunVillage_info/list_issues.vue

@@ -170,7 +170,7 @@
         this.$router.push('/sunVillage_info/fixedAssetsAdd')
       },
       goDetail(id){
-        this.$router.push({path:'/sunVillage_info/details',query: {id:id}})
+        this.$router.push({path:'/sunVillage_info/details',query: {id:id,type:'issues'}})
       },
     },
   }