Merge branch 'master' of http://git.cc-lotus.info/Free-cysci/cysci-website

src/views/service/register/company.vue

@@ -30,6 +30,11 @@
               <el-form-item label="所属行业" prop="profession">
                 <el-input v-model="form.profession" placeholder="请输入所属行业"></el-input>
               </el-form-item>
+              <el-form-item label="所属辖区" prop="juris">
+                <el-select v-model="form.juris" placeholder="请选择所属辖区">
+                  <el-option v-for="(i, index) in jusicList" :key="`juris${index}`" :label="i" :value="i"></el-option>
+                </el-select>
+              </el-form-item>
             </el-col>
             <el-col :span="24" class="title"> 详细信息 </el-col>
             <el-col :span="24" class="info">
@@ -100,6 +105,7 @@
 </template>
 
 <script>
+import { jusic } from '@common/dict/index';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: organization } = createNamespacedHelpers('organization');
 export default {
@@ -121,7 +127,9 @@ export default {
         office_phone: [{ required: true, message: '请输入办公电话', trigger: 'blur' }],
         profession: [{ required: true, message: '请输入所属行业', trigger: 'blur' }],
         institution_code: [{ required: true, message: '请输入机构代码', trigger: 'blur' }],
+        juris: [{ required: true, message: '请选择所属辖区', trigger: 'blur' }],
       },
+      jusicList: jusic,
     };
   },
   created() {},

src/views/service/register/mechanism.vue

@@ -27,6 +27,11 @@
               <el-form-item label="所属行业" prop="industry">
                 <el-input v-model="form.industry" placeholder="请输入所属行业"></el-input>
               </el-form-item>
+              <el-form-item label="所属辖区" prop="juris">
+                <el-select v-model="form.juris" placeholder="请选择所属辖区">
+                  <el-option v-for="(i, index) in jusicList" :key="`juris${index}`" :label="i" :value="i"></el-option>
+                </el-select>
+              </el-form-item>
             </el-col>
             <!-- <el-col :span="24" class="title"> 详细信息 </el-col>
             <el-col :span="24" class="info"> 111 </el-col> -->
@@ -42,6 +47,7 @@
 </template>
 
 <script>
+import { jusic } from '@common/dict/index';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: mapMechanism } = createNamespacedHelpers('mechanism');
 export default {
@@ -62,7 +68,9 @@ export default {
         email: [{ required: true, message: '请输入电子邮箱', trigger: 'blur' }],
         address: [{ required: true, message: '请输入联系地址', trigger: 'blur' }],
         profession: [{ required: true, message: '请输入所属行业', trigger: 'blur' }],
+        juris: [{ required: true, message: '请选择所属辖区', trigger: 'blur' }],
       },
+      jusicList: jusic,
     };
   },
   created() {},

src/views/service/ticket.vue

@@ -10,15 +10,40 @@
             <el-col :span="24" class="text">环南湖科创先导区双创服务平台-高企申报服务</el-col>
             <el-col :span="24" class="dwon">
               <el-form :model="form" :rules="rules" ref="form" label-width="100px">
-                <el-form-item label="法人复印件" prop="qyfr">
-                  <e-upload url="/files/cysci/qyfr_file/upload" :limit="1" v-model="form.qyfr" type="text"></e-upload>
-                </el-form-item>
-                <el-form-item label="企业营业执照" prop="yyzz">
-                  <e-upload url="/files/cysci/yyzz_file/upload" :limit="1" v-model="form.yyzz" type="text"></e-upload>
-                </el-form-item>
-                <el-form-item label="企业利润表" prop="qylr">
-                  <e-upload url="/files/cysci/qylr_file/upload" :limit="1" v-model="form.qylr" type="text"></e-upload>
-                </el-form-item>
+                <el-row>
+                  <el-col :span="24" class="title"> 资质资料 </el-col>
+                  <el-col :span="24" class="info">
+                    <el-form-item label="法人复印件" prop="qyfr">
+                      <e-upload url="/files/cysci/qyfr_file/upload" :limit="1" v-model="form.qyfr" type="text"></e-upload>
+                    </el-form-item>
+                    <el-form-item label="企业营业执照" prop="yyzz">
+                      <e-upload url="/files/cysci/yyzz_file/upload" :limit="1" v-model="form.yyzz" type="text"></e-upload>
+                    </el-form-item>
+                    <el-form-item label="企业利润表" prop="qylr">
+                      <e-upload url="/files/cysci/qylr_file/upload" :limit="1" v-model="form.qylr" type="text"></e-upload>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="24" class="title">信息资料</el-col>
+                  <el-col :span="24" class="info">
+                    <el-form-item label="中介机构" prop="mechanism_id">
+                      <el-select v-model="form.mechanism_id" placeholder="请选择中介机构">
+                        <el-option v-for="(i, index) in mechanismList" :key="`mechanism${index}`" :value="i._id" :label="i.name"></el-option>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="法人复印件" prop="mqyfr">
+                      <e-upload url="/files/cysci/qyfr_file/upload" :limit="1" v-model="form.mqyfr" type="text"></e-upload>
+                    </el-form-item>
+                    <el-form-item label="企业营业执照" prop="myyzz">
+                      <e-upload url="/files/cysci/yyzz_file/upload" :limit="1" v-model="form.myyzz" type="text"></e-upload>
+                    </el-form-item>
+                    <el-form-item label="企业利润表" prop="mqylr">
+                      <e-upload url="/files/cysci/qylr_file/upload" :limit="1" v-model="form.mqylr" type="text"></e-upload>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+
                 <el-col :span="24" class="formBtn">
                   <el-button type="danger" size="mini" @click="back">取消申请</el-button>
                   <el-button type="primary" size="mini" @click="onSubmit('form')">提交申请</el-button>
@@ -36,6 +61,7 @@
 const _ = require('lodash');
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: ticket } = createNamespacedHelpers('ticket');
+const { mapActions: mechanism } = createNamespacedHelpers('mechanism');
 export default {
   name: 'ticket',
   props: {},
@@ -46,23 +72,32 @@ export default {
         qyfr: [],
         yyzz: [],
         qylr: [],
+        mqyfr: [],
+        myyzz: [],
+        mqylr: [],
       },
       rules: {},
+      mechanismList: [],
     };
   },
-  created() {},
+  created() {
+    this.getOtherList();
+  },
   methods: {
     ...ticket(['create']),
+    ...mechanism(['query']),
     onSubmit(formName) {
       this.$refs[formName].validate(async (valid) => {
         if (valid) {
           const obj = { user_id: this.user._id };
           const material = this.resetData();
+          const medium_material = this.resetDataMM();
           if (material.length < 3) {
             this.$message.error('缺少所需资料');
             return;
           }
           obj.material = material;
+          obj.medium_material = medium_material;
           let res = await this.create(obj);
           if (this.$checkRes(res)) {
             this.$message({
@@ -93,6 +128,24 @@ export default {
       }
       return res;
     },
+    resetDataMM() {
+      let data = _.cloneDeep(this.form);
+      const arr = ['mqyfr', 'myyzz', 'mqylr'];
+      const res = [];
+      for (const key of arr) {
+        const e = data[key];
+        if (e.length <= 0) continue;
+        const head = _.head(e);
+        res.push(head);
+      }
+      return res;
+    },
+    async getOtherList() {
+      const res = await this.query();
+      if (this.$checkRes(res)) {
+        this.$set(this, 'mechanismList', res.data);
+      }
+    },
   },
   computed: {
     ...mapState(['user', 'menuParams']),
@@ -129,9 +182,21 @@ export default {
       border: 1px dashed #ccc;
       border-radius: 5px;
       .formBtn {
+        margin-top: 10px;
         text-align: center;
       }
     }
   }
 }
+.title {
+  font-weight: bold;
+  border-bottom: 1px dashed;
+  padding: 10px 0;
+  margin-bottom: 10px;
+}
+.info {
+  border: 1px solid #000;
+  border-radius: 5px;
+  padding: 10px;
+}
 </style>