liuxiangqi пре 1 година
родитељ
комит
a2ca24627c

+ 3 - 1
package.json

@@ -43,7 +43,7 @@
     "core-js": "^3.22.2",
     "docx-preview": "^0.1.11",
     "echarts": "4.9.0",
-    "element-ui": "2.15.8",
+    "element-ui": "^2.15.13",
     "exceljs": "^4.3.0",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
@@ -53,6 +53,7 @@
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
+    "layui": "^2.8.11",
     "nprogress": "0.2.0",
     "pdfjs-dist": "^2.12.313",
     "qs": "^6.10.5",
@@ -63,6 +64,7 @@
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
     "vue-meta": "2.4.0",
+    "vue-pdf": "^4.3.0",
     "vue-print-nb": "^1.7.5",
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",

+ 2 - 1
public/index.html

@@ -195,7 +195,8 @@
     }
   </style>
   </head>
-  <body>
+  <body>
+    <script src="./laydate/laydate.js"></script>
     <div id="app">
 	    <div id="loader-wrapper">
 		    <div id="loader"></div>

Разлика између датотеке није приказан због своје велике величине
+ 2813 - 0
public/laydate/laydate.js


BIN
public/laydate/theme/default/font/iconfont.eot


Разлика између датотеке није приказан због своје велике величине
+ 45 - 0
public/laydate/theme/default/font/iconfont.svg


BIN
public/laydate/theme/default/font/iconfont.ttf


BIN
public/laydate/theme/default/font/iconfont.woff


+ 169 - 0
public/laydate/theme/default/laydate.css

@@ -0,0 +1,169 @@
+/** 图标字体 **/
+@font-face {font-family: 'laydate-icon';
+  src: url('./font/iconfont.eot');
+  src: url('./font/iconfont.eot#iefix') format('embedded-opentype'),
+  url('./font/iconfont.svg#iconfont') format('svg'),
+  url('./font/iconfont.woff') format('woff'),
+  url('./font/iconfont.ttf') format('truetype');
+}
+                    
+.laydate-icon{
+  font-family:"laydate-icon" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/**
+ 
+ @Name: laydata
+ 
+ **/
+ 
+
+html #layuicss-laydate{display: none; position: absolute; width: 1989px;}
+
+/* 初始化 */
+.layui-laydate *{margin: 0; padding: 0;}
+
+/* 主体结构 */
+.layui-laydate, .layui-laydate *{box-sizing: border-box;}
+.layui-laydate{position: absolute; z-index: 66666666; margin: 5px 0; border-radius: 2px; font-size: 14px; -webkit-animation-duration: 0.2s; animation-duration: 0.2s; -webkit-animation-fill-mode: both; animation-fill-mode: both;}
+.layui-laydate-main{width: 272px;}
+.layui-laydate-header *,
+.layui-laydate-content td,
+.layui-laydate-list li{transition-duration: .3s; -webkit-transition-duration: .3s;}
+
+/* 微微往下滑入 */
+@keyframes laydate-downbit {
+  0% {opacity: 0.3; transform: translate3d(0, -5px, 0);}
+  100% {opacity: 1; transform: translate3d(0, 0, 0);}
+}
+
+.layui-laydate{animation-name: laydate-downbit;}
+.layui-laydate-static{ position: relative; z-index: 0; display: inline-block; margin: 0; -webkit-animation: none; animation: none;}
+
+/* 展开年月列表时 */
+.laydate-ym-show .laydate-prev-m,
+.laydate-ym-show .laydate-next-m{display: none !important;}
+.laydate-ym-show .laydate-prev-y,
+.laydate-ym-show .laydate-next-y{display: inline-block !important;}
+.laydate-ym-show .laydate-set-ym span[lay-type="month"]{display: none !important;}
+
+/* 展开时间列表时 */
+.laydate-time-show .layui-laydate-header .layui-icon,
+.laydate-time-show .laydate-set-ym span[lay-type="year"],
+.laydate-time-show .laydate-set-ym span[lay-type="month"]{display: none !important;}
+
+/* 头部结构 */
+.layui-laydate-header{position: relative; line-height:30px; padding: 10px 70px 5px;}
+.layui-laydate-header *{display: inline-block; vertical-align: bottom;}
+.layui-laydate-header i{position: absolute; top: 10px; padding: 0 5px; color: #999; font-size: 18px; cursor: pointer;}
+.layui-laydate-header i.laydate-prev-y{left: 15px;}
+.layui-laydate-header i.laydate-prev-m{left: 45px;}
+.layui-laydate-header i.laydate-next-y{right: 15px;}
+.layui-laydate-header i.laydate-next-m{right: 45px;}
+.laydate-set-ym{width: 100%; text-align: center; box-sizing: border-box; text-overflow: ellipsis; overflow: hidden; white-space: nowrap;}
+.laydate-set-ym span{padding: 0 10px; cursor: pointer;}
+.laydate-time-text{cursor: default !important;}
+
+/* 主体结构 */
+.layui-laydate-content{position: relative; padding: 10px; -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none;}
+.layui-laydate-content table{border-collapse: collapse; border-spacing: 0;}
+.layui-laydate-content th,
+.layui-laydate-content td{width: 36px; height: 30px; padding: 5px; text-align: center;}
+.layui-laydate-content th{font-weight: 400;}
+.layui-laydate-content td{position: relative; cursor: pointer;}
+.laydate-day-mark{position: absolute; left: 0; top: 0; width: 100%; line-height: 30px; font-size: 12px; overflow: hidden;}
+.laydate-day-mark::after{position: absolute; content:''; right: 2px; top: 2px; width: 5px; height: 5px; border-radius: 50%;}
+
+/* 底部结构 */
+.layui-laydate-footer{position: relative; height: 46px; line-height: 26px; padding: 10px;}
+.layui-laydate-footer span{display: inline-block;  vertical-align: top; height: 26px; line-height: 24px; padding: 0 10px; border: 1px solid #C9C9C9; border-radius: 2px; background-color: #fff; font-size: 12px; cursor: pointer; white-space: nowrap; transition: all .3s;}
+.layui-laydate-footer span:hover{color: #5FB878;}
+.layui-laydate-footer span.layui-laydate-preview{cursor: default; border-color: transparent !important;}
+.layui-laydate-footer span.layui-laydate-preview:hover{color: #666;}
+.layui-laydate-footer span:first-child.layui-laydate-preview{padding-left: 0;}
+.laydate-footer-btns{position: absolute; right: 10px; top: 10px;}
+.laydate-footer-btns span{margin: 0 0 0 -1px;}
+
+/* 年月列表 */
+.layui-laydate-list{position: absolute; left: 0; top: 0; width: 100%; height: 100%; padding: 10px; box-sizing: border-box; background-color: #fff;}
+.layui-laydate-list>li{position: relative; display: inline-block; width: 33.3%; height: 36px; line-height: 36px; margin: 3px 0; vertical-align: middle; text-align: center; cursor: pointer;}
+.laydate-month-list>li{width: 25%; margin: 17px 0;}
+.laydate-time-list{}
+.laydate-time-list>li{height: 100%; margin: 0; line-height: normal; cursor: default;}
+.laydate-time-list p{position: relative; top: -4px; line-height: 29px;}
+.laydate-time-list ol{height: 181px; overflow: hidden;}
+.laydate-time-list>li:hover ol{overflow-y: auto;}
+.laydate-time-list ol li{width: 130%; padding-left: 33px; height: 30px; line-height: 30px; text-align: left; cursor: pointer;}
+
+/* 提示 */
+.layui-laydate-hint{position: absolute; top: 115px; left: 50%; width: 250px; margin-left: -125px; line-height: 20px; padding: 15px; text-align: center; font-size: 12px; color: #FF5722;}
+
+
+/* 双日历 */
+.layui-laydate-range{width: 546px;}
+.layui-laydate-range .layui-laydate-main{display: inline-block; vertical-align: middle;}
+.layui-laydate-range .laydate-main-list-1 .layui-laydate-header,
+.layui-laydate-range .laydate-main-list-1 .layui-laydate-content{border-left: 1px solid #e2e2e2;}
+
+
+/* 默认简约主题 */
+.layui-laydate, .layui-laydate-hint{border: 1px solid #d2d2d2; box-shadow: 0 2px 4px rgba(0,0,0,.12); background-color: #fff; color: #666;}
+.layui-laydate-header{border-bottom: 1px solid #e2e2e2;}
+.layui-laydate-header i:hover,
+.layui-laydate-header span:hover{color: #5FB878;}
+.layui-laydate-content{border-top: none 0; border-bottom: none 0;}
+.layui-laydate-content th{color: #333;}
+.layui-laydate-content td{color: #666;}
+.layui-laydate-content td.laydate-selected{background-color: #B5FFF8;}
+.laydate-selected:hover{background-color: #00F7DE !important;}
+.layui-laydate-content td:hover,
+.layui-laydate-list li:hover{background-color: #eee; color: #333;}
+.laydate-time-list li ol{margin: 0; padding: 0; border: 1px solid #e2e2e2; border-left-width: 0;}
+.laydate-time-list li:first-child ol{border-left-width: 1px;}
+.laydate-time-list>li:hover{background: none;}
+.layui-laydate-content .laydate-day-prev,
+.layui-laydate-content .laydate-day-next{color: #d2d2d2;}
+.laydate-selected.laydate-day-prev,
+.laydate-selected.laydate-day-next{background-color: #f8f8f8 !important;}
+.layui-laydate-footer{border-top: 1px solid #e2e2e2;}
+.layui-laydate-hint{color: #FF5722;}
+.laydate-day-mark::after{background-color: #5FB878;}
+.layui-laydate-content td.layui-this .laydate-day-mark::after{display: none;}
+.layui-laydate-footer span[lay-type="date"]{color: #5FB878;}
+.layui-laydate .layui-this{background-color: #009688 !important; color: #fff !important;}
+.layui-laydate .laydate-disabled,
+.layui-laydate .laydate-disabled:hover{background:none !important; color: #d2d2d2 !important; cursor: not-allowed !important; -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none;}
+
+/* 墨绿/自定义背景色主题 */
+.laydate-theme-molv{border: none;}
+.laydate-theme-molv.layui-laydate-range{width: 548px}
+.laydate-theme-molv .layui-laydate-main{width: 274px;}
+.laydate-theme-molv .layui-laydate-header{border: none; background-color: #009688;}
+.laydate-theme-molv .layui-laydate-header i,
+.laydate-theme-molv .layui-laydate-header span{color: #f6f6f6;}
+.laydate-theme-molv .layui-laydate-header i:hover,
+.laydate-theme-molv .layui-laydate-header span:hover{color: #fff;}
+.laydate-theme-molv .layui-laydate-content{border: 1px solid #e2e2e2; border-top: none; border-bottom: none;}
+.laydate-theme-molv .laydate-main-list-1 .layui-laydate-content{border-left: none;}
+.laydate-theme-molv .layui-laydate-footer{border: 1px solid #e2e2e2;}
+
+/* 格子主题 */
+.laydate-theme-grid .layui-laydate-content td,
+.laydate-theme-grid .layui-laydate-content thead,
+.laydate-theme-grid .laydate-year-list>li,
+.laydate-theme-grid .laydate-month-list>li{border: 1px solid #e2e2e2;}
+.laydate-theme-grid .laydate-selected,
+.laydate-theme-grid .laydate-selected:hover{background-color: #f2f2f2 !important; color: #009688 !important;}
+.laydate-theme-grid .laydate-selected.laydate-day-prev,
+.laydate-theme-grid .laydate-selected.laydate-day-next{color: #d2d2d2 !important;}
+.laydate-theme-grid .laydate-year-list,
+.laydate-theme-grid .laydate-month-list{margin: 1px 0 0 1px;}
+.laydate-theme-grid .laydate-year-list>li,
+.laydate-theme-grid .laydate-month-list>li{margin: 0 -1px -1px 0;}
+.laydate-theme-grid .laydate-year-list>li{height: 43px; line-height: 43px;}
+.laydate-theme-grid .laydate-month-list>li{height: 71px; line-height: 71px;}
+

Разлика између датотеке није приказан због своје велике величине
+ 1 - 0
public/layui/css/layui.css


BIN
public/layui/font/iconfont.eot


Разлика између датотеке није приказан због своје велике величине
+ 405 - 0
public/layui/font/iconfont.svg


BIN
public/layui/font/iconfont.ttf


BIN
public/layui/font/iconfont.woff


BIN
public/layui/font/iconfont.woff2


Разлика између датотеке није приказан због своје велике величине
+ 1 - 0
public/layui/layui.js


+ 4 - 1
src/assets/styles/index.scss

@@ -735,7 +735,7 @@ $border: #ddd;
     background: #f2f6fc;
   }
   th {
-    width: 200px;
+    // width: 200px;
     color: #313031;
     text-align: right;
     background: #fff;
@@ -759,4 +759,7 @@ $border: #ddd;
     height: 25px;
     line-height: 25px;
   }
+  .el-input-group__append, .el-input-group__prepend {
+    padding: 0;
+  }
 }

+ 3 - 0
src/assets/styles/ruoyi.scss

@@ -271,3 +271,6 @@
 	position: relative;
 	float: right;
 }
+.el-table--medium .el-table__cell {
+  padding: 0;
+}

+ 438 - 141
src/views/common/registerFirst.vue

@@ -1,23 +1,15 @@
 <template>
   <div class="app-container">
-    <div class="top-fixed">
-      <div class="title-reg">
-        <h3 class="title">注册信息</h3>
-        <div class="top-img" @click="cancel">
-          <img src='../../assets/images/cancel.png'>
-        </div>
-      </div>
-    </div>
     <div class="content">
-      <el-form ref="registerForm" :model="registerForm" :rules="registerRules" label-width="200px">
+      <el-form ref="form" :model="form" :rules="registerRules" label-width="200px">
         <template v-if="tokenVisile">
-          <table class="table_register">
+          <table class="table_register media">
             <tr>
-              <th rowspan="6">企业信息</th>
+              <th rowspan="6" style="width: 10%;">企业信息</th>
               <th><span style="color: red;">*</span>企业名称</th>
               <td>
                 <el-form-item label-width="0" prop="entName">
-                  <el-input v-model="registerForm.entName" type="text" auto-complete="off" placeholder="请输入企业名称">
+                  <el-input v-model="form.entName" type="text" auto-complete="off" placeholder="请输入企业名称">
                   </el-input>
                 </el-form-item>
               </td>
@@ -25,7 +17,7 @@
               <td>
                 <el-form-item label-width="0" prop="license">
                   <el-input type="text" @change="validLicense"
-                    v-model="registerForm.license"
+                    v-model="form.license"
                     placeholder="请输入统一社会信用代码">
                   </el-input>
                 </el-form-item>
@@ -36,7 +28,7 @@
               <td>
                 <el-form-item label-width="0" prop="regCapital">
                   <el-input type="text"
-                    v-model="registerForm.regCapital"
+                    v-model="form.regCapital"
                     placeholder="请输入注册资金">
                     <template slot="append">万元</template>
                   </el-input>
@@ -45,7 +37,7 @@
               <th><span style="color: red;">*</span>工商注册时间</th>
               <td>
                 <el-form-item label-width="0" prop="regDate">
-                  <el-date-picker v-model="registerForm.regDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
+                  <el-date-picker v-model="form.regDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
                 </el-form-item>
               </td>
             </tr>
@@ -53,7 +45,7 @@
               <th><span style="color: red;">*</span>工商注册类型</th>
               <td>
                 <el-form-item label-width="0" prop="regType">
-                  <el-select v-model="registerForm.regType" filterable>
+                  <el-select v-model="form.regType" filterable>
                     <el-option v-for="item in regTypeOptions" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
                   </el-select>
                 </el-form-item>
@@ -61,7 +53,7 @@
               <th><span style="color: red;">*</span>主营产品(服务)所属技术领域</th>
               <td>
                 <el-form-item label-width="0" prop="mainProducts">
-                  <el-select v-model="registerForm.mainProducts" style="width: 220px;" filterable>
+                  <el-select v-model="form.mainProducts" style="width: 220px;" filterable>
                     <el-option v-for="(item,index) in mainProductsOptions" :label="item.dictLabel" :key="index" :value="item.dictValue">{{item.dictLabel}}</el-option>
                   </el-select>
                 </el-form-item>
@@ -71,14 +63,14 @@
               <th><span style="color: red;">*</span>通信地址</th>
               <td>
                 <el-form-item label-width="0" prop="address">
-                  <el-input v-model="registerForm.address" type="text" auto-complete="off" placeholder="请输入通信地址">
+                  <el-input v-model="form.address" type="text" auto-complete="off" placeholder="请输入通信地址">
                   </el-input>
                 </el-form-item>
               </td>
               <th><span style="color: red;">*</span>邮政编码</th>
               <td>
                 <el-form-item label-width="0" prop="zipCode">
-                  <el-input v-model="registerForm.zipCode" type="text" auto-complete="off" placeholder="请输入邮政编码">
+                  <el-input v-model="form.zipCode" type="text" auto-complete="off" placeholder="请输入邮政编码">
                   </el-input>
                 </el-form-item>
               </td>
@@ -88,21 +80,21 @@
               <td colspan="3">
                 <el-col :span="8">
                   <el-form-item label-width="0" prop="provinceId">
-                    <el-select v-model="registerForm.provinceId" placeholder="省" @change="getCityData" style="width: 220px;" filterable>
+                    <el-select v-model="form.provinceId" placeholder="省" @change="getCityData" style="width: 220px;" filterable>
                       <el-option v-for="(item,index) in provinceDataList" :key="index" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item prop="cityId" label-width="0px">
-                    <el-select v-model="registerForm.cityId" placeholder="市" @change="getDistrictData" style="width: 220px;" filterable>
+                    <el-select v-model="form.cityId" placeholder="市" @change="getDistrictData" style="width: 220px;" filterable>
                       <el-option v-for="(item, index) in cityDataList" :key="index" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label-width="0px" prop="districtId">
-                    <el-select v-model="registerForm.districtId" placeholder="区" style="width: 220px;" filterable>
+                    <el-select v-model="form.districtId" placeholder="区" style="width: 220px;" filterable>
                       <el-option v-for="(item, index) in districtDataList" :key="index" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                   </el-form-item>
@@ -113,7 +105,7 @@
               <th><span style="color: red;">*</span>企业所得税主管税务机关</th>
               <td colspan="3">
                 <el-form-item label-width="0" prop="taxOffice">
-                  <el-input v-model="registerForm.taxOffice" type="text" auto-complete="off" placeholder="请输入企业所得税主管税务机关" disabled>
+                  <el-input v-model="form.taxOffice" type="text" auto-complete="off" placeholder="请输入企业所得税主管税务机关" disabled>
                   </el-input>
                 </el-form-item>
               </td>
@@ -123,14 +115,14 @@
               <th><span style="color: red;">*</span>姓名</th>
               <td>
                 <el-form-item label-width="0" prop="legalName">
-                  <el-input v-model="registerForm.legalName" type="text" auto-complete="off" placeholder="请输入法人姓名">
+                  <el-input v-model="form.legalName" type="text" auto-complete="off" placeholder="请输入法人姓名">
                   </el-input>
                 </el-form-item>
               </td>
               <th><span style="color: red;">*</span>身份证号码</th>
               <td>
                 <el-form-item label-width="0" prop="legalIdCard">
-                  <el-input v-model="registerForm.legalIdCard" type="text" auto-complete="off" placeholder="请输入法人身份证号码">
+                  <el-input v-model="form.legalIdCard" type="text" auto-complete="off" placeholder="请输入法人身份证号码">
                   </el-input>
                 </el-form-item>
               </td>
@@ -139,14 +131,14 @@
               <th><span style="color: red;">*</span>手机号码</th>
               <td>
                 <el-form-item label-width="0" prop="legalMobile">
-                  <el-input v-model="registerForm.legalMobile" type="text" auto-complete="off" placeholder="手机号码">
+                  <el-input v-model="form.legalMobile" type="text" auto-complete="off" placeholder="手机号码">
                   </el-input>
                 </el-form-item>
               </td>
               <th>固定电话</th>
               <td>
                 <el-form-item label-width="0" prop="legalPhone">
-                  <el-input v-model="registerForm.legalPhone" type="text" auto-complete="off" placeholder="请输入固定电话">
+                  <el-input v-model="form.legalPhone" type="text" auto-complete="off" placeholder="请输入固定电话">
                   </el-input>
                 </el-form-item>
               </td>
@@ -155,14 +147,14 @@
               <th>传真</th>
               <td>
                 <el-form-item label-width="0" prop="legalFax">
-                  <el-input v-model="registerForm.legalFax" type="text" auto-complete="off" placeholder="请输入法人传真">
+                  <el-input v-model="form.legalFax" type="text" auto-complete="off" placeholder="请输入法人传真">
                   </el-input>
                 </el-form-item>
               </td>
               <th>E-mail</th>
               <td>
                 <el-form-item label-width="0" prop="legalEmail">
-                  <el-input v-model="registerForm.legalEmail" type="text" auto-complete="off" placeholder="请输入法人邮箱">
+                  <el-input v-model="form.legalEmail" type="text" auto-complete="off" placeholder="请输入法人邮箱">
                   </el-input>
                 </el-form-item>
               </td>
@@ -173,14 +165,14 @@
               <th><span style="color: red;">*</span>姓名</th>
               <td>
                 <el-form-item label-width="0" prop="linkName">
-                  <el-input v-model="registerForm.linkName" type="text" auto-complete="off" placeholder="请输入联系人姓名">
+                  <el-input v-model="form.linkName" type="text" auto-complete="off" placeholder="请输入联系人姓名">
                   </el-input>
                 </el-form-item>
               </td>
               <th><span style="color: red;">*</span>身份证号码</th>
               <td>
                 <el-form-item label-width="0" prop="linkIdCard">
-                  <el-input v-model="registerForm.linkIdCard" type="text" auto-complete="off" placeholder="请输入联系人身份证号码">
+                  <el-input v-model="form.linkIdCard" type="text" auto-complete="off" placeholder="请输入联系人身份证号码">
                   </el-input>
                 </el-form-item>
               </td>
@@ -189,14 +181,14 @@
               <th><span style="color: red;">*</span>手机号码</th>
               <td>
                 <el-form-item label-width="0" prop="linkMobile">
-                  <el-input v-model="registerForm.linkMobile" type="text" auto-complete="off" placeholder="请填入手机号码">
+                  <el-input v-model="form.linkMobile" type="text" auto-complete="off" placeholder="请填入手机号码">
                   </el-input>
                 </el-form-item>
               </td>
               <th>固定电话</th>
               <td>
                 <el-form-item label-width="0" prop="linkPhone">
-                  <el-input v-model="registerForm.linkPhone" type="text" auto-complete="off" placeholder="请输入联系人固定电话">
+                  <el-input v-model="form.linkPhone" type="text" auto-complete="off" placeholder="请输入联系人固定电话">
                   </el-input>
                 </el-form-item>
               </td>
@@ -205,14 +197,14 @@
               <th>传真</th>
               <td>
                 <el-form-item label-width="0" prop="linkFax">
-                  <el-input v-model="registerForm.linkFax" type="text" auto-complete="off" placeholder="请输入联系人传真">
+                  <el-input v-model="form.linkFax" type="text" auto-complete="off" placeholder="请输入联系人传真">
                   </el-input>
                 </el-form-item>
               </td>
               <th>E-mail</th>
               <td>
                 <el-form-item label-width="0" prop="linkEmail">
-                  <el-input v-model="registerForm.linkEmail" type="text" auto-complete="off" placeholder="请输入联系人邮箱">
+                  <el-input v-model="form.linkEmail" type="text" auto-complete="off" placeholder="请输入联系人邮箱">
                   </el-input>
                 </el-form-item>
               </td>
@@ -222,16 +214,16 @@
               <th><span style="color: red;">*</span>企业是否上市</th>
               <td>
                 <el-form-item label-width="0" prop="listedFlag">
-                  <el-radio-group v-model="registerForm.listedFlag">
+                  <el-radio-group v-model="form.listedFlag">
                     <el-radio v-for="(item, index) in yesOrNoOptions" :key="index" :label="item.dictValue">{{item.dictLabel}}</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </td>
-              <template v-if="registerForm.listedFlag == 1">
+              <template v-if="form.listedFlag == 1">
                 <th><span style="color: red;">*</span>企业上市代码</th>
                 <td>
                   <el-form-item label-width="0" prop="listingCode">
-                    <el-input v-model="registerForm.listingCode" type="text" auto-complete="off" placeholder="请输入企业上市代码">
+                    <el-input v-model="form.listingCode" type="text" auto-complete="off" placeholder="请输入企业上市代码">
                     </el-input>
                   </el-form-item>
                 </td>
@@ -242,16 +234,16 @@
               <th><span style="color: red;">*</span>是否引入风险投资</th>
               <td>
                 <el-form-item label-width="0" prop="investFlag">
-                  <el-radio-group v-model="registerForm.investFlag">
+                  <el-radio-group v-model="form.investFlag">
                     <el-radio v-for="(item, index) in yesOrNoOptions" :key="index" :label="item.dictValue">{{item.dictLabel}}</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </td>
-              <template v-if="registerForm.investFlag == 1">
+              <template v-if="form.investFlag == 1">
                 <th><span style="color: red;">*</span>风险投资金额</th>
                 <td>
                   <el-form-item label-width="0" prop="investCapital">
-                    <el-input v-model="registerForm.investCapital" type="text" auto-complete="off" placeholder="请输入风险投资金额">
+                    <el-input v-model="form.investCapital" type="text" auto-complete="off" placeholder="请输入风险投资金额">
                       <template slot="append">万元</template>
                     </el-input>
                   </el-form-item>
@@ -263,16 +255,16 @@
               <th><span style="color: red;">*</span>是否为高新企业</th>
               <td>
                 <el-form-item label-width="0" prop="techFlag">
-                  <el-radio-group v-model="registerForm.techFlag">
+                  <el-radio-group v-model="form.techFlag">
                     <el-radio v-for="(item, index) in yesOrNoOptions" :key="index" :label="item.dictValue">{{item.dictLabel}}</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </td>
-              <template v-if="registerForm.techFlag == 1">
+              <template v-if="form.techFlag == 1">
                 <th><span style="color: red;">*</span>高新企业编号</th>
                 <td>
                   <el-form-item label-width="0" prop="techCode">
-                    <el-input v-model="registerForm.techCode" type="text" auto-complete="off" placeholder="请输入高新企业编号">
+                    <el-input v-model="form.techCode" type="text" auto-complete="off" placeholder="请输入高新企业编号">
                     </el-input>
                   </el-form-item>
                 </td>
@@ -283,7 +275,7 @@
               <th><span style="color: red;">*</span>上年度是否做加计扣除</th>
               <td>
                 <el-form-item label-width="0" prop="deductionFlag">
-                  <el-radio-group v-model="registerForm.deductionFlag">
+                  <el-radio-group v-model="form.deductionFlag">
                     <el-radio v-for="(item, index) in yesOrNoOptions" :key="index" :label="item.dictValue">{{item.dictLabel}}</el-radio>
                   </el-radio-group>
                 </el-form-item>
@@ -294,8 +286,8 @@
               <th><span style="color: red;">*</span>企业营业执照</th>
               <td colspan="3">
                 <el-form-item label-width="3" prop="licensePath" ref="licenseUpload">
-                  <ImageUpload @input="handleLicenseSuccess" :params="params" :limit="limit" :value="registerForm.licensePath" :fileSize="fileSize"></ImageUpload>
-                  <!-- <FileUpload :file="{url: registerForm.licensePath, name: registerForm.fileName}" @input="handleSuccess">上传材料</FileUpload> -->
+                  <ImageUpload @input="handleLicenseSuccess" :params="params" :limit="limit" :value="form.licensePath" :fileSize="fileSize"></ImageUpload>
+                  <!-- <FileUpload :file="{url: form.licensePath, name: form.fileName}" @input="handleSuccess">上传材料</FileUpload> -->
                 </el-form-item>
               </td>
             </tr>
@@ -303,18 +295,7 @@
               <th>其他附件</th>
               <td colspan="3">
                 <el-form-item label-width="0" prop="attachIds">
-                  <FileUpload :files="registerForm.fileList" @input="handleSaleSuccess" :multiple="true" :params="params">上传材料</FileUpload>
-                  <el-table v-loading="loading" :data="list" border style="width: 100%;margin-top: 5px;" v-if="dataId">
-                    <el-table-column label="序号" type="index" width="50" align="center"></el-table-column>
-                    <el-table-column label="文件名称" prop="fileName" align="center"></el-table-column>
-                    <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                      <template slot-scope="scope">
-                        <el-button type="text" @click="handleView(scope.row)">查看</el-button>
-                        <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                  <!-- <FileUpload :files="registerForm.attachIds" @input="handleSaleSuccess" :multiple="true">上传材料</FileUpload> -->
+                  <FileUpload :files="form.fileList" @input="handleSaleSuccess" :multiple="true" :params="params">上传材料</FileUpload>
                 </el-form-item>
               </td>
             </tr>
@@ -323,13 +304,347 @@
               <th>文件水印</th>
               <td colspan="3">
                 <el-form-item label-width="0" prop="logo" ref="logoUpload">
-                  <ImageUpload @input="handleLogoSuccess" :params="params" :limit="limit" :value="registerForm.logo" :fileSize="fileSize"></ImageUpload>
+                  <ImageUpload @input="handleLogoSuccess" :params="params" :limit="limit" :value="form.logo" :fileSize="fileSize"></ImageUpload>
                   <!-- <ImageUpload @input="handleLogoSuccess"></ImageUpload> -->
                 </el-form-item>
               </td>
             </tr>
           </table>
         </template>
+        <template v-if="tokenVisile">
+          <table class="table_register media-short">
+            <tr>
+              <th rowspan="10" style="width: 10%;">企业信息</th>
+              <th><span style="color: red;">*</span>企业名称</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="entName">
+                  <el-input v-model="form.entName" type="text" auto-complete="off" placeholder="请输入企业名称" style="width: 220px;">
+                  </el-input>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th><span style="color: red;">*</span>统一社会信用代码</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="license">
+                  <el-input type="text" @change="validLicense" style="width: 220px;"
+                    v-model="form.license"
+                    placeholder="请输入统一社会信用代码">
+                  </el-input>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th><span style="color: red;">*</span>注册资金</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="regCapital">
+                  <el-input type="text" style="width: 220px;"
+                    v-model="form.regCapital"
+                    placeholder="请输入注册资金">
+                    <template slot="append">万元</template>
+                  </el-input>
+                </el-form-item>
+              </td>
+
+            </tr>
+            <tr>
+              <th><span style="color: red;">*</span>工商注册时间</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="regDate">
+                  <el-date-picker v-model="form.regDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" style="width: 220px;"></el-date-picker>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th><span style="color: red;">*</span>工商注册类型</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="regType">
+                  <el-select v-model="form.regType" filterable style="width: 220px;">
+                    <el-option v-for="item in regTypeOptions" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+                  </el-select>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th><span style="color: red;">*</span>主营产品(服务)所属技术领域</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="mainProducts">
+                  <el-select v-model="form.mainProducts" style="width: 220px;" filterable>
+                    <el-option v-for="(item,index) in mainProductsOptions" :label="item.dictLabel" :key="index" :value="item.dictValue">{{item.dictLabel}}</el-option>
+                  </el-select>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th><span style="color: red;">*</span>通信地址</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="address">
+                  <el-input v-model="form.address" type="text" auto-complete="off" placeholder="请输入通信地址" style="width: 220px;">
+                  </el-input>
+                </el-form-item>
+              </td>
+
+            </tr>
+            <tr>
+              <th><span style="color: red;">*</span>邮政编码</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="zipCode">
+                  <el-input v-model="form.zipCode" type="text" auto-complete="off" placeholder="请输入邮政编码" style="width: 220px;">
+                  </el-input>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th><span style="color: red;">*</span>企业所属行政区域</th>
+              <td colspan="3">
+                <el-col :span="24">
+                  <el-form-item label-width="0" prop="provinceId">
+                    <el-select v-model="form.provinceId" placeholder="省" @change="getCityData" style="width: 220px;" filterable>
+                      <el-option v-for="(item,index) in provinceDataList" :key="index" :label="item.name" :value="item.id"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item prop="cityId" label-width="0px">
+                    <el-select v-model="form.cityId" placeholder="市" @change="getDistrictData" style="width: 220px;" filterable>
+                      <el-option v-for="(item, index) in cityDataList" :key="index" :label="item.name" :value="item.id"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label-width="0px" prop="districtId">
+                    <el-select v-model="form.districtId" placeholder="区" style="width: 220px;" filterable>
+                      <el-option v-for="(item, index) in districtDataList" :key="index" :label="item.name" :value="item.id"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </td>
+            </tr>
+            <tr>
+              <th><span style="color: red;">*</span>企业所得税主管税务机关</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="taxOffice">
+                  <el-input v-model="form.taxOffice" type="text" auto-complete="off" placeholder="请输入企业所得税主管税务机关" disabled style="width: 220px;">
+                  </el-input>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th rowspan="6">法人信息</th>
+              <th><span style="color: red;">*</span>姓名</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="legalName">
+                  <el-input v-model="form.legalName" type="text" auto-complete="off" placeholder="请输入法人姓名" style="width: 220px;">
+                  </el-input>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th><span style="color: red;">*</span>身份证号码</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="legalIdCard">
+                  <el-input v-model="form.legalIdCard" type="text" auto-complete="off" placeholder="请输入法人身份证号码" style="width: 220px;">
+                  </el-input>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th><span style="color: red;">*</span>手机号码</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="legalMobile">
+                  <el-input v-model="form.legalMobile" type="text" auto-complete="off" placeholder="手机号码" style="width: 220px;">
+                  </el-input>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th>传真</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="legalFax">
+                  <el-input v-model="form.legalFax" type="text" auto-complete="off" placeholder="请输入法人传真" style="width: 220px;">
+                  </el-input>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th>固定电话</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="legalPhone">
+                  <el-input v-model="form.legalPhone" type="text" auto-complete="off" placeholder="请输入固定电话" style="width: 220px;">
+                  </el-input>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th>E-mail</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="legalEmail">
+                  <el-input v-model="form.legalEmail" type="text" auto-complete="off" placeholder="请输入法人邮箱" style="width: 220px;">
+                  </el-input>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th rowspan="6">联系人信息</th>
+              <th><span style="color: red;">*</span>姓名</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="linkName">
+                  <el-input v-model="form.linkName" type="text" auto-complete="off" placeholder="请输入联系人姓名" style="width: 220px;">
+                  </el-input>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th><span style="color: red;">*</span>身份证号码</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="linkIdCard">
+                  <el-input v-model="form.linkIdCard" type="text" auto-complete="off" placeholder="请输入联系人身份证号码" style="width: 220px;">
+                  </el-input>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th>固定电话</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="linkPhone">
+                  <el-input v-model="form.linkPhone" type="text" auto-complete="off" placeholder="请输入联系人固定电话" style="width: 220px;">
+                  </el-input>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th><span style="color: red;">*</span>手机号码</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="linkMobile">
+                  <el-input v-model="form.linkMobile" type="text" auto-complete="off" placeholder="请填入手机号码" style="width: 220px;">
+                  </el-input>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th>E-mail</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="linkEmail">
+                  <el-input v-model="form.linkEmail" type="text" auto-complete="off" placeholder="请输入联系人邮箱" style="width: 220px;">
+                  </el-input>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th>传真</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="linkFax">
+                  <el-input v-model="form.linkFax" type="text" auto-complete="off" placeholder="请输入联系人传真" style="width: 220px;">
+                  </el-input>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th :rowspan="form.listedFlag == 1 ? '2' : '1'">企业上市信息</th>
+              <th><span style="color: red;">*</span>企业是否上市</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="listedFlag">
+                  <el-radio-group v-model="form.listedFlag" style="width: 220px;">
+                    <el-radio v-for="(item, index) in yesOrNoOptions" :key="index" :label="item.dictValue">{{item.dictLabel}}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <template v-if="form.listedFlag == 1">
+                <th><span style="color: red;">*</span>企业上市代码</th>
+                <td colspan="3">
+                  <el-form-item label-width="0" prop="listingCode">
+                    <el-input v-model="form.listingCode" type="text" auto-complete="off" placeholder="请输入企业上市代码" style="width: 220px;">
+                    </el-input>
+                  </el-form-item>
+                </td>
+              </template>
+            </tr>
+            <tr>
+              <th :rowspan="form.investFlag == 1 ? '2' : '1'">风险投资信息</th>
+              <th><span style="color: red;">*</span>是否引入风险投资</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="investFlag">
+                  <el-radio-group v-model="form.investFlag" style="width: 220px;">
+                    <el-radio v-for="(item, index) in yesOrNoOptions" :key="index" :label="item.dictValue">{{item.dictLabel}}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr v-if="form.investFlag == 1">
+              <!-- <template v-if="form.investFlag == 1"> -->
+                <th><span style="color: red;">*</span>风险投资金额</th>
+                <td colspan="3">
+                  <el-form-item label-width="0" prop="investCapital">
+                    <el-input v-model="form.investCapital" type="text" auto-complete="off" placeholder="请输入风险投资金额" style="width: 220px;">
+                      <template slot="append">万元</template>
+                    </el-input>
+                  </el-form-item>
+                </td>
+              <!-- </template> -->
+            </tr>
+            <tr>
+              <th :rowspan="form.techFlag == 1 ? '2' : '1'">高新企业</th>
+              <th><span style="color: red;">*</span>是否为高新企业</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="techFlag">
+                  <el-radio-group v-model="form.techFlag" style="width: 220px;">
+                    <el-radio v-for="(item, index) in yesOrNoOptions" :key="index" :label="item.dictValue">{{item.dictLabel}}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <template v-if="form.techFlag == 1">
+                <th><span style="color: red;">*</span>高新企业编号</th>
+                <td colspan="3">
+                  <el-form-item label-width="0" prop="techCode">
+                    <el-input v-model="form.techCode" type="text" auto-complete="off" placeholder="请输入高新企业编号" style="width: 220px;">
+                    </el-input>
+                  </el-form-item>
+                </td>
+              </template>
+            </tr>
+            <tr>
+              <th>上年度是否做加计扣除</th>
+              <th><span style="color: red;">*</span>上年度是否做加计扣除</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="deductionFlag">
+                  <el-radio-group v-model="form.deductionFlag" style="width: 220px;">
+                    <el-radio v-for="(item, index) in yesOrNoOptions" :key="index" :label="item.dictValue">{{item.dictLabel}}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th rowspan="2">附件</th>
+              <th><span style="color: red;">*</span>企业营业执照</th>
+              <td colspan="3">
+                <el-form-item label-width="3" prop="licensePath" ref="licenseUpload">
+                  <ImageUpload @input="handleLicenseSuccess" :params="params" :limit="limit" :value="form.licensePath" :fileSize="fileSize"></ImageUpload>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th>其他附件</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="attachIds">
+                  <FileUpload :files="form.fileList" @input="handleSaleSuccess" :multiple="true" :params="params">上传材料</FileUpload>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th>文件水印</th>
+              <th>文件水印</th>
+              <td colspan="3">
+                <el-form-item label-width="0" prop="logo" ref="logoUpload">
+                  <ImageUpload @input="handleLogoSuccess" :params="params" :limit="limit" :value="form.logo" :fileSize="fileSize"></ImageUpload>
+                </el-form-item>
+              </td>
+            </tr>
+          </table>
+        </template>
       <el-row :gutter="40" style="margin-top: 20px;">
         <el-col :span="24">
           <el-form-item style="width:100%;text-align: center;" label-width="0px">
@@ -390,7 +705,6 @@ export default {
       },
       dialogVisible: false,
       dialogImageUrl: "",
-      activeNames: ['1','2','3','4','5','6','7','8','9','10', '11'],
       provinceName: '',
       attachType: 'ENT',
       dataId: '',
@@ -405,7 +719,7 @@ export default {
       provinceDataList: [],
       cityDataList: [],
       districtDataList: [],
-      registerForm: {
+      form: {
         startDate: '',
         endDate: '',
         attachIds: [],
@@ -568,23 +882,23 @@ export default {
       this.loading = true
       getEntUserById(this.token).then(res => {
         this.loading = false
-        this.registerForm = res.data || {}
+        this.form = res.data || {}
         this.dataId = res.data.id || {}
         if(this.dataId) {
           this.getEnclosureData()
         }
-        // let mainProductArray = this.registerForm.mainProducts.split(',') || ['电子信息'];
-        // this.$set(this.registerForm, 'mainProductArray', mainProductArray);
-        this.registerForm.provinceId = res.data.provinceId
-        if(this.registerForm.provinceId) {
-          getRegionChildrenApi(this.registerForm.provinceId).then(res => {
+        // let mainProductArray = this.form.mainProducts.split(',') || ['电子信息'];
+        // this.$set(this.form, 'mainProductArray', mainProductArray);
+        this.form.provinceId = res.data.provinceId
+        if(this.form.provinceId) {
+          getRegionChildrenApi(this.form.provinceId).then(res => {
             if(res.code == 200) {
               this.cityDataList = res.data
             }
           })
         }
-        if(this.registerForm.cityId) {
-          getRegionChildrenApi(this.registerForm.cityId).then(res => {
+        if(this.form.cityId) {
+          getRegionChildrenApi(this.form.cityId).then(res => {
             if(res.code == 200) {
               this.districtDataList = res.data
             }
@@ -593,26 +907,26 @@ export default {
       })
     },
     handleSuccess(file) {
-      this.registerForm.licensePath = file.url;
-      this.registerForm.fileName = file.name;
+      this.form.licensePath = file.url;
+      this.form.fileName = file.name;
     },
     // handleSaleSuccess(files) {
     //   files.forEach(item => {
-    //     this.registerForm.attachIds.push(item.response.data.id)
+    //     this.form.attachIds.push(item.response.data.id)
     //   });
     // },
     handleSaleSuccess(files) {
-      this.registerForm.fileList = files
-      this.registerForm.attachIds = []
+      this.form.fileList = files
+      this.form.attachIds = []
       files.forEach(item => {
-        this.registerForm.attachIds.push(item.response.data.id)
+        this.form.attachIds.push(item.response.data.id)
       });
     },
     handleLogoSuccess(file) {
-      this.registerForm.logo = file
+      this.form.logo = file
     },
     handleLicenseSuccess(file) {
-      this.registerForm.licensePath = file
+      this.form.licensePath = file
       this.$refs.licenseUpload.clearValidate()
     },
     handleView(row) {
@@ -644,52 +958,52 @@ export default {
     },
     //选择省份
     getCityData() {
-      this.registerForm.cityId = ''
-      this.registerForm.districtId = ''
-      getRegionChildrenApi(this.registerForm.provinceId).then(res => {
+      this.form.cityId = ''
+      this.form.districtId = ''
+      getRegionChildrenApi(this.form.provinceId).then(res => {
         if(res.code == 200) {
           this.cityDataList = res.data
 
           let obj = this.provinceDataList.find(item => {
-            return item.id == this.registerForm.provinceId
+            return item.id == this.form.provinceId
           })
           this.provinceName = obj.name
-          this.registerForm.taxOffice = '国家税务总局'+this.provinceName+'税务局'
+          this.form.taxOffice = '国家税务总局'+this.provinceName+'税务局'
         }
       })
     },
     //选择市
     getDistrictData() {
-      this.registerForm.districtId = ''
-      getRegionChildrenApi(this.registerForm.cityId).then(res => {
+      this.form.districtId = ''
+      getRegionChildrenApi(this.form.cityId).then(res => {
         if(res.code == 200) {
           this.districtDataList = res.data
 
           let obj = this.cityDataList.find(item => {
-            return item.id == this.registerForm.cityId
+            return item.id == this.form.cityId
           })
           this.cityName = obj.name
-          this.registerForm.taxOffice = '国家税务总局'+this.cityName+'税务局'
+          this.form.taxOffice = '国家税务总局'+this.cityName+'税务局'
         }
       })
     },
     changeDistrict() {
       let obj = this.districtDataList.find(item => {
-        return item.id == this.registerForm.districtId
+        return item.id == this.form.districtId
       })
       this.districtName = obj.name
-      this.registerForm.taxOffice = '国家税务总局'+this.districtName+'税务局'
+      this.form.taxOffice = '国家税务总局'+this.districtName+'税务局'
     },
     getProvinceData() {
       getProvinceDataApi().then(res => {
         if(res.code == 200) {
           this.provinceDataList = res.data
-          this.registerForm.provinceId = '1481196860266852481'
-          getRegionChildrenApi(this.registerForm.provinceId).then(res => {
+          this.form.provinceId = '1481196860266852481'
+          getRegionChildrenApi(this.form.provinceId).then(res => {
             if(res.code == 200) {
               this.cityDataList = res.data
-              this.registerForm.cityId = '1481196860266852482'
-              getRegionChildrenApi(this.registerForm.cityId).then(res => {
+              this.form.cityId = '1481196860266852482'
+              getRegionChildrenApi(this.form.cityId).then(res => {
                 if(res.code == 200) {
                   this.districtDataList = res.data
                 }
@@ -698,14 +1012,14 @@ export default {
           })
         }
       })
-      this.registerForm.taxOffice = '国家税务总局长沙市税务局'
+      this.form.taxOffice = '国家税务总局长沙市税务局'
     },
     getCode() {
       getCodeImg().then(res => {
         this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
         if (this.captchaOnOff) {
           this.codeUrl = "data:image/gif;base64," + res.img;
-          this.registerForm.uuid = res.uuid;
+          this.form.uuid = res.uuid;
         }
       });
     },
@@ -713,20 +1027,17 @@ export default {
       this.$router.go(-1);
     },
     handleRegister() {
-      // this.registerForm.mainProducts = this.registerForm.mainProductArray.join(',')
-      validLicenseApi(this.registerForm.license).then(res => {
-        // true存在
+      validLicenseApi(this.form.license).then(res => {
         if(res.data) {
           this.$message.error('统一社会信用代码已经存在,不可以重复注册');
           return
         }
       })
-
-      this.$refs.registerForm.validate((valid,obj) => {
+      this.$refs.form.validate((valid,obj) => {
         if (valid) {
           this.loading = true;
           if(this.token) {
-            entUserAudit(this.token, this.registerForm).then(res => {
+            entUserAudit(this.token, this.form).then(res => {
               this.$alert("注册信息修改成功", '系统提示', {
                 dangerouslyUseHTMLString: true,
                 type: 'success'
@@ -739,9 +1050,9 @@ export default {
               this.loading = false;
             })
           }else {
-            registerEntApi(this.registerForm).then(res => {
-              const userName = this.registerForm.userName;
-              this.$alert("<font color='red'>恭喜你,您的账号 " + userName + " 注册成功!</font>", '系统提示', {
+            registerEntApi(this.form).then(res => {
+              const userName = this.form.userName;
+              this.$alert("<font color='red'>您已注册成功,账户为统一信用代码,密码为默认123456。请等待审核通过后登录平台进行操作。</font>", '系统提示', {
                 dangerouslyUseHTMLString: true,
                 type: 'success'
               }).then(() => {
@@ -768,44 +1079,30 @@ export default {
 };
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-  .title-reg {
-    position: fixed;
-    z-index: 999;
-    top: 0;
-    right: 0;
-    left: 0;
-    width: 100%;
-    height: 45px;
-    line-height: 45px;
-    padding: 20px;
-    background-color: #1890ff;
-    img {
-      left: 0;
-    }
+<style lang="scss" scoped>
+  .register {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 900px;
+    overflow-y: auto;
+    scroll-behavior: auto;
+    background-image: url("../../assets/images/login-background.jpg");
+    background-size: cover;
+  }
+  .title {
+    margin: 0px auto 30px auto;
+    text-align: center;
+    color: #FFFFFF;
   }
-  .top-fixed {
-    width: 100%;
-    height: 45px;
+  @media ( max-width : 850px) {
+    .media {
+      display: none !important;
+    }
   }
-  .top-img {
-    float: right;
-    margin-top: -64px;
+  @media ( min-width: 850px ) {
+    .media-short {
+      display: none !important;
+    }
   }
-.register {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 900px;
-  overflow-y: auto;
-  scroll-behavior: auto;
-  background-image: url("../../assets/images/login-background.jpg");
-  background-size: cover;
-}
-.title {
-  margin: 0px auto 30px auto;
-  text-align: center;
-  color: #FFFFFF;
-}
 </style>

+ 5 - 2
src/views/enterprise/ent/basicInfo.vue

@@ -23,7 +23,7 @@
         <th>工商注册类型</th>
         <td>{{regTypeFormat}}</td>
         <th>主营产品(服务)所属技术领域</th>
-        <td>{{info.mainProducts}}</td>
+        <td>{{mainProductsFormat}}</td>
       </tr>
       <tr>
         <th>通信地址</th>
@@ -167,7 +167,7 @@
 <script>
   import { listEntUserApi } from "@/api/ent/ent"
   import {getEnclosureApi} from "@/api/enterprise/project/project"
-  import {regTypeOptions, getLabel,yesOrNoOptions} from '@/utils/dataFormat'
+  import {regTypeOptions, getLabel,yesOrNoOptions,mainProductsOptions} from '@/utils/dataFormat'
   export default {
     name: 'EntInfo',
     data () {
@@ -202,6 +202,9 @@
       },
       deductionFlag() {
         return getLabel(yesOrNoOptions, this.info.deductionFlag)
+      },
+      mainProductsFormat() {
+        return getLabel(mainProductsOptions, this.info.mainProducts)
       }
     },
     created () {

+ 24 - 12
src/views/enterprise/ent/components/service.vue

@@ -2,7 +2,7 @@
   <el-dialog title="修改服务时间" :visible.sync="open" width="800px" append-to-body>
     <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="服务时间段" prop="serviceTime">
-          <el-date-picker v-model="form.serviceTime" placeholder="选择日期" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @input="$forceUpdate()"></el-date-picker>
+          <el-input  @focus="getLayDate" id="inputUI" v-model="form.serviceTime"></el-input>
         </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -21,7 +21,7 @@
         disabled: false,
         type: '',
         form: {
-          serviceTime: [],
+          serviceTime: "",
           endDate: '',
           startDate: ''
         },
@@ -43,10 +43,10 @@
       getData() {
         getEntInfoByIdApi(this.form.id).then(res => {
           this.form = res.data || {}
-          this.form.serviceTime = []
-          if(this.form.startDate) {
-            this.form.serviceTime[0] = this.form.startDate
-            this.form.serviceTime[1] = this.form.endDate
+          if(this.form.startDate && this.form.endDate) {
+            this.form.serviceTime = this.form.startDate + ' 至 ' + this.form.endDate
+          }else {
+            this.form.serviceTime = ""
           }
         })
       },
@@ -54,9 +54,9 @@
         this.$refs.form.validate(valid => {
           if (valid) {
             this.disabled = true
-            if(this.form.serviceTime.length > 0) {
-              this.form.startDate = this.form.serviceTime[0]
-              this.form.endDate = this.form.serviceTime[1]
+            if(this.form.serviceTime) {
+              this.form.startDate = this.form.serviceTime.split('至')[0].trim()
+              this.form.endDate = this.form.serviceTime.split('至')[1].trim()
             }else {
               this.form.startDate = ''
               this.form.endDate = ''
@@ -78,12 +78,24 @@
       cancel() {
         this.open = false
       },
+      getLayDate(){
+        let _self = this
+          laydate.render({
+            elem: '#inputUI', // 输入框的id属性,用来绑定到dom
+            type: 'date',
+            range: true,
+            done: (value) => {
+              _self.form.serviceTime = value; // 将选中的值赋给组件中的变量
+            }
+          })
+        }
     },
     watch: {
       "form.serviceTime"(val) {
-        if(this.form.serviceTime.length > 0) {
-          this.form.startDate = this.form.serviceTime[0]
-          this.form.endDate = this.form.serviceTime[1]
+        if(val) {
+          let arr = val.split('至')
+          this.form.startDate = arr[0].trim()
+          this.form.endDate = arr[1].trim()
         }else {
           this.form.startDate = ''
           this.form.endDate = ''

+ 391 - 15
src/views/enterprise/ent/edit.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container" v-loading="loading">
     <el-form ref="form" :model="form" :rules="registerRules">
-      <table class="table_register">
+      <table class="table_register media">
         <tr>
-          <th rowspan="6">企业信息</th>
-          <th><span style="color: red;">*</span>企业名称</th>
+          <th rowspan="6" style="width: 10%;">企业信息</th>
+          <th style="width: 20%;"><span style="color: red;">*</span>企业名称</th>
           <td>
             <el-form-item label-width="0" prop="entName">
               <el-input v-model="form.entName" type="text" auto-complete="off" placeholder="请输入企业名称">
@@ -35,7 +35,7 @@
           <th><span style="color: red;">*</span>工商注册时间</th>
           <td>
             <el-form-item label-width="0" prop="regDate">
-              <el-date-picker v-model="form.regDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
+              <el-date-picker v-model="form.regDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" style="width: 180px;"></el-date-picker>
             </el-form-item>
           </td>
         </tr>
@@ -51,7 +51,7 @@
           <th><span style="color: red;">*</span>主营产品(服务)所属技术领域</th>
           <td>
             <el-form-item label-width="0" prop="mainProducts">
-              <el-select v-model="form.mainProducts" style="width: 220px;" filterable>
+              <el-select v-model="form.mainProducts" style="width: 180px;" filterable>
                 <el-option v-for="(item,index) in mainProductsOptions" :label="item.dictLabel" :key="index" :value="item.dictValue">{{item.dictLabel}}</el-option>
               </el-select>
             </el-form-item>
@@ -284,7 +284,362 @@
           <th><span style="color: red;">*</span>服务时间段</th>
           <td colspan="3">
             <el-form-item prop="serviceDate" label-width="0">
-              <el-date-picker v-model="form.serviceDate" placeholder="选择日期" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+              <el-input id="inputUI" v-model="form.serviceDate" style="width: 220px"></el-input>
+              <!-- <el-date-picker v-model="form.serviceDate" placeholder="选择日期" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker> -->
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th rowspan="2">附件</th>
+          <th><span style="color: red;">*</span>企业营业执照</th>
+          <td colspan="3">
+            <el-form-item label-width="3" prop="licensePath" ref="licenseUpload">
+              <ImageUpload @input="handleLicenseSuccess" :params="params" :limit="limit" :value="form.licensePath" :fileSize="fileSize"></ImageUpload>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th>其他附件</th>
+          <td colspan="3">
+            <el-form-item prop="attachIds" label-width="0">
+              <el-upload
+                class="upload-demo"
+                :action="action"
+                :headers="headers"
+                :on-preview="handlePreview"
+                :on-remove="handleRemove"
+                :before-remove="beforeRemove"
+                :on-success="handleFileSuccess"
+                multiple
+                :data="params"
+                :file-list="form.fileList">
+                <el-button size="small" type="primary">点击上传</el-button>
+              </el-upload>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th>文件水印</th>
+          <th>文件水印</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="logo" ref="logoUpload">
+              <ImageUpload @input="handleLogoSuccess" :params="params" :limit="limit" :value="form.logo" :fileSize="fileSize"></ImageUpload>
+            </el-form-item>
+          </td>
+        </tr>
+      </table>
+      <table class="table_register media-short">
+        <tr>
+          <th rowspan="10" style="width: 10%;">企业信息</th>
+          <th><span style="color: red;">*</span>企业名称</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="entName">
+              <el-input v-model="form.entName" type="text" auto-complete="off" placeholder="请输入企业名称" style="width: 220px;">
+              </el-input>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th><span style="color: red;">*</span>统一社会信用代码</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="license">
+              <el-input type="text" @change="validLicense" style="width: 220px;"
+                v-model="form.license"
+                placeholder="请输入统一社会信用代码">
+              </el-input>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th><span style="color: red;">*</span>注册资金</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="regCapital">
+              <el-input type="text" style="width: 220px;"
+                v-model="form.regCapital"
+                placeholder="请输入注册资金">
+                <template slot="append">万元</template>
+              </el-input>
+            </el-form-item>
+          </td>
+
+        </tr>
+        <tr>
+          <th><span style="color: red;">*</span>工商注册时间</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="regDate">
+              <el-date-picker v-model="form.regDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" style="width: 220px;"></el-date-picker>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th><span style="color: red;">*</span>工商注册类型</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="regType">
+              <el-select v-model="form.regType" filterable style="width: 220px;">
+                <el-option v-for="item in regTypeOptions" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+              </el-select>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th><span style="color: red;">*</span>主营产品(服务)所属技术领域</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="mainProducts">
+              <el-select v-model="form.mainProducts" style="width: 220px;" filterable>
+                <el-option v-for="(item,index) in mainProductsOptions" :label="item.dictLabel" :key="index" :value="item.dictValue">{{item.dictLabel}}</el-option>
+              </el-select>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th><span style="color: red;">*</span>通信地址</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="address">
+              <el-input v-model="form.address" type="text" auto-complete="off" placeholder="请输入通信地址" style="width: 220px;">
+              </el-input>
+            </el-form-item>
+          </td>
+
+        </tr>
+        <tr>
+          <th><span style="color: red;">*</span>邮政编码</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="zipCode">
+              <el-input v-model="form.zipCode" type="text" auto-complete="off" placeholder="请输入邮政编码" style="width: 220px;">
+              </el-input>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th><span style="color: red;">*</span>企业所属行政区域</th>
+          <td colspan="3">
+            <el-col :span="24">
+              <el-form-item label-width="0" prop="provinceId">
+                <el-select v-model="form.provinceId" placeholder="省" @change="getCityData" style="width: 220px;" filterable>
+                  <el-option v-for="(item,index) in provinceDataList" :key="index" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item prop="cityId" label-width="0px">
+                <el-select v-model="form.cityId" placeholder="市" @change="getDistrictData" style="width: 220px;" filterable>
+                  <el-option v-for="(item, index) in cityDataList" :key="index" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label-width="0px" prop="districtId">
+                <el-select v-model="form.districtId" placeholder="区" style="width: 220px;" filterable>
+                  <el-option v-for="(item, index) in districtDataList" :key="index" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </td>
+        </tr>
+        <tr>
+          <th><span style="color: red;">*</span>企业所得税主管税务机关</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="taxOffice">
+              <el-input v-model="form.taxOffice" type="text" auto-complete="off" placeholder="请输入企业所得税主管税务机关" disabled style="width: 220px;">
+              </el-input>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th rowspan="6">法人信息</th>
+          <th><span style="color: red;">*</span>姓名</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="legalName">
+              <el-input v-model="form.legalName" type="text" auto-complete="off" placeholder="请输入法人姓名" style="width: 220px;">
+              </el-input>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th><span style="color: red;">*</span>身份证号码</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="legalIdCard">
+              <el-input v-model="form.legalIdCard" type="text" auto-complete="off" placeholder="请输入法人身份证号码" style="width: 220px;">
+              </el-input>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th><span style="color: red;">*</span>手机号码</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="legalMobile">
+              <el-input v-model="form.legalMobile" type="text" auto-complete="off" placeholder="手机号码" style="width: 220px;">
+              </el-input>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th>传真</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="legalFax">
+              <el-input v-model="form.legalFax" type="text" auto-complete="off" placeholder="请输入法人传真" style="width: 220px;">
+              </el-input>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th>固定电话</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="legalPhone">
+              <el-input v-model="form.legalPhone" type="text" auto-complete="off" placeholder="请输入固定电话" style="width: 220px;">
+              </el-input>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th>E-mail</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="legalEmail">
+              <el-input v-model="form.legalEmail" type="text" auto-complete="off" placeholder="请输入法人邮箱" style="width: 220px;">
+              </el-input>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th rowspan="6">联系人信息</th>
+          <th><span style="color: red;">*</span>姓名</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="linkName">
+              <el-input v-model="form.linkName" type="text" auto-complete="off" placeholder="请输入联系人姓名" style="width: 220px;">
+              </el-input>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th><span style="color: red;">*</span>身份证号码</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="linkIdCard">
+              <el-input v-model="form.linkIdCard" type="text" auto-complete="off" placeholder="请输入联系人身份证号码" style="width: 220px;">
+              </el-input>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th>固定电话</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="linkPhone">
+              <el-input v-model="form.linkPhone" type="text" auto-complete="off" placeholder="请输入联系人固定电话" style="width: 220px;">
+              </el-input>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th><span style="color: red;">*</span>手机号码</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="linkMobile">
+              <el-input v-model="form.linkMobile" type="text" auto-complete="off" placeholder="请填入手机号码" style="width: 220px;">
+              </el-input>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th>E-mail</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="linkEmail">
+              <el-input v-model="form.linkEmail" type="text" auto-complete="off" placeholder="请输入联系人邮箱" style="width: 220px;">
+              </el-input>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th>传真</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="linkFax">
+              <el-input v-model="form.linkFax" type="text" auto-complete="off" placeholder="请输入联系人传真" style="width: 220px;">
+              </el-input>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <th :rowspan="form.listedFlag == 1 ? '2' : '1'">企业上市信息</th>
+          <th><span style="color: red;">*</span>企业是否上市</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="listedFlag">
+              <el-radio-group v-model="form.listedFlag" style="width: 220px;">
+                <el-radio v-for="(item, index) in yesOrNoOptions" :key="index" :label="item.dictValue">{{item.dictLabel}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <template v-if="form.listedFlag == 1">
+            <th><span style="color: red;">*</span>企业上市代码</th>
+            <td colspan="3">
+              <el-form-item label-width="0" prop="listingCode">
+                <el-input v-model="form.listingCode" type="text" auto-complete="off" placeholder="请输入企业上市代码" style="width: 220px;">
+                </el-input>
+              </el-form-item>
+            </td>
+          </template>
+        </tr>
+        <tr>
+          <th :rowspan="form.investFlag == 1 ? '2' : '1'">风险投资信息</th>
+          <th><span style="color: red;">*</span>是否引入风险投资</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="investFlag">
+              <el-radio-group v-model="form.investFlag" style="width: 220px;">
+                <el-radio v-for="(item, index) in yesOrNoOptions" :key="index" :label="item.dictValue">{{item.dictLabel}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr v-if="form.investFlag == 1">
+          <!-- <template v-if="form.investFlag == 1"> -->
+            <th><span style="color: red;">*</span>风险投资金额</th>
+            <td colspan="3">
+              <el-form-item label-width="0" prop="investCapital">
+                <el-input v-model="form.investCapital" type="text" auto-complete="off" placeholder="请输入风险投资金额" style="width: 220px;">
+                  <template slot="append">万元</template>
+                </el-input>
+              </el-form-item>
+            </td>
+          <!-- </template> -->
+        </tr>
+        <tr>
+          <th :rowspan="form.techFlag == 1 ? '2' : '1'">高新企业</th>
+          <th><span style="color: red;">*</span>是否为高新企业</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="techFlag">
+              <el-radio-group v-model="form.techFlag" style="width: 220px;">
+                <el-radio v-for="(item, index) in yesOrNoOptions" :key="index" :label="item.dictValue">{{item.dictLabel}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr>
+          <template v-if="form.techFlag == 1">
+            <th><span style="color: red;">*</span>高新企业编号</th>
+            <td colspan="3">
+              <el-form-item label-width="0" prop="techCode">
+                <el-input v-model="form.techCode" type="text" auto-complete="off" placeholder="请输入高新企业编号" style="width: 220px;">
+                </el-input>
+              </el-form-item>
+            </td>
+          </template>
+        </tr>
+        <tr>
+          <th>上年度是否做加计扣除</th>
+          <th><span style="color: red;">*</span>上年度是否做加计扣除</th>
+          <td colspan="3">
+            <el-form-item label-width="0" prop="deductionFlag">
+              <el-radio-group v-model="form.deductionFlag" style="width: 220px;">
+                <el-radio v-for="(item, index) in yesOrNoOptions" :key="index" :label="item.dictValue">{{item.dictLabel}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </td>
+        </tr>
+        <tr v-if="type == 'add'">
+          <th>服务时间</th>
+          <th><span style="color: red;">*</span>服务时间段</th>
+          <td colspan="3">
+            <el-form-item prop="serviceDate" label-width="0">
+              <el-input id="inputUI" v-model="form.serviceDate" style="width: 220px"></el-input>
+              <!-- <el-date-picker v-model="form.serviceDate" placeholder="选择日期" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 220px;"></el-date-picker> -->
             </el-form-item>
           </td>
         </tr>
@@ -294,7 +649,6 @@
           <td colspan="3">
             <el-form-item label-width="3" prop="licensePath" ref="licenseUpload">
               <ImageUpload @input="handleLicenseSuccess" :params="params" :limit="limit" :value="form.licensePath" :fileSize="fileSize"></ImageUpload>
-              <!-- <FileUpload :file="{url: form.licensePath, name: form.fileName}" @input="handleSuccess">上传材料</FileUpload> -->
             </el-form-item>
           </td>
         </tr>
@@ -386,6 +740,7 @@ export default {
             }
           };
     return {
+      date: "",
       action: process.env.VUE_APP_BASE_API + "/common/attach/upload", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
@@ -422,7 +777,7 @@ export default {
       disabledVisible: false,
       form: {
         id: '',
-        serviceDate: [],
+        serviceDate: "",
         fileList: [],
         listedFlag: 1,
         investFlag: 1,
@@ -589,7 +944,7 @@ export default {
         //   { required: true, trigger: "change", message: "请上传文件水印" },
         // ],
         serviceDate: [
-          { type: 'array', required: true, message: '请选择服务时间', trigger: 'change' }
+          { required: true, message: '请选择服务时间', trigger: 'change' }
         ]
       },
       loading: false,
@@ -609,6 +964,17 @@ export default {
     }else{
       this.getProvinceData()
     }
+  },
+  mounted() {
+    let laydate = window.laydate;
+    laydate.render({
+      elem: '#inputUI', // 输入框的id属性,用来绑定到dom
+      type: 'date',
+      range: true,
+      done: (value) => {
+        this.form.serviceDate = value; // 将选中的值赋给组件中的变量
+      }
+    });
   },
   methods: {
     validLicense(val) {
@@ -626,7 +992,6 @@ export default {
         })
         this.$set(this.form, 'fileList', this.list)
         this.$forceUpdate()
-        console.log(this.form.fileList, "this.form.fileList")
       })
     },
     handleUpload() {
@@ -645,8 +1010,8 @@ export default {
         // this.$set(this.form, 'mainProductArray', mainProductArray);
         this.form.serviceDate = []
         if(this.form.startDate) {
-          this.form.serviceDate[0] = this.form.startDate
-          this.form.serviceDate[1] = this.form.endDate
+          this.form.serviceDate[0] = this.form.startDate + ' '
+          this.form.serviceDate[1] = ' ' + this.form.endDate
         }
         getProvinceDataApi().then(res => {
           if(res.code == 200) {
@@ -958,9 +1323,10 @@ export default {
   },
   watch: {
     'form.serviceDate'(val) {
-      if(this.form.serviceDate.length > 0) {
-        this.form.startDate = this.form.serviceDate[0]
-        this.form.endDate = this.form.serviceDate[1]
+      if(val) {
+        let arr = val.split('至')
+        this.form.startDate = arr[0].trim()
+        this.form.endDate = arr[1].trim()
       }
     }
    }
@@ -970,5 +1336,15 @@ export default {
 <style lang="scss" scoped>
   .table_register {
     width: 100%;
+  }
+  @media ( max-width : 850px) {
+    .media {
+      display: none !important;
+    }
+  }
+  @media ( min-width: 850px ) {
+    .media-short {
+      display: none !important;
+    }
   }
 </style>

+ 1 - 1
src/views/enterprise/ent/index.vue

@@ -104,7 +104,7 @@
         </template>
       </el-table-column>
       <el-table-column label="审核状态" prop="authState" align="center" width="120" :formatter="authStateFormat"></el-table-column>
-      <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
+      <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button type="text" @click="handleView(scope.row)">查看</el-button>
           <!-- 只有科德管理员才可以有以下操作 -->

+ 6 - 7
src/views/enterprise/ent/info.vue

@@ -23,7 +23,7 @@
         <th>工商注册类型</th>
         <td>{{regTypeFormat}}</td>
         <th>主营产品(服务)所属技术领域</th>
-        <td>{{info.mainProducts}}</td>
+        <td>{{mainProductsFormat}}</td>
       </tr>
       <tr>
         <th>通信地址</th>
@@ -174,7 +174,7 @@
   import AuditEnt from "./components/audit"
   import {getEnclosureApi} from "@/api/enterprise/project/project"
   import {getEntInfoByIdTaxApi} from "@/api/gov/gov"
-  import {regTypeOptions, getLabel,yesOrNoOptions} from '@/utils/dataFormat'
+  import {regTypeOptions, getLabel,yesOrNoOptions,mainProductsOptions} from '@/utils/dataFormat'
   import {downloadEnclosureByIdApi} from "@/api/common/common"
   export default {
     name: 'EntInfo',
@@ -215,6 +215,9 @@
       },
       deductionFlag() {
         return getLabel(yesOrNoOptions, this.info.deductionFlag)
+      },
+      mainProductsFormat() {
+        return getLabel(mainProductsOptions, this.info.mainProducts)
       }
     },
     created () {
@@ -252,7 +255,6 @@
             this.info = res.data || {}
           })
         }
-
       },
       handleAudit() {
         this.auditEntVisible = true
@@ -280,10 +282,7 @@
           })
       },
       handleUpdate() {
-
-      },
-      handleView(id) {
-        window.open("http://124.232.146.72:7015/api/common/attach/"+id)
+        this.$router.push("/ent/edit/"+this.info.id+'?type=updateEnt')
       },
       cancel() {
         this.$store.dispatch("tagsView/delView", this.$route); // 关闭当前tab

+ 122 - 0
src/views/enterprise/ent/list.vue

@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Demo</title>
+  <!-- 请勿在项目正式环境中引用该 layui.css 地址 -->
+  <link href="//unpkg.com/layui@2.8.11/dist/css/layui.css" rel="stylesheet">
+</head>
+<body>
+<div class="layui-form">
+  <h5 style="margin-bottom: 16px;">
+    左右面板<strong class="layui-font-red">独立</strong>选择模式(默认) :
+  </h5>
+  <div class="layui-form-item">
+    <div class="layui-inline">
+      <label class="layui-form-label">日期范围</label>
+      <div class="layui-inline" id="ID-laydate-range">
+        <div class="layui-input-inline">
+          <input type="text" autocomplete="off" id="ID-laydate-start-date" class="layui-input" placeholder="开始日期">
+        </div>
+        <div class="layui-form-mid">-</div>
+        <div class="layui-input-inline">
+          <input type="text" autocomplete="off" id="ID-laydate-end-date" class="layui-input" placeholder="结束日期">
+        </div>
+      </div>
+    </div>
+  </div>
+  <h5 style="margin-bottom: 16px;">
+    左右面板<strong class="layui-font-red">联动</strong>选择模式 <sup>2.8+</sup> :
+  </h5>
+  <div class="layui-form-item">
+    <div class="layui-inline">
+      <label class="layui-form-label">日期范围</label>
+      <div class="layui-inline" id="ID-laydate-rangeLinked">
+        <div class="layui-input-inline">
+          <input type="text" autocomplete="off" id="ID-laydate-start-date-1" class="layui-input" placeholder="开始日期">
+        </div>
+        <div class="layui-form-mid">-</div>
+        <div class="layui-input-inline">
+          <input type="text" autocomplete="off" id="ID-laydate-end-date-1" class="layui-input" placeholder="结束日期">
+        </div>
+      </div>
+    </div>
+  </div>
+  <h5 style="margin-bottom: 16px;">其他类型的范围选择 :</h5>
+  <div class="layui-form-item">
+    <div class="layui-inline">
+      <label class="layui-form-label">年范围</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" id="ID-laydate-range-year" placeholder=" - ">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">年月范围</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" id="ID-laydate-range-month" placeholder=" - ">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">时间范围</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" id="ID-laydate-range-time" placeholder=" - ">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">日期时间范围</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" id="ID-laydate-range-datetime" placeholder=" - ">
+      </div>
+    </div>
+  </div>
+</div>
+  
+<!-- 请勿在项目正式环境中引用该 layui.js 地址 -->
+<script src="//unpkg.com/layui@2.8.11/dist/layui.js"></script> 
+<script>
+layui.use(function(){
+  var laydate = layui.laydate;
+  // 日期范围 - 左右面板独立选择模式
+  laydate.render({
+    elem: '#ID-laydate-range',
+    range: ['#ID-laydate-start-date', '#ID-laydate-end-date']
+  });
+  // 日期范围 - 左右面板联动选择模式
+  laydate.render({
+    elem: '#ID-laydate-rangeLinked',
+    range: ['#ID-laydate-start-date-1', '#ID-laydate-end-date-1'],
+    rangeLinked: true // 开启日期范围选择时的区间联动标注模式 ---  2.8+ 新增
+  });
+  
+  // 年范围
+  laydate.render({
+    elem: '#ID-laydate-range-year',
+    type: 'year',
+    range: true
+  });
+  
+  // 年月范围
+  laydate.render({
+    elem: '#ID-laydate-range-month',
+    type: 'month',
+    range: true
+  });
+  
+  // 时间范围
+  laydate.render({
+    elem: '#ID-laydate-range-time',
+    type: 'time',
+    range: true
+  });
+  
+  // 日期时间范围
+  laydate.render({
+    elem: '#ID-laydate-range-datetime',
+    type: 'datetime',
+    range: true
+  });
+});
+</script>
+</body>
+</html>

+ 2 - 2
src/views/system/user/profile/index.vue

@@ -23,10 +23,10 @@
                 <svg-icon icon-class="email" />用户邮箱
                 <div class="pull-right">{{ user.email }}</div>
               </li>
-              <li class="list-group-item">
+              <!-- <li class="list-group-item">
                 <svg-icon icon-class="tree" />所属部门
                 <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
-              </li>
+              </li> -->
               <li class="list-group-item">
                 <svg-icon icon-class="peoples" />所属角色
                 <div class="pull-right">{{ roleGroup }}</div>