pref:修改事项管理页面

base-manager-ui/admin/src/pages/basicset/addmatter/AddMatter.vue

 <template>
   <div class="addmatter">
     <a-tabs default-active-key="1">
-      <a-button slot="tabBarExtraContent" @click="handleBack"
-        >返回上一级</a-button
-      >
+      <div slot="tabBarExtraContent">
+        <a-space>
+          <a-button @click="handleManage">返回事项列表</a-button>
+          <a-button @click="handleBack">返回概要列表</a-button>
+        </a-space>
+      </div>
       <a-tab-pane key="1" tab="基本信息">
         <BaseMessage />
       </a-tab-pane>
@@ -70,6 +73,10 @@ export default {
   mounted() {},
 
   methods: {
+    // 返回管理页面
+    handleManage() {
+      this.$router.push("/business");
+    },
     // 返回上一级
     handleBack() {
       this.$router.back();

base-manager-ui/admin/src/pages/basicset/addmatter/components/AddSynopsis.vue

@@ -11,7 +11,7 @@
       <!-- 基本信息 -->
       <div class="flex jcb aic">
         <div class="color_title">基本信息</div>
-        <div class="more primary">完善更多信息>></div>
+        <div class="more primary" @click="checkMore">完善更多信息>></div>
       </div>
       <a-row>
         <a-col :span="8">
@@ -43,17 +43,17 @@
           </a-form-model-item>
         </a-col>
         <a-col :span="8">
-          <a-form-model-item label="所属部门" prop="belongDept">
+          <a-form-model-item label="所属部门" prop="deptCode">
             <a-select
               showSearch
-              v-model="baseform.belongDept"
+              v-model="baseform.deptCode"
               optionFilterProp="label"
               placeholder="请选择部门"
             >
               <a-select-option
                 v-for="v in deptData"
                 :key="v.id"
-                :value="v.name"
+                :value="v.deptNumber"
                 :label="v.name"
               >
                 {{ v.name }}</a-select-option
@@ -132,7 +132,7 @@
       <!-- 窗口办理 -->
       <div class="flex jcb aic">
         <div class="color_title">窗口办理</div>
-        <div class="more primary">完善更多信息>></div>
+        <div class="more primary" @click="checkMore">完善更多信息>></div>
       </div>
       <a-row>
         <a-col :span="8">
@@ -171,7 +171,7 @@
       <!-- 常规信息 -->
       <div class="flex jcb aic">
         <div class="color_title">常规信息</div>
-        <div class="more primary">完善更多信息>></div>
+        <div class="more primary" @click="checkMore">完善更多信息>></div>
       </div>
       <a-row>
         <a-col :span="8">
@@ -293,7 +293,9 @@
       </a-row>
     </a-form-model>
     <div class="btn_box">
-      <a-button type="primary" class="mr" @click="handleOk"> 确定 </a-button>
+      <a-button type="primary" class="mr" @click="handleOk" :loading="loading">
+        确定
+      </a-button>
       <a-button @click="handleReset"> 重置 </a-button>
     </div>
   </div>
@@ -303,11 +305,12 @@
 import { mapGetters } from "vuex";
 import local from "@/utils/local";
 import { getDeptList } from "@/services/dept";
-import { saveAddMatter } from "@/services/matter";
+import { saveAddMatter, addMatterToSite } from "@/services/matter";
 export default {
   data() {
     return {
       siteId: local.getLocal("siteId"), // 站点id
+      loading: false,
       labelCol: { span: 5 },
       wrapperCol: { span: 19 },
       isTimely: undefined,
@@ -325,6 +328,7 @@ export default {
         matterNo: "", //事项编号
         sort: "", // 排序
         belongDept: undefined, //所属部门
+        deptCode: undefined, //所属部门编号
         legalTimeLimitShow: "", // 法定办结时限
         promiseTimeLimitShow: "", // 承诺办结时限
         isChargesShow: "", //是否收费
@@ -349,7 +353,7 @@ export default {
         matterNo: [
           { required: true, message: "事项编号不能为空", trigger: "blur" },
         ],
-        belongDept: [
+        deptCode: [
           { required: true, message: "所属部门不能为空", trigger: "change" },
         ],
       },
@@ -374,13 +378,19 @@ export default {
     handleOk() {
       this.$refs.form.validate(async (valid) => {
         if (valid) {
+          this.loading = true;
           let res = await saveAddMatter({
             siteId: this.siteId,
             ...this.baseform,
           });
-          let { code, msg } = res.data;
+          let { code, msg, data } = res.data;
+          this.loading = false;
           if (code === 1) {
             this.$message.success(msg);
+            await addMatterToSite({
+              siteId: this.siteId,
+              matterIds: data.entity.id + "",
+            });
             this.handleReset();
           }
         }
@@ -389,6 +399,15 @@ export default {
     handleReset() {
       this.$refs.form.resetFields();
     },
+    // 完善更多
+    checkMore() {
+      this.$router.push({
+        path: "addmatter",
+        query: {
+          formData: JSON.stringify(this.baseform),
+        },
+      });
+    },
   },
 };
 </script>

base-manager-ui/admin/src/pages/basicset/addmatter/components/baseMessage.vue

@@ -986,20 +986,7 @@ export default {
 <style lang="less" scoped>
 .basemessage {
   width: 100%;
-  .color_title {
-    margin-left: 15px;
-    position: relative;
-    margin-bottom: 15px;
-    &::before {
-      content: "";
-      width: 4px;
-      height: 20px;
-      position: absolute;
-      top: 1px;
-      left: -16px;
-      background-color: rgba(5, 149, 253, 1);
-    }
-  }
+
   .btn_box {
     padding: 25px 126px 20px;
     justify-content: flex-start;

base-manager-ui/admin/src/pages/basicset/business/business.vue

 <template>
   <div class="business">
     <a-tabs v-model="active">
-      <a-tab-pane :key="1" tab="业务管理">
-        <BusinessTabs1 v-if="active === 1" ref="BusinessTabs1" />
+      <a-tab-pane :key="1" tab="事项管理">
+        <BusinessTabs2 v-if="active === 1" ref="BusinessTabs2" />
       </a-tab-pane>
 
-      <a-tab-pane :key="2" tab="事项管理">
-        <BusinessTabs2 v-if="active === 2" ref="BusinessTabs2" />
+      <a-tab-pane :key="2" tab="业务管理">
+        <BusinessTabs1 v-if="active === 2" ref="BusinessTabs1" />
       </a-tab-pane>
 
       <a-tab-pane :key="3" tab="业务事项关联">

base-manager-ui/admin/src/pages/basicset/business/components/businessTabs2.vue

@@ -69,7 +69,7 @@
           </template>
           <!-- 事项名称 -->
           <template slot="matterName" slot-scope="text">
-            <a-tooltip placement="top">
+            <a-tooltip placement="topLeft">
               <template slot="title">
                 {{ text.matterName }}
               </template>
@@ -156,7 +156,7 @@
           </template>
           <!-- 事项名称 -->
           <template slot="matterName" slot-scope="text">
-            <a-tooltip placement="top">
+            <a-tooltip placement="topLeft">
               <template slot="title">
                 {{ text.matterName }}
               </template>
@@ -442,7 +442,6 @@ export default {
         this.getMatterSiteData();
         this.getMatterListData();
         this.selectedRowKeys = [];
-        this.$bus.$emit("addMatterSiteData");
       }
     },
     // 右边删除

base-manager-ui/admin/src/pages/basicset/business/components/businessTabs3.vue

@@ -113,6 +113,18 @@
           <template slot="deptName" slot-scope="text">
             {{ text.deptName ? text.deptName : "--" }}
           </template>
+          <!-- 事项名称 -->
+          <template slot="matterName" slot-scope="text">
+            <a-tooltip placement="topLeft">
+              <template slot="title">
+                {{ text.matterName }}
+              </template>
+              <div class="matter-name">{{ text.matterName }}</div>
+            </a-tooltip>
+            <!-- <a-tag v-if="text.source === 0" color="green"> 一体化添加 </a-tag>
+            <a-tag v-else color="blue"> 手动添加 </a-tag> -->
+          </template>
+          <!-- 操作 -->
           <template slot="action" slot-scope="text">
             <a href="javascript:;" class="jion" @click="handleIn(text)">关联</a>
           </template>
@@ -287,8 +299,11 @@ const rightColumns = [
   },
   {
     title: "事项名称",
-    ellipsis: true,
-    dataIndex: "matterName",
+    // ellipsis: true,
+    align: "left",
+    scopedSlots: {
+      customRender: "matterName",
+    },
   },
   {
     title: "操作",
@@ -664,6 +679,12 @@ export default {
       }
     }
   }
+  .matter-name {
+    margin-bottom: 10px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
   .header-bottom {
     display: flex;
     justify-content: space-between;