Merge branch 'master' of https://gitee.com/dmc_qq/etc-project into master

src/views/fancongcong/corporateaccountManage/corporateaccountManage.vue

@@ -42,7 +42,6 @@
         <el-form-item label="公司名称">
           <el-input v-model="formInline.user" placeholder="公司名称"/>
         </el-form-item>
-
         <el-form-item>
           <el-button :icon="Search" type="primary" @click="search">查询</el-button>
           <el-button type="info" @click="resive">重置</el-button>
@@ -50,7 +49,7 @@
         </el-form-item>
       </el-form>
     </div>
-    <el-table :data="tableData" border style="width: 100%" class="table_box" stripe>
+    <el-table :data="tableData" border style="width: 100%" class="table_box" stripe @row-click="getDetil">
       <el-table-column prop="id" label="序号" width="100px"/>
       <el-table-column prop="accountId" label="对公账户资金账户编号"/>
       <el-table-column prop="corporateName" label="公司名称"/>
@@ -60,6 +59,8 @@
       <el-table-column prop="confirmStaffId" label="审核人员"/>
       <el-table-column prop="confirmTime" label="审核时间"/>
       <el-table-column label="操作" class="table_btn" width="350px" align="center">
+        <!--<template v-slot="scppe">
+        <template>-->
         <el-tooltip content="驳回" placement="top">
           <el-button type="warning" @click="опровергать">驳回审核</el-button>
         </el-tooltip>
@@ -67,27 +68,27 @@
           <el-button type="warning" @click="agree">审核通过</el-button>
         </el-tooltip>
         <el-tooltip content="详细" placement="top">
-          <el-button type="warning" @click="dialogFormVisible = true">查看详细</el-button>
+          <el-button type="warning" @click="getDetil">查看详细</el-button>
         </el-tooltip>
       </el-table-column>
     </el-table>
 
     <div class="page_box">
-      <el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="1000"/>
+      <el-pagination :page-size="pageSize" :pager-count="15" layout="prev, pager, next" :total="pageCount"/>
     </div>
 
-    <el-dialog v-model="dialogFormVisible" :title="title">
+    <el-dialog v-model="dialogFormVisible" :title="title" :show-close="false">
       <el-form :model="form" v-if="form.delivery">
         <el-form-item label="手机号" :label-width="formLabelWidth">
           <el-input v-model="form.phone" autocomplete="off" disabled/>
         </el-form-item>
-        <el-form-item label="验证码" label-width="formLabelWidth">
+        <el-form-item label="验证码" :label-width="150">
           <div class="as-layout-horizontal">
-            <el-input v-model="form.region"/>
+            <el-input v-model="form.region" />
             <el-button
               type="primary"
               @click="getPhone"
-              :disabled="codetext.length == 2"
+              :disabled="codetext != '获取验证码'"
             >{{codetext}}</el-button>
           </div>
         </el-form-item>
@@ -144,7 +145,7 @@
             fit="cover"
           />
         </el-form-item>
-        <el-form-item label="公司营业执照" :label-width="formLabelWidth+50">
+        <el-form-item label="公司营业执照" :label-width="600">
           <el-image
             style="width: 100px; height: 100px"
             :src="form.colicense"
@@ -174,11 +175,25 @@
       </el-form>
       <template #footer>
         <span class="dialog-footer">
-          <el-button type="primary" @click="dialogFormVisible = false">取消</el-button>
+          <el-button type="primary" @click="dialogFormVisible = false">关闭</el-button>
           <el-button type="primary" @click="regcode">确定</el-button>
         </span>
       </template>
     </el-dialog>
+
+     <el-dialog v-model="dialogFormVisibles" title="驳回申请">
+        <el-form :model="form">
+          <el-form-item label="驳回原因" :label-width="formLabelWidth">
+            <el-input v-model="form.data_msg" autocomplete="off" placeholder="请输入驳回原因"/>
+          </el-form-item>
+        </el-form>
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="dialogFormVisibles = false">关闭</el-button>
+            <el-button type="primary" @click="getMsg">确定</el-button>
+          </span>
+        </template>
+  </el-dialog>
   </div>
 </template>
 
@@ -189,7 +204,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref ,getCurrentInstance, onMounted } from 'vue'
 
 //变量定义
-let form = reactive({
+let form = ref({
   phone: '13078580843', //手机号
   region: '123', //验证码
   delivery: true, //默认显示获取验证码，false显示详细
@@ -210,15 +225,22 @@ let form = reactive({
   colicense: '', //公司营业执照
   coauthorization: '', //授权书
   idImgOne: '', //被委托人身份证正面照
-  idImgTwo: '' //被委托人身份证反面照
+  idImgTwo: '', //被委托人身份证反面照
+  data_id:"",//获取详细信息所点击的数据的id
+  data_msg:''//驳回原因
 })
-const formInline = reactive({
+const formInline = ref({
   user: '',
   region: '123',
-  number: '' //资金编号
+  number: '',//资金编号
+  coNumber:'', //
 })
 let title = ref('对公账户信息')
-const options = [
+let pageSize = ref(20);//显示每页条数
+let pageCount = ref(1);//总页数
+let pageNo = ref(1);//当前页
+let clickType = ref(0);//点击事件类型 0.驳回审核 1.审核通过 3.查看详细
+const options = ref( [
   {
     value: '',
     label: '全部'
@@ -239,9 +261,9 @@ const options = [
     value: '2',
     label: '待修改初始密码'
   }
-]
+])
 let codetext = ref('获取验证码')
-let setTime = ref(null)
+let setTime = ref(null)//
 let start_time = ref('') //申请选择开始时间
 let end_time = ref('') //申请选择结束时间
 let cтатус_счета = ref('') //账号状态
@@ -252,7 +274,7 @@ let dialogFormVisible = ref(false)
 let formLabelWidth = '140px'
 let dialogFormVisibles = ref(false)
 const { proxy } = getCurrentInstance();
-const optiones = [
+const optiones = ref([
   {
     value: '2',
     label: '2'
@@ -273,7 +295,7 @@ const optiones = [
     value: '30',
     label: '30'
   }
-]
+])
 const defaultTime = new Date(2000, 1, 1, 12, 0, 0)
 const shortcuts = [
   {
@@ -297,8 +319,7 @@ const shortcuts = [
     }
   }
 ]
-
-const tableData = [
+let tableData:any = ref([
    {
     accountId: 'HIJYVSGSK',
 	agentName: '杨杰',
@@ -315,7 +336,7 @@ const tableData = [
 	status: 0,
 	uploadTime: '2009/09/05 11:28:06'
   }
-]
+])
 
 //事件处理
 const onSubmit = () => {
@@ -323,16 +344,30 @@ const onSubmit = () => {
 }
 //同意申请
 const agree = (id: any) => {
+  dialogFormVisible.value = false;
   ElMessageBox.confirm('确定通过这个申请?', '警告', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning'
   })
-    .then(() => {
-      ElMessage({
-        type: 'success',
-        message: '操作成功！'
-      })
+  .then(() => {
+        proxy.$request.post('/corporateaccount/confirm', {}, {
+          baseURL: 'http://localhost:8089',
+          id:form.data_id,
+         // message:form.data_msg,
+          value:0
+        }).then((res) => {
+             console.log(res,form.data_id,form.value);
+            if(res.data.success){
+                ElMessage({
+                type: 'success',
+                message: '操作成功！'
+              })
+              getList()
+            }
+        }).catch((err) => {
+            console.log(err);
+        })
     })
     .catch(() => {
       ElMessage({
@@ -343,16 +378,14 @@ const agree = (id: any) => {
 }
 //驳回申请
 const опровергать = (id: any) => {
+  dialogFormVisible.value = false;
   ElMessageBox.confirm('确定驳回这个申请?', '警告', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning'
   })
     .then(() => {
-      ElMessage({
-        type: 'success',
-        message: '操作成功！'
-      })
+      dialogFormVisibles.value = true;
     })
     .catch(() => {
       ElMessage({
@@ -361,10 +394,30 @@ const опровергать = (id: any) => {
       })
     })
 }
-//验证码60s倒计时
+//驳回申请原因
+const getMsg=()=>{
+  proxy.$request.post('/corporateaccount/confirm', {}, {
+        baseURL: 'http://localhost:8089',
+        id:form.data_id,
+        message:form.data_msg,
+        value:1
+    }).then((res) => {
+        console.log(res,form.data_id,form.value.data_msg);
+        if(res.data.success){
+            ElMessage({
+            type: 'success',
+            message: '操作成功！'
+          })
+          dialogFormVisibles.value = false;
+          getList()
+        }
+    }).catch((err) => {
+        console.log(err);
+    })
+}
 //验证码60s倒计时
 const startime = () => {
-  console.log('st', codetext)
+// console.log('st', codetext)
   if (parseInt(time) == 0) {
     codetext.value = '获取验证码'
     time = 60
@@ -372,25 +425,28 @@ const startime = () => {
   } else {
     time--
     codetext.value = time.toString() + 's'
-    console.log('t2', time, codetext)
+   // console.log('t2', time, codetext)
     setTime = setTimeout(function() {
       startime()
     }, 1000)
   }
 }
 //发送验证码
-const getPhone = (id) => {
+const getPhone = (id:Number) => {
   if(form.region != '') {
-	 proxy.$request.post('/corporateaccount/send', {id:id}, {
-        baseURL: 'http://localhost:8085'
+	 proxy.$request.post('/corporateaccount/send', {}, {
+        baseURL: 'http://localhost:8089',
+        id:id
     }).then((res) => {
         console.log(res);
+        if(res.data.success){
+            codetext.value = 60 + 's'
+             time = 60
+            startime()
+        }
     }).catch((err) => {
         console.log(err);
     })
-    codetext.value = 60 + 's'
-    time = 60
-    startime()
   } else {
     ElMessage({
       type: 'success',
@@ -401,17 +457,44 @@ const getPhone = (id) => {
 //查询
 const search = () => {
   console.log('查询')
+  let data = {
+	  accountId:formInline.number,
+	  bankCardId:"",
+	  corporateIdNum:formInline.number,
+	  corporateName: formInline.user,
+	  endApplyTime:end_time,
+	  pageNo:pageNo,
+	  pageSize:номер,
+	  startApplyTime:start_time,
+    status:cтатус_счета,
+    baseURL:'http://localhost:8089',
+  }
+  /* = '';
+  cтатус_счета.value = '';
+  номер.value = '';
+  = '';
+   = '';
+ = '';*/
+ console.log("date",data)
+  proxy.$request.post('/corporateaccount/queryPage', {},data).then((res) => {
+        console.log(res);
+        if(res.data.success){
+            
+        }
+    }).catch((err) => {
+        console.log(err,form.delivery);
+    })
 }
 //重置
 const resive = () => {
   console.log('重置')
-  start_time = ''
-  end_time = ''
-  cтатус_счета = ''
-  номер = ''
-  formInline.number = ''
-  formInline.coNumber = ''
-  formInline.user = ''
+  start_time.value = '';
+  end_time.value = '';
+  cтатус_счета.value = '';
+  номер.value = '';
+  formInline.value.number= '';
+  formInline.value.coNumber = '';
+  formInline.value.user= '';
 }
 //导出
 const drow = () => {
@@ -422,43 +505,70 @@ const regcode = () => {
   if (form.delivery) {
     //dialogFormVisible = false;
     //dialogFormVisibles = true;
-    console.log('heyan', dialogFormVisible, dialogFormVisibles)
-    //验证码核验
-	form.delivery = false
-	if(form.region == resCode){
-
-	}
+    console.log('heyan')
+    
   } else {
     //展示详细
-	dialogFormVisible.value = false
-	proxy.$request.post('/corporateaccount/queryId', {id:id}, {
-        baseURL: 'http://localhost:8085'
+	  //dialogFormVisible.value = false
+    console.log("00")
+    clearTimeout(setTime)
+    codetext.value = '获取验证码'
+    proxy.$request.post('/corporateaccount/check', { }, {
+        baseURL:'http://localhost:8089',
+        id:form.data_id,
+        verifyCode:form.region
     }).then((res) => {
         console.log(res);
+        if(res.data.success){
+            form.value.delivery = false
+            console.log("de",form.delivery);
+              /*proxy.$request.post('/corporateaccount/queryId', {}, {
+                  baseURL: 'http://localhost:8089',
+                  id:form.data_id
+              }).then((res) => {
+                  console.log(res);
+              }).catch((err) => {
+                  console.log(err);
+              })*/
+        }
     }).catch((err) => {
-        console.log(err);
+        console.log(err,form.delivery);
     })
+
   }
 }
 
  onMounted(() => {
-//      proxy.$request.post('api/corporateaccount/queryPage', {}, {
-//         baseURL: 'http://localhost:8089'
-//     }).then((res) => {
-//         console.log(res);
-//     }).catch((err) => {
-//         console.log(err);
-//     })
+  getList()
+  })
+
+  //获取详细信息，打开弹窗
+  const getDetil=(val)=>{
+   // form.value.data_id = id;
+    dialogFormVisible.value = true;
+    try {
+      form.data_id = val.id;
+      console.log("dedil_id",form.data_id);
+    } catch (error) {
+      
+    }
+  } 
 
-	proxy.$request.post('/corporateaccount/queryPage', {}, {
+  //获取查询数据
+  const getList = ()=>{
+    proxy.$request.post('/corporateaccount/queryPage', {}, {
         baseURL:'http://localhost:8089',
     }).then((res) => {
-        console.log(res);
+        console.log(res.data.result,res.data.success);
+		if(res.data.success){
+			tableData.value = res.data.result
+			console.log("res",tableData)
+			pageCount.value = res.data.pageCount;
+		}
     }).catch((err) => {
         console.log(err);
     })
-
- })
+  }
 
 </script>