wangmengwei преди 4 седмици
родител
ревизия
7cfb9641b1
променени са 3 файла, в които са добавени 98 реда и са изтрити 69 реда
  1. 10 2
      src/views/project/list.vue
  2. 14 9
      src/views/zhaoshang/completed/index.vue
  3. 74 58
      src/views/zhaoshang/touzf/index.vue

+ 10 - 2
src/views/project/list.vue

@@ -15,8 +15,9 @@
         <el-col :span="8">
           <el-form-item label="创建日期" prop="createTime">
             <el-date-picker
-                  v-model="queryParams.createTime"
+                  v-model="queryParams.params.begintime"
                   type="date"
+				  value-format="yyyy-MM-dd"
 				  @keyup.enter.native="handleQuery"
                   placeholder="年 / 月 / 日">
                 </el-date-picker>
@@ -153,7 +154,8 @@ export default {
                xmbh: null,
                xmmc: null,
 			   progress:1,
-			   createTime:null
+			   createTime:null,
+			   params:{}
       },
       // 表单参数
       form: {},
@@ -182,6 +184,11 @@ export default {
     }
   },
   created() {
+	  if(this.$route.query.id != undefined){
+		 this.queryParams.tzfkId = this.$route.query.id
+	  }else{
+		  this.queryParams.tzfkId = undefined
+	  }
     this.getList()
   },
   computed: {
@@ -254,6 +261,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm")
+	  this.queryParams.tzfkId = undefined
       this.handleQuery()
     },
     // 多选框选中数据

+ 14 - 9
src/views/zhaoshang/completed/index.vue

@@ -36,8 +36,9 @@
         <el-col :span="8">
           <el-form-item label="创建日期" prop="noticeTitle">
             <el-date-picker
-                  v-model="queryParams.creadtime"
+                 v-model="queryParams.params.begintime"
                   type="date"
+				  value-format="yyyy-MM-dd"
                   placeholder="年 / 月 / 日">
                 </el-date-picker>
           </el-form-item>
@@ -58,6 +59,7 @@
          <el-form-item>
            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+		   
          </el-form-item>
         </el-col>
       </el-row>
@@ -65,7 +67,12 @@
 
     <!-- 列表 -->
     <!-- 标签页 -->
-    <div class="tabs">
+	
+    <div class="tabs" style="padding: 10px; padding-top: 50px;">
+		<div class="btns flexcc" style="right: 10px;">
+		  <div style="width: 25px;"></div>
+		  <el-button type="success"  class="cbbtn" size="small" @click="handleExport">导出</el-button>
+		</div>
         <div class="boxlist" v-for="(item,index) in noticeList" :key="index" v-if='noticeList.length != 0'>
           <div class="ltop flex ">
               <!-- <div class="check"> -->
@@ -79,10 +86,9 @@
                <div class="txt">属地政府:{{item.sdzf == null?'暂无数据' : item.sdzf}}</div>
              </div>
               <div class="flex1"></div>
-			  <div @click="hunge(item)">
-				  查看
+			  <div>
+				   <el-button type="success"  @click="hunge(item)"  class="cbbtn" size="small" >查看</el-button>
 			  </div>
-              
           </div>
           <div class="lbox">
             <div class="lboxl">
@@ -115,10 +121,7 @@
             </div>
           </div>
         </div>
-		<div class="btns flexcc">
-		  <div style="width: 25px;"></div>
-		  <el-button type="success"  class="cbbtn" size="small" @click="handleExport">导出</el-button>
-		</div>
+		
 		<div v-if='noticeList.length == 0'>
 		  <el-empty :image-size="200"></el-empty>
 		</div>
@@ -175,6 +178,7 @@ export default {
                endTime: null,
                jgTime: null,
                rtTime: null,
+			   params:{}
       },
       // 表单参数
       form: {},
@@ -266,6 +270,7 @@ export default {
       this.multiple = !selection.length
     },
 	hunge(row){
+		console.log(row)
 		this.$router.push({
 		  path: '/zhaoshang/Information',
 		  query: {

+ 74 - 58
src/views/zhaoshang/touzf/index.vue

@@ -1,17 +1,10 @@
 <template>
   <div class="app-container">
     <el-form style="background-color: #fff;border-radius: 4px; padding-top: 20px;" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
-      <el-form-item label="入库时间" prop="noticeTitle">
-        <el-date-picker
-              v-model="queryParams.zczb"
-              type="date"
-              placeholder="选择日期">
-            </el-date-picker>
-      </el-form-item>
       <el-form-item label="投资方名称" prop="tzf">
         <el-input  
           v-model="queryParams.tzf"
-          placeholder="请输入操作人员"
+          placeholder="请输入投资方名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -60,14 +53,14 @@
     <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 @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 @mouseenter="showContent(item)" @mouseleave="hideContent(item)"   :class=" ishsouetan == false? 'box_3dr zuihsoue flex-col' : 'box_3dr  flex-col'"   v-for="(item,index ) in noticeList" :key="index" >
+		                  <div :class=" item.isHidden?'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
 		                        class="thumbnail_21"
 		                        referrerpolicy="no-referrer"
 		                        src="../../../assets/images/icon_tzfk_mp_qy_white.png"
-								v-if="index == 0"
+								v-if="item.isHidden"
 		                      />
 							  <img
 							    class="thumbnail_21"
@@ -75,7 +68,7 @@
 							    src="../../../assets/images/icon_tzfk_mp_qy_blue.png"
 							  	v-else
 							  />
-		                      <span class="text_19">{{item.tzf == null?'暂无数据 ': item.tzf}}</span>
+		                      <span class="text_19">{{item.zcqymc == null?'暂无数据 ': item.zcqymc}}</span>
 		                    </div>
 		                    <div>
 		                      <img
@@ -84,7 +77,7 @@
 		                        @click="handleUpdate(item)"
 		                        v-hasPermi="['manage:equipmentManage:edit']"
 		                        src="../../../assets/images/icon_tzfk_mp_gx_selected.png"
-								v-if="index == 0"
+								v-if="item.isHidden"
 		                      />
 							  <img
 							    class="image_1"
@@ -97,7 +90,7 @@
 		                        class="thumbnail_22"
 		                        referrerpolicy="no-referrer"
 		                         src="../../../assets/images/icon_tzfk_mp_gd_white.png"
-								 v-if="index == 0"
+								 v-if="item.isHidden"
 								 />
 								 <img
 								   class="thumbnail_22"
@@ -108,7 +101,7 @@
 		                    </div>
 		                  </div>
 		                  <div style="padding: 10px;">
-		                    <span class="text_20">联系人:{{item.tzflxr == null?'暂无数据 ': item.tzflxr}} </span>
+		                    <span class="text_20">联系人:{{item.fddbr == null?'暂无数据 ': item.fddbr}} </span>
 		                    <div class="box_6 flex-row " style="align-items: center;">
 		                      <span class="text_21">联系方式: </span>
 		                      <div style="margin-left: 12px;">
@@ -122,22 +115,22 @@
 		                      </div>
 		                    </div>
 		                    <!-- <span class="text_20">设备地址:192.168.1.1</span> -->
-		                    <span class="text_20" >注册资金:{{item.zczb == null?'暂无数据 ': item.zczb}}万元</span>
+		                    <span class="text_20" >注册资金:{{item.zczj == null?'暂无数据 ': item.zczj}}万元</span>
 		                  </div>
-						  <div class="xnhse"v-show="isHidden">
+						  <div class="xnhse" v-show="item.isHidden" style="cursor: pointer;">
 						  	<div v-hasPermi="['zhaoshangV3:tzfk:edit']" @click="handleUpdate(item)">
 						  		<img
 						  		  referrerpolicy="no-referrer"
 						  		   src="../../../assets/images/icon_tzfk_mp_gd_bj.png"/>
 						  		   <span>编辑信息</span>
 						  	</div>
-						  	<div style="margin: 10px 0;">
+						  	<div style="margin: 10px 0;cursor: pointer;" @click="lsihge(item)" >
 						  		<img
 						  		  referrerpolicy="no-referrer"
 						  		   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"
 								  
@@ -165,41 +158,48 @@
 
     <!-- 添加或修改公告对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="公告标题" prop="noticeTitle">
-              <el-input v-model="form.noticeTitle" placeholder="请输入公告标题" />
-            </el-form-item>
+          <el-col :span="24">
+           <el-form-item label="公司名称" prop="zcqymc">
+                     <el-input v-model="form.zcqymc" placeholder="请输入在潜注册公司名称" />
+                   </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="公告类型" prop="noticeType">
-              <el-select v-model="form.noticeType" placeholder="请选择公告类型">
-                <el-option
-                  v-for="dict in dict.type.sys_notice_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in dict.type.sys_notice_status"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
+            <el-form-item label="注册日期" prop="zcrq">
+                      <el-date-picker style="width: 100%;" 
+                        v-model="form.zcrq"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择企业注册日期">
+                      </el-date-picker>
+                    </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="内容">
-              <editor v-model="form.noticeContent" :min-height="192"/>
-            </el-form-item>
+          <el-col :span="12">
+            <el-form-item label="注册资金" prop="zczj">
+                      <el-input v-model="form.zczj" placeholder="请输入注册资金" />
+                    </el-form-item>
           </el-col>
+		  <el-col :span="12">
+		    <el-form-item label="法定代表人" prop="fddbr">
+		              <el-input v-model="form.fddbr" placeholder="请输入法定代表人" />
+		            </el-form-item>
+		  </el-col>
+		  <el-col :span="12">
+		    <el-form-item label="联系方式" prop="lxfs">
+		              <el-input v-model="form.lxfs" placeholder="请输入联系方式" />
+		            </el-form-item>
+		  </el-col>
+		  <el-col :span="12">
+		    <el-form-item label="经营范围" prop="jyfw">
+		              <el-input v-model="form.jyfw" type="textarea" placeholder="请输入内容" />
+		            </el-form-item>
+		  </el-col>
+		  <el-col :span="12">
+		    <el-form-item label="备注" prop="remark">
+		              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+		            </el-form-item>
+		  </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -242,7 +242,8 @@ export default {
         pageSize: 10,
         noticeTitle: undefined,
         createBy: undefined,
-        status: undefined
+        status: undefined,
+		params:{}
       },
       // 表单参数
       form: {},
@@ -276,6 +277,10 @@ export default {
       this.loading = true
       listTzfk(this.queryParams).then(response => {
         this.noticeList = response.rows
+		this.noticeList.filter(rou=>{
+			rou.isHidden == false
+		})
+		
         this.total = response.total
         this.loading = false
       })
@@ -289,11 +294,12 @@ export default {
     reset() {
       this.form = {
               tzfkId: null,
-              tzf: null,
-              tzflxr: null,
-              lxfs: null,
+              zcqymc: null,
               zcrq: null,
-              zczb: null,
+              zczj: null,
+              jyfw: null,
+              fddbr: null,
+              lxfs: null,
               createBy: null,
               createTime: null,
               updateBy: null,
@@ -305,13 +311,14 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1
+	  console.log(this.queryParams.zczb)
       this.getList()
     },
-	showContent() {
-	    this.isHidden = true;
+	showContent(item) {
+		this.$set(item, 'isHidden', true);
 	  },
-	  hideContent() {
-	    this.isHidden = false;
+	  hideContent(item) {
+		  this.$set(item, 'isHidden', false);
 	  },
     /** 重置按钮操作 */
     resetQuery() {
@@ -330,6 +337,15 @@ export default {
       this.open = true
       this.title = "添加公告"
     },
+	// 历史投资
+	lsihge(item){
+		this.$router.push({
+		  path: '/zhaoshang/projectlist',
+		  query: {
+			'id':item.tzfkId
+		  }
+		})
+	},
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()