fix：修改基础事项办理渠道和基本信息编辑

base-manager-ui/admin/.env.development

 #开发环境
 NODE_ENV = "development"
-# VUE_APP_API_BASE_URL=http://192.168.0.250:11071
-# VUE_APP_API_IMG_URL=http://192.168.0.250:11071/
-VUE_APP_API_BASE_URL=http://192.168.0.98:11078
-VUE_APP_API_IMG_URL=http://192.168.0.98:11078/
+VUE_APP_API_BASE_URL=http://192.168.0.250:11071
+VUE_APP_API_IMG_URL=http://192.168.0.250:11071/
+# VUE_APP_API_BASE_URL=http://192.168.0.98:11078
+# VUE_APP_API_IMG_URL=http://192.168.0.98:11078/
 #VUE_APP_API_BASE_URL=http://10.12.185.213:11071
\ No newline at end of file

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

@@ -141,7 +141,10 @@
       <a-row>
         <a-col :span="8">
           <a-form-model-item label="跳转地址" props="netApplyUrl">
-            <a-input v-model="baseform.netApplyUrl" placeholder="请输入跳转地址" />
+            <a-input
+              v-model="baseform.netApplyUrl"
+              placeholder="请输入跳转地址"
+            />
           </a-form-model-item>
         </a-col>
         <a-col :span="8">
@@ -428,11 +431,11 @@ export default {
       }
     },
   },
-  created() {
-    this.getDeptListData();
+  async created() {
+    await this.getDeptListData();
     if (this.$route.query.edit == 1) {
       let matterId = this.$route.query.matterId;
-      this.getMatterInfo(matterId);
+      await this.getMatterInfo(matterId);
     }
     if (!this.baseform.matterNo) {
       this.baseform.matterNo = this.$nanoid();
@@ -458,7 +461,19 @@ export default {
     async getMatterInfo(id) {
       let res = await getMatterInfo({ id });
       if (res.data.code === 1) {
-        this.baseform = res.data.data;
+        this.baseform = { ...res.data.data };
+        this.baseform.promiseTimeLimitShow == ""
+          ? (this.isPromise = "")
+          : this.baseform.promiseTimeLimitShow == 0 ||
+            this.baseform.promiseTimeLimitShow == "即办"
+          ? (this.isPromise = "1")
+          : (this.isPromise = "2");
+        this.baseform.legalTimeLimitShow == ""
+          ? (this.isTimely = "")
+          : this.baseform.legalTimeLimitShow == 0 ||
+            this.baseform.legalTimeLimitShow == "即办"
+          ? (this.isTimely = "1")
+          : (this.isTimely = "2");
         this.curDpt = {
           key: this.baseform.deptCode,
           label: this.baseform.deptName,

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

@@ -107,13 +107,14 @@ export default {
 
   methods: {
     handleAdd(i) {
-      this.arrType.push({
-        name: "",
-        qrcode: "",
-        appType: i == 1 ? 0 : 1,
-        url: "",
-        icon: "",
-      });
+      this.arrType &&
+        this.arrType.push({
+          name: "",
+          qrcode: "",
+          appType: i == 1 ? 0 : 1,
+          url: "",
+          icon: "",
+        });
     },
     async handleDel(val, i) {
       this.arrType = this.arrType.filter((v, index) => index != i);
@@ -196,8 +197,9 @@ export default {
       margin-bottom: 20px;
       .close_icon {
         position: absolute;
-        left: 0px;
+        right: 0px;
         top: 0px;
+
         font-size: 18px;
         color: #f56c6c;
         font-weight: 700;
@@ -205,7 +207,7 @@ export default {
       .add_text {
         border-width: 0px;
         position: absolute;
-        right: 0px;
+        left: 0px;
         top: 0px;
         width: 40px;
         height: 20px;
@@ -215,7 +217,8 @@ export default {
         border-radius: 18px;
         border-top-left-radius: 0px;
         border-top-right-radius: 0px;
-        border-bottom-right-radius: 0px;
+        border-bottom-left-radius: 0px;
+        // border-bottom-right-radius: 0px;
         -moz-box-shadow: none;
         -webkit-box-shadow: none;
         box-shadow: none;

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

@@ -275,7 +275,10 @@
         <a-row>
           <a-col :span="8">
             <a-form-model-item label="跳转地址" props="netApplyUrl">
-              <a-input v-model="baseform.netApplyUrl" placeholder="请输入跳转地址" />
+              <a-input
+                v-model="baseform.netApplyUrl"
+                placeholder="请输入跳转地址"
+              />
             </a-form-model-item>
           </a-col>
           <a-col :span="8">
@@ -934,7 +937,6 @@ export default {
     };
   },
   created() {
-    this.mergeForm();
     this.getDeptListData();
   },
   computed: {
@@ -984,6 +986,9 @@ export default {
       let { code, data } = res.data;
       if (code === 1) {
         this.deptData = data.data;
+        this.mergeForm();
+      } else {
+        this.mergeForm();
       }
     },
 

base-manager-ui/admin/src/services/basicsetApi.js

@@ -92,6 +92,12 @@ module.exports = {
     delete: `${BASE_URL}/base/matter/accept/delete`,
     exportExcel: `${BASE_URL}/base/matter/accept/exportExcel`,
   },
+  // 事项办理渠道
+  matterchannel: {
+    list: `${BASE_URL}/base/matter/channel/list`,
+    save: `${BASE_URL}/base/matter/channel/batchSave`,
+    delete: `${BASE_URL}/base/matter/channel/delete`,
+  },
   // 事项收费标准
   mattercharges: {
     list: `${BASE_URL}/base/matter/charges/list`,

base-manager-ui/admin/src/services/matter.js

@@ -9,6 +9,7 @@ import {
   matterintermediary,
   matterflowlimit,
   mattercharges,
+  matterchannel,
 } from "@/services/basicsetApi";
 
 import { request, METHOD } from "@/utils/request";
@@ -184,3 +185,18 @@ export async function getMattercharges(data) {
 export async function delMattercharges(data) {
   return request(mattercharges.delete, METHOD.GET, data);
 }
+/**
+ *  办理渠道
+ */
+// 新增办理渠道
+export async function addMatterInternet(data) {
+  return request(matterchannel.save, METHOD.POST, data);
+}
+// 获取办理渠道
+export async function getMatterInternetList(data) {
+  return request(matterchannel.list, METHOD.POST, data);
+}
+// 删除办理渠道
+export async function delMatterInternet(data) {
+  return request(matterchannel.delete, METHOD.GET, data);
+}