From fe78120a79d0efe95c9554d10713096c2ccb563d Mon Sep 17 00:00:00 2001
From: rose <1942951600@qq.com>
Date: Tue, 11 May 2021 15:47:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E9=A9=BB=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  8 ++--
 src/components/EntityApply/EntityApplyAdd.vue | 43 +++++++++----------
 .../EntityApply/EntityApplyEdit.vue           | 37 +++++++++++++---
 .../EntityApply/EntityApplySearch.vue         | 11 +++--
 4 files changed, 62 insertions(+), 37 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 271b478..efacbee 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,7 @@
 <template>
   <a-config-provider :locale="zh_CN">
     <div class="d-flex flex-row flex-nowrap" id="app">
-      <btn-con />
+      <btn-con /> 
       <router-view class="flex-1 bg pa-3"></router-view>
     </div>
   </a-config-provider>
@@ -13,12 +13,10 @@ import zh_CN from 'ant-design-vue/lib/locale-provider/zh_CN';
 import BtnCon from 'components/BtnCom/BtnCon.vue';
 
 export default {
-  name: 'app',
+  name: 'App',
   components: { BtnCon },
   data() {
-    return {
-      zh_CN,
-    };
+    return {zh_CN,};
   },
 
   computed: mapState(['anyringToken', 'ptProps']),
diff --git a/src/components/EntityApply/EntityApplyAdd.vue b/src/components/EntityApply/EntityApplyAdd.vue
index 408c95d..9672ea6 100644
--- a/src/components/EntityApply/EntityApplyAdd.vue
+++ b/src/components/EntityApply/EntityApplyAdd.vue
@@ -101,31 +101,15 @@
           <a-input placeholder="请输入申请人职务..." v-model.trim="platform.position" />
         </a-form-item>
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="联系电话" required>
-          <a-input @change="changePhone" placeholder="请输入联系电话.." type="tel" v-decorator="['tel', { rules: phoneRules }]" />
+          <a-input @change="changePhone" placeholder="请输入联系电话.." type="tel" v-decorator="['tel', { rules: phoneRules,initialValue: platform.tel }]" />
         </a-form-item>
-        <!-- <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="图片验证码" required>
-          <div class="d-flex flex-nowrap">
-            <a-input placeholder="图片验证码" type="number" v-model="codeNum" />
-            <img :src="picCode.imageBase64" @click="changePicCode" class="code_img ml-2" v-if="picCode && picCode.imageBase64" />
-            <a-button @click="changePicCode" class="code_img ml-2" size="small" v-else>获取验证码</a-button>
-          </div>
-        </a-form-item> -->
-        <!-- <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="短信验证码" required>
-          <div class="d-flex flex-nowrap">
-            <a-input placeholder="请输入验证码" type="number" v-model="platform.code" />
-            <a-button class="code_img ml-2" disabled type="primary" v-if="showInterval">重新发送 {{ interval }}</a-button>
-            <a-button :disabled="platform.isTel === false" @click="getCode" class="code_img ml-2" type="primary" v-else
-              >获取验证码</a-button
-            >
-          </div>
-        </a-form-item> -->
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="电子邮箱">
           <!-- 电子邮箱 -->
-          <a-input @change="changeEamil" placeholder="请输入电子邮箱..." type="email" v-decorator="['email', { rules: emailRules }]" />
+          <a-input @change="changeEamil" placeholder="请输入电子邮箱..." type="email" v-decorator="['email', { rules: emailRules,initialValue: platform.email }]" />
         </a-form-item>
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="身份证号" required>
           <!-- 身份证号 -->
-          <a-input @change="changeIdCard" placeholder="请输入身份证号..." v-decorator="['idCard', { rules: idCardRules }]" />
+          <a-input @change="changeIdCard" placeholder="请输入身份证号..." v-decorator="['idCard', { rules: idCardRules,initialValue: platform.idCard }]" />
         </a-form-item>
       </a-form>
       <a-steps :current="current">
@@ -230,6 +214,7 @@ export default {
       codeNum: '',
       showInterval: false,
       codeTimer: null,
+      filesUpload: [],
       interval: 120, // 验证码有效时间倒计时
     };
   },
@@ -346,7 +331,7 @@ export default {
           this.$message.error('请输入身份证号');
         } else {
           for (var i = 0; i < this.fileList.length; i++) {
-            this.platform.files = this.platform.files.concat(this.fileList[i].response.data[0].id);
+            this.filesUpload = this.filesUpload.concat(this.fileList[i].response.data[0].id);
           }
           this.addSettled();
         }
@@ -362,7 +347,7 @@ export default {
             company: this.platform.company,
             electricDesign: this.platform.electricDesign,
             email: this.platform.email,
-            fileList: this.platform.files,
+            fileList: this.filesUpload,
             friendCompany: this.platform.friendCompany,
             gender: this.platform.sex,
             idCard: this.platform.idCard,
@@ -390,7 +375,6 @@ export default {
         // console.log(res);
         const { code, msg, data } = res.data;
         if (code === 200) {
-          this.$message.success('申请成功');
           this.visible = false;
           this.confirmLoading = false;
           for (let key in this.platform) {
@@ -398,7 +382,20 @@ export default {
           }
           this.platform.isTel = false;
           this.platform.isEmail = false;
-          this.platform.isIdCard = false;
+          this.platform.isIdCard =false;
+          this.platform.buildTime= 0 // 成立时间（时间戳）       
+          this.platform.registerMoney= 0 // 注册资金
+          this.platform.staffCount= 0 // 员工人数
+          this.platform.resarchStaff= 0 // 研发人数
+          this.platform.juniorCollege =0 // 大专以上人员
+          this.platform.businessIncome = 0 // 营业收入
+          this.platform.productTech= 0 // 产品阶段
+          this.platform.patentApply= 0 // 申请专利数
+          this.platform.patentGrented= 0 // 授权专利数
+          this.platform.patentInvent= 0 // 发明专利数
+          this.platform.sex = 1
+          this.$emit('getData');
+          this.$message.success('申请成功');
         } else {
           throw msg;
           // console.log('失败1');
diff --git a/src/components/EntityApply/EntityApplyEdit.vue b/src/components/EntityApply/EntityApplyEdit.vue
index 7ee66c9..c47aee9 100644
--- a/src/components/EntityApply/EntityApplyEdit.vue
+++ b/src/components/EntityApply/EntityApplyEdit.vue
@@ -78,6 +78,13 @@
           <a-input placeholder="请输入合作单位..." v-model.trim="platform.friendCompany" />
         </a-form-item>
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="上传附件">
+          <div v-if="editData.picUrl" class="d-flex align-end">
+            <img :src="editData.picUrl" style="height:100px;" alt=""> 
+            <div>
+              <a-icon @click="deleteFileList" class="ml-5" type="close-circle" />
+            </div>
+            
+          </div>
           <a-upload
             :action="action"
             :before-upload="beforeUpload"
@@ -89,7 +96,7 @@
             <p>1.营业执照复印件（尚无注册的无需梯控）</p>
             <p>2.法定代表或授权代表身份证复印件</p>
             <p>3.主导产品或技术简介</p>
-            <a-button> <a-icon type="upload" />点击上传附件 </a-button>
+            <a-button v-show="fileList.length - 0 === 0"><a-icon type="upload" />点击上传附件 </a-button>
           </a-upload>
         </a-form-item>
       </a-form>
@@ -112,15 +119,22 @@
           <a-input placeholder="请输入申请人职务..." v-model.trim="platform.position" />
         </a-form-item>
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="联系电话" required>
-          <a-input @change="changePhone" placeholder="请输入联系电话.." type="tel" v-decorator="['tel', { rules: phoneRules,initialValue: platform.phone }]" />
+          <a-input 
+            @change="changePhone" placeholder="请输入联系电话.." type="tel" 
+            v-decorator="['tel', { rules: phoneRules,initialValue: platform.phone }]" 
+            />
         </a-form-item>
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="电子邮箱">
           <!-- 电子邮箱 -->
-          <a-input @change="changeEamil" placeholder="请输入电子邮箱..." type="email" v-decorator="['email', { rules: emailRules,initialValue: platform.email }]" />
+          <a-input @change="changeEamil" placeholder="请输入电子邮箱..." type="email" 
+            v-decorator="['email', { rules: emailRules,initialValue: platform.email }]" 
+          />
         </a-form-item>
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="身份证号" required>
           <!-- 身份证号 -->
-          <a-input @change="changeIdCard" placeholder="请输入身份证号..." v-decorator="['idCard', { rules: idCardRules,initialValue: platform.idCard }]" />
+          <a-input @change="changeIdCard" placeholder="请输入身份证号..." 
+            v-decorator="['idCard', { rules: idCardRules,initialValue: platform.idCard }]" 
+          />
         </a-form-item>
       </a-form>
       <a-steps :current="current">
@@ -203,13 +217,26 @@ export default {
       if( this.platform.buildTime === null){
         this.platform.buildTime = 0
       }
+      //在这个地方来完成相关的上传附件回显
+      this.fileList.push(val.picUrl)
+
       console.log("========>",this.platform)
-      
+
 
     },
     
   },
   methods: {
+
+    // 删除fileList
+    deleteFileList(){
+      console.log("进入事件")
+
+      this.fileList = []
+      this.editData.picUrl = ''
+   
+
+    },
     beforeUpload(file) {
       return new Promise((resolve, reject) => {
         const isLt5M = file.size / 1024 / 1024 < 5;
diff --git a/src/components/EntityApply/EntityApplySearch.vue b/src/components/EntityApply/EntityApplySearch.vue
index 80fc42d..792eb87 100644
--- a/src/components/EntityApply/EntityApplySearch.vue
+++ b/src/components/EntityApply/EntityApplySearch.vue
@@ -17,7 +17,7 @@
     <!-- <a-button @click="showModal" class="editable-add-btn mb-3" type="primary">增加</a-button> -->
 
     <!-- 添加 -->
-    <entity-apply-add :visible="visible" @closeModal="closeModal" />
+    <entity-apply-add :visible="visible" @closeModal="closeModal" @getData="getData" />
   </div>
 </template>
 
@@ -26,9 +26,7 @@ import EntityApplyAdd from 'components/EntityApply/EntityApplyAdd.vue';
 
 export default {
   name: 'EntityApplySearch',
-  components: {
-    EntityApplyAdd,
-  },
+  components: {EntityApplyAdd,},
   data() {
     return {
       visible: false,
@@ -43,6 +41,11 @@ export default {
     };
   },
   methods: {
+
+    getData() {
+      this.$emit('entityApplicationSearch');
+    },
+
     handleChangeName(value) {
       console.log('value: ', value);
       this.companyName = value;