From f2119ca3306c1ffee683993e9489137c4522525f Mon Sep 17 00:00:00 2001
From: huxiaolei <286388969@qq.com>
Date: Thu, 26 Sep 2024 10:45:50 +0800
Subject: [PATCH 1/7] =?UTF-8?q?12345=E6=B4=BE=E5=8D=95=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=8C=87=E6=B4=BE=E5=A4=9A=E4=B8=AA=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../event/cpts/process-form-assign.vue        | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/shequzhili/event/cpts/process-form-assign.vue b/src/views/modules/shequzhili/event/cpts/process-form-assign.vue
index 603fef1ac..fd4fb5cd3 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-assign.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-assign.vue
@@ -9,10 +9,10 @@
 <template>
     <div class="search">
         <el-form ref="ref_form2" :inline="false" :model="formData" :rules="dataRule">
-            <el-form-item  label="指派处理部门" prop="deptId" label-width="150px"
+            <el-form-item  label="指派处理部门" prop="assignDeptIds" label-width="150px"
                 :class="{ 'form-item': source === 'visiual' }">
                 <el-cascader  class="cell-width-1" ref="agencyIdArray"   filterable  clearable :filter-method="filter" v-model.trim="agencyIdArray" :options="orgOptions"
-                    :props="orgOptionProps" :show-all-levels="false" @change="handleChangeAgency"></el-cascader>
+                    :props="orgOptionProps"  :show-all-levels="false" @change="handleChangeAgency"></el-cascader>
             </el-form-item>
             <el-form-item label="派件时间" prop="createdTime" label-width="150px"
                 :class="{ 'form-item': source === 'visiual' }" style="display: block">
@@ -82,12 +82,15 @@ export default {
                 deptId:'', //指派部门
                 deptName:'',
                 sendMsg:1,
-                status:'assigned'
+                status:'assigned',
+                levels: [],
+                assignDeptIds: [],
+                assignDeptNames: []
             },
             orgOptions: [],
             orgOptionsCopy: [],
             orgOptionProps: {
-                multiple: false,
+                multiple: true,
                 value: 'agencyId',
                 label: 'agencyName',
                 children: 'subAgencyList',
@@ -111,7 +114,7 @@ export default {
                 categoryId: [
                     { required: true, message: "事件分类不能为空", trigger: "blur" },
                 ],
-                deptId: [
+                assignDeptIds: [
                     { required: true, message: "处理部门不能为空", trigger: "blur" },
                 ],
                 timeLimit: [
@@ -207,12 +210,27 @@ export default {
         handleChangeAgency(val) {
             this.$nextTick(() => {
                 
-                let obj = this.$refs["agencyIdArray"].getCheckedNodes()[0].data
+                
+                let obj = this.$refs["agencyIdArray"].getCheckedNodes()
+                const assignDeptIds = []
+                const assignDeptNames = []
+                const levels = []
+                for (val in obj) {
+                    assignDeptIds.push(obj[val].data.agencyId)
+                    assignDeptNames.push(obj[val].data.agencyName)
+                    levels.push(obj[val].data.level)
+                }
+                
+                console.log('assignDeptIds',assignDeptIds);
+                console.log('assignDeptNames',assignDeptNames);
+                console.log('levels',levels);
+
             
                 if (obj) {
-                    this.formData.level = obj.level 
-                    this.formData.deptId = obj.agencyId
-                    this.formData.deptName = obj.agencyName
+                    
+                    this.formData.levels = levels
+                    this.formData.assignDeptIds = assignDeptIds
+                    this.formData.assignDeptNames = assignDeptNames
                 } else {
                     this.form.orgType = ''
                     this.form.orgId = ''

From 7d7955fc5df3fafd655cc546c035f0ae583d606e Mon Sep 17 00:00:00 2001
From: huxiaolei <286388969@qq.com>
Date: Thu, 26 Sep 2024 14:01:12 +0800
Subject: [PATCH 2/7] =?UTF-8?q?12345=E6=B4=BE=E4=BB=B6=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E8=A2=AB=E6=8C=87=E6=B4=BE=E9=83=A8=E9=97=A8=E9=83=BD=E5=8F=AF?=
 =?UTF-8?q?=E5=8A=9E=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/eventHandling/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/shequzhili/eventHandling/index.vue b/src/views/modules/shequzhili/eventHandling/index.vue
index f47b2a97d..b7dcbe360 100644
--- a/src/views/modules/shequzhili/eventHandling/index.vue
+++ b/src/views/modules/shequzhili/eventHandling/index.vue
@@ -143,8 +143,10 @@
                     <el-table-column fixed="right" label="操作" align="center" width="200px" prop="status">
                         <template slot-scope="scope">
                             <el-button @click="handleWatch(scope.row)" type="text" size="small">查看</el-button>
-                            <el-button  @click="handleDispose(scope.row,'dispose')" type="text" size="small" v-if="scope.row.canOperate && scope.row.operationType != '11'&&scope.row.operationType!= '12' ">办理</el-button>
-                            <el-button  @click="handleDispose(scope.row,'return')" type="text" size="small" v-if="scope.row.canOperate && scope.row.deptId && scope.row.latestOperatedTime && isWithinTwoHours(scope.row.latestOperatedTime) && scope.row.operationType!='11' &&scope.row.operationType!= '12'">退件</el-button>
+                            <!-- <el-button  @click="handleDispose(scope.row,'dispose')" type="text" size="small" v-if="scope.row.canOperate && scope.row.operationType != '11'&&scope.row.operationType!= '12' ">办理</el-button>
+                            <el-button  @click="handleDispose(scope.row,'return')" type="text" size="small" v-if="scope.row.canOperate && scope.row.deptId && scope.row.latestOperatedTime && isWithinTwoHours(scope.row.latestOperatedTime) && scope.row.operationType!='11' &&scope.row.operationType!= '12'">退件</el-button> -->
+                            <el-button  @click="handleDispose(scope.row,'dispose')" type="text" size="small" v-if=" scope.row.operationType != '11'&&scope.row.operationType!= '12' ">办理</el-button>
+                            <el-button  @click="handleDispose(scope.row,'return')" type="text" size="small" v-if=" scope.row.deptId && scope.row.latestOperatedTime && isWithinTwoHours(scope.row.latestOperatedTime) && scope.row.operationType!='11' &&scope.row.operationType!= '12'">退件</el-button>
                         </template>
                     </el-table-column>
                 </el-table>

From 12e90825efb5266b131d1ae138a17e182ec2e074 Mon Sep 17 00:00:00 2001
From: huxiaolei <286388969@qq.com>
Date: Fri, 27 Sep 2024 09:43:08 +0800
Subject: [PATCH 3/7] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=B4=BB=E5=8A=A8=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=B1=BB=E5=9E=8B=E4=BC=A0=E5=8F=82=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityParty/activity/initiateActivity.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityParty/activity/initiateActivity.vue b/src/views/modules/communityParty/activity/initiateActivity.vue
index 1c6edca38..7a20fb11b 100644
--- a/src/views/modules/communityParty/activity/initiateActivity.vue
+++ b/src/views/modules/communityParty/activity/initiateActivity.vue
@@ -342,7 +342,7 @@ export default {
                 pageSize: 20,
                 pageNo: 1,
                 typeName: "",
-                enabled: 1
+                enabled: ""
             }
             const { data, code, msg } = await requestPost(url, params)
             if (code === 0) {

From cb30deea865b87b63382cca3c57fee483da40e13 Mon Sep 17 00:00:00 2001
From: duanliangtao <48194157+duanliangtao@users.noreply.github.com>
Date: Fri, 27 Sep 2024 14:11:25 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E5=BF=97=E6=84=BF=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E7=9A=84iframe=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/volunteer/mall/index.vue | 71 ++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 src/views/modules/volunteer/mall/index.vue

diff --git a/src/views/modules/volunteer/mall/index.vue b/src/views/modules/volunteer/mall/index.vue
new file mode 100644
index 000000000..8ef16ac3d
--- /dev/null
+++ b/src/views/modules/volunteer/mall/index.vue
@@ -0,0 +1,71 @@
+<template>
+  <div>
+    <!-- 隐藏 iframe，等子页面加载完成并修改后再显示 -->
+    <iframe
+      id="childIframe"
+      ref="childIframe"
+      :src="iframeSrc"
+      width="100%"
+      height="1000px"
+      frameborder="0"
+      style="display: none;"
+      @load="onIframeLoad"
+    ></iframe>
+  </div>
+</template>
+
+<script>
+import http from "@/utils/request";
+export default {
+  data() {
+    return {
+      // 嵌入的网页地址
+      iframeSrc: '', // 初始时 iframeSrc 为空，等接口获取到地址后再赋值
+    };
+  },
+  created() {
+    // 此处请求后端,获取一个ticket票据
+    http.get("/auth/sso/getTicket")
+        .then(({data: res}) => {
+        let ticket = res.data
+        console.log('ticket:', ticket)
+        this.iframeSrc = "../../../epmet-voluntary-mall-admin/pms/product?target=_blank&ticket=" + ticket
+      })
+  },
+  methods: {
+    // 监听 iframe 加载完成事件
+    onIframeLoad() {
+      // 获取 iframe 的内容窗口
+      const iframe = this.$refs.childIframe;
+      const iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
+      
+      if (iframeDocument) {
+        const styleElement = iframeDocument.createElement('style');
+        styleElement.type = 'text/css';
+        
+        const newStyles = `
+          #app .main-container {
+            margin-left: 0px !important;
+          }
+          #app .sidebar-container {
+              display: none !important;
+          }
+          .navbar {
+              display: none !important;
+          }
+        `;
+        
+        styleElement.appendChild(iframeDocument.createTextNode(newStyles));
+        
+        iframeDocument.head.appendChild(styleElement);
+
+        // 显示 iframe
+        iframe.style.display = 'block';
+      }
+    }
+  }
+};
+</script>
+
+<style scoped>
+</style>

From 77df8d16337e1b4715af434d4a754b84819d786c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Fri, 27 Sep 2024 14:58:55 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0type=3D=E2=80=9Cnumber=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/volunteer/VoluntaryOrganization/process.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/volunteer/VoluntaryOrganization/process.vue b/src/views/modules/volunteer/VoluntaryOrganization/process.vue
index 0309255aa..0d2219d60 100644
--- a/src/views/modules/volunteer/VoluntaryOrganization/process.vue
+++ b/src/views/modules/volunteer/VoluntaryOrganization/process.vue
@@ -74,7 +74,7 @@
 
         </el-form-item>
         <el-form-item label="原因" v-if="findingsofaudit == 'notPass'">
-          <el-input  v-if="findingsofaudit == 'notPass'" type="number" v-model="reason" style="width: 200px;"
+          <el-input  v-if="findingsofaudit == 'notPass'" v-model="reason" style="width: 200px;"
           placeholder="请说明原因"></el-input>
         </el-form-item>
       </el-form>

From cf6665613238e3bcf8af8831bc2708c42d6df9fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Fri, 27 Sep 2024 15:23:23 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BB=8B=E7=BB=8D=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../volunteer/VoluntaryOrganization/process.vue     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/volunteer/VoluntaryOrganization/process.vue b/src/views/modules/volunteer/VoluntaryOrganization/process.vue
index 0d2219d60..4c55aee73 100644
--- a/src/views/modules/volunteer/VoluntaryOrganization/process.vue
+++ b/src/views/modules/volunteer/VoluntaryOrganization/process.vue
@@ -35,18 +35,25 @@
         </el-form-item>
         <el-form-item label="附件">
           <div class="demo-image__preview">
-            <img v-if="tableData.orgImage" style="width: 100px; height: 100px" :src="tableData.orgImage">
+            <img v-if="tableData.qualification" style="width: 100px; height: 100px" :src="tableData.qualification">
             </img>
           </div>
           <!-- {{ tableData.address}} -->
         </el-form-item>
+        <el-form-item label="组织介绍图" v-if="tableData.orgImage">
+          <div class="demo-image__preview">
+            <img v-if="tableData.orgImage" style="width: 100px; height: 100px" :src="tableData.orgImage">
+          </img>
+          </div>
+          <!-- {{ tableData.address}} -->
+        </el-form-item>
         <el-form-item label="申请时间">
           {{tableData.updatedTime}}
         </el-form-item>
-        <el-form-item label="志愿品牌">
+        <el-form-item label="志愿品牌" v-if="tableData.brand">
           {{tableData.brand}}
         </el-form-item>
-        <el-form-item label="品牌展示图">
+        <el-form-item label="品牌展示图" v-if="tableData.brandImg">
           <div class="demo-image__preview">
             <img v-if="tableData.brandImg" style="width: 100px; height: 100px" :src="tableData.brandImg">
           </img>

From f463ebccb6f521cbac8fb3d9061d2e3ce248f0e3 Mon Sep 17 00:00:00 2001
From: duanliangtao <48194157+duanliangtao@users.noreply.github.com>
Date: Fri, 27 Sep 2024 16:49:22 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/volunteer/mall/category.vue | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 src/views/modules/volunteer/mall/category.vue

diff --git a/src/views/modules/volunteer/mall/category.vue b/src/views/modules/volunteer/mall/category.vue
new file mode 100644
index 000000000..8728dcb27
--- /dev/null
+++ b/src/views/modules/volunteer/mall/category.vue
@@ -0,0 +1,71 @@
+<template>
+  <div>
+    <!-- 隐藏 iframe，等子页面加载完成并修改后再显示 -->
+    <iframe
+      id="childIframe"
+      ref="childIframe"
+      :src="iframeSrc"
+      width="100%"
+      height="1000px"
+      frameborder="0"
+      style="display: none;"
+      @load="onIframeLoad"
+    ></iframe>
+  </div>
+</template>
+
+<script>
+import http from "@/utils/request";
+export default {
+  data() {
+    return {
+      // 嵌入的网页地址
+      iframeSrc: '', // 初始时 iframeSrc 为空，等接口获取到地址后再赋值
+    };
+  },
+  created() {
+    // 此处请求后端,获取一个ticket票据
+    http.get("/auth/sso/getTicket")
+        .then(({data: res}) => {
+        let ticket = res.data
+        console.log('ticket:', ticket)
+        this.iframeSrc = "../../../epmet-voluntary-mall-admin/pms/productCategory?target=_blank&ticket=" + ticket
+      })
+  },
+  methods: {
+    // 监听 iframe 加载完成事件
+    onIframeLoad() {
+      // 获取 iframe 的内容窗口
+      const iframe = this.$refs.childIframe;
+      const iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
+      
+      if (iframeDocument) {
+        const styleElement = iframeDocument.createElement('style');
+        styleElement.type = 'text/css';
+        
+        const newStyles = `
+          #app .main-container {
+            margin-left: 0px !important;
+          }
+          #app .sidebar-container {
+              display: none !important;
+          }
+          .navbar {
+              display: none !important;
+          }
+        `;
+        
+        styleElement.appendChild(iframeDocument.createTextNode(newStyles));
+        
+        iframeDocument.head.appendChild(styleElement);
+
+        // 显示 iframe
+        iframe.style.display = 'block';
+      }
+    }
+  }
+};
+</script>
+
+<style scoped>
+</style>