0620 重要事项新增需求开发

src/permission.js

@@ -148,6 +148,8 @@ const whiteList = [
   '/sunVillage_info/list_discussions_new_detail',
   '/sunVillage_info/list_process',
   '/sunVillage_info/list_process_detail',
+  '/sunVillage_info/list_issues_zy',
+  '/sunVillage_info/list_issues_zy_detail',
 
   // 新型经营主体
   'newBusinessEntity/newsBulletin', //新闻公告

src/views/sunVillage_info/list_contract_ranking.vue

@@ -22,8 +22,8 @@
       <div class="right_box">
         <div class="right_box_box">
           <van-row>
-            <van-col :span="4">合同编码</van-col>
-            <van-col :span="2">合同类型</van-col>
+            <van-col :span="3">合同编码</van-col>
+            <van-col :span="1">合同类型</van-col>
             <van-col :span="2">合同乙方</van-col>
             <van-col :span="2">结款方式</van-col>
             <van-col :span="2">合同金额</van-col>
@@ -34,10 +34,11 @@
             <van-col :span="2">签订日期</van-col>
             <van-col :span="2">开始日期</van-col>
             <van-col :span="2">结束日期</van-col>
+            <van-col :span="2">附件</van-col>
           </van-row>
           <van-row v-for="(item,index) in applicationList" :key="index">
-            <van-col :span="4">{{item.code}}</van-col>
-            <van-col :span="2">{{item.biddingType}}</van-col>
+            <van-col :span="3">{{item.code}}</van-col>
+            <van-col :span="1">{{item.biddingType}}</van-col>
             <van-col :span="2">{{item.secondParty}}</van-col>
             <van-col :span="2">{{item.settleType}}</van-col>
             <van-col :span="2">{{item.totalAmount}}</van-col>
@@ -48,6 +49,7 @@
             <van-col :span="2">{{item.buildingTime}}</van-col>
             <van-col :span="2">{{item.startTime}}</van-col>
             <van-col :span="2">{{item.endTime}}</van-col>
+            <van-col :span="2">{{item.endTime}}</van-col>
           </van-row>
         </div>
       </div>
@@ -491,7 +493,7 @@
     display: -webkit-box;
     -webkit-overflow-scrolling: touch;
     .right_box_box{
-      width: 1500PX;
+      width: 2500PX;
     }
     .van-row:nth-child(odd){
       background-color: #ffffff;

src/views/sunVillage_info/list_finance_new_add.vue

@@ -43,24 +43,24 @@
              </template>
            </van-field>
 
-           <van-field  readonly 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>
-<!--           @delete="deleteFile1"-->
-           <van-uploader v-model="fileList" multiple :after-read="afterRead" @delete="deleteFile1" style="margin-top: 10PX">
-             <template #preview-cover="file">
-               <DnD class="van-ellipsis" @touchdragstart="drag" @touchdrop="drop" :value="file.index" touchdraggable touchdroppable show-mask="1">
-                 <template #mask>
-                   <div class="preview-cover">
-                     <img :src="file.url || file.content" class="van-image__img" style="object-fit: cover;"/>
-                   </div>
-                 </template>
-               </DnD>
-             </template>
-           </van-uploader>
+<!--           <van-field  readonly 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>-->
+<!--&lt;!&ndash;           @delete="deleteFile1"&ndash;&gt;-->
+<!--           <van-uploader v-model="fileList" multiple :after-read="afterRead" @delete="deleteFile1" style="margin-top: 10PX">-->
+<!--             <template #preview-cover="file">-->
+<!--               <DnD class="van-ellipsis" @touchdragstart="drag" @touchdrop="drop" :value="file.index" touchdraggable touchdroppable show-mask="1">-->
+<!--                 <template #mask>-->
+<!--                   <div class="preview-cover">-->
+<!--                     <img :src="file.url || file.content" class="van-image__img" style="object-fit: cover;"/>-->
+<!--                   </div>-->
+<!--                 </template>-->
+<!--               </DnD>-->
+<!--             </template>-->
+<!--           </van-uploader>-->
 
            <van-field readonly :border="false">
              <template #label>

src/views/sunVillage_info/list_finance_new_detail.vue

@@ -33,15 +33,15 @@
              </template>
            </van-field>
 
-           <van-field readonly v-model="form.updateTime === null ? form.createTime : form.updateTime" 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>
-<!--           @delete="deleteFile1"-->
-           <van-uploader v-model="openPic" :show-upload="false" :deletable="false" multiple style="margin-top: 10PX" />
-           <van-empty v-if="openPic.length < 1" description="暂无文件" />
+<!--           <van-field readonly v-model="form.updateTime === null ? form.createTime : form.updateTime" 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>-->
+<!--&lt;!&ndash;           @delete="deleteFile1"&ndash;&gt;-->
+<!--           <van-uploader v-model="openPic" :show-upload="false" :deletable="false" multiple style="margin-top: 10PX" />-->
+<!--           <van-empty v-if="openPic.length < 1" description="暂无文件" />-->
 
 
            <van-field readonly :border="false">

src/views/sunVillage_info/list_finance_new_edit.vue

@@ -43,24 +43,24 @@
              </template>
            </van-field>
 
-           <van-field readonly 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>
-<!--           @delete="deleteFile1"-->
-           <van-uploader v-model="openPic" multiple :after-read="afterRead" @delete="deleteFile1" style="margin-top: 10PX" >
-             <template #preview-cover="file">
-                 <DnD class="van-ellipsis" @touchdragstart="drag" @touchdrop="drop" :value="file.index" touchdraggable touchdroppable show-mask="1">
-                   <template #mask>
-                     <div class="preview-cover">
-                       <img :src="file.url || file.content" class="van-image__img" style="object-fit: cover;"/>
-                     </div>
-                   </template>
-                 </DnD>
-             </template>
-           </van-uploader>
+<!--           <van-field readonly 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>-->
+<!--&lt;!&ndash;           @delete="deleteFile1"&ndash;&gt;-->
+<!--           <van-uploader v-model="openPic" multiple :after-read="afterRead" @delete="deleteFile1" style="margin-top: 10PX" >-->
+<!--             <template #preview-cover="file">-->
+<!--                 <DnD class="van-ellipsis" @touchdragstart="drag" @touchdrop="drop" :value="file.index" touchdraggable touchdroppable show-mask="1">-->
+<!--                   <template #mask>-->
+<!--                     <div class="preview-cover">-->
+<!--                       <img :src="file.url || file.content" class="van-image__img" style="object-fit: cover;"/>-->
+<!--                     </div>-->
+<!--                   </template>-->
+<!--                 </DnD>-->
+<!--             </template>-->
+<!--           </van-uploader>-->
 
            <van-field readonly :border="false">
              <template #label>

src/views/sunVillage_info/list_issues_zy_detail.vue

@@ -21,21 +21,24 @@
              :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-field readonly  v-model="form.openName"  :rules="[{ required: true , message:'请输入名称' }]" 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 readonly  v-model="form.importantType"  :rules="[{ required: true , message:'请输入' }]" input-align="right" :border="false" >
+             <template #label>
+               <p style="margin-left: 5px;">事项类型</p>
+             </template>
+           </van-field>
+
            <van-field readonly 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>
@@ -45,7 +48,6 @@
            <div style="border-top: 1px solid #ededed;margin-top: 10PX;">
              <van-field readonly 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>
@@ -61,7 +63,6 @@
 
            <van-field readonly type="textarea" autosize  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>
              <template #input>
@@ -71,7 +72,6 @@
 
            <van-field readonly v-model="form.remark"  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>
@@ -107,17 +107,13 @@
           deptId:''
         },
         showBtn:true,
+        importantTypeOptions:[],
+        importantType: ''
       };
     },
     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.getDicts("important_type").then((response) => {
+        this.importantTypeOptions = response.data;
       });
       this.type = this.$route.query.type;
       this.queryParams.bookId = Cookies.get('bookId');
@@ -148,6 +144,7 @@
               this.openPic.push({url:'/api'+rrr})
             })
           }
+          res.data.importantType = this.selectDictLabel(this.importantTypeOptions, res.data.importantType);
           this.form = res.data;
         })
       },

src/views/sunVillage_info/list_issues_zy_edit.vue

@@ -22,7 +22,6 @@
              :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>
@@ -38,14 +37,39 @@
 
            <van-field required v-model="form.openName" placeholder="请输入名称" :rules="[{ required: true , message:'请输入名称' }]" 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
+             readonly
+             clickable
+             placeholder="请选择"
+             v-model="importantType"
+             @click="showThreeDetailType = true"
+             input-align="right"
+             right-icon="arrow-down"
+             label-width="auto"
+             required
+             :border="false"
+             :rules="[{ required: true , message:'请选择事项类型'  }]"
+           >
+             <template #label>
+               <p style="margin-left: 5px;">事项类型</p>
+             </template>
+           </van-field>
+           <van-popup v-model="showThreeDetailType" position="bottom">
+             <van-picker
+               show-toolbar
+               value-key="dictLabel"
+               :columns="importantTypeOptions"
+               @confirm="onConfirmThreeDetailType"
+               @cancel="showThreeDetailType = false"
+             />
+           </van-popup>
+
            <van-field readonly 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>
@@ -55,7 +79,6 @@
            <div style="border-top: 1px solid #ededed;margin-top: 10PX;">
              <van-field readonly 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>
@@ -75,14 +98,12 @@
 
            <van-field v-model="form.content" type="textarea" autosize 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>
 
             <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>
@@ -107,6 +128,7 @@
     data() {
       return {
         showBuildTime:false,
+        showThreeDetailType:false,
         form:{
           openNy:this.format(new Date(),'yyyy-MM'),
           openPic:'',
@@ -125,18 +147,14 @@
           deptId:''
         },
         openPic2:[],
-        openFile2:[]
+        openFile2:[],
+        importantTypeOptions:[],
+        importantType: ''
       };
     },
     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.getDicts("important_type").then((response) => {
+        this.importantTypeOptions = response.data;
       });
       this.type = this.$route.query.type;
       this.queryParams.bookId = Cookies.get('bookId');
@@ -145,6 +163,11 @@
       this.getDetail();
     },
     methods: {
+      onConfirmThreeDetailType(data){
+        this.importantType = data.dictLabel;
+        this.form.importantType = data.dictValue;
+        this.showThreeDetailType = false;
+      },
       getDetail(id){
         importantDetail(this.queryParams).then((res) => {
           var that = this ;