wangmengwei 1 kuukausi sitten
vanhempi
commit
127a3fd831

+ 12 - 3
src/views/project/add.vue

@@ -55,9 +55,9 @@
                 </el-tab-pane>
             </el-tabs>
 
-            <!-- <div class="btns flexcc">
-              <el-button type="success" size="small">审核</el-button>
-            </div> -->
+            <div class="btns flexcc">
+              <el-button v-hasPermi="['zhaoshangV3:qyxx:edit']" type="success" size="small" @click="hunpl">完成</el-button>
+            </div>
         <!-- </div> -->
 
 
@@ -206,6 +206,15 @@
       this.qyxxinfo.qyrq=this.time()
     },
     methods:{
+		// 完成
+		hunpl(){
+			this.qyxxinfo.progress = 5
+			updateQyxx(this.qyxxinfo).then(res=>{
+			    if(res.code==200){
+			      this.$message.success('操作成功');
+			    }
+			  })
+		},
       handleClicka(){
         if(this.isdisabled){
           this.$message.error('请先提交签约信息');

+ 5 - 5
src/views/project/fourthInfoForm.vue

@@ -35,7 +35,7 @@
 				<div class="ftop flexc">
 					<img class="timg flex0" src="@/assets/images/project/tabtit.png" />
 					<div class="flex1 tit">年度统计<span style="color: red; font-size: 12px;">(请先报存投产信息在填写年度统计)</span></div>
-					<el-button type="primary" plain @click="handleAdd">提交</el-button>
+					<el-button type="primary" v-hasPermi="['zhaoshangV3:tcxx:edit']" plain @click="handleAdd">提交</el-button>
 				</div>
 				<div class="rowbox">
 					<el-row :gutter="22">
@@ -87,12 +87,12 @@
 						<el-table-column align="center" label="操作" :width="120">
 							<template slot-scope="scope">
 								<div class="flexcc">
-									<div class="btna  coa" style="padding: 0; margin-right: 3px;"
+									<div v-hasPermi="['zhaoshangV3:month:edit']" class="btna  coa" style="padding: 0; margin-right: 3px;"
 										@click="handleUpdate(scope.row)">
 										<div class="imgs">
 										</div>修改
 									</div>
-									<div class="btna  cod" style="padding: 0; margin-left: 3px;"
+									<div v-hasPermi="['zhaoshangV3:month:remove']" class="btna  cod" style="padding: 0; margin-left: 3px;"
 										@click="handleDelete(scope.row)">
 										<div class="imgs">
 										</div>删除
@@ -138,7 +138,7 @@
 		</el-form>
 		<div class="flexcc pt7">
 			<!-- <el-button type="primary" plain>暂存</el-button> -->
-			<el-button type="primary" style="margin-left: 26px;" @click="submitForm">提交</el-button>
+			<el-button v-hasPermi="['zhaoshangV3:tcxx:edit']" type="primary" style="margin-left: 26px;" @click="submitForm">提交</el-button>
 		</div>
 	</div>
 
@@ -330,7 +330,7 @@
 						}
 						that.getList()
 					}
-				}, 2000)
+				}, 1000)
 				// console.log(this.info)
 			},
 			getList() {

+ 7 - 5
src/views/project/list.vue

@@ -3,9 +3,9 @@
     <el-form class="secbox" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
       <el-row :gutter="20">
         <el-col :span="8">
-          <el-form-item label="项目编号" prop="noticeTitle">
+          <el-form-item label="项目编号" prop="xmbh">
             <el-input
-              v-model="queryParams.noticeTitle"
+              v-model="queryParams.xmbh"
               placeholder="输入项目编号"
               clearable
               @keyup.enter.native="handleQuery"
@@ -13,10 +13,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="创建日期" prop="noticeTitle">
+          <el-form-item label="创建日期" prop="createTime">
             <el-date-picker
-                  v-model="queryParams.value1"
+                  v-model="queryParams.createTime"
                   type="date"
+				  @keyup.enter.native="handleQuery"
                   placeholder="年 / 月 / 日">
                 </el-date-picker>
           </el-form-item>
@@ -151,7 +152,8 @@ export default {
                xmId: null,
                xmbh: null,
                xmmc: null,
-			   progress:1
+			   progress:1,
+			   createTime:null
       },
       // 表单参数
       form: {},

+ 4 - 5
src/views/project/thirdInfoForm.vue

@@ -54,9 +54,8 @@
         </div>
         <div class="ftab flexc">
           <div class="line"></div>上报项目建设进展情况
-		  
           <div class="flex1"></div>
-          <el-button type="primary" @click="handleAdd"  plain class="upbox" plain >
+          <el-button type="primary" v-hasPermi="['zhaoshangV3:jsxx:add']" @click="handleAdd"  plain class="upbox" plain >
             提交
           </el-button>
         </div>
@@ -124,11 +123,11 @@
                 <el-table-column align="center" label="操作" :width="120">
                   <template slot-scope="scope">
                    <div class="flexcc">
-                    <div class="btna  coa" style="padding: 0; margin-right: 3px;" @click="handleUpdate(scope.row)" >
+                    <div v-hasPermi="['zhaoshangV3:jdqk:edit']"  class="btna  coa" style="padding: 0; margin-right: 3px;" @click="handleUpdate(scope.row)" >
                        <div class="imgs">
                        </div>修改
                      </div>
-                     <div class="btna  cod" style="padding: 0; margin-left: 3px;" @click="handleDelete(scope.row)" >
+                     <div v-hasPermi="['zhaoshangV3:jdqk:remove']"  class="btna  cod" style="padding: 0; margin-left: 3px;" @click="handleDelete(scope.row)" >
                        <div class="imgs"  >
                        </div>删除
                      </div>
@@ -168,7 +167,7 @@
     </el-form>
     <div class="flexcc pt7">
         <!-- <el-button type="primary" plain>暂存</el-button> -->
-         <el-button type="primary"  style="margin-left: 26px;" @click="submitForm">提交</el-button>
+         <el-button type="primary" v-hasPermi="['zhaoshangV3:jsxx:edit']"    style="margin-left: 26px;" @click="submitForm">提交</el-button>
     </div>
 	
  

+ 10 - 3
src/views/zhaoshang/touzf/index.vue

@@ -60,7 +60,7 @@
     <div style="margin-top: 15px;">
 		<div class=" infinite-list" :style="dynamicStyle"  >
 		  <div  v-if='noticeList.length !=0'    :class=" ishsouetan == false? 'imghse hyeg' : 'hyeg'"   style="display: flex;flex-wrap: wrap;justify-content: space-between; " >
-		    <div    :class=" ishsouetan == false? 'box_3dr zuihsoue flex-col' : 'box_3dr  flex-col'"   v-for="(item,index ) in noticeList" :key="index" >
+		    <div @mouseenter="showContent" @mouseleave="hideContent"   :class=" ishsouetan == false? 'box_3dr zuihsoue flex-col' : 'box_3dr  flex-col'"   v-for="(item,index ) in noticeList" :key="index" >
 		                  <div :class=" index == 0?'nshge box_4 flex-row' : 'box_4 flex-row'" style="justify-content: space-between;margin: 0;">
 		                    <div  @click="handleSelectionChange(item)" style="display: flex;align-items: center; cursor: pointer;" >
 		                      <img
@@ -124,7 +124,7 @@
 		                    <!-- <span class="text_20">设备地址:192.168.1.1</span> -->
 		                    <span class="text_20" >注册资金:{{item.zczb == null?'暂无数据 ': item.zczb}}万元</span>
 		                  </div>
-						  <div class="xnhse">
+						  <div class="xnhse"v-show="isHidden">
 						  	<div v-hasPermi="['zhaoshangV3:tzfk:edit']" @click="handleUpdate(item)">
 						  		<img
 						  		  referrerpolicy="no-referrer"
@@ -137,7 +137,7 @@
 						  		   src="../../../assets/images/icon_tzfk_mp_gd_ls.png"/>
 						  		   <span>历史投资</span>
 						  	</div>
-						  	<div @click="handleDelete(item)" v-hasPermi="['zhaoshangV3:tzfk:remove']">
+						  	<div  @click="handleDelete(item)" v-hasPermi="['zhaoshangV3:tzfk:remove']">
 						  		<img
 						  		  referrerpolicy="no-referrer"
 								  
@@ -255,6 +255,7 @@ export default {
           { required: true, message: "公告类型不能为空", trigger: "change" }
         ]
       },
+	  isHidden:false,
 	  tableMaxHeight:380
     }
   },
@@ -306,6 +307,12 @@ export default {
       this.queryParams.pageNum = 1
       this.getList()
     },
+	showContent() {
+	    this.isHidden = true;
+	  },
+	  hideContent() {
+	    this.isHidden = false;
+	  },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm")