提交

ruoyi-ui/src/components/DictData/index.js

@@ -0,0 +1,49 @@
+import Vue from 'vue'
+import store from '@/store'
+import DataDict from '@/utils/dict'
+import { getDicts as getDicts } from '@/api/system/dict/data'
+
+function searchDictByKey(dict, key) {
+  if (key == null && key == "") {
+    return null
+  }
+  try {
+    for (let i = 0; i < dict.length; i++) {
+      if (dict[i].key == key) {
+        return dict[i].value
+      }
+    }
+  } catch (e) {
+    return null
+  }
+}
+
+function install() {
+  Vue.use(DataDict, {
+    metas: {
+      '*': {
+        labelField: 'dictLabel',
+        valueField: 'dictValue',
+        request(dictMeta) {
+          const storeDict = searchDictByKey(store.getters.dict, dictMeta.type)
+          if (storeDict) {
+            return new Promise(resolve => { resolve(storeDict) })
+          } else {
+            return new Promise((resolve, reject) => {
+              getDicts(dictMeta.type).then(res => {
+                store.dispatch('dict/setDict', { key: dictMeta.type, value: res.data })
+                resolve(res.data)
+              }).catch(error => {
+                reject(error)
+              })
+            })
+          }
+        },
+      },
+    },
+  })
+}
+
+export default {
+  install,
+}

ruoyi-ui/src/components/DictTag/index.vue

@@ -0,0 +1,52 @@
+<template>
+  <div>
+    <template v-for="(item, index) in options">
+      <template v-if="values.includes(item.value)">
+        <span
+          v-if="item.raw.listClass == 'default' || item.raw.listClass == ''"
+          :key="item.value"
+          :index="index"
+          :class="item.raw.cssClass"
+          >{{ item.label }}</span
+        >
+        <el-tag
+          v-else
+          :disable-transitions="true"
+          :key="item.value"
+          :index="index"
+          :type="item.raw.listClass == 'primary' ? '' : item.raw.listClass"
+          :class="item.raw.cssClass"
+        >
+          {{ item.label }}
+        </el-tag>
+      </template>
+    </template>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "DictTag",
+  props: {
+    options: {
+      type: Array,
+      default: null,
+    },
+    value: [Number, String, Array],
+  },
+  computed: {
+    values() {
+      if (this.value !== null && typeof this.value !== 'undefined') {
+        return Array.isArray(this.value) ? this.value : [String(this.value)];
+      } else {
+        return [];
+      }
+    },
+  },
+};
+</script>
+<style scoped>
+.el-tag + .el-tag {
+  margin-left: 10px;
+}
+</style>

ruoyi-ui/src/components/ProjectDec/SignContract.vue

@@ -33,14 +33,16 @@
       </el-row>
       <div class="sign_tit">项目签约信息</div>
       <el-row>
-        <el-form-item label-width="120px" label="签约日期:" class="elItem" prop="orderDate">
-          <el-col :span="6">
-            <el-date-picker value-format="yyyy-MM-dd" :disabled="dis_flag" type="date" placeholder="请选择签约日期" v-model="form.orderDate" style="width: 100%"></el-date-picker>
+        <el-form-item label-width="120px"  label="项目名称:" class="elItem" prop="overseasInvestment">
+          <el-col :span="18">
+            <el-input type="number" :disabled="dis_flag" placeholder="请输入总投资额度" v-model="form.overseasInvestment"></el-input>
           </el-col>
+          <div class="dw_name">(填写新注册企业名称+已办项目)</div>
         </el-form-item>
+
       </el-row>
       <el-row>
-        <el-col :span="6">
+        <el-col :span="24">
           <el-form-item label-width="120px" label="投资方式:" class="elItem" prop="investmentType">
             <el-col :span="24">
               <el-radio-group v-model="form.investmentType" :disabled="dis_flag" style="width: 100%">
@@ -54,69 +56,107 @@
             </el-col>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="是否外资:" class="elItem" prop="isOutInvestment">
+        <el-col :span="10">
+          <el-form-item label-width="120px" label="建设方式:" class="elItem" prop="isOutInvestment">
             <!-- <el-col :span="6"> -->
               <!-- <el-checkbox-group v-model="form.isOutInvestment" :disabled="dis_flag"> -->
 				  <el-radio-group v-model="form.isOutInvestment" :disabled="dis_flag" style="width: 100%">
-				    <el-col :span="12">
+				    <el-col :span="6">
 				      <el-radio label="1">是</el-radio>
 				    </el-col>
-				    <el-col :span="12">
+				    <el-col :span="6">
 				      <el-radio label="2">否</el-radio>
 				    </el-col>
+            <el-col :span="6">
+              <el-radio label="2">否</el-radio>
+            </el-col>
+            <el-col :span="6">
+              <el-radio label="2">否</el-radio>
+            </el-col>
 				  </el-radio-group>
-                <!-- <el-checkbox :label="1" name="type">外资</el-checkbox> -->
-              <!-- </el-checkbox-group> -->
-            <!-- </el-col> -->
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="是否宜商:" class="elItem" prop="isOutInvestment">
+            <!-- <el-col :span="6"> -->
+              <!-- <el-checkbox-group v-model="form.isOutInvestment" :disabled="dis_flag"> -->
+          <el-radio-group v-model="form.isOutInvestment" :disabled="dis_flag" style="width: 100%">
+            <el-col :span="12">
+              <el-radio label="1">是</el-radio>
+            </el-col>
+            <el-col :span="12">
+              <el-radio label="2">否</el-radio>
+            </el-col>
+          </el-radio-group>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="7">
-          <el-form-item label-width="120px" label="总投资额度:" class="elItem" prop="totInvestment">
-            <el-col :span="18">
-              <el-input type="number" :disabled="dis_flag" placeholder="请输入总投资额度" v-model="form.totInvestment"></el-input>
+        <el-col :span="9">
+        <el-form-item label-width="120px" label="签约日期:" class="elItem" prop="orderDate">
+            <el-date-picker value-format="yyyy-MM-dd" :disabled="dis_flag" type="date" placeholder="请选择签约日期" v-model="form.orderDate" style="width: 100%"></el-date-picker>
+          <div class="dw_name dw_names">实际合同签订日期</div>
+        </el-form-item>
+         </el-col>
+         <el-col :span="9">
+        <el-form-item label-width="100px" label="通报日期:" class="elItem" prop="orderDate">
+               <el-date-picker value-format="yyyy-MM-dd" :disabled="dis_flag" type="date" placeholder="请选择通报日期" v-model="form.orderDate" style="width: 100%"></el-date-picker>
+          <div class="dw_name dw_names">项目上报月份</div>
+        </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label-width="120px" label="协议投资额:" class="elItem" prop="totInvestment">
+            <el-col :span="7" style="margin-right:100px;">
+              <el-select :disabled="dis_flag" v-model="queryParams.field108" placeholder="请选择" clearable :style="{width: '100%'}">
+                <el-option v-for="(item, index) in field107Options" :key="index" :label="item.label"
+                  :value="item.value" :disabled="item.disabled"></el-option>
+              </el-select>
+              </el-col>
+            <el-col :span="7">
+              <el-input type="number" :disabled="dis_flag" placeholder="请输入协议投资额" v-model="form.totInvestment"></el-input>
             </el-col>
+
+
             <div class="dw_name">万元</div>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="1">
-          <div class="qz_name">其中</div>
-        </el-col>
         <el-col :span="10">
-          <el-form-item label-width="182px" label="境外投资(含港澳台投资):" class="elItem" prop="overseasInvestment">
+          <el-form-item label-width="182px" label="境固定资产投资额:" class="elItem" prop="overseasInvestment">
             <el-col :span="18">
               <el-input type="number" :disabled="dis_flag" placeholder="请输入总投资额度" v-model="form.overseasInvestment"></el-input>
             </el-col>
             <div class="dw_name">万元</div>
           </el-form-item>
-          <el-form-item label-width="182px" label="境内省外投资:" class="elItem" prop="jnswInvestm" :rules="[
+          <el-form-item label-width="182px" label="市外资金:" class="elItem" prop="jnswInvestm" :rules="[
       { required: true, message: '请输入境内省外投资', trigger: 'blur' }]">
             <el-col :span="18">
               <el-input type="number" :disabled="dis_flag" placeholder="请输入境内省外投资额度" v-model="form.jnswInvestm" ></el-input>
             </el-col>
             <div class="dw_name">万元</div>
           </el-form-item>
-          <el-form-item label-width="182px" label="省内市外投资:" class="elItem" prop="snswInvestm":rules="[{ required: true, message: '请输入省内市外投资', trigger: 'blur' }]">
+          <el-form-item label-width="182px" label="签约跟进人手机号:" class="elItem" prop="snswInvestm":rules="[{ required: true, message: '请输入省内市外投资', trigger: 'blur' }]">
             <el-col :span="18">
               <el-input type="number" :disabled="dis_flag" placeholder="请输入省内市外投资额度" v-model="form.snswInvestm"></el-input>
             </el-col>
             <div class="dw_name">万元</div>
           </el-form-item>
-          <el-form-item label-width="182px" label="市内县外投资:" class="elItem" prop="snxwInvestm" :rules="[{ required: true, message: '请输入市内县外投资', trigger: 'blur' }]">
+          <el-form-item label-width="182px" label="项目所在地(园区或乡镇):" class="elItem" prop="snxwInvestm" :rules="[{ required: true, message: '请输入市内县外投资', trigger: 'blur' }]">
             <el-col :span="18">
               <el-input type="number" :disabled="dis_flag" placeholder="请输入市内县外投资额度" v-model="form.snxwInvestm"></el-input>
             </el-col>
-            <div class="dw_name">万元</div>
+            <div class="dw_name"></div>
           </el-form-item>
-          <el-form-item label-width="182px" label="县内投资:" class="elItem" prop="xnInvestm" :rules="[{ required: true, message: '请输入县内投资', trigger: 'blur' }]">
+          <el-form-item label-width="182px" label="所属行业:" class="elItem" prop="xnInvestm" :rules="[{ required: true, message: '请输入县内投资', trigger: 'blur' }]">
             <el-col :span="18">
-              <el-input type="number" :disabled="dis_flag" placeholder="请输入县内投资额度" v-model="form.xnInvestm"></el-input>
+              <el-select style="width: 100%;" v-model="form.isIndependentLan" :disabled="dis_flag" placeholder="请选择">
+                <el-option label="是" value="Y"></el-option>
+                <el-option label="否" value="N"></el-option>
+              </el-select>
             </el-col>
-            <div class="dw_name">万元</div>
           </el-form-item>
         </el-col>
       </el-row>
@@ -132,31 +172,35 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label-width="121px" label="供地面积:" class="elItem" prop="landArea">
+          <el-form-item label-width="121px" label="用地面积:" class="elItem" prop="landArea">
             <el-col :span="20">
-              <el-input placeholder="请输入供地面积" :disabled="dis_flag" v-model="form.landArea"></el-input>
+              <el-input placeholder="请输入用地面积" :disabled="dis_flag" v-model="form.landArea"></el-input>
             </el-col>
             <div class="dw_name">亩</div>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label-width="121px" label="供地位置:" class="elItem" prop="landAddress">
-            <el-input placeholder="请输入供地位置" :disabled="dis_flag" v-model="form.landAddress"></el-input>
+          <el-form-item label-width="121px" label="建设内容:" class="elItem" prop="landAddress">
+            <el-input placeholder="请输入建设内容" :disabled="dis_flag" v-model="form.landAddress"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label-width="121px" label="用地位置:" class="elItem" prop="landAddress">
+            <el-input placeholder="请输入用地位置" :disabled="dis_flag" v-model="form.landAddress"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
 	  <el-row>
-		  <el-col :span="24">
+		 <!-- <el-col :span="24">
 		    <el-form-item label-width="121px" label="土地证:" class="elItem" prop="landPhoto">
 		      <el-upload class="upload-demo" :before-upload= "beforeAvatarUpload"  :disabled="dis_flag" :file-list="fileListTdz" :on-remove="resetPhoto" :on-success="upl_fn" :on-preview="handlePreview" :action="defaultSettings.urls + process + '/common/upload'">
 		        <el-button size="small" type="primary">点击上传</el-button>
             <div slot="tip" class="el-upload__tip">只能上传word/pdf格式，大小不超过10M(土地证须盖章)</div>
-            <!-- <div></div> -->
 		      </el-upload>
 		    </el-form-item>
-		  </el-col>
+		  </el-col> -->
 	  </el-row>
-      <el-row>
+      <!-- <el-row>
         <el-col :span="12">
           <el-form-item label-width="121px" label="流转土地面积:" class="elItem" prop="circulationLand">
             <el-col :span="18">
@@ -170,8 +214,8 @@
             <el-input placeholder="请输入流转土地位置" :disabled="dis_flag" v-model="form.circulationAddres"></el-input>
           </el-form-item>
         </el-col>
-        </el-row>
-        <el-row>
+        </el-row> -->
+        <!-- <el-row>
         <el-col :span="12">
           <el-form-item label-width="121px" label="土地流转合同:" class="elItem" prop="circulationDoc">
             <el-upload :before-upload= "beforeAvatarUpload" :disabled="dis_flag" class="upload-demo" :on-preview="handlePreview" :on-remove="resetPhoto1" :file-list="fileListTdls" :on-success="upl_fn_lzht" :action="defaultSettings.urls+process+'/common/upload'">
@@ -188,61 +232,13 @@
             </el-upload>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label-width="121px" label="租赁厂房面积:" class="elItem" prop="leasePlantArea">
-            <el-col :span="16">
-              <el-input :disabled="dis_flag" placeholder="请输入" v-model="form.leasePlantArea"></el-input>
-            </el-col>
-            <div class="dw_name">平方米</div>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label-width="121px" label="租赁厂房位置:" class="elItem" prop="leasePlantAddress">
-            <el-input :disabled="dis_flag" placeholder="请输入租赁厂房位置" v-model="form.leasePlantAddress"></el-input>
-          </el-form-item>
-        </el-col>
-        </el-row>
-        <el-row>
-        <el-col :span="12">
-          <el-form-item label-width="121px" label="租赁合同:" class="elItem" prop="leasePlantDoc">
-            <el-upload :before-upload= "beforeAvatarUpload" :disabled="dis_flag" class="upload-demo"  :on-remove="resetPhoto3" :file-list="fileListZht" :on-success="upl_fn_zlht" :on-preview="handlePreview" :action="defaultSettings.urls + process + '/common/upload'">
-              <el-button size="small" type="primary">点击上传</el-button>
-              <div slot="tip" class="el-upload__tip">只能上传word/pdf格式，大小不超过10M(合同须盖章)</div>
-            </el-upload>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label-width="121px" label="产权证:" class="elItem" prop="leasePlantPhoto">
-            <el-upload :before-upload= "beforeAvatarUpload" :disabled="dis_flag" class="upload-demo"  :on-remove="resetPhoto4" :file-list="fileListZcq" :on-success="upl_fn_zlcqz" :on-preview="handlePreview" :action="defaultSettings.urls + process + '/common/upload'">
-              <el-button size="small" type="primary">点击上传</el-button>
-              <div slot="tip" class="el-upload__tip">只能上传word/pdf格式，大小不超过10M(产权证须盖章)</div>
-            </el-upload>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label-width="121px" label="合同约定产值:" class="elItem" prop="agreementTot">
-            <el-col :span="18">
-              <el-input :disabled="dis_flag" placeholder="请输入" v-model="form.agreementTot"></el-input>
-            </el-col>
-            <div class="dw_name">万元</div>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label-width="131px" label="合同约定税收:" class="elItem" prop="agreementTax">
-            <el-col :span="18">
-              <el-input :disabled="dis_flag" placeholder="请输入" v-model="form.agreementTax"></el-input>
-            </el-col>
-            <div class="dw_name">万元</div>
-          </el-form-item>
-        </el-col>
-      </el-row>
+      </el-row> -->
+
+
+
       <el-row style="margin-left: -10px">
         <el-col :span="8">
-          <el-form-item label-width="141px" label="合同约定开工时间:" class="elItem" prop="agreementStartdate">
+          <el-form-item label-width="141px" label="拟开工时间:" class="elItem" prop="agreementStartdate">
             <el-col :span="18">
               <el-date-picker :disabled="dis_flag" value-format="yyyy-MM-dd" type="date" placeholder="请选择开工时间" v-model="form.agreementStartdate"
                 style="width: 100%"></el-date-picker>
@@ -250,7 +246,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label-width="141px" label="合同约定竣工时间:" class="elItem" prop="agreementEnddate">
+          <el-form-item label-width="141px" label="立项日期:" class="elItem" prop="agreementEnddate">
             <el-col :span="18">
               <el-date-picker :disabled="dis_flag" value-format="yyyy-MM-dd" type="date" placeholder="请选择竣工时间" v-model="form.agreementEnddate"
                 style="width: 100%"></el-date-picker>
@@ -296,7 +292,7 @@
 		  </el-form-item>
 		</el-col>
       </el-row>
-      <el-row>
+      <!-- <el-row>
         <el-col :span="6">
           <el-form-item label-width="121px" label="第三方:" class="elItem" prop="agreementThird">
             <el-input placeholder="请输入第三方" :disabled="dis_flag" v-model="form.agreementThird"></el-input>
@@ -312,8 +308,8 @@
 		    <el-input placeholder="请输入职务" :disabled="dis_flag" v-model="form.thirdJob"></el-input>
 		  </el-form-item>
 		</el-col>
-      </el-row>
-      <el-row>
+      </el-row> -->
+      <!-- <el-row>
         <el-col :span="18">
           <el-form-item label-width="121px" label="合同文本:" class="elItem" prop="agreementUrl">
             <el-upload class="upload-demo" :disabled="dis_flag" ref="upload"   :file-list="flieListHt" :action="defaultSettings.urls + process + '/common/upload'" :on-preview="handlePreview"
@@ -324,7 +320,7 @@
             </el-upload>
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
       <div class="sign_tit">企业注册信息</div>
       <el-row>
         <el-col :span="8">
@@ -341,7 +337,7 @@
             ></el-autocomplete>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label-width="109px" label="法定代表人:" class="elItem" prop="legalRep">
             <el-input :disabled="dis_flag" placeholder="请输入法定代表人" v-model="form.legalRep"></el-input>
           </el-form-item>
@@ -366,6 +362,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
+          <el-form-item label-width="109px" label="经营范围:" class="elItem" prop="bussinessUrl">
+             <el-input :disabled="dis_flag" placeholder="请输入社会信用代码" v-model="form.code"></el-input>
+          </el-form-item>
+        </el-col>
+        <!-- <el-col :span="8">
           <el-form-item label-width="173px" label="营业执照复印件:" class="elItem" prop="bussinessUrl">
             <el-upload :before-upload= "beforeAvatarUpload" :disabled="dis_flag" class="upload-demo" :on-remove='resetPhoto5'  list-type="picture-card" :on-preview="handlePreview" :file-list="flieListYzz" :on-success="upl_fn_zzfyj" :action="defaultSettings.urls + process + '/common/upload'">
               <el-button size="small" type="primary">点击上传</el-button>
@@ -374,19 +375,17 @@
 			  </div>
             </el-upload>
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
-      <div class="sign_tit" >企业股东构成  <span style="color: red;">(*以下自然人和企业股东二选一必填)</span></div>
+      <!-- <div class="sign_tit" >企业股东构成  <span style="color: red;">(*以下自然人和企业股东二选一必填)</span></div>
       <el-row>
         <div class="ads_box" @click="addshareBtn" v-hasPermi="['projectPersion:persion:add']">
           <img src="../../assets/images/icon_add@2x.png" alt="" class="add_icon" />
           <span >添加自然人</span>
-          <!-- <i style="color: red;">*</i> -->
         </div>
       </el-row>
       <el-row>
         <el-table v-loading="loading" class="elItem" :data="shareholderList">
-          <!-- <el-table-column type="selection" width="55" align="center" /> -->
           <el-table-column label="姓名" align="center" prop="name" />
           <el-table-column label="股权比例" align="center" prop="equityRatio" :show-overflow-tooltip="true">
             <template slot-scope="scope">
@@ -404,9 +403,7 @@
               <img @click="imgBtn(scope.row.idcardBack)" :src="scope.row.idcardBack" alt="" class="imgs" />
             </template>
           </el-table-column>
-          <!-- <el-table-column label="操作" align="center" prop="remark" :show-overflow-tooltip="true" /> -->
           <el-table-column label="操作" align="center">
-            <!-- class-name="small-padding fixed-width" -->
             <template slot-scope="scope">
               <el-button size="mini" :disabled="dis_flag" type="warning" @click="handleUpdate(scope.row)" v-hasPermi="['projectPersion:persion:edit']">修改</el-button>
               <el-button size="mini":disabled="dis_flag" type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['projectPersion:persion:remove']">删除</el-button>
@@ -420,12 +417,11 @@
 	    <div class="ads_box" @click="addshareBtnde" v-hasPermi="['projectInvestor:investor:add']">
 	      <img src="../../assets/images/icon_add@2x.png" alt="" class="add_icon" />
 	      <span>添加企业股东</span>
-	      <!-- <i style="color: red;">*</i> -->
+
 	    </div>
-	  </el-row>
-	  <el-row>
+	  </el-row> -->
+	  <!-- <el-row>
 	    <el-table v-loading="loading" class="elItem" :data="shareholderLists">
-	      <!-- <el-table-column type="selection" width="55" align="center" /> -->
 	      <el-table-column label="企业名称" align="center" prop="companyName" />
 	      <el-table-column label="股权比例" align="center" prop="equityRatio" :show-overflow-tooltip="true">
 	        <template slot-scope="scope">
@@ -438,14 +434,7 @@
 	          <img @click="imgBtn(scope.row.businessPhoto)" :src="scope.row.businessPhoto" alt="" class="imgs" />
 	        </template>
 	      </el-table-column>
-	      <!-- <el-table-column label="身份证(反面)" align="center" prop="idcardBack">
-	        <template slot-scope="scope">
-	          <img @click="imgBtn(scope.row.idcardBack)" :src="scope.row.idcardBack" alt="" class="imgs" />
-	        </template>
-	      </el-table-column> -->
-	      <!-- <el-table-column label="操作" align="center" prop="remark" :show-overflow-tooltip="true" /> -->
 	      <el-table-column label="操作" align="center">
-	        <!-- class-name="small-padding fixed-width" -->
 	        <template slot-scope="scope">
 	          <el-button size="mini" :disabled="dis_flag" type="warning" @click="handleUpdates(scope.row)" v-hasPermi="['projectInvestor:investor:edit']">修改</el-button>
 	          <el-button size="mini":disabled="dis_flag" type="danger" @click="handleDeletes(scope.row.id)" v-hasPermi="['projectInvestor:investor:remove']">删除</el-button>
@@ -454,15 +443,15 @@
 	    </el-table>
 	    <pagination v-show="total > 0" :total="totals" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
 	      @pagination="getShareholderListss" />
-	  </el-row>
-      <div class="sign_tit">企业备案信息</div>
-      <el-row>
+	  </el-row> -->
+      <!-- <div class="sign_tit">企业备案信息</div>
+      <el-row> -->
         <!-- <el-col :span="8">
           <el-form-item label-width="121px" label="备案单位:" class="elItem" prop="recordName">
             <el-input placeholder="请输入备案单位" :disabled="dis_flag" v-model="form.recordName"></el-input>
           </el-form-item>
         </el-col> -->
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label-width="109px" label="备案文号:" class="elItem" prop="recordCode">
             <el-input placeholder="请输入备案文号" :disabled="dis_flag" v-model="form.recordCode"></el-input>
           </el-form-item>
@@ -524,7 +513,7 @@
             <el-input placeholder="请输入联系方式" :disabled="dis_flag" v-model="form.contactPersonPhone"></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <!-- 添加或修改岗位对话框 -->
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="600px" append-to-body>
@@ -929,7 +918,8 @@
         dialogImageUrl: '',
                 dialogVisible: false,
         dkrou:{},
-        ndheuos:false
+        ndheuos:false,
+        field107Options:[]
       };
     },
     mounted() {
@@ -1485,16 +1475,16 @@
           this.msgError("请输入责任人联系方式");
           return  false
         }
-		
+
 		if(this.shareholderList.length == 0  && this.shareholderLists.length == 0){
 			console.log(178)
 			this.msgError("自然人和企业股东二选一必填");
 			return  false
 		}
-		
-		
-		
-		
+
+
+
+
         this.$refs["form"].validate((valid) => {
           if (valid) {
             let  zNum =  (this.form.overseasInvestment-0)+ (this.form.jnswInvestm-0)+ (this.form.snswInvestm-0)+ (this.form.snxwInvestm-0)+ (this.form.xnInvestm-0)
@@ -1902,4 +1892,8 @@
     line-height: 36px;
     width: 100%;
   }
+  .dw_names{
+    font-size: 12px;
+    color: red;
+  }
 </style>

ruoyi-ui/src/main.js

@@ -24,6 +24,12 @@ import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels,
 import Pagination from "@/components/Pagination";
 // 自定义表格工具扩展
 import RightToolbar from "@/components/RightToolbar"
+// 字典标签组件
+import DictTag from '@/components/DictTag'
+// 头部标签组件
+// import VueMeta from 'vue-meta'
+// 字典数据组件
+import DictData from '@/components/DictData'
 
 import BigPicture from "@/components/BigPicture";
 
@@ -52,11 +58,14 @@ Vue.prototype.msgInfo = function (msg) {
 }
 
 // 全局组件挂载
+// Vue.component('DictTag', DictTag)
 Vue.component('BigPicture', BigPicture)
 Vue.component('Pagination', Pagination)
 Vue.component('RightToolbar', RightToolbar)
 
 Vue.use(permission)
+// Vue.use(VueMeta)
+DictData.install()
 
 /**
  * If you don't want to use mock-server

ruoyi-ui/src/settings.js

@@ -1,7 +1,7 @@
 module.exports = {
   title: '招商引资管理系统',
-  urls: 'http://47.99.82.249:80',
-  // urls: 'http://192.168.101.11:8010',
+  // urls: 'http://47.99.82.249:80',
+  urls: 'http://192.168.101.11:8010',
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light

ruoyi-ui/src/utils/dict/Dict.js

@@ -0,0 +1,83 @@
+import Vue from 'vue'
+import { mergeRecursive } from "@/utils/ruoyi";
+import DictMeta from './DictMeta'
+import DictData from './DictData'
+
+const DEFAULT_DICT_OPTIONS = {
+  types: [],
+}
+
+/**
+ * @classdesc 字典
+ * @property {Object} label 标签对象，内部属性名为字典类型名称
+ * @property {Object} dict 字段数组，内部属性名为字典类型名称
+ * @property {Array.<DictMeta>} _dictMetas 字典元数据数组
+ */
+export default class Dict {
+  constructor() {
+    this.owner = null
+    this.label = {}
+    this.type = {}
+  }
+
+  init(options) {
+    if (options instanceof Array) {
+      options = { types: options }
+    }
+    const opts = mergeRecursive(DEFAULT_DICT_OPTIONS, options)
+    if (opts.types === undefined) {
+      throw new Error('need dict types')
+    }
+    const ps = []
+    this._dictMetas = opts.types.map(t => DictMeta.parse(t))
+    this._dictMetas.forEach(dictMeta => {
+      const type = dictMeta.type
+      Vue.set(this.label, type, {})
+      Vue.set(this.type, type, [])
+      if (dictMeta.lazy) {
+        return
+      }
+      ps.push(loadDict(this, dictMeta))
+    })
+    return Promise.all(ps)
+  }
+
+  /**
+   * 重新加载字典
+   * @param {String} type 字典类型
+   */
+  reloadDict(type) {
+    const dictMeta = this._dictMetas.find(e => e.type === type)
+    if (dictMeta === undefined) {
+      return Promise.reject(`the dict meta of ${type} was not found`)
+    }
+    return loadDict(this, dictMeta)
+  }
+}
+
+/**
+ * 加载字典
+ * @param {Dict} dict 字典
+ * @param {DictMeta} dictMeta 字典元数据
+ * @returns {Promise}
+ */
+function loadDict(dict, dictMeta) {
+  return dictMeta.request(dictMeta)
+    .then(response => {
+      const type = dictMeta.type
+      let dicts = dictMeta.responseConverter(response, dictMeta)
+      if (!(dicts instanceof Array)) {
+        console.error('the return of responseConverter must be Array.<DictData>')
+        dicts = []
+      } else if (dicts.filter(d => d instanceof DictData).length !== dicts.length) {
+        console.error('the type of elements in dicts must be DictData')
+        dicts = []
+      }
+      dict.type[type].splice(0, Number.MAX_SAFE_INTEGER, ...dicts)
+      dicts.forEach(d => {
+        Vue.set(dict.label[type], d.value, d.label)
+      })
+      console.log(dicts)
+      return dicts
+    })
+}

ruoyi-ui/src/utils/dict/DictConverter.js

@@ -0,0 +1,17 @@
+import DictOptions from './DictOptions'
+import DictData from './DictData'
+
+export default function(dict, dictMeta) {
+  const label = determineDictField(dict, dictMeta.labelField, ...DictOptions.DEFAULT_LABEL_FIELDS)
+  const value = determineDictField(dict, dictMeta.valueField, ...DictOptions.DEFAULT_VALUE_FIELDS)
+  return new DictData(dict[label], dict[value], dict)
+}
+
+/**
+ * 确定字典字段
+ * @param {DictData} dict
+ * @param  {...String} fields
+ */
+function determineDictField(dict, ...fields) {
+  return fields.find(f => Object.prototype.hasOwnProperty.call(dict, f))
+}

ruoyi-ui/src/utils/dict/DictData.js

@@ -0,0 +1,13 @@
+/**
+ * @classdesc 字典数据
+ * @property {String} label 标签
+ * @property {*} value 标签
+ * @property {Object} raw 原始数据
+ */
+export default class DictData {
+  constructor(label, value, raw) {
+    this.label = label
+    this.value = value
+    this.raw = raw
+  }
+}

ruoyi-ui/src/utils/dict/DictMeta.js

@@ -0,0 +1,38 @@
+import { mergeRecursive } from "@/utils/ruoyi";
+import DictOptions from './DictOptions'
+
+/**
+ * @classdesc 字典元数据
+ * @property {String} type 类型
+ * @property {Function} request 请求
+ * @property {String} label 标签字段
+ * @property {String} value 值字段
+ */
+export default class DictMeta {
+  constructor(options) {
+    this.type = options.type
+    this.request = options.request
+    this.responseConverter = options.responseConverter
+    this.labelField = options.labelField
+    this.valueField = options.valueField
+    this.lazy = options.lazy === true
+  }
+}
+
+
+/**
+ * 解析字典元数据
+ * @param {Object} options
+ * @returns {DictMeta}
+ */
+DictMeta.parse= function(options) {
+  let opts = null
+  if (typeof options === 'string') {
+    opts = DictOptions.metas[options] || {}
+    opts.type = options
+  } else if (typeof options === 'object') {
+    opts = options
+  }
+  opts = mergeRecursive(DictOptions.metas['*'], opts)
+  return new DictMeta(opts)
+}

ruoyi-ui/src/utils/dict/DictOptions.js

@@ -0,0 +1,52 @@
+import { mergeRecursive } from "@/utils/ruoyi";
+import dictConverter from './DictConverter'
+
+export const options = {
+  metas: {
+    '*': {
+      /**
+       * 字典请求，方法签名为function(dictMeta: DictMeta): Promise
+       */
+      request: (dictMeta) => {
+        console.log(`load dict ${dictMeta.type}`)
+        return Promise.resolve([])
+      },
+      /**
+       * 字典响应数据转换器，方法签名为function(response: Object, dictMeta: DictMeta): DictData
+       */
+      responseConverter,
+      labelField: 'label',
+      valueField: 'value',
+    },
+  },
+  /**
+   * 默认标签字段
+   */
+  DEFAULT_LABEL_FIELDS: ['label', 'name', 'title'],
+  /**
+   * 默认值字段
+   */
+  DEFAULT_VALUE_FIELDS: ['value', 'id', 'uid', 'key'],
+}
+
+/**
+ * 映射字典
+ * @param {Object} response 字典数据
+ * @param {DictMeta} dictMeta 字典元数据
+ * @returns {DictData}
+ */
+function responseConverter(response, dictMeta) {
+  const dicts = response.content instanceof Array ? response.content : response
+  if (dicts === undefined) {
+    console.warn(`no dict data of "${dictMeta.type}" found in the response`)
+    return []
+  }
+  return dicts.map(d => dictConverter(d, dictMeta))
+}
+
+export function mergeOptions(src) {
+ console.log(options, src)
+  mergeRecursive(options, src)
+}
+
+export default options

ruoyi-ui/src/utils/dict/index.js

@@ -0,0 +1,33 @@
+import Dict from './Dict'
+import { mergeOptions } from './DictOptions'
+
+export default function(Vue, options) {
+  mergeOptions(options)
+  Vue.mixin({
+    data() {
+      if (this.$options === undefined || this.$options.dicts === undefined || this.$options.dicts === null) {
+        return {}
+      }
+      const dict = new Dict()
+      dict.owner = this
+      return {
+        dict
+      }
+    },
+    created() {
+      if (!(this.dict instanceof Dict)) {
+        return
+      }
+      options.onCreated && options.onCreated(this.dict)
+      this.dict.init(this.$options.dicts).then(() => {
+        options.onReady && options.onReady(this.dict)
+        this.$nextTick(() => {
+          this.$emit('dictReady', this.dict)
+          if (this.$options.methods && this.$options.methods.onDictReady instanceof Function) {
+            this.$options.methods.onDictReady.call(this, this.dict)
+          }
+        })
+      })
+    },
+  })
+}

ruoyi-ui/src/utils/ruoyi.js

@@ -1,10 +1,28 @@
-/**
+/**
  * 通用js方法封装处理
  * Copyright (c) 2019 ruoyi
  */
 
 const baseURL = process.env.VUE_APP_BASE_API
 
+// 数据合并
+export function mergeRecursive(source, target) {
+  for (var p in target) {
+    try {
+      if (target[p].constructor == Object) {
+        source[p] = mergeRecursive(source[p], target[p]);
+      } else {
+        source[p] = target[p];
+      }
+    } catch (e) {
+      source[p] = target[p];
+    }
+  }
+  return source;
+};
+
+
+
 // 日期格式化
 export function parseTime(time, pattern) {
 	if (arguments.length === 0 || !time) {

ruoyi-ui/src/views/login.vue

@@ -174,7 +174,8 @@ export default {
             Cookies.remove('rememberMe');
           }
           this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push({ path: "/yind" }).catch(()=>{});
+            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+            // this.$router.push({ path: "/index" }).catch(()=>{});
             // \ path: this.redirect || "/yind"
           }).catch(() => {
             this.loading = false;

ruoyi-ui/src/views/management/info/index.vue

@@ -50,6 +50,14 @@
           v-hasPermi="['bmProject:project:export']"
         >导出</el-button>
       </el-col>
+      <el-col :span="1.5" v-for="(item,index) in statusOptions" :key="index" style="margin-bottom: 10px;">
+        <el-button
+         type="success"
+          plain
+          size="mini"
+          @click="handleExportf(item.dictValue)"
+        >{{item.dictLabel}}</el-button>
+      </el-col>
       <!-- <el-col :span="1.5">
         <el-button
           type="warning"
@@ -566,6 +574,15 @@
          // window.open('http://192.168.101.11:8001/jmreport/list','_blank');
          window.open('http://47.99.82.249:8001/jmreport/view/592963074020708352','_blank');
       },
+      handleExportf(row){
+        this.queryParams.projectStatus = row
+        this.loading = true;
+        listInfo(this.queryParams).then(response => {
+          this.infoList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
       /** 删除按钮操作 */
       handleDelete(row) {
         const ids = row.id || this.ids;

ruoyi-ui/src/views/management/nstruction/index.vue

@@ -95,54 +95,20 @@
             :rules="queryForm"
             :inline="true"
             v-show="showSearch"
-            label-width="135px"
+            label-width="140px"
             label-position="center"
             class="manager_form bhyeksu"
           >
-            <el-form-item
-              label="施工许可证/施工合同:"
-              prop="constructionCode"
-              class="maget_ty"
-              :rules="[{ required: true, message: '请上传施工许可证', trigger: 'blur' }]"
-            >
-              <div class="bgteu fre" style="width: 618px">
-                <div class="">
-                  <el-upload
-                    :action="defaultSettings.urls + process+'/common/upload'"
-                    :auto-upload="true"
-                    ref="uploadone"
-                    :before-upload="beforeAvatarUpload"
-                    :on-preview="handlePictureCardPreview"
-                    :on-remove="handleRemove"
-                    :on-success="handleSuccpermit"
-                    :multiple="true"
-                    :disabled = "disfal"
-                    :file-list="fileListther"
-                    style="display: flex;"
-                  >
-                    <div style="display: flex; justify-content: flex-start; flex-direction: column; flex: 1;">
-                      <i slot="default" class="el-icon-plus" style="width:100px;height: 100px; line-height: 100px; background-color: #f5f5f5; border-radius: 6px;"> </i>
-                      <div slot="tip" class="el-upload__tip" style="line-height: 24px;">只能上传word/pdf格式，大小不超过10M(请上传完整施工许可证或完整的施工合同,许可证/合同须盖章,)</div>
-                    </div>
-                  </el-upload>
-                </div>
-              </div>
-            </el-form-item>
-            <el-form-item label="是否开工建设:" prop="isConstruction">
-              <el-select
-                v-model="queryParamstwr.isConstruction"
-                placeholder="请选择"
+
+            <el-form-item label="开工跟进人手机号:" prop="isConstruction">
+              <el-input
+                v-model="form.isConstruction"
+                placeholder="请输入开工跟进人手机号"
                 clearable
-                :disabled = "disfal"
                 size="small"
-                style="width: 458px"
-              >
-                <el-option
-                  v-for="dict in typeOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
+                :disabled = "disfal"
+                style="width: 335px"
+              />
               </el-select>
             </el-form-item>
             <el-form-item label=" 开工日期:" prop="constructionStartdate" :rules="[{ required: true, message: '请选择开工日期', trigger: 'blur' }]">
@@ -165,6 +131,26 @@
                 style="width: 335px"
               ></el-date-picker>
             </el-form-item>
+            <el-form-item label=" 拟投产日期:" prop="constructionStartdate" :rules="[{ required: true, message: '请选择开工日期', trigger: 'blur' }]">
+              <el-date-picker
+                type="date"
+                placeholder="选择日期"
+                :disabled = "disfal"
+                v-model="queryParamstwr.constructionStartdate"
+                value-format="yyyy-MM-dd"
+                style="width: 335px"
+              ></el-date-picker>
+            </el-form-item>
+            <el-form-item label="试生产日期:" prop="constructionEnddate" :rules="[{ required: true, message: '请选择预计完工日期', trigger: 'blur' }]">
+              <el-date-picker
+                type="date"
+                :disabled = "disfal"
+                placeholder="选择日期"
+                v-model="queryParamstwr.constructionEnddate"
+                value-format="yyyy-MM-dd"
+                style="width: 335px"
+              ></el-date-picker>
+            </el-form-item>
             <!-- <el-form-item label="施工合同(请上传完整的施工合同):" prop="constructionDoc" class="maget_ty" :rules="[{ required: true, message: '请上传施工合同', trigger: 'blur' }]" >
               <div class="bgteu fre" style="width: 618px">
                 <div class="">
@@ -240,9 +226,38 @@
                 </div>
               </div>
             </el-form-item>
+            <el-form-item
+              label="附件:"
+              prop="constructionCode"
+              class="maget_ty"
+              :rules="[{ required: true, message: '请上传附件', trigger: 'blur' }]"
+            >
+              <div class="bgteu fre" style="width: 618px">
+                <div class="">
+                  <el-upload
+                    :action="defaultSettings.urls + process+'/common/upload'"
+                    :auto-upload="true"
+                    ref="uploadone"
+                    :before-upload="beforeAvatarUpload"
+                    :on-preview="handlePictureCardPreview"
+                    :on-remove="handleRemove"
+                    :on-success="handleSuccpermit"
+                    :multiple="true"
+                    :disabled = "disfal"
+                    :file-list="fileListther"
+                    style="display: flex;"
+                  >
+                    <div style="display: flex; justify-content: flex-start; flex-direction: column; flex: 1;">
+                      <i slot="default" class="el-icon-plus" style="width:100px;height: 100px; line-height: 100px; background-color: #f5f5f5; border-radius: 6px;"> </i>
+                      <div slot="tip" class="el-upload__tip" style="line-height: 24px;">只能上传word/pdf格式，大小不超过10M(请上传完整施工许可证或完整的施工合同,许可证/合同须盖章,)</div>
+                    </div>
+                  </el-upload>
+                </div>
+              </div>
+            </el-form-item>
           </el-form>
           <p class="kaieu_tw" @click="handleAdd(0)">
-            <i class="el-icon-circle-plus-outline"></i> <i style="color: red;">*</i> 添加开工照片
+            <i class="el-icon-circle-plus-outline"></i> <i style="color: red;">*</i> 添加进度照片
           </p>
           <el-table v-loading="loading" :data="configList">
             <!-- <el-table-column type="selection" width="55" align="center" /> -->
@@ -288,7 +303,7 @@
           />
         </div>
 
-        <div class="equipment" v-if="tab == 1">
+        <div class="equipment" v-if="tab == 3">
           <p class="kaieu_tw" @click="quipment(1)">
             <i class="el-icon-circle-plus-outline"></i> <i style="color: red; margin-right: 5px;">*</i>添加设备安装信息
           </p>
@@ -387,7 +402,7 @@
           />
         </div>
       </div>
-      <div class="namjeu" v-if="tab == 3">
+      <div class="namjeu" v-if="tab == 1">
         <el-form
           :model="queryParamstheyr"
           ref="queryFormtwo"
@@ -763,7 +778,7 @@ export default {
       //步骤条
       naueactive: 2,
       tab: 0,
-      tabNume: ["项目施工", "设备安装", "项目到资", "项目入统"],
+      tabNume: ["项目施工",  "项目入统"],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -1798,20 +1813,22 @@ export default {
       this.tab = index;
       this.udgmentList = []
       if (this.tab == 1) {
-        this.getListther();
+        this.getListssijeu()
       } else if (this.tab == 0) {
         this.getList();
         this.getListtoi();
-      } else if (this.tab == 2) {
-        this.getListfour();
-        this.getListfive();
-      } else if (this.tab == 3) {
-        // 判断有没有进入4
-        this.fourenter=true
-        this.getListsix();
-      }else if(this.tab == 4){
-         this.getListssijeu()
       }
+      //  else if (this.tab == 2) {
+      //   this.getListfour();
+      //   this.getListfive();
+      // } else if (this.tab == 3) {
+      //   // 判断有没有进入4
+      //   this.fourenter=true
+      //   this.getListsix();
+      // }else if(this.tab == 4){
+      //    this.getListssijeu()
+      // }
+
       if(!this.disfal){
         this.submitCtionfrty()
       }

ruoyi-ui/src/views/management/roduction/index.vue

@@ -63,26 +63,27 @@
               label-position="center"
               class="manager_form bhyeksu"
             >
-              <el-form-item label=" 已完成投资额(万元):" prop="totInvestment">
+              <el-form-item label=" 投产跟进人手机号:" prop="totInvestment">
                 <el-input
                   v-model="form.totInvestment"
-                  placeholder="请输入已完成投资额"
+                  placeholder="请输入投产跟进人手机号"
                   clearable
                   size="small"
                   :disabled = "disfal"
                   style="width: 335px"
                 />
               </el-form-item>
-              <el-form-item label="设备投资额度(万元):" prop="macInvestment">
+              <el-form-item label="实际到资额(万元):" prop="macInvestment">
                 <el-input
                   v-model="form.macInvestment"
-                  placeholder="请输入设备投资额度"
+                  placeholder="请输入实际到资额"
                   clearable
                   :disabled = "disfal"
                   size="small"
                   style="width: 335px"
                 />
               </el-form-item>
+
               <el-form-item label="投产时间:" prop="productDate">
                 <el-date-picker
                   type="date"
@@ -94,72 +95,37 @@
               </el-form-item>
               <el-form-item label="投产图片:" prop="productPhoto" class="maget_ty" :rules="[{ required: true, message: '请上传投产图片', trigger: 'blur' }]" >
                 <div class="bgteu " style="width: 618px">
-                  <div class="">
-                    <el-upload
-                      :action="defaultSettings.urls + process+'/common/upload'"
-                      list-type="picture-card"
-                      :on-preview="handlePictureCardPreview"
-                      :on-remove="handleRemove"
-                      :on-success="handleOnsuccess"
-                      :before-upload="beforeAvatarUpload"
-                      :file-list="productPhotoList"
-                       :disabled = "disfal"
-                    >
-                      <div style="display: flex; justify-content: flex-start; flex-direction: column; flex: 1;">
-                        <i slot="default" class="el-icon-plus" style="width:100px;height: 100px; line-height: 100px; background-color: #f5f5f5; border-radius: 6px;"> </i>
-                        <div slot="tip" class="el-upload__tip" style="line-height: 24px;">只能上传jpg/png文件，且不超过500kb</div>
-                      </div>
-                      <!-- <el-button slot="trigger" size="small" type="primary"
-                        >选取文件</el-button
-                      >
-                      <el-button
-                        style="margin-left: 10px"
-                        size="small"
-                        type="primary"
-                        @click="submitUpload"
-                        >上传到服务器</el-button
-                      > -->
-                    </el-upload>
-                    <el-dialog :visible.sync="dialogVisible">
-                      <img width="100%" :src="dialogImageUrl" alt="" />
-                    </el-dialog>
-                  </div>
-                </div>
-              </el-form-item>
-              <el-form-item label="设备订购合同:" prop="orderContractPhoto" class="maget_ty" :rules="[{ required: true, message: '请上传设备订购合同', trigger: 'blur' }]">
-                <div class="bgteu fre" style="width: 618px">
-                  <div class="">
-                    <el-upload
-                      :action="defaultSettings.urls + process+'/common/upload'"
-                      :on-preview="handlePictureCardPreview"
-                      :before-upload="beforeAvatarUpload"
-                      :on-remove="handleRemove3"
-                      :on-success="handleOnsuccess3"
-                      :file-list="orderContractPhotoList"
-                       :disabled = "disfal"
-                    >
-                      <div style="display: flex; justify-content: flex-start; flex-direction: column; flex: 1;">
-                        <i slot="default" class="el-icon-plus" style="width:100px;height: 100px; line-height: 100px; background-color: #f5f5f5; border-radius: 6px;"> </i>
-                        <div slot="tip" class="el-upload__tip" style="line-height: 24px;">只能上传word/pdf格式，大小不超过10M(合同须盖章)</div>
-                      </div>
-                      <!-- <el-button slot="trigger" size="small" type="primary"
-                        >选取文件</el-button
-                      >
-                      <el-button
-                        style="margin-left: 10px"
-                        size="small"
-                        type="primary"
-                        @click="submitUpload"
-                        >上传到服务器</el-button
-                      > -->
-                    </el-upload>
-                    <el-dialog :visible.sync="dialogVisible">
-                      <img width="100%" :src="dialogImageUrl" alt="" />
-                    </el-dialog>
+                  <div class="nmlse">
+                      1.用地面积<el-input class="borderNone" :disabled = "disfal" v-model="form.macInvestment"     size="small" style="width: 40px"
+                />
+                亩，土地出让<el-input class="borderNone" :disabled = "disfal" v-model="form.macInvestment"     size="small" style="width: 40px"
+                />万元，新建厂房平方米，厂房投入万元，付款凭证<el-input class="borderNone" :disabled = "disfal" v-model="form.macInvestment"     size="small" style="width: 40px"
+                />万元；</br>
+
+                       2.租赁厂房<el-input class="borderNone" :disabled = "disfal" v-model="form.macInvestment"     size="small" style="width: 40px"
+                />平方米，厂房投入<el-input class="borderNone" :disabled = "disfal" v-model="form.macInvestment"     size="small" style="width: 40px"
+                />万元，设备清单 <el-input class="borderNone" :disabled = "disfal" v-model="form.macInvestment"     size="small" style="width: 40px"
+                />万元，设备发票万元，设备合同<el-input class="borderNone" :disabled = "disfal" v-model="form.macInvestment"     size="small" style="width: 40px"
+                />万元，付款凭证<el-input class="borderNone" :disabled = "disfal" v-model="form.macInvestment"     size="small" style="width: 40px"
+                />万元；</br>
+
+                        3.实缴税收<el-input class="borderNone" :disabled = "disfal" v-model="form.macInvestment"     size="small" style="width: 40px"
+                />万元(连续<el-input class="borderNone" :disabled = "disfal" v-model="form.macInvestment"     size="small" style="width: 40px"
+                />个月缴纳社保<el-input class="borderNone" :disabled = "disfal" v-model="form.macInvestment"     size="small" style="width: 40px"
+                />人)</br>
+
+                        4.装备投入<el-input class="borderNone" :disabled = "disfal" v-model="form.macInvestment"     size="small" style="width: 40px"
+                />万元；</br>
+
+                        5.会计年度实缴税收<el-input class="borderNone" :disabled = "disfal" v-model="form.macInvestment"     size="small" style="width: 50px"
+                />万元；</br>
+
+                        6.其他<el-input class="borderNone" :disabled = "disfal" v-model="form.macInvestment"     size="small" style="width: 40px"
+                />
                   </div>
                 </div>
               </el-form-item>
-              <el-form-item label="到资清单:" prop="arrivalListPhoto" class="maget_ty" :rules="[{ required: true, message: '请上传到资清单', trigger: 'blur' }]">
+              <el-form-item label="添加附件:" prop="arrivalListPhoto" class="maget_ty" :rules="[{ required: true, message: '请上传到资清单', trigger: 'blur' }]">
                 <div class="bgteu fre" style="width: 618px">
                   <div class="">
                     <el-upload
@@ -192,45 +158,12 @@
                   </div>
                 </div>
               </el-form-item>
-              <el-form-item label="入规截图:" prop="entryPhoto" class="maget_ty">
-                <div class="bgteu " style="width: 618px">
-                  <div class="">
-                    <el-upload
-                      :action="defaultSettings.urls + process+'/common/upload'"
-                      list-type="picture-card"
-                      :on-preview="handlePictureCardPreview"
-                      :on-remove="handleRemove4"
-                      :on-success="handleOnsuccess4"
-                      :before-upload="beforeAvatarUpload"
-                      :file-list="orderContractPhotoLists"
-                       :disabled = "disfal"
-                    >
-                      <div style="display: flex; justify-content: flex-start; flex-direction: column; flex: 1;">
-                        <i slot="default" class="el-icon-plus" style="width:100px;height: 100px; line-height: 100px; background-color: #f5f5f5; border-radius: 6px;"> </i>
-                        <div slot="tip" class="el-upload__tip" style="line-height: 24px;">只能上传jpg/png文件，且不超过500kb</div>
-                      </div>
-                      <!-- <el-button slot="trigger" size="small" type="primary"
-                        >选取文件</el-button
-                      >
-                      <el-button
-                        style="margin-left: 10px"
-                        size="small"
-                        type="primary"
-                        @click="submitUpload"
-                        >上传到服务器</el-button
-                      > -->
-                    </el-upload>
-                    <el-dialog :visible.sync="dialogVisible">
-                      <img width="100%" :src="dialogImageUrl" alt="" />
-                    </el-dialog>
-                  </div>
-                </div>
-              </el-form-item>
               <el-form-item> </el-form-item>
-              <el-form-item label=" 项目入规(限):" prop="isOk">
+              
+              <el-form-item label=" 拟入规时间(限):" prop="isOk">
                 <el-select
                   v-model="form.isOk"
-                  placeholder="项目入规(限)"
+                  placeholder="拟入规时间(限)"
                   clearable
                   size="small"
                   :disabled = "disfal"
@@ -253,6 +186,7 @@
                   style="width: 235px"
                 ></el-date-picker>
               </el-form-item>
+              
             </el-form>
           </div>
         </div>
@@ -739,6 +673,28 @@ export default {
   // height: 30px !important;
   // line-height: 30px !important;
 }
+.nmlse{
+
+
+  .el-input.is-disabled .el-input__inner{
+    background-color: #fff;
+     border: 0 !important;
+     padding: 0;
+     text-align: center;
+     border-bottom: 1px solid #333 !important;
+     border-radius: 0 !important;
+  }
+   .el-input__inner{
+    background-color: #fff;
+     border: 0 !important;
+     padding: 0;
+     text-align: center;
+     border-bottom: 1px solid #333 !important;
+     border-radius: 0 !important;
+  }
+}
+
+
 .ijeut {
   display: flex;
   height: 78px;

ruoyi-ui/src/views/under/index.vue

@@ -51,13 +51,17 @@
       <div class="nvestor">
         <p>投资方 <i>*</i></p>
       </div>
-      <p class="enterprise">企业</p>
-      <p class="enterprise_tw" @click="handleAdd">
-        <i class="el-icon-circle-plus-outline"></i>添加企业
-        <i style="color: red;">*</i>
-      </p>
-      <el-table v-loading="loading" :data="configList">
-        <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <!-- <p class="enterprise">企业</p> -->
+      <div class="txfs">
+        <p class="enterprise_tw" @click="handleAdd">
+          <i class="el-icon-circle-plus-outline"></i>添加企业
+        </p>
+        <p class="enterprise_tw" @click="handleAddtwo">
+          <i class="el-icon-circle-plus-outline"></i>添加自然人
+        </p>
+      </div>
+
+      <el-table v-loading="loading" :data="configList" v-if="nj">
         <el-table-column label="企业名称" align="center" prop="companyName" />
         <el-table-column
           label="企业所在地"
@@ -100,13 +104,12 @@
           </template>
         </el-table-column>
       </el-table>
-      <p class="enterprise">自然人</p>
-      <p class="enterprise_tw" @click="handleAddtwo">
+      <!-- <p class="enterprise">自然人</p> -->
+     <!-- <p class="enterprise_tw" @click="handleAddtwo">
         <i class="el-icon-circle-plus-outline"></i>添加自然人
         <i style="color: red;">*</i>
-      </p>
-      <el-table v-loading="loading" :data="configListtwoL">
-        <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      </p> -->
+      <el-table v-loading="loading" :data="configListtwoL" v-if="njs">
         <el-table-column label="姓名" align="center" prop="name" />
         <el-table-column
           label="自然人所在地"
@@ -156,184 +159,293 @@
         class="manager_form"
       >
         <!-- <el-form ref="queryForm" :model="queryParams" :rules="queryForm" label-width="115px" label-position="center" class="manager_form"> -->
-        <el-form-item label="投资方联系人" prop="contactor">
-          <el-input
-            v-model="queryParams.contactor"
-            placeholder="请输入投资方联系人"
-            clearable
-            :disabled="disfal"
-            size="small"
-            style="width: 223px"
-          />
-        </el-form-item>
-        <el-form-item label="投资方联系方式:" prop="phone" class="weiru">
-          <el-input
-            v-model.number="queryParams.phone"
-            placeholder="请输入联系方式"
-            :disabled="disfal"
-            clearable
-            size="small"
-            style="width: 233px"
-          />
-        </el-form-item>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="投资人姓名:" prop="contactor">
+              <el-input
+                v-model="queryParams.contactor"
+                placeholder="请输入投资人姓名"
+                clearable
+                :disabled="disfal"
+                size="small"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="投资人职务:" prop="contactor">
+              <el-input
+                v-model="queryParams.contactor"
+                placeholder="请输入投资人职务"
+                clearable
+                :disabled="disfal"
+                size="small"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="投资人电话:" prop="contactor">
+              <el-input
+                v-model="queryParams.contactor"
+                placeholder="请输入个体投资人投资人电话"
+                clearable
+                :disabled="disfal"
+                size="small"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="身份证号:" prop="contactor">
+              <label slot="label">身&nbsp;&nbsp;份&nbsp;&nbsp;证&nbsp;&nbsp;号:</label>
+              <el-input
+                v-model="queryParams.contactor"
+                placeholder="请输入个体投资人身份证号"
+                clearable
+                :disabled="disfal"
+                size="small"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="信用代码:" prop="phone" class="weiru">
+              <label slot="label">信&nbsp;&nbsp;用&nbsp;&nbsp;代&nbsp;&nbsp;码:</label>
+              <el-input
+                v-model.number="queryParams.phone"
+                placeholder="请输入企业投资人信用代码"
+                :disabled="disfal"
+                clearable
+                size="small"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
         <div class="nvestor">
-          <p>引荐方 <i>*</i></p>
+          <p>引资信息 <i>*</i></p>
         </div>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="引资地区:"   :rules="[{ required: true, message: '请输入引荐单位', trigger: 'blur' }]" >
+              <label slot="label">引&nbsp;&nbsp;资&nbsp;&nbsp;地&nbsp;&nbsp;区:</label>
+             <!-- <treeselect :multiple="false" v-model="queryParams.referralList[0].sysDeptId" :normalizer="normalizer" :options="typeOptionstwo"  :maxHeight="150" @select="djieskle" placeholder="请选择归属部门" /> -->
+              <el-select v-model="queryParams.sysDeptId" placeholder="请选择引资地区" clearable :style="{width: '100%'}">
+                <el-option v-for=" dict in dict.type.investment_area" :key="index" :label="dict.label"
+                  :value="dict.value" :disabled="disfal"></el-option>
+              </el-select>
+              <!-- <el-cascader
+                v-model="queryParams.referralList[0].sysDeptId "
+                :show-all-levels="false"
+                :disabled="disfal"
+                :options="dict in dict.type.investment_area"
+                @change="handleChange"
+                :props="{checkStrictly: true,value:'id',label:'label',children: 'children'}"
+              ></el-cascader> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item
+              label="引资省市:"
+            >
+            <label slot="label">引&nbsp;&nbsp;资&nbsp;&nbsp;省&nbsp;&nbsp;市:</label>
+              <el-input
+                v-model="queryParams.referralList[1].referralPhone"
+                placeholder="请输入引资省市"
+                clearable
+                :disabled="disfal"
+                size="small"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-        <!-- <div v-if="queryParams.referralList == null" > -->
-        <el-form-item label="引荐单位:"  style="width: 23% ; margin-right: 0;" :rules="[{ required: true, message: '请输入引荐单位', trigger: 'blur' }]" class="yije">
-         <!-- <treeselect :multiple="false" v-model="queryParams.referralList[0].sysDeptId" :normalizer="normalizer" :options="typeOptionstwo"  :maxHeight="150" @select="djieskle" placeholder="请选择归属部门" /> -->
-          <el-cascader
-            v-model="queryParams.referralList[0].sysDeptId "
-            :show-all-levels="false"
-            :disabled="disfal"
-            :options="typeOptionstwo"
-            @change="handleChange"
-            style="width: 128px"
-            :props="{checkStrictly: true,value:'id',label:'label',children: 'children'}"
-          ></el-cascader>
-        </el-form-item>
-        <el-form-item
-          label="省外股东占比:"
-          style="width: 20%"
-          class="fenpe"
-          :prop="queryParams.referralList[0].investmentAllcocation + ''"
-          :rules="[{ required: true, message: '请输入省外股东占比', trigger: 'blur' }]"
-        >
-          <el-input
-            v-model="queryParams.referralList[0].investmentAllcocation  "
-            placeholder="数"
-            clearable
-            :disabled="disfal"
-            size="small"
-            style="width: 66px; padding: 0"
-            @keyup.enter.native="handleQuery"
-          />
-          <span class="souu">%</span>
-        </el-form-item>
-        <el-form-item label="引荐方联系人:" :prop="queryParams.referralList[0].referral" style="width: 22%; margin-right: 0;" :rules="[{ required: true, message: '请输入引荐方联系人', trigger: 'blur' }]">
-          <el-input
-            v-model="queryParams.referralList[0].referral"
-            placeholder="请输入"
-            clearable
-            :disabled="disfal"
-            size="small"
-            style="width: 98px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
 
-        <el-form-item
-          label="引荐方联系方式:"
-          :prop="queryParams.referralList[0].referralPhone"
-          style="width: 34%;margin-right: 0;"
-          class="yiuejg"
-          :rules="[{ required: true, message: '请输入引荐方联系方式', trigger: 'blur' }]"
-        >
-          <el-input
-            v-model="queryParams.referralList[0].referralPhone"
-            placeholder="请输入联系方式"
-            clearable
-            :disabled="disfal"
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item class="yije" label="引荐单位:" style="width: 23%;margin-right: 0;"  >
-          <el-cascader
-            :show-all-levels="false"
-            v-model="queryParams.referralList[1].sysDeptId"
-            :options="typeOptionstwo"
-            style="width: 128px"
-            :disabled="disfal"
-            @change="handleChangete"
-            :props="{checkStrictly: true,value:'id',label:'label',children: 'children'}"
-          ></el-cascader>
-        </el-form-item>
-        <el-form-item
-          label="省外股东占比:"
-          style="width: 20%;margin-right: 0;"
-          class="fenpe"
-          :prop="queryParams.referralList[1].investmentAllcocation + ''"
-        >
-          <el-input
-            v-model="queryParams.referralList[1].investmentAllcocation"
-            placeholder="数"
-            :disabled="disfal"
-            clearable
-            size="small"
-            style="width: 66px; padding: 0"
-            @keyup.enter.native="handleQuery"
-          />
-          <span class="souu">%</span>
-        </el-form-item>
-        <el-form-item label="引荐方联系人:"  style="width: 22%;margin-right: 0;">
-          <el-input
-            v-model="queryParams.referralList[1].referral"
-            placeholder="请输入"
-            :disabled="disfal"
-            clearable
-            size="small"
-            style="width: 98px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item
-          label="引荐方联系方式:"
-          style="width: 34%"
-          class="yiuejg"
-        >
-          <el-input
-            v-model="queryParams.referralList[1].referralPhone"
-            placeholder="请输入联系方式"
-            clearable
-            :disabled="disfal"
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
         <!-- </div> -->
         <div class="nvestor">
           <p>项目基本信息 <i>*</i></p>
         </div>
-        <el-form-item label="预计投资额(亿元)" class="gueigntwo" prop="needAmt">
-          <el-input
-            type="number"
-            value="1"
-            min="0"
-            step="0.1"
-            v-model.number="queryParams.needAmt"
-            placeholder="请输入预计投资额"
-            clearable
-            :disabled="disfal"
-            size="small"
-            style="width: 223px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item
-          label="其中 固定资产投资(万元):"
-          prop="fixedAssets"
-          class="gueigntwo gueignthr"
-        >
-          <el-input
-            type="number"
-            value="1"
-            min="0"
-            step="0.1"
-            v-model.number="queryParams.fixedAssets"
-            placeholder="请输入"
-            clearable
-            :disabled="disfal"
-            size="small"
-            style="width: 223px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <div class="lage_div">
+        <el-row>
+          <el-col :span='8'>
+             <el-form-item
+               label="上报单位:"
+             >
+             <label slot="label">上&nbsp;&nbsp;报&nbsp;&nbsp;单&nbsp;&nbsp;位:</label>
+               <el-cascader
+                 v-model="queryParams.sbdw "
+                 :show-all-levels="false"
+                 :disabled="disfal"
+                 :options="typeOptionstwo"
+                 @change="handleChange"
+                 :props="{checkStrictly: true,value:'id',label:'label',children: 'children'}"
+               ></el-cascader>
+             </el-form-item>
+          </el-col>
+          <el-col :span='8'>
+             <el-form-item
+               label="填表日期:"
+             >
+             <label slot="label">填&nbsp;&nbsp;表&nbsp;&nbsp;日&nbsp;&nbsp;期:</label>
+               <el-date-picker
+                 type="date"
+                 :disabled = "disfal"
+                 placeholder="选择项填表日期"
+                 v-model="queryParams.tbrq"
+               ></el-date-picker>
+             </el-form-item>
+          </el-col>
+          <el-col :span='8'>
+             <el-form-item
+               label="项目负责人:"
+             >
+               <el-input
+                 v-model="queryParams.zszxfzr"
+                 placeholder="请输入联系方式"
+                 clearable
+                 :disabled="disfal"
+                 size="small"
+                 @keyup.enter.native="handleQuery"
+               />
+             </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24" class="nkil">
+            <el-form-item label="项目线索名称" prop="needAmt">
+              <el-input v-model="queryParams.needAmt" placeholder="请输入用户昵称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="项目编号:"
+              prop="xmbh"
+            >
+              <el-input
+                type="number"
+                value="1"
+                min="0"
+                step="0.1"
+                v-model.number="queryParams.xmbh"
+                placeholder="请输入"
+                clearable
+                :disabled="disfal"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="领航信息" prop="field107">
+              <el-select v-model="queryParams.field107" placeholder="请选择是否为领航信息" clearable :style="{width: '100%'}">
+                <el-option v-for=" dict in dict.type.investment_area" :key="index" :label="dict.label"
+                  :value="dict.value" :disabled="disfal"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+            <el-col :span="12">
+              <el-form-item label-width="116px" label="拟投资(亿元)：" prop="field102">
+                <el-input v-model="queryParams.field102" placeholder="请输入拟投资(亿元)：" clearable :style="{width: '100%'}">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产业类型" prop="field107">
+                <el-select v-model="queryParams.field107" placeholder="请选择产业类型" clearable :style="{width: '100%'}">
+                  <el-option v-for="(item, index) in field106Options" :key="index" :label="item.label"
+                    :value="item.value" :disabled="disfal"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-form-item label="项目类别" prop="field106">
+              <el-radio-group v-model="queryParams.field106" size="medium">
+                <el-radio v-for="(item, index) in field106Options" :key="index" :label="item.value"
+                  :disabled="disfal">{{item.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-row>
+          <el-row>
+              <el-col :span="12">
+                  <el-form-item label="投资类别" prop="field103">
+                    <el-select v-model="queryParams.field103" placeholder="请选择投资类别" clearable :style="{width: '100%'}">
+                    </el-select>
+                  </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                  <el-form-item label="拟落户地" prop="field106">
+                    <el-select v-model="queryParams.field106" placeholder="请选择拟落户地" clearable :style="{width: '100%'}">
+                      <el-option v-for="(item, index) in field107Options" :key="index" :label="item.label"
+                        :value="item.value" :disabled="item.disabled"></el-option>
+                    </el-select>
+                  </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="承载平台" prop="field108">
+                  <el-select v-model="queryParams.field108" placeholder="请选择承载平台" clearable :style="{width: '100%'}">
+                    <el-option v-for="(item, index) in field107Options" :key="index" :label="item.label"
+                      :value="item.value" :disabled="item.disabled"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="投资主体" prop="field114">
+                  <el-input v-model="queryParams.field114" placeholder="请输入投资主体" clearable :style="{width: '100%'}">
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="上年度销售额" prop="field108">
+                  <div style="display: flex;">
+                    <el-input  v-model="queryParams.field108" placeholder="请输入上年度销售额(万元)" clearable :style="{width: '100%'}">
+                    </el-input>
+                    <span class="souu">(万元)</span>
+                  </div>
+
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="上年度纳税额" prop="field109">
+                  <div style="display: flex;">
+                    <el-input  v-model="queryParams.field109" placeholder="请输入上年度纳税额(万元)" clearable :style="{width: '100%'}">
+                    </el-input>
+                    <span class="souu" style="width: 11%;">(万元)</span>
+                  </div>
+
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="项目简介" prop="field104">
+                  <el-input style="width: 100%;" v-model="queryParams.field104" type="textarea" placeholder="请输入项目简介"
+                     ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+                <el-form-item label="企业背景" prop="field102">
+                  <el-radio-group v-model="queryParams.field102" size="medium">
+                    <el-radio v-for="(item, index) in field107Options" :key="index" :label="item.value"
+                      :disabled="item.disabled">{{item.label}}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item label="投资方简介" prop="field104" style="width: 100%;">
+                    <el-input style="width: 100%;" v-model="queryParams.field104" type="textarea" placeholder="请输入投资方简介"
+                      :style="{width: '100%'}"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+      <!-- class="gueigntwo" -->
+
+        <!-- <div class="lage_div">
           <span>项目主营产品</span>
-          <!-- </div> -->
           <el-form-item label="产品名称:" prop="productName" class="maneg_lar">
             <el-input
               v-model="queryParams.productName"
@@ -417,11 +529,37 @@
             :disabled="disfal"
             style="width: 470px"
           />
-        </el-form-item>
+        </el-form-item> -->
         <div class="nvestor">
-          <p>项目基本需求</p>
+          <p>首谈信息</p>
         </div>
-        <el-form-item
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="首谈人" prop="field108">
+              <el-input v-model="queryParams.field108" placeholder="请输入首谈人" clearable :style="{width: '100%'}">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="首谈日期" prop="field109">
+              <el-input v-model="queryParams.field109" placeholder="请输入当前日期以前的时间点" clearable :style="{width: '100%'}">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="单位职务" prop="field108">
+              <el-input v-model="queryParams.field108" placeholder="请输入首读人单位职务" clearable :style="{width: '100%'}">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="手机号码" prop="field109">
+              <el-input v-model="queryParams.field109" placeholder="请输入首谈跟进人手机号" clearable :style="{width: '100%'}">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-form-item
           label="项目计划用地:"
           prop="plannedLand"
           style="width: 45%"
@@ -564,9 +702,9 @@
               :value="dict.dictValue"
             />
           </el-select>
-        </el-form-item>
-        <el-form-item label="添加附件:" prop="configType" class="maget_ty" style="margin-bottom: 50px;">
-          <div class="bgteu fre" style="width: 618px">
+        </el-form-item> -->
+        <el-form-item label="添加附件:" prop="configType"  style="margin-bottom: 50px;">
+          <div class="bgteu fre">
             <div class="">
               <el-upload
                 :action="defaultSettings.urls + process + '/common/upload'"
@@ -598,7 +736,7 @@
             </div>
           </div>
         </el-form-item>
-        <el-form-item label="备注:" prop="description" class="maget_ty">
+        <el-form-item label="备注:" prop="description" >
           <el-input
             v-model="queryParams.description"
             placeholder="请输入备注"
@@ -606,7 +744,6 @@
             type="textarea"
             :disabled="disfal"
             size="small"
-            style="width: 480px; height: 78px"
             class="ieuyr"
             @keyup.enter.native="handleQuery"
           />
@@ -792,6 +929,7 @@ import Treeselect from '@riophae/vue-treeselect';
 import '@riophae/vue-treeselect/dist/vue-treeselect.css';
 export default {
   name: "Config",
+  dicts: ['sys_normal_disable','investment_area'],
    components: {  Treeselect },
   props: {
     // queryParams: Object,
@@ -802,6 +940,7 @@ export default {
       process: process.env.VUE_APP_BASE_API,
       defaultSettings,
       disfal: false,
+      field106Options:[{'value':1,'label':'选项一'}],
       // 遮罩层
       loading: true,
       //步骤条
@@ -976,14 +1115,16 @@ export default {
       value: [],
       valuess: [],
       values: [],
-      resets:[]
+      resets:[],
+      njs:false,
+      nj:false,
     };
   },
   created() {
+
     this.bmProjectId = this.$route.query.setid;
     this.jeutu.bmProjectId = this.bmProjectId;
     this.setrd = this.$route.query.setrd;
-    console.log(this.setrd);
     if (this.setrd != 1) {
       this.disfal = true;
     } else {
@@ -1021,9 +1162,9 @@ export default {
     },
     handleChange(value) {
       if (value.length == 1) {
-        this.queryParams.referralList[0].sysDeptId = value.join(",");
+        this.queryParams.sbdw = value.join(",");
       } else {
-        this.queryParams.referralList[0].sysDeptId = value[value.length - 1];
+        this.queryParams.sbdw = value[value.length - 1];
       }
       //0
 
@@ -1381,6 +1522,8 @@ export default {
       }
       this.reset();
       this.open = true;
+      this.nj = true
+      this.njs = false
       // this.opentwo =  true
       this.title = "添加信息";
       // this.titletwo = "添加参数";
@@ -1392,6 +1535,8 @@ export default {
       this.resettwo();
       // this.open = true;
       this.opentwo = true;
+      this.nj = false
+      this.njs = true
       // this.title = "添加参数";
       this.titletwo = "添加信息";
     },
@@ -1723,6 +1868,45 @@ export default {
 };
 </script>
 <style  lang="scss"  >
+  .mation{
+    .el-form-item{
+        width: 100% !important;
+      }
+      .el-date-editor.el-input{
+        width: 100%;
+      }
+    .el-form-item--medium .el-form-item__content{
+      width:-webkit-calc(100% - 120px);
+      width:-moz-calc(100% - 120px);
+      width:calc(100% - 120px);
+    }
+    .el-col-16{
+      .el-form-item{
+          width: 100% !important;
+        }
+      .el-form-item--medium .el-form-item__content{
+        width:-webkit-calc(100% - 120px);
+        width:-moz-calc(100% - 120px);
+        width:calc(100% - 120px);
+      }
+      .el-cascader{
+        width: 100%;
+      }
+    }
+  }
+
+  .nkil{
+     .el-form-item{
+      width: 100% !important;
+    }
+  .el-form-item--medium .el-form-item__content{
+    width:-webkit-calc(100% - 120px);
+    width:-moz-calc(100% - 120px);
+    width:calc(100% - 120px);
+  }
+  }
+
+
   .fre{
     .el-upload-list{
       width: 80%;
@@ -1751,7 +1935,7 @@ export default {
 
 .weiru {
   .el-form-item__label {
-    width: 130px !important;
+    width: 120px !important;
   }
 }
 .manager_form {
@@ -1978,6 +2162,7 @@ export default {
     font-weight: 400;
     color: #343434;
     margin-left: 5px;
+    width: 11%;
   }
 }
 //在建项目
@@ -2053,4 +2238,17 @@ export default {
       border-radius: 4px;
       padding: 10px ;
 }
+.txfs{
+  display: flex;
+  p{
+    color: red;
+    i{
+      color: red;
+    }
+  }
+  p:nth-child(1){
+    margin-right: 10px;
+  }
+
+}
 </style>