所属孵化器 公司编辑

src/assets/js/httpApi.js

@@ -566,7 +566,7 @@ var reqApis = function(){
 				Dict: {
 					baseInfo: {
 						"companyName": {name:"企业名称", must:true },
-						// "incubatorId": {name:"所属孵化器", must:true, 'type':'select', key:'name', showYN: Tools.isHighTech()},
+						"incubatorId": {name:"所属孵化器", must:true, 'type':'select', key:'name', showYN: Tools.isHighTech()},
 						"technicalField": {name:"所属技术领域", must:true, 'type':'select', key:'name', },
 
 						"entryDate": {
@@ -662,20 +662,20 @@ var reqApis = function(){
 						"inventionApplicationsNumber": { 'type': '', 'name': '发明申请数(件)', table:0,  },
 						"utilityModelsNumber": { 'type': '', 'name': '实用新型数(件)', table:0,  },
 						"softwareCopyrightNumber": { 'type': '', 'name': '软件著作权数（件）', table:0,  },
-						"isTechSme": { 'type': 'select', 'name': '是否科技型中小企业', table:0,  },
-						"techSmeDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, },
-						"isHighTech": { 'type': 'select', 'name': '是否高新技术企业', table:0,  },
-						"highTechDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, },
-						"isSpecializedSpecialEnterprises": { 'type': 'select', 'name': '是否专精特新企业', table:0,  },
-						"specializedSpecialEnterprisesDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, },
-						"isGazelle": { 'type': 'select', 'name': '是否瞪羚企业', table:0,  },
-						"gazelleDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, },
-						"isLittleGiant": { 'type': 'select', 'name': '是否小巨人企业', table:0,  },
-						"littleGiantDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, },
-						"isHighGrowthInnovative": { 'type': 'select', 'name': '是否创新性中小企业', table:0,  },
-						"highGrowthInnovativeDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7,},
-						"isAdvancedTechService": { 'type': 'select', 'name': '是否技术先进型服务企业', table:0,  },
-						"advancedTechServiceDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, },
+						"isTechSme": { 'type': 'select', 'name': '是否科技型中小企业', table:0, inputCombine_1:'Y' }, // inputCombine_1 组合框中的父输入框
+						"techSmeDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, inputCombine_2:'Y' },
+						"isHighTech": { 'type': 'select', 'name': '是否高新技术企业', table:0, inputCombine_1:'Y' },
+						"highTechDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, inputCombine_2:'Y'},
+						"isSpecializedSpecialEnterprises": { 'type': 'select', 'name': '是否专精特新企业', table:0, inputCombine_1:'Y' },
+						"specializedSpecialEnterprisesDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, inputCombine_2:'Y'},
+						"isGazelle": { 'type': 'select', 'name': '是否瞪羚企业', table:0, inputCombine_1:'Y' },
+						"gazelleDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7,  inputCombine_2:'Y'},
+						"isLittleGiant": { 'type': 'select', 'name': '是否小巨人企业', table:0, inputCombine_1:'Y' },
+						"littleGiantDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7,  inputCombine_2:'Y'},
+						"isHighGrowthInnovative": { 'type': 'select', 'name': '是否创新性中小企业', table:0, inputCombine_1:'Y'  },
+						"highGrowthInnovativeDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, inputCombine_2:'Y'},
+						"isAdvancedTechService": { 'type': 'select', 'name': '是否技术先进型服务企业', table:0, inputCombine_1:'Y'  },
+						"advancedTechServiceDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7,  inputCombine_2:'Y'},
 				
 						
 
@@ -1160,7 +1160,7 @@ var reqApis = function(){
 				Dict: {
 					baseInfo: {
 						"mentorName": {name:"导师姓名", must:true},
-						// "incubatorId": {name:"所属孵化器", must:true, 'type':'select', key:'name', showYN: Tools.isHighTech()},
+						"incubatorId": {name:"所属孵化器", must:true, 'type':'select', key:'name', showYN: Tools.isHighTech()},
 						"education": {name:"学历", must:true },
 						"graduationSchool": {name:"毕业学校",  },
 						"contactPhone": {name:"联系电话",  },
@@ -1333,11 +1333,11 @@ var reqApis = function(){
 						},
 					],
 					search: [
-						// {
-						// 	'type': 'string', 'name': '孵化器名称', 'word': 'incubatorName', 'mode': 0, 'width': '180px', 'clear': function () {
-						// 		this.loadData()
-						// 	}
-						// },
+						{
+							'type': 'string', 'name': '孵化器名称', 'word': 'incubatorName', 'mode': 0, 'width': '180px', 'clear': function () {
+								this.loadData()
+							}
+						},
 						{
 							'type': 'string', 'name': '企业名称', 'word': 'companyName', 'mode': 0, 'width': '180px', 'clear': function () {
 								this.loadData()

src/components/cuForm/index2.vue

@@ -60,10 +60,16 @@
   * @createtime: 2021/12/09
   */
 -->
+
+<!-- 
+	mode 7 为组合框特殊处理，选择父下拉框后，字下拉框显隐 效果
+	showYN： true|false 根据配置文件，进行显隐某些字段（判断科技局和孵化器用户个别字段显隐）
+	inputCombine_1: 'Y'|'N' 用于区分组合框分别设置样式，子输入框没有title标题
+ -->
 <template>
 	<el-dialog id="printJS-form" class="qyzz-dialog" append-to-body :close-on-click-modal="false" :before-close="cancelForm" :visible.sync="form.visible" :title="form.title" :width="form.config.formWidth || '50%'">
 		<el-form :model="form.item" :rules="rules" :ref="ref" :inline="true" size="small" :label-width="(form.config.labelWidth || 80) + 'px'">
-			<el-form-item v-for="(item, key) in Dict.baseInfo" :prop="item.rule || key" :label="item.name" v-if="item.form !== 0 && item.showYN !==false" :style="item.style" :class="{'isHide': item.mode===7, [key]: item.mode===7}" :ref="key">
+			<el-form-item v-for="(item, key) in Dict.baseInfo" :prop="item.rule || key" :label="item.inputCombine_2==='Y'? '' : item.name" v-if="item.form !== 0 && item.showYN !==false" :style="item.style" :class="{'isHide': item.mode===7, [key]: item.mode===7, 'inputCombine_1': item.inputCombine_1==='Y', 'inputCombine_2': item.inputCombine_2==='Y'}" :ref="key">
 				<template v-if="item.type === 'img'">
 					<div class="img-upload">
 						<label class="upload-area" for="imgUpload">
@@ -231,7 +237,8 @@ export default {
 			.btn2{font-size:23px;margin-left:10px;color:#48A2FF;cursor:pointer;}
 		}
 		.isHide{
-			display: none !important;
+			// display: none !important;
+			visibility: hidden !important;
 		}
 		.isShow{
 			display: inline-flex !important;

src/views/business/basicInfo/index.vue

@@ -520,8 +520,24 @@ export default {
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scope>
+.inputCombine_1{
+  .el-form-item__content{
+    width: 75px;
+
+  }
+}
+.inputCombine_2{
+  .el-form-item__content{
+    width: 128px;
+  }
+  .el-date-editor.el-input, .el-date-editor.el-input__inner{
+    width: 128px;
+  }
+}
+
 	.isHide{
-			display: none !important;
+			// display: none !important;
+      visibility: hidden !important;
 		}
 .p-head {
   position: absolute;