Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test into master

src/layout/enterprise/contextfabu.vue

@@ -85,8 +85,8 @@
                   <el-form-item label="注册类型">
                     <el-input v-model="form.companytype" placeholder="请输入注册类型"></el-input>
                   </el-form-item>
-                  <el-form-item label="组织机构代码">
-                    <el-input v-model="form.zzjgdm" placeholder="请输入组织机构代码"></el-input>
+                  <el-form-item label="统一社会信用代码">
+                    <el-input v-model="form.zzjgdm" placeholder="请输入统一社会信用代码"></el-input>
                   </el-form-item>
                   <el-form-item label="注册时间">
                     <el-date-picker v-model="form.companydate" type="date" placeholder="请选择时间" format="yyyy-MM-dd" value-format="yyyy-MM-dd">

src/layout/login/webLogin.vue

@@ -8,15 +8,8 @@
             <el-tab-pane label="登录" name="first">
               <el-col :span="24">
                 <el-form ref="form" :model="form" label-width="120px">
-                  <el-form-item
-                    label="手机号"
-                    prop="phone"
-                    :rules="[
-                      { required: true, message: '手机号不能为空' },
-                      { type: 'number', message: '手机号必须为数字值' },
-                    ]"
-                  >
-                    <el-input type="phone" v-model.number="form.phone" autocomplete="off" placeholder="请输入手机号" :minlength="11" :maxlength="11"></el-input>
+                  <el-form-item label="用户名" prop="phone">
+                    <el-input type="phone" v-model="form.phone" autocomplete="off" placeholder="请输入手机号/统一社会信用代码"></el-input>
                   </el-form-item>
                   <el-form-item label="登录密码">
                     <el-input v-model="form.passwd" placeholder="请输入登录密码" show-password></el-input>
@@ -76,6 +69,10 @@
                     </el-form-item>
                   </span>
                   <span v-else-if="forms.role == '5'">
+                    <el-form-item label="统一社会信用代码" prop="institution_code">
+                      <el-input v-model="forms.institution_code" placeholder="请输入统一社会信用代码"></el-input>
+                      <el-link type="danger" :underline="false">统一社会信用代码作为机构用户登录平台唯一凭证</el-link>
+                    </el-form-item>
                     <el-form-item label="注册类型">
                       <el-input v-model="forms.companytype" placeholder="请输入注册类型"></el-input>
                     </el-form-item>
@@ -83,9 +80,6 @@
                       <el-date-picker v-model="forms.companydate" placeholder="请选择" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date">
                       </el-date-picker>
                     </el-form-item>
-                    <el-form-item label="组织机构代码">
-                      <el-input v-model="forms.institution_code" placeholder="请输入组织机构代码"></el-input>
-                    </el-form-item>
                     <el-form-item label="注册资金">
                       <el-input v-model="forms.companycapital" placeholder="请输入注册资金"></el-input>
                     </el-form-item>
@@ -240,12 +234,13 @@ export default {
       activeName: 'first',
       rules: {
         name: [{ required: true, message: '请输入用户名称', trigger: 'blur' }],
-        phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
+        phone: [{ required: true, message: '请输入手机号/统一社会信用代码', trigger: 'blur' }],
         password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
         code: [
           { required: true, message: '请输入邀请码', trigger: 'blur' },
           // { type: 'number', message: '年龄必须为数字值' },
         ],
+        institution_code: [{ required: true, message: '请输入统一社会信用代码', trigger: 'blur' }],
         // cardnumber: [{ required: true, message: '请输入身份证号', trigger: 'blur' }],
         // email: [{ required: true, message: '请输入邮箱', trigger: 'blur' }],
         // addr: [{ required: true, message: '请输入地址', trigger: 'blur' }],
@@ -256,7 +251,7 @@ export default {
         // img_qy: [{ required: false, message: '请输入组织机构图片', trigger: 'blur' }],
         // institution_type: [{ required: false, message: '请输入机构类型', trigger: 'blur' }],
         // institution_name: [{ required: false, message: '请输入机构名称', trigger: 'blur' }],
-        // institution_code: [{ required: false, message: '请输入机构代码', trigger: 'blur' }],
+
         // institution_nature: [{ required: false, message: '请输入机构性质', trigger: 'blur' }],
         // office_phone: [{ required: false, message: '请输入办公电话', trigger: 'blur' }],
         // profession: [{ required: false, message: '请输入从事专业', trigger: 'blur' }],

src/views/adminCenter/applyInfo/index.vue

@@ -111,8 +111,8 @@
           <el-form-item label="注册类型">
             <el-input v-model="form.companytype" placeholder="请输入注册类型"></el-input>
           </el-form-item>
-          <el-form-item label="组织机构代码">
-            <el-input v-model="form.zzjgdm" placeholder="请输入组织机构代码"></el-input>
+          <el-form-item label="统一社会信用代码">
+            <el-input v-model="form.zzjgdm" placeholder="请输入统一社会信用代码"></el-input>
           </el-form-item>
           <el-form-item label="注册时间">
             <el-date-picker v-model="form.companydate" type="date" placeholder="请选择时间" format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>

src/views/hall/liveApply.vue

@@ -94,8 +94,8 @@
                   <el-form-item label="注册类型">
                     <el-input v-model="demandForm.companytype" placeholder="请输入注册类型"></el-input>
                   </el-form-item>
-                  <el-form-item label="组织机构代码">
-                    <el-input v-model="demandForm.zzjgdm" placeholder="请输入组织机构代码"></el-input>
+                  <el-form-item label="统一社会信用代码">
+                    <el-input v-model="demandForm.zzjgdm" placeholder="请输入统一社会信用代码"></el-input>
                   </el-form-item>
                   <el-form-item label="注册时间">
                     <el-date-picker v-model="demandForm.companydate" type="date" placeholder="请选择时间" format="yyyy-MM-dd" value-format="yyyy-MM-dd">

src/views/market/index.vue

@@ -19,7 +19,6 @@
               <el-col :span="24" class="leftDown">
                 <el-col
                   :span="12"
-                  :offset="6"
                   class="achieveList"
                   v-for="(item, index) in achieveList"
                   :key="index"
@@ -167,8 +166,8 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="12" class="txt">
-                    <el-form-item label="组织机构代码：">
-                      <el-input v-model="technologyForm.companytype" placeholder="请输入组织机构代码"></el-input>
+                    <el-form-item label="统一社会信用代码：">
+                      <el-input v-model="technologyForm.companytype" placeholder="请输入统一社会信用代码"></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12" class="txt">

src/views/notice/index.vue

@@ -40,8 +40,8 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="12" class="txt">
-                    <el-form-item label="组织机构代码：">
-                      <el-input v-model="technologyForm.companytype" placeholder="请输入组织机构代码"></el-input>
+                    <el-form-item label="统一社会信用代码：">
+                      <el-input v-model="technologyForm.companytype" placeholder="请输入统一社会信用代码"></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12" class="txt">

src/views/notice/productForm.vue

@@ -37,10 +37,10 @@
                       </el-col>
                       <el-col :span="12" class="txt">
                         <el-col :span="5" class="left">
-                          组织机构代码：
+                          统一社会信用代码：
                         </el-col>
                         <el-col :span="19" class="right">
-                          <el-input v-model="technologyForm.zzjgdm" placeholder="请输入组织机构代码"></el-input>
+                          <el-input v-model="technologyForm.zzjgdm" placeholder="请输入统一社会信用代码"></el-input>
                         </el-col>
                       </el-col>
                       <el-col :span="12" class="txt">

src/views/superAdminCenter/adminUser/index.vue

@@ -59,12 +59,13 @@ export default {
       total: 0,
 
       formFields: [
-        { label: '机构代码或邀请码', prop: 'code', model: 'code' },
+        // { label: '机构代码或邀请码', model: 'code' },
+        // { label: '机构代码或邀请码', model: 'code', options: { disabled: true } },
         { label: '所属管理员', model: 'pid', type: 'select' },
-        { label: '姓名', prop: 'name', model: 'name' },
-        { label: '机构名称', prop: 'deptname', model: 'deptname' },
-        { label: '手机号', prop: 'phone', model: 'phone', options: { maxLength: 11, minLength: 11, type: 'number' } },
-        { label: '密码', prop: 'password', model: 'password', type: 'password' },
+        { label: '姓名', model: 'name' },
+        { label: '机构名称', model: 'deptname' },
+        { label: '手机号', model: 'phone', options: { maxLength: 11, minLength: 11, type: 'number' } },
+        { label: '密码', model: 'password', type: 'password' },
       ],
       rules: {
         code: [{ required: true, message: '请输入推荐码' }],
@@ -88,9 +89,11 @@ export default {
     },
     // 添加
     toAdd() {
+      this.formFields.push({ label: '机构代码或邀请码', model: 'code' });
       this.dialog = true;
     },
     toEdit({ data }) {
+      this.formFields.push({ label: '机构代码或邀请码', model: 'code', options: { disabled: true } });
       this.$set(this, 'form', data);
       this.dialog = true;
       this.dialogIsNew = false;

src/views/superAdminCenter/dictionary/index.vue

@@ -6,7 +6,7 @@
           <el-col :span="7" class="column">
             <column @setCategory="data => (category = data)" @setList="data => (categoryList = data)"></column>
           </el-col>
-          <el-col :span="17" class="message">
+          <el-col :span="16" class="message">
             <item-list :category="category" :categoryList="categoryList"></item-list>
           </el-col>
         </el-col>
@@ -52,7 +52,7 @@ export default {
   width: 96%;
 }
 .column {
-  width: 27%;
+  width: 30%;
   min-height: 690px;
   border: 1px solid #ccc;
   margin: 0 20px 0 0;

src/views/superAdminCenter/enterpriseProduct/index.vue

@@ -112,8 +112,8 @@
               <el-form-item label="注册类型">
                 <el-input v-model="form.companytype" placeholder="请输入注册类型"></el-input>
               </el-form-item>
-              <el-form-item label="组织机构代码">
-                <el-input v-model="form.zzjgdm" placeholder="请输入组织机构代码"></el-input>
+              <el-form-item label="统一社会信用代码">
+                <el-input v-model="form.zzjgdm" placeholder="请输入统一社会信用代码"></el-input>
               </el-form-item>
               <el-form-item label="注册时间">
                 <el-date-picker v-model="form.companydate" type="date" placeholder="请选择时间" format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>

src/views/superAdminCenter/productSolicit/index.vue

@@ -81,7 +81,7 @@
             <span v-if="form.type == '0'">
               <el-form-item label="投资预算"> <el-input v-model="form.budget" placeholder="请输入投资预算"></el-input> </el-form-item>
               <el-form-item label="注册类型"> <el-input v-model="form.companytype" placeholder="请输入注册类型"></el-input> </el-form-item>
-              <el-form-item label="组织机构代码"> <el-input v-model="form.zzjgdm" placeholder="请输入组织机构代码"></el-input> </el-form-item>
+              <el-form-item label="统一社会信用代码"> <el-input v-model="form.zzjgdm" placeholder="请输入统一社会信用代码"></el-input> </el-form-item>
               <el-form-item label="注册时间">
                 <el-date-picker v-model="form.companydate" type="date" placeholder="请选择时间" format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>
               </el-form-item>

src/views/superAdminCenter/user/index.vue

@@ -56,8 +56,8 @@
               <el-form-item label="注册时间">
                 <el-date-picker v-model="form.companydate" placeholder="请选择" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"> </el-date-picker>
               </el-form-item>
-              <el-form-item label="组织机构代码">
-                <el-input v-model="form.institution_code" placeholder="请输入组织机构代码"></el-input>
+              <el-form-item label="统一社会信用代码">
+                <el-input v-model="form.institution_code" placeholder="请输入统一社会信用代码"></el-input>
               </el-form-item>
               <el-form-item label="注册资金">
                 <el-input v-model="form.companycapital" placeholder="请输入注册资金"></el-input>
@@ -280,10 +280,9 @@ export default {
     },
     // 提交
     async handleSave() {
-      let data = this.editData;
-      data.status = this.form.status;
+      let data = this.form;
       if (data.role == '4' || data.role == '5') {
-        data.id = data.uid;
+        data.id = this.editData.uid;
         let res = await this.update(data);
         if (this.$checkRes(res)) {
           this.$message({
@@ -293,7 +292,7 @@ export default {
           this.handleClose();
         }
       } else if (data.role == '6') {
-        data.id = data.uid;
+        data.id = this.editData.uid;
         let res = await this.exportuserUpdate(data);
         if (this.$checkRes(res)) {
           this.$message({

src/views/userCenter/basicInfo/index.vue

@@ -145,10 +145,10 @@
               <el-col :span="12">
                 <el-form-item prop="institution_code">
                   <el-col :span="21" slot="label">
-                    组织机构代码
+                    统一社会信用代码
                   </el-col>
                   <el-col :span="24">
-                    <el-input v-model="form.institution_code" placeholder="请输入组织机构代码"></el-input>
+                    <el-input v-model="form.institution_code" placeholder="请输入统一社会信用代码"></el-input>
                   </el-col>
                 </el-form-item>
               </el-col>
@@ -484,6 +484,7 @@ export default {
         phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
         password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
         role: [{ required: true, message: '请输入用户类型', trigger: 'blur' }],
+        institution_code: [{ required: true, message: '请输入统一社会信用代码', trigger: 'blur' }],
       },
       form: {},
       qc: '',

src/views/webLogin.vue

@@ -44,6 +44,7 @@ export default {
     async submitRegisters({ data }) {
       if (data.role == '4' || data.role == '5') {
         let res = await this.userCreate(data);
+        console.log(res.data);
         let msg = `注册成功，等待管理员审核，方可登录`;
         this.$checkRes(res, msg);
       } else if (data.role == '6') {