From a6a8e49af8c8172f4209dd94e65f53f17825cc44 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期四, 21 十一月 2024 17:30:12 +0800
Subject: [PATCH] 项目管理

---
 src/layout/components/Register/index.vue |   64 ++++++++++++++++++++-----------
 1 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/src/layout/components/Register/index.vue b/src/layout/components/Register/index.vue
index ddd287b..afdc9b3 100644
--- a/src/layout/components/Register/index.vue
+++ b/src/layout/components/Register/index.vue
@@ -12,7 +12,7 @@
             <el-form-item prop="agency.name" label="机构名称">
               <el-input
                   :disabled="isAbleEdit"
-                  v-model="registerForm.agency.name"
+                  v-model.trim="registerForm.agency.name"
                   size="large"
                   placeholder="请输入机构名称"
               >
@@ -23,7 +23,7 @@
             <el-form-item prop="agency.creditCode" label="社会信用代码">
               <el-input
                   :disabled="isAbleEdit"
-                  v-model="registerForm.agency.creditCode"
+                  v-model.trim="registerForm.agency.creditCode"
                   size="large"
                   placeholder="请输入社会信用代码"
               >
@@ -55,7 +55,7 @@
           <el-col :span="12">
             <el-form-item prop="agency.address" label="实际经营地址">
               <el-input
-                  v-model="registerForm.agency.address"
+                  v-model.trim="registerForm.agency.address"
                   size="large"
                   placeholder="请输入实际经营地址"
               />
@@ -66,7 +66,7 @@
           <el-col :span="12">
             <el-form-item prop="agency.legalPerson" label="法定代表人">
               <el-input
-                  v-model="registerForm.agency.legalPerson"
+                  v-model.trim="registerForm.agency.legalPerson"
                   size="large"
                   placeholder="请输入法定代表人"
               />
@@ -75,7 +75,7 @@
           <el-col :span="12">
             <el-form-item prop="agency.legalPhone" label="法人电话">
               <el-input
-                  v-model="registerForm.agency.legalPhone"
+                  v-model.trim="registerForm.agency.legalPhone"
                   size="large"
                   placeholder="请输入法人电话"
               />
@@ -86,7 +86,7 @@
           <el-col :span="12">
             <el-form-item prop="agency.manager" label="机构负责人">
               <el-input
-                  v-model="registerForm.agency.manager"
+                  v-model.trim="registerForm.agency.manager"
                   size="large"
                   placeholder="请输入机构负责人"
               />
@@ -95,7 +95,7 @@
           <el-col :span="12">
             <el-form-item prop="agency.managerPhone" label="负责人电话">
               <el-input
-                  v-model="registerForm.agency.managerPhone"
+                  v-model.trim="registerForm.agency.managerPhone"
                   size="large"
                   placeholder="请输入负责人电话"
               />
@@ -106,7 +106,7 @@
           <el-col :span="8">
             <el-form-item prop="agency.certNumber" label="资质证书编号">
               <el-input
-                  v-model="registerForm.agency.certNumber"
+                  v-model.trim="registerForm.agency.certNumber"
                   size="large"
                   placeholder="请输入资质证书编号"
               />
@@ -115,7 +115,7 @@
           <el-col :span="8">
             <el-form-item prop="agency.issueDate" label="发证日期">
               <el-date-picker
-                  v-model="registerForm.agency.issueDate"
+                  v-model.trim="registerForm.agency.issueDate"
                   type="date"
                   placeholder="请选择发证日期"
                   value-format="YYYY-MM-DD 00:00:00"
@@ -127,7 +127,7 @@
           <el-col :span="8">
             <el-form-item prop="agency.validDate" label="有效日期">
               <el-date-picker
-                  v-model="registerForm.agency.validDate"
+                  v-model.trim="registerForm.agency.validDate"
                   type="date"
                   placeholder="请选择有效日期"
                   value-format="YYYY-MM-DD 00:00:00"
@@ -153,7 +153,7 @@
           <el-col :span="8">
             <el-form-item prop="agency.assetValue" label="固定资产总值">
               <el-input
-                  v-model="registerForm.agency.assetValue"
+                  v-model.trim="registerForm.agency.assetValue"
                   type="number"
                   size="large"
                   placeholder="请输入固定资产总值"
@@ -164,7 +164,7 @@
             <el-form-item prop="agency.workArea" label="工作场所建筑面积">
               <el-input
                   type="number"
-                  v-model="registerForm.agency.workArea"
+                  v-model.trim="registerForm.agency.workArea"
                   size="large"
                   placeholder="请输入工作场所建筑面积"
               ><template #append>㎡</template></el-input>
@@ -174,7 +174,7 @@
             <el-form-item prop="agency.archiveArea" label="档案室面积">
               <el-input
                   type="number"
-                  v-model="registerForm.agency.archiveArea"
+                  v-model.trim="registerForm.agency.archiveArea"
                   size="large"
                   placeholder="请输入档案室面积"
               ><template #append>㎡</template></el-input>
@@ -185,7 +185,7 @@
           <el-col :span="8">
             <el-form-item prop="agency.regAddress" label="注册地址">
               <el-input
-                  v-model="registerForm.agency.regAddress"
+                  v-model.trim="registerForm.agency.regAddress"
                   size="large"
                   placeholder="请输入注册地址"
               />
@@ -205,8 +205,8 @@
           </el-col>
         </el-row>
         <el-row :gutter="30">
-          <el-col :span="8">
-            <el-form-item prop="agency.reportPath" label="加盖公章的《机构信息上报表》">
+          <el-col :span="24">
+            <el-form-item prop="agency.reportPath" label="加盖公章的《机构信息上报表》(请上传加盖公章的营业执照)">
               <!--              <el-upload-->
               <!--                  v-model:file-list="state.fileList"-->
               <!--                  class="upload-demo"-->
@@ -319,6 +319,7 @@
 import { Base64 } from 'js-base64'
 import {getAgencyById} from "../../../api/sysUsers";
 import Cookies from "js-cookie";
+import {getInstitutionDetail} from "@/api/backManage/insitution";
 const emit = defineEmits(["getList"]);
 
 const props = {
@@ -520,10 +521,11 @@
   // });
 })
 const isAbleEdit = ref(false);
+const isReject = ref(false);
 const openDialog=(type, value)=>{
-  state.title = type === 'add' ? '新增/注册' : type ==='edit' ? '编辑' : '查看' ;
-    getArea()
-  if(type === 'edit' || type == 'view') {
+  state.title = type === 'add' ? '新增/注册' : (type ==='edit' || type ==='reject') ? '编辑' : '查看' ;
+  getArea()
+  if(type === 'edit' || type == 'view' || type ==='reject') {
     state.registerForm.id = value.id
     state.registerForm.username = value.username
     state.registerForm.phone = value.phone
@@ -544,7 +546,8 @@
           }
         }
         getArea()
-
+        state.registerForm.phone = info.user.phone
+        startPhone.value = info.user.phone
         state.registerForm.agency.business = info.business.split(',').map(Number)
           if(state.registerForm.agency.attribute === 0){
               state.registerForm.agency.area = [info.city,info.district].filter(item => { return item && item.trim() })
@@ -560,6 +563,7 @@
             state.certList = imgUrl ? imgUrl.split(',').map(url => {return {url} }) : []
           }
 
+
       }else{
         ElMessage.warning(res.message)
       }
@@ -567,8 +571,12 @@
     if(type == 'view'){
       state.isView = true
     }
+    if(type === 'reject'){
+      isReject.value = true;
+    }
   }
   dialogVisible.value = true
+  console.log('state.registerForm',state.registerForm)
 }
 
 const validKey=(key,obj)=>{
@@ -607,6 +615,10 @@
 }
 
 const changeAttr=()=>{
+  state.registerForm.agency.area = []
+  state.registerForm.agency.province = ''
+  state.registerForm.agency.city = ''
+  state.registerForm.agency.district  = ''
   getArea()
 }
 
@@ -652,6 +664,9 @@
 }
 
 const handleRemove = async (file, uploadFiles,type) => {
+  if(file && file.status == 'success'){
+
+
   let path = '';
   if(type === '上报表'){
     path = state.registerForm.agency.reportPath;
@@ -669,6 +684,7 @@
       type: 'warning',
       message: res.message
     })
+  }
   }
 }
 
@@ -712,8 +728,10 @@
       }else {
           const {confirmPassword, ...data} = JSON.parse(JSON.stringify(state.registerForm))
           data.password = Base64.encode(data.password)
-          console.log('data',data)
           data.agency.business = data.agency.business.join(',')
+          if(isReject.value) {
+            data.state = 1;
+          }
           // delete data.agency.area
           console.log('data',data)
           editAgency(data).then(res => {
@@ -722,7 +740,7 @@
                       type: 'success',
                       message: '编辑成功'
                   })
-                  emit("getList")
+
                   dialogVisible.value = false
                   state.registerForm.agency.attribute = 0
                   proxy.$refs.registerRef.resetFields()
@@ -730,7 +748,7 @@
                   state.fileList = []
                   state.certList = []
                   loading.value = false
-
+                emit("getList")
               }else{
                   ElMessage({
                       type: 'warning',

--
Gitblit v1.9.2