Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev

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

back/src/views/modules/myAgent/demo/competency-application.vue

@@ -24,7 +24,16 @@
           <span class="text" v-if="dataForm.content.applicationSystem">应用系统：<span>{{
           dataForm.content.applicationSystem || '--'
           }}</span></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>
@@ -35,11 +44,6 @@
             需求依据：<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>

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'],

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'])

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,

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')