From ee56af20ecc72db440376a5037fd2fc7b6f771f5 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Wed, 28 Dec 2022 15:32:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myAgent/demo/competency-application.vue    | 18 +++++++++++-------
 back/src/views/modules/workBench/workBench.vue |  2 +-
 front/src/views/demandCenter/demandDetails.vue |  8 +++++++-
 front/src/views/demandCenter/index.vue         |  4 ++++
 .../personalCenter/components/MyApply.vue      |  5 ++++-
 5 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index 098deeab..ef349dbd 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -24,22 +24,26 @@
           <span class="text" v-if="dataForm.content.applicationSystem">应用系统：<span>{{
           dataForm.content.applicationSystem || '--'
           }}</span></span>
-          <span class="text"></span>
+          <template v-if="version == 'xihaian'">
+            <span class="text" v-if="version == 'xihaian'">申请期限:<span>
+              {{
+       dataForm.content.expireDate || '--'}}</span></span>
+
+          </template>
+          <template v-else>
+            <span class="text"></span>
+          </template>
+        
         </p>
         <p>
           <span v-if="dataForm.content.applicationSceneStr">应用场景：<span>
               {{ dataForm.content.applicationSceneStr || '--' }}</span></span>
         </p>
-        <p>
+      <p>
           <span>
             需求依据：<span>
               {{ dataForm.content.applicationBackground || '--' }}</span></span>
         </p>
-        <!-- <p>
-          <div>
-            <el-button type="primary" v-if="dataForm.content.attachment" size="small" @click="download(dataForm.content)">附件下载</el-button>
-          </div>
-        </p> -->
         <p>
           <div v-if="version == 'xihaian'">
             <el-button type="primary" size="small" @click="download(dataForm.content)">附件下载</el-button>
diff --git a/back/src/views/modules/workBench/workBench.vue b/back/src/views/modules/workBench/workBench.vue
index db89b9e5..d0555de2 100644
--- a/back/src/views/modules/workBench/workBench.vue
+++ b/back/src/views/modules/workBench/workBench.vue
@@ -73,7 +73,7 @@ export default {
       },
       // 部门申请
       resourceData: [],
-      resourceColor: ['#7b2cff', '#fd5151', , '#2ca1ff', '#0adbfa', '#febe13', '#65e5dd', '#f071ff', '#85f67a'],
+      resourceColor: ['#7b2cff', '#fd5151' , '#2ca1ff', '#0adbfa', '#febe13', '#65e5dd', '#f071ff', '#85f67a'],
       // 部门申请
       applyData: [],
       applyColor: ['#5085f2', '#e75fc3', '#f87be2', '#f2719a', '#fca4bb', '#f59a8f', '#fdb301', '#57e7ec', '#cf9ef1'],
diff --git a/front/src/views/demandCenter/demandDetails.vue b/front/src/views/demandCenter/demandDetails.vue
index 535c36ab..78f196be 100644
--- a/front/src/views/demandCenter/demandDetails.vue
+++ b/front/src/views/demandCenter/demandDetails.vue
@@ -388,7 +388,13 @@
     }
   }
   const closeMain = () => {
-    window.history.go(-1)
+    const showKey = router.currentRoute.value.query.showKey
+    router.push({
+    path: '/demandCenter',
+    query: {
+      toShowKey:showKey
+    },
+  })
   }
   onMounted(() => {
     // const formData = computed(() => store.getters['home/demandDetailsData'])
diff --git a/front/src/views/demandCenter/index.vue b/front/src/views/demandCenter/index.vue
index 91f6230b..22b0e3d5 100644
--- a/front/src/views/demandCenter/index.vue
+++ b/front/src/views/demandCenter/index.vue
@@ -187,6 +187,10 @@ const toView = () => {
 }
 
 onMounted(() => {
+  const toShowKey = router.currentRoute.value.query.toShowKey
+  if(toShowKey){
+    selectedKeys.value=toShowKey
+  }
   const params = {
     page: pageNum.value,
     limit: pageSize.value,
diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index d2ce67c7..d08e1a21 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -405,6 +405,7 @@ const phoneVisible = ref(false)
 
 // 选择类型
 const changeType = (item, index) => {
+  debugger
   contentList.data = []
   formState.value.name = ''
 
@@ -1126,8 +1127,10 @@ const showPhoneModal = () => {
 }
 
 mybus.on('closeModal', (obj) => {
+  debugger
   detailsVisible.value = false
-  changeType(obj.type, obj.index)
+  obj.name=obj.type
+  changeType(obj, obj.index)
 })
 onBeforeUnmount(() => {
   mybus.off('closeModal')

From ebd946b3331d7d58888255c8be1edb4f8ecc6229 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Wed, 28 Dec 2022 16:01:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/myAgent/ConferenceRoom.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/back/src/views/modules/myAgent/ConferenceRoom.vue b/back/src/views/modules/myAgent/ConferenceRoom.vue
index 04ef1a59..f730d2a5 100644
--- a/back/src/views/modules/myAgent/ConferenceRoom.vue
+++ b/back/src/views/modules/myAgent/ConferenceRoom.vue
@@ -318,6 +318,9 @@ export default {
     onRemove (file, fileList) {
       this.$nextTick(() => {
         if (fileList.length == 0) {
+          this.ruleForm.pic =null
+          this.fileList = []
+          this.picImg =''
           this.checkImgSuccess = false // 检查图片是否加载成功
           //   this.$refs.ruleForm.validate() //删除图片,重新触发校验
         }
@@ -358,7 +361,7 @@ export default {
       this.$http.get(`/meeting/${row.id}`).then(({ data: res }) => {
         this.dialogFormVisible = true
         this.ruleForm = res.data
-        if (res.data.pic != null) {
+        if (res.data.pic != null && res.data.pic != '') {
           //   let imgUrl = { name: res.data.name, url: res.data.pic }
           //   this.fileList.push(imgUrl)
           this.picImg = res.data.pic