yyfang vor 3 Jahren
Ursprung
Commit
582ed3b2dd

+ 3 - 3
src/components/admin.vue

@@ -97,7 +97,7 @@
 		this.addTab("首页",'/admin/conSole')
 		},
 		created() {
-			this.getAccount()
+			this.getJgAccount()
 			this.lastTime = new Date().getTime() // 网页第一次打开时,记录当前时间
 			// 保证admin中的页面刷新后重置到/admin路由下
 			if (this.$route.path !== '/admin/conSole') this.$router.push('/admin/conSole')
@@ -164,8 +164,8 @@
 			this.menuList = data
 		},
 		methods: {
-			async getAccount() {
-				const result = await this.$http.post('getAccount')
+			async getJgAccount() {
+				const result = await this.$http.post('getJgAccount')
 				this.name = result.data.data.name
 				console.log(this.name)
 			},

+ 11 - 23
src/components/admin/getMonitor.vue

@@ -12,20 +12,8 @@
 		<div class="headSearch" >
 			<el-row :gutter="120" style="margin-right: 0px;">
 				<el-form :inline="true">
-                    <!-- <el-form-item label="组别"  size="small">
-                        <el-select v-model="queryInfo.groupname" style="width: 150px;" clearable>
-                            <el-option v-for="item in groupList" :key="item.value" :label="item.label" :value="item.label" ></el-option>
-                        </el-select>
-                    </el-form-item> -->
-
-                    <!-- <el-form-item label="机构性质" size="small">
-                        <el-select v-model="queryInfo.jgxz" style="width: 150px;" clearable>
-                            <el-option v-for="item in jxgzList" :key="item.value" :label="item.label" :value="item.value" ></el-option>
-                        </el-select>
-                    </el-form-item> -->
-
                     <el-form-item label="机构名称" size="small">
-                        <el-input v-model="queryInfo.name"></el-input>
+                        <el-input v-model="queryInfo.rymc"></el-input>
                     </el-form-item>
                     <!-- 查询 -->
                     <!-- <el-button  size="mini" style="height: 40px;margin-left: 10px;" type="success" @click="searchData()">查询</el-button> -->
@@ -45,13 +33,13 @@
 		    </el-table-column>
             
             <el-table-column :key="table.label" v-for="table in tableHeader" :label="table.label" :prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
-            <el-table-column prop="properties" label="机构性质" width="155" align="center">
-					<template slot-scope="scope">
+            <!-- <el-table-column prop="properties" label="机构性质" width="155" align="center"> -->
+					<!-- <template slot-scope="scope">
 						<div  v-if="scope.row.properties==1">政府部门</div>
 						<div  v-if="scope.row.properties==2">事业单位</div>
 						<div v-if="scope.row.properties==3">企业</div>
-					</template>
-				</el-table-column>
+					</template> -->
+				<!-- </el-table-column> -->
             <el-table-column label="操作" align="center" fixed="right"> 
                 <template slot-scope="scope">
                     <el-button style="margin:5px 0" type="text" size="medium" @click="readDialogVisible1(scope.row)">查看详情</el-button>
@@ -67,18 +55,18 @@
 		<el-dialog title="查看详情" :visible.sync="readDialogVisible" width="30%" :close-on-click-modal="false" class="dialogItem">
             <el-form v-if="readDialogVisible" :model="readForm" label-width="150px">
 
-                <el-form-item label="机构名称:" prop="name" class="labelItem">
+                <el-form-item label="机构名称:" prop="rymc" class="labelItem">
 					<div>{{readForm.name}}</div>
 				</el-form-item>
-                <el-form-item label="机构性质:" prop="jgxz" class="labelItem">
+                <!-- <el-form-item label="机构性质:" prop="jgxz" class="labelItem">
 					<div v-if="readForm.jgxz=='1'">政府部分</div>
 					<div v-else-if="readForm.level=='2'">事业单位</div>
 					<div v-else>企业</div>
-				</el-form-item>
-                <el-form-item label="组别:" prop="jgxz" class="labelItem">
-					<div v-if="readForm.groupname=='1'">省级监管单位</div>
+				</el-form-item> -->
+                <el-form-item label="组别:" prop="groupname" class="labelItem">
+					<!-- <div v-if="readForm.groupname=='1'">省级监管单位</div>
 					<div v-else-if="readForm.groupname=='2'">市级监管单位</div>
-					<div v-else>县级监管单位</div>
+					<div v-else>县级监管单位</div> -->
 				</el-form-item>
                 <el-form-item label="企业代码:" prop="qydm" class="labelItem">
 					<div>{{readForm.qydm}}</div>

+ 43 - 50
src/components/admin/getOrganization.vue

@@ -68,7 +68,7 @@
                 <el-form-item label="机构名称:" prop="name" class="labelItem">
 					<div>{{readForm.name}}</div>
 				</el-form-item>
-                <el-form-item label="依托单位:" prop="userJcjgProfile.dtRelyOnUnit" class="labelItem">
+                <el-form-item label="依托单位:" prop="dtRelyOnUnit" class="labelItem">
 					<div>{{readForm.dtRelyOnUnit}}</div>
 				</el-form-item>
                 <el-form-item label="审核状态:" prop="userJcjgProfile.flag" class="labelItem">
@@ -76,10 +76,10 @@
                     <div v-else>未通过</div>
 				</el-form-item>
                 	<el-form-item label="机构性质:" prop="userJcjgProfile.properties" class="labelItem">
-					<div v-if="readForm.properties=='1'">政府部分</div>
+					<!-- <div v-if="readForm.properties=='1'">政府部分</div>
 					<div v-else-if="readForm.properties=='2'">事业单位</div>
-					<div v-else>企业</div>
-				</el-form-item>
+					<div v-else>企业</div> -->
+				    </el-form-item>
                 <el-form-item label="统一社会信用代码:" prop="userJcjgProfile.dtCode" class="labelItem">
 					<div>{{readForm.dtCode}}</div>
 				</el-form-item>
@@ -162,7 +162,7 @@ export default {
                 width: 230
 			},{
                 label: '依托单位',
-                prop: 'userJcjgProfile.dtRelyOnUnit',
+                prop: 'dtRelyOnUnit',
                 width: 180
 			},
             // {
@@ -170,29 +170,25 @@ export default {
             //     prop: 'dtCode',
             //     width: 180
             // },
-            {
-                label: '法人姓名',
-                prop: 'userJcjgProfile.user_fa',
-                width: 100
-            },{
+           {
                 label: 'cma证书编码',
-                prop: 'userJcjgProfile.cma_code',
+                prop: 'cma_code',
                 width: 150
             },{
-                label: 'mara证书编码',
-                prop: 'userJcjgProfile.mara_code',
-                width: 140
+                label: '农业农村部认可编号',
+                prop: 'mara_code',
+                width: 160
             },{
                 label: '机构性质',
-                prop: 'properties',
+                prop: 'jgxz',
                 width: 150
             },{
                 label: '产品范围',
-                prop: 'userJcjgProfile.cpfw',
+                prop: 'cpfw',
                 width: 150
             },{
                 label: '认证参数数量',
-                prop: 'userJcjgProfile.canshu',
+                prop: 'canshu',
                 width: 150
             }
         ],
@@ -208,17 +204,17 @@ export default {
                 value: '3',
                 label: '县级'
             }],
-        jxgzList: [
-            {
-                value: '1',
-                label: '政府部门'
-            }, {
-                value: '2',
-                label: '事业单位'
-            }, {
-                value: '3',
-                label: '企业'
-            }],
+        // jxgzList: [
+        //     {
+        //         value: '1',
+        //         label: '政府部门'
+        //     }, {
+        //         value: '2',
+        //         label: '事业单位'
+        //     }, {
+        //         value: '3',
+        //         label: '企业'
+        //     }],
          cpfwList: [
             {
                 value: '1',
@@ -247,15 +243,15 @@ export default {
             this.tableData = res.data.rows
             this.total = res.data.total
             console.log(this.tableData) 
-            for(let i= 0; i < this.tableData.length; i++) {
-                if (this.tableData[i].properties == 1){
-                      this.tableData[i].properties ='政府部门';
-                }else if(this.tableData[i].properties == 2){
-                    this.tableData[i].properties ='事业单位';
-                }else{
-                     this.tableData[i].properties ='企业';
-                }
-            }
+            // for(let i= 0; i < this.tableData.length; i++) {
+            //     if (this.tableData[i].properties == 1){
+            //           this.tableData[i].properties ='政府部门';
+            //     }else if(this.tableData[i].properties == 2){
+            //         this.tableData[i].properties ='事业单位';
+            //     }else{
+            //          this.tableData[i].properties ='企业';
+            //     }
+            // }
         },
         //查询
         async searchData(){
@@ -303,21 +299,18 @@ export default {
 			// 查看主体信息详情
 			async readDialogVisible1(row) {
                 this.readForm.name = row.name
-                this.readForm.dtRelyOnUnit = row.userJcjgProfile.dtRelyOnUnit
-                this.readForm.flag = row.userJcjgProfile.flag
-                this.readForm.dtCode = row.userJcjgProfile.dtCode
-                this.readForm.address = row.userJcjgProfile.address
-                this.readForm.user_fa = row.userJcjgProfile.user_fa
-                this.readForm.zipcode = row.userJcjgProfile.zipcode
-                this.readForm.user_js = row.userJcjgProfile.user_js
-                this.readForm.user_zl = row.userJcjgProfile.user_zl
+                this.readForm.dtRelyOnUnit = row.dtRelyOnUnit
+                this.readForm.flag = row.flag
+                this.readForm.dtCode = row.dtCode
+                this.readForm.address = row.address
                 this.readForm.catl_code = row.catl_code
                 this.readForm.calt_expiration = row.calt_expiration
-                this.readForm.cma_code = row.userJcjgProfile.cma_code
-                this.readForm.cma_expiration = row.userJcjgProfile.cma_expiration
-                this.readForm.cpfw = row.userJcjgProfile.cpfw
-                this.readForm.shuliang = row.userJcjgProfile.shuliang
-                this.readForm.canshu = row.userJcjgProfile.canshu
+                this.readForm.cma_code = row.cma_code
+                this.readForm.cma_expiration = row.cma_expiration
+                this.readForm.cpfw = row.cpfw
+                this.readForm.shuliang = row.shuliang
+                this.readForm.canshu = row.canshu
+                this.readForm.jgxz = row.jgxz
 				// console.log(this.readForm.dtRelyOnUnit)
 				this.readDialogVisible = true
 

+ 45 - 22
src/components/admin/putAccount.vue

@@ -10,30 +10,39 @@
 		</div>
 
 		<el-form :model="form" label-width="100px">
-			<el-form-item label="登录账号" prop="form.username" required>
-				<el-input v-model="form.username"></el-input>
+			<el-form-item label="登录账号" prop="form.rybh" required>
+				<el-input v-model="form.rybh" ></el-input>
 			</el-form-item>
-			<el-form-item label="用户名称" prop="form.name" required>
-				<el-input v-model="form.name" ></el-input>
+			<el-form-item label="密码" prop="form.kl" required>
+				<el-input v-model="form.kl" :disabled="true"></el-input>
 			</el-form-item>
-            <el-form-item label="别名" prop="form.name_other" required>
-				<el-input v-model="form.name_other"></el-input>
+			<el-form-item label="新密码" prop="form.new_password" >
+				<el-input v-model="form.new_password" ></el-input>
 			</el-form-item>
-            <el-form-item label="组别" prop="form.groupname" required>
-				<el-input v-model="form.groupname" ></el-input>
+			<el-form-item label="用户名称" prop="form.rymc" required>
+				<el-input v-model="form.rymc" :disabled="true"></el-input>
 			</el-form-item>
-            <!-- <el-form-item label="机构属性" prop="form.properties" required>
-				<el-input v-model="form.properties" ></el-input>
+            <!-- <el-form-item label="别名" prop="form.name_other" required>
+				<el-input v-model="form.name_other"></el-input>
 			</el-form-item> -->
-			 <el-form-item label="机构属性" prop="form.properties" required>
-				<el-input v-model="form.properties" :disabled="true"></el-input>
+            <el-form-item label="组别" prop="form.groupname" required>
+				<el-input v-model="form.groupname" :disabled="true"></el-input>
 			</el-form-item>
+			 <!-- <el-form-item label="机构属性" prop="form.properties" required>
+				<el-input v-model="form.properties" :disabled="true"></el-input>
+			</el-form-item> -->
             <el-form-item label="联系人姓名" prop="form.contact_name" required>
 				<el-input v-model="form.contact_name" ></el-input>
 			</el-form-item>
             <el-form-item label="联系人电话" prop="form.contact_phone" required>
 				<el-input v-model="form.contact_phone"></el-input>
 			</el-form-item>
+			 <el-form-item label="联系人邮箱" prop="form.contact_mail" required>
+				<el-input v-model="form.contact_mail"></el-input>
+			</el-form-item>
+			 <el-form-item label="联系人QQ" prop="form.contact_qq" required>
+				<el-input v-model="form.contact_qq"></el-input>
+			</el-form-item>
             <!-- <el-form-item label="创建时间" prop="form.create_time" required>
 				<el-input v-model="form.create_time" ></el-input>
 			</el-form-item>
@@ -58,37 +67,51 @@
 			return {
 				form: {
                     username:'',
-                    name:'', 
+                    rybh:'', 
+					rymc:'',
                     name_other:'', 
                     groupname: '', 
                     properties: '', 
                     contact_name: '', 
                     contact_phone: '',
                     create_time:'' ,
-                    update_time:''
+                    update_time:'',
+					kl:'',
+					new_password:''
 				},
             }
 		},
 		created() {	
-            this.getAccount()
+            this.getJgAccount()
 		},
 		mounted() {
-            this.getAccount()
+            this.getJgAccount()
 		},
 		methods: {
             //保存修改
             async preServe(){
-				const result = await this.$http.post('putAccount',this.form)
-				// console.log(result.data.data)
-                this.getAccount()
+				const result = await this.$http.post('putJgAccount',this.form)
+				// 判断业务逻辑
+				if (result.code == 0) {
+						this.$message({
+						type: 'success',
+						message: '修改成功'
+					})
+				} else {
+					this.$message({
+						type: 'error',
+						message:  result.data.message
+					})
+				}
+                // this.putJgAccount()
             },
             //返回
             reBack(){
-                 this.$router.push('getAccount')
+                 this.$router.push('userAccount')
                 },
          //获取用户信息
-            async getAccount() {
-				const result = await this.$http.post('getAccount')
+            async getJgAccount() {
+				const result = await this.$http.post('getJgAccount')
 				console.log(result.data.data)
 					this.form = result.data.data
 					if (this.form.properties == 1){

+ 20 - 14
src/components/admin/userAccount.vue

@@ -2,32 +2,38 @@
 	<div style="width: 100%">
 		<el-breadcrumb separator-class="el-icon-arrow-right">
 			<el-breadcrumb-item>首页</el-breadcrumb-item>
-			<el-breadcrumb-item>个人中心</el-breadcrumb-item>
+			<el-breadcrumb-item>个人信息</el-breadcrumb-item>
 		</el-breadcrumb>
 		<div class="title">
-			个人中心
+			个人信息
 		</div>
 		<el-form :model="form" label-width="100px">
-			<el-form-item label="登录账号" prop="form.username" required>
-				<el-input v-model="form.username" :disabled="true"></el-input>
+			<el-form-item label="登录账号" prop="form.rybh" required>
+				<el-input v-model="form.rybh" :disabled="true"></el-input>
 			</el-form-item>
-			<el-form-item label="用户名称" prop="form.name" required>
-				<el-input v-model="form.name" :disabled="true"></el-input>
+			<el-form-item label="用户名称" prop="form.rymc" required>
+				<el-input v-model="form.rymc" :disabled="true"></el-input>
 			</el-form-item>
-            <el-form-item label="别名" prop="form.name_other" required>
+            <!-- <el-form-item label="别名" prop="form.name_other" required>
 				<el-input v-model="form.name_other" :disabled="true"></el-input>
-			</el-form-item>
+			</el-form-item> -->
             <el-form-item label="组别" prop="form.groupname" required>
 				<el-input v-model="form.groupname" :disabled="true"></el-input>
 			</el-form-item>
-            <el-form-item label="机构属性" prop="form.properties" required>
+            <!-- <el-form-item label="机构属性" prop="form.properties" required>
 				<el-input v-model="form.properties" :disabled="true"></el-input>
-			</el-form-item>
+			</el-form-item> -->
             <el-form-item label="联系人姓名" prop="form.contact_name" required>
 				<el-input v-model="form.contact_name" :disabled="true"></el-input>
 			</el-form-item>
             <el-form-item label="联系人电话" prop="form.contact_phone" required>
 				<el-input v-model="form.contact_phone" :disabled="true"></el-input>
+			</el-form-item>
+			 <el-form-item label="联系人邮箱" prop="form.contact_mail" required>
+				<el-input v-model="form.contact_mail" :disabled="true"></el-input>
+			</el-form-item>
+			<el-form-item label="联系人QQ" prop="form.contact_qq" required>
+				<el-input v-model="form.contact_qq" :disabled="true"></el-input>
 			</el-form-item>
 			<el-form-item>
 				<el-button type="success" @click="putAccount()">修改账户信息</el-button>
@@ -57,14 +63,14 @@
             }
 		},
 		created() {	
-            this.getAccount()
+            this.getJgAccount()
 		},
 		mounted() {
-            this.getAccount()
+            this.getJgAccount()
 		},
 		methods: {
-            async getAccount() {
-				const result = await this.$http.post('getAccount')
+            async getJgAccount() {
+				const result = await this.$http.post('getJgAccount')
 				console.log(result.data.data)
                 this.form = result.data.data
                 if (this.form.properties == 1){