From a4221224b8aba81a5176152c42d19017ac2fcc35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Mon, 24 Oct 2022 19:00:36 +0800
Subject: [PATCH] =?UTF-8?q?rpm=E5=B1=9E=E5=9C=B0=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E9=99=90=E5=AE=9A/=E5=88=86=E9=85=8D=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E5=8F=AF=E9=80=89=E5=B7=B2=E6=9C=89=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/rpm/rcertificate.vue |  2 ++
 src/views/rpm/rparty.vue       | 31 ++++++++++++++++++++++++-------
 src/views/rpm/rparty_form.vue  |  6 +++---
 src/views/rpm/rpj.vue          |  1 +
 src/views/rpm/rpj_form.vue     |  2 +-
 5 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/views/rpm/rcertificate.vue b/src/views/rpm/rcertificate.vue
index 7a039258..931c372c 100644
--- a/src/views/rpm/rcertificate.vue
+++ b/src/views/rpm/rcertificate.vue
@@ -274,6 +274,7 @@ export default {
           this.$API.rpm.rcertificate.create
             .req(this.form)
             .then((res) => {
+              this.$refs.table.refresh();
               this.$message.success("创建成功");
               this.dialogcart = false;
               return res;
@@ -285,6 +286,7 @@ export default {
           this.$API.rpm.rcertificate.update
             .req(this.form.id, this.form)
             .then((res) => {
+              this.$refs.table.refresh();
               this.$message.success("修改成功");
               this.dialogcart = false;
               return res;
diff --git a/src/views/rpm/rparty.vue b/src/views/rpm/rparty.vue
index 647dab8a..f1640b38 100644
--- a/src/views/rpm/rparty.vue
+++ b/src/views/rpm/rparty.vue
@@ -32,7 +32,7 @@
        
       >
         <el-table-column label="#" type="index" width="50"></el-table-column>
-        <el-table-column label="名称" prop="name" width="220"></el-table-column>
+        <el-table-column label="名称" prop="name" width="240"  :show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="信用代码" prop="number" width="180">
         </el-table-column>
         <el-table-column
@@ -43,11 +43,15 @@
           label="联系电话"
           prop="phone"
         ></el-table-column>
-        <!-- <el-table-column
-          label="企业地址"
-          prop="address"
+        <el-table-column
+          label="所属部门"
+          prop="belong_dept"
           width="180"
-        ></el-table-column> -->
+        >
+        <template #default="scope">
+          {{scope.row.belong_dept_name}}
+        </template>
+        </el-table-column>
           <el-table-column
           label="管理员"
         >
@@ -59,7 +63,6 @@
         <el-table-column label="操作" fixed="right" align="left" width="200">
           <template #default="scope">
                 <el-button
-                v-if="scope.row.admin==null"
                 link
                 type="primary"
                 size="small"
@@ -94,8 +97,14 @@
       </scTable>
     </el-main>
   </el-container>
-  <el-dialog v-model="adminvisible" title="分配账号" @closed="$emit('closed')">
+  <el-dialog v-model="adminvisible" title="分配账号(新建或选择)" @closed="$emit('closed')">
 	<el-form ref="ruleForm" :model="adminform"  	:rules="rules" label-width="100px">
+      <el-form-item label="管理员">
+						<span style="display:flex">
+                <el-input readonly v-model="adminform.admin_name"></el-input>
+                <ehsUserSelect :multiple="false" @submit="getAdmin"/>
+                </span>
+					</el-form-item>
 				<el-form-item label="姓名" prop="name">
 					<el-input v-model="adminform.name"></el-input>
 				</el-form-item>
@@ -132,6 +141,7 @@ export default {
         permission: false,
       },
       adminform:{
+        admin: null,
         username:"",
       },
       apiObj: this.$API.rpm.rparty.list,
@@ -165,6 +175,13 @@ export default {
         this.$refs.saveDialog.open("add");
       });
     },
+    getAdmin(data){
+				this.adminform.admin=data.id;
+      	this.adminform.admin_name=data.name;
+        this.adminform.name = data.name;
+        this.adminform.phone = data.phone;
+        this.adminform.username = data.username;
+			},
     //编辑
     table_edit(row) {
       this.dialog.save = true;
diff --git a/src/views/rpm/rparty_form.vue b/src/views/rpm/rparty_form.vue
index 5c86ac91..095211c8 100644
--- a/src/views/rpm/rparty_form.vue
+++ b/src/views/rpm/rparty_form.vue
@@ -59,7 +59,7 @@
                 <el-input v-model="form.email" type="text" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :md="24" :sm="24" :xs="24">
+            <el-col :md="12" :sm="12" :xs="24">
                 <el-form-item label="归属部门">
                   <el-cascader
 									v-model="form.belong_dept"
@@ -83,7 +83,7 @@
               </el-form-item>
             </el-col>
             <el-col :md="24" :sm="24" :xs="24">
-              <el-form-item label="概述">
+              <el-form-item label="其他说明">
                 <el-input
                   v-model="form.description"
                   clearable
@@ -131,7 +131,7 @@ export default {
   },
   methods: {
     getDeptOptions() {
-        this.$API.system.dept.list.req({page:0}).then(res=>{
+        this.$API.system.dept.list.req({page:0, type__in:'dept'}).then(res=>{
             this.belong_dept_options = genTree(res);
         })
     },
diff --git a/src/views/rpm/rpj.vue b/src/views/rpm/rpj.vue
index 3aa4c4da..cdd02f6a 100644
--- a/src/views/rpm/rpj.vue
+++ b/src/views/rpm/rpj.vue
@@ -175,6 +175,7 @@
 							>编辑
 							</el-button>-->
             <el-popconfirm
+              v-if="scope.row.state == 10"
               title="确定删除吗？"
               @confirm="table_del(scope.row, scope.$index)"
             >
diff --git a/src/views/rpm/rpj_form.vue b/src/views/rpm/rpj_form.vue
index 07f4f3bf..cf998866 100644
--- a/src/views/rpm/rpj_form.vue
+++ b/src/views/rpm/rpj_form.vue
@@ -162,7 +162,7 @@
 			},
 			//所属部门
 			getDept() {
-				this.$API.system.dept.list.req({page: 0}).then((res) => {
+				this.$API.system.dept.list.req({page: 0, type__in: 'dept'}).then((res) => {
 					this.deptoptions = genTree(res);
 				});
 			},