企业调查修改

src/views/twoweb/service/comDemand/parts/one.vue

@@ -24,36 +24,43 @@
                 <el-input v-model="form.web_site" placeholder="请输入网址"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item label="注册登记类型(可多选)" prop="register_type" label-width="150px">
-                <el-checkbox-group v-model="form.register_type">
+            <el-col :span="12">
+              <el-form-item label="注册登记类型(可多选)" prop="register_type">
+                <el-checkbox-group v-model="form.register_type" class="checkbox">
                   <el-checkbox v-for="(item, index) in typeList" :key="index" :label="item" name="type"></el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
             </el-col>
             <el-col :span="12">
+              <el-form-item label="所属领域(可多选)" prop="field">
+                <el-checkbox-group v-model="form.field" class="checkbox">
+                  <el-checkbox v-for="(item, index) in fieldList" :key="index" :label="item" name="type"></el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
               <el-form-item label="注册时间" prop="register_time">
                 <el-date-picker v-model="form.register_time" placeholder="请选择" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" style="width:100%">
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="注册资金" prop="funds">
-                <el-input v-model="form.funds" placeholder="请输入注册资金"></el-input>
+            <el-col :span="8">
+              <el-form-item label="注册资金(万元)" prop="funds" label-width="120px">
+                <el-input v-model="form.funds" type="number" placeholder="请输入注册资金"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item label="所属领域(可多选)" prop="field" label-width="140px">
-                <el-checkbox-group v-model="form.field">
-                  <el-checkbox v-for="(item, index) in fieldList" :key="index" :label="item" name="type"></el-checkbox>
-                </el-checkbox-group>
+            <el-col :span="8">
+              <el-form-item label="注册地" prop="register_address">
+                <el-select v-model="form.register_address" placeholder="请选择" style="width:100%">
+                  <el-option v-for="(item, index) in register_addressList" :key="index" :label="item" :value="item"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="合作概括" prop="brief">
+              <el-form-item label="企业概况" prop="brief">
                 <el-input
                   v-model="form.brief"
-                  placeholder="请输入合作概括"
+                  placeholder="请输入企业概况"
                   type="textarea"
                   :autosize="{ minRows: 4, maxRows: 6 }"
                   maxlength="500"
@@ -83,6 +90,8 @@ export default {
       typeList: ['国有企业', '集体企业', '股份合作企业', '联营企业', '有限责任公司', '股份有限公司', '私营企业', '其他企业'],
       // 所属领域
       fieldList: ['先进制造与自动化', '资源与环境技术', '新能源及节能技术', '高技术服务业', '新材料技术', '航空航天技术', '生物与新医药技术', '电子信息技术'],
+      // 注册地
+      register_addressList: ['长春市', '吉林市', '四平市', '辽源市', '通化市', '白山市', '白城市', '延边州', '松原市', '长白山管委会'],
     };
   },
   created() {},
@@ -103,4 +112,10 @@ export default {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.checkbox {
+  border: 1px solid #dcdfe6;
+  padding: 10px;
+  border-radius: 5px;
+}
+</style>

src/views/twoweb/service/comDemand/parts/thr.vue

@@ -5,16 +5,15 @@
         <el-col :span="24" class="one">
           <el-form :model="form" :rules="rules" ref="form" label-width="100px">
             <el-col :span="24" class="list">
-              <!-- <el-table :data="form.products" border style="width: 100%">
+              <el-table :data="form.products" border style="width: 100%">
                 <el-table-column prop="name" label="主要产品名称" align="center" show-overflow-tooltip> </el-table-column>
-                <el-table-column prop="mix" label="占企业销售收入总额比例" align="center" show-overflow-tooltip> </el-table-column>
-                <el-table-column label="操作" align="center">
+                <el-table-column prop="mix" label="占企业销售收入总额比例(%)" width="200px" show-overflow-tooltip> </el-table-column>
+                <el-table-column label="" width="100px" align="center">
                   <template slot-scope="scope">
                     <el-button size="mini" type="danger" @click="toDel(scope.$index, scope.row)">删除</el-button>
                   </template>
                 </el-table-column>
-              </el-table> -->
-              <data-table :fields="fields" :opera="opera" :usePage="false" :data="form.products" @del="toDel"> </data-table>
+              </el-table>
             </el-col>
             <el-col :span="24" class="btn">
               <el-button type="primary" size="small" @click="toAdd()">添加</el-button>
@@ -24,12 +23,12 @@
       </el-col>
     </el-row>
     <el-dialog :title="dialog.title" :visible.sync="dialog.show" :width="dialog.width" :before-close="toClose">
-      <el-form ref="form" :model="marketForm" label-width="80px">
+      <el-form ref="form" :model="marketForm" label-width="100px">
         <el-form-item label="产品名称">
           <el-input v-model="marketForm.name" placeholder="请输入产品名称"></el-input>
         </el-form-item>
-        <el-form-item label="总额占比">
-          <el-input v-model="marketForm.mix" placeholder="请输入总额占比"></el-input>
+        <el-form-item label="总额占比(%)">
+          <el-input v-model="marketForm.mix" type="number" placeholder="请输入总额占比"></el-input>
         </el-form-item>
         <el-form-item style="text-align:center">
           <el-button type="primary" @click="marketSubmit">提交保存</el-button>
@@ -53,11 +52,6 @@ export default {
       marketForm: {},
       // 弹框
       dialog: { titla: '产品管理', show: false, width: '50%' },
-      fields: [
-        { label: '主要产品名称', prop: 'name' },
-        { label: '占企业销售收入总额比例', prop: 'mix' },
-      ],
-      opera: [{ label: '删除', method: 'del' }],
     };
   },
   created() {},
@@ -72,8 +66,7 @@ export default {
       this.toClose();
     },
     // 删除
-    toDel({ data }) {
-      let index = this.form.products.findIndex(i => i.name == data.name);
+    toDel(index) {
       this.form.products.splice(index, 1);
     },
     // 关闭
@@ -106,6 +99,7 @@ export default {
     }
     .btn {
       text-align: right;
+      padding: 0 22px;
     }
   }
 }

src/views/twoweb/service/comDemand/parts/two.vue

@@ -4,90 +4,76 @@
       <el-col :span="24" class="main">
         <el-col :span="24" class="one">
           <el-form :model="form" :rules="rules" ref="form" label-width="100px">
-            <el-col :span="24" class="legal">
-              <el-col :span="2" class="legal_l">
-                企业法人
-              </el-col>
-              <el-col :span="22" class="legal_r">
-                <el-col :span="6" class="legal_r_1">
-                  <el-col :span="24" class="title">
-                    姓名
-                  </el-col>
-                  <el-col :span="24">
-                    <el-input v-model="form.legal_person.name" placeholder="请输入姓名"></el-input>
-                  </el-col>
-                </el-col>
-                <el-col :span="6" class="legal_r_1">
-                  <el-col :span="24" class="title">
-                    性別
-                  </el-col>
-                  <el-col :span="24">
-                    <el-select v-model="form.legal_person.gender" placeholder="请选择" style="width:100%">
-                      <el-option v-for="(item, index) in genderList" :key="index" :label="item" :value="item"></el-option>
-                    </el-select>
-                  </el-col>
-                </el-col>
-                <el-col :span="6" class="legal_r_1">
-                  <el-col :span="24" class="title">
-                    出生年月
-                  </el-col>
-                  <el-col :span="24">
-                    <el-date-picker
-                      v-model="form.legal_person.birth"
-                      placeholder="请选择"
-                      value-format="yyyy-MM-dd"
-                      format="yyyy-MM-dd"
-                      type="date"
-                      style="width:100%"
-                    >
-                    </el-date-picker>
-                  </el-col>
-                </el-col>
-                <el-col :span="6" class="legal_r_1">
-                  <el-col :span="24" class="title">
-                    最高学历
-                  </el-col>
-                  <el-col :span="24">
-                    <el-select v-model="form.legal_person.education" placeholder="请选择" style="width:100%">
-                      <el-option v-for="(item, index) in educationList" :key="index" :label="item" :value="item"></el-option>
-                    </el-select>
-                  </el-col>
-                </el-col>
-              </el-col>
+            <el-col :span="6">
+              <el-form-item label="企业法人" prop="name">
+                <el-input v-model="form.legal_person.name" placeholder="请输入企业法人"></el-input>
+              </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="企业联系人" prop="contact">
-                <el-input v-model="form.contact" placeholder="请输入企业联系人"></el-input>
+            <el-col :span="6">
+              <el-form-item label="性別" prop="gender">
+                <el-select v-model="form.legal_person.gender" placeholder="请选择" style="width:100%">
+                  <el-option v-for="(item, index) in genderList" :key="index" :label="item" :value="item"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="联系电话" prop="contact_tel">
-                <el-input v-model="form.contact_tel" placeholder="请输入联系电话"></el-input>
+            <el-col :span="6">
+              <el-form-item label="出生年月" prop="birth">
+                <el-date-picker
+                  v-model="form.legal_person.birth"
+                  placeholder="请选择"
+                  value-format="yyyy-MM-dd"
+                  format="yyyy-MM-dd"
+                  type="date"
+                  style="width:100%"
+                >
+                </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="E-mail" prop="email">
-                <el-input v-model="form.email" placeholder="请输入E-mail"></el-input>
+            <el-col :span="6">
+              <el-form-item label="最高学历" prop="education">
+                <el-select v-model="form.legal_person.education" placeholder="请选择" style="width:100%">
+                  <el-option v-for="(item, index) in educationList" :key="index" :label="item" :value="item"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="企业职工数" prop="person_number">
-                <el-input v-model="form.person_number" placeholder="请输入企业职工数"></el-input>
+                <el-input v-model="form.person_number" type="number" placeholder="请输入企业职工数"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="本科以上人数" prop="bk_number">
-                <el-input v-model="form.bk_number" placeholder="请输入本科以上人数"></el-input>
+                <el-input v-model="form.bk_number" type="number" placeholder="请输入本科以上人数"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="研究开发人数" prop="research_number">
-                <el-input v-model="form.research_number" placeholder="请输入研究开发人数"></el-input>
+                <el-input v-model="form.research_number" type="number" placeholder="请输入研究开发人数"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="高级职称人数" prop="advanced_number">
-                <el-input v-model="form.advanced_number" placeholder="请输入高级职称人数"></el-input>
+                <el-input v-model="form.advanced_number" type="number" placeholder="请输入高级职称人数"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="企业联系人" prop="contact">
+                <el-input v-model="form.contact" placeholder="请输入企业联系人"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系电话" prop="contact_tel">
+                <el-input v-model="form.contact_tel" placeholder="请输入联系电话"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="E-mail" prop="email">
+                <el-input v-model="form.email" placeholder="请输入E-mail"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="QQ" prop="qq">
+                <el-input v-model="form.qq" placeholder="请输入OO"></el-input>
               </el-form-item>
             </el-col>
           </el-form>
@@ -136,26 +122,12 @@ export default {
 .main {
   .one {
     .legal {
-      margin: 0 0 22px 0;
       .legal_l {
         text-align: right;
-        padding: 0 13px;
+        padding: 15px 13px;
         color: #606266;
         font-size: 14px;
       }
-      .legal_r {
-        .legal_r_1 {
-          width: 24%;
-          border: 1px solid #cccc;
-          border-radius: 5px;
-          padding: 10px;
-          margin: 0 5px;
-          .title {
-            text-align: center;
-            margin: 0 0 5px 0;
-          }
-        }
-      }
     }
   }
 }