11

src/assets/styles/element-ui.scss

@@ -141,4 +141,18 @@
 
 .is-current{
   background-color: #EFF6FF!important;
+}
+
+.el-input.is-disabled .el-input__wrapper{
+  background: #fafafa!important;
+  
+}
+.el-input.is-disabled .el-input__inner{
+  -webkit-text-fill-color:#606266!important;
+  color:#606266!important;
+}
+.el-textarea.is-disabled .el-textarea__inner{
+  background: #fafafa!important;
+  -webkit-text-fill-color:#606266!important;
+  color:#606266!important;
 }

src/assets/styles/index.scss

@@ -195,7 +195,7 @@ aside {
 
 .commons-title{
   font-size: 14px;
-  font-weight: 500;
+  font-weight: bold;
   margin-bottom: 20px;
   padding-left: 20px;
   position: relative;

src/layout/components/TagsView/index.vue

@@ -82,7 +82,7 @@ onMounted(() => {
 })
 
 function isActive(r) {
-  return r.path === route.path
+  return r.fullPath === route.fullPath
 }
 function activeStyle(tag) {
   if (!isActive(tag)) return {};

src/store/modules/tagsView.js

@@ -12,18 +12,27 @@ const useTagsViewStore = defineStore(
         this.addCachedView(view)
       },
       addIframeView(view) {
-        if (this.iframeViews.some(v => v.path === view.path)) return
+        console.log(view,123123)
+        if (this.iframeViews.some(v => v.fullPath === view.fullPath)) return
+        let title = view.meta.title || 'no-name'
+        if(view.path == '/platform_manage/process/processApproval') {
+          title = view.query.processType == 10 ? '审批' : view.query.processType == 20 ? '查看' : '发起'
+        }
         this.iframeViews.push(
           Object.assign({}, view, {
-            title: view.meta.title || 'no-name'
+            title: title
           })
         )
       },
       addVisitedView(view) {
-        if (this.visitedViews.some(v => v.path === view.path)) return
+        if (this.visitedViews.some(v => v.fullPath === view.fullPath)) return
+        let title = view.meta.title || 'no-name'
+        if(view.path == '/platform_manage/process/processApproval') {
+          title = view.query.processType == 10 ? '审批' : view.query.processType == 20 ? '查看' : '发起'
+        }
         this.visitedViews.push(
           Object.assign({}, view, {
-            title: view.meta.title || 'no-name'
+            title: title
           })
         )
       },
@@ -47,18 +56,18 @@ const useTagsViewStore = defineStore(
       delVisitedView(view) {
         return new Promise(resolve => {
           for (const [i, v] of this.visitedViews.entries()) {
-            if (v.path === view.path) {
+            if (v.fullPath === view.fullPath) {
               this.visitedViews.splice(i, 1)
               break
             }
           }
-          this.iframeViews = this.iframeViews.filter(item => item.path !== view.path)
+          this.iframeViews = this.iframeViews.filter(item => item.fullPath !== view.fullPath)
           resolve([...this.visitedViews])
         })
       },
       delIframeView(view) {
         return new Promise(resolve => {
-          this.iframeViews = this.iframeViews.filter(item => item.path !== view.path)
+          this.iframeViews = this.iframeViews.filter(item => item.fullPath !== view.fullPath)
           resolve([...this.iframeViews])
         })
       },
@@ -82,9 +91,9 @@ const useTagsViewStore = defineStore(
       delOthersVisitedViews(view) {
         return new Promise(resolve => {
           this.visitedViews = this.visitedViews.filter(v => {
-            return v.meta.affix || v.path === view.path
+            return v.meta.affix || v.fullPath === view.fullPath
           })
-          this.iframeViews = this.iframeViews.filter(item => item.path === view.path)
+          this.iframeViews = this.iframeViews.filter(item => item.fullPath === view.fullPath)
           resolve([...this.visitedViews])
         })
       },
@@ -125,7 +134,7 @@ const useTagsViewStore = defineStore(
       },
       updateVisitedView(view) {
         for (let v of this.visitedViews) {
-          if (v.path === view.path) {
+          if (v.fullPath === view.fullPath) {
             v = Object.assign(v, view)
             break
           }
@@ -133,7 +142,7 @@ const useTagsViewStore = defineStore(
       },
       delRightTags(view) {
         return new Promise(resolve => {
-          const index = this.visitedViews.findIndex(v => v.path === view.path)
+          const index = this.visitedViews.findIndex(v => v.fullPath === view.fullPath)
           if (index === -1) {
             return
           }
@@ -146,7 +155,7 @@ const useTagsViewStore = defineStore(
               this.cachedViews.splice(i, 1)
             }
             if(item.meta.link) {
-              const fi = this.iframeViews.findIndex(v => v.path === item.path)
+              const fi = this.iframeViews.findIndex(v => v.fullPath === item.fullPath)
               this.iframeViews.splice(fi, 1)
             }
             return false
@@ -156,7 +165,7 @@ const useTagsViewStore = defineStore(
       },
       delLeftTags(view) {
         return new Promise(resolve => {
-          const index = this.visitedViews.findIndex(v => v.path === view.path)
+          const index = this.visitedViews.findIndex(v => v.fullPath === view.fullPath)
           if (index === -1) {
             return
           }
@@ -169,7 +178,7 @@ const useTagsViewStore = defineStore(
               this.cachedViews.splice(i, 1)
             }
             if(item.meta.link) {
-              const fi = this.iframeViews.findIndex(v => v.path === item.path)
+              const fi = this.iframeViews.findIndex(v => v.fullPath === item.fullPath)
               this.iframeViews.splice(fi, 1)
             }
             return false

src/views/publicModule/companyConfig/index.vue

@@ -114,6 +114,13 @@
                       class="avatar" />
                     <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
                   </el-upload>
+                  <el-button 
+                    class="delete-btn" 
+                    type="danger" 
+                    v-if="formData.data.enterpriseLogoList && formData.data.enterpriseLogoList.length > 0"
+                    @click="formData.data.enterpriseLogoList = []">
+                    删除
+                  </el-button>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -132,6 +139,13 @@
                       class="avatar" />
                     <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
                   </el-upload>
+                  <el-button 
+                    class="delete-btn" 
+                    type="danger" 
+                    v-if="formData.data.larSignList && formData.data.larSignList.length > 0"
+                    @click="formData.data.larSignList = []">
+                    删除
+                  </el-button>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -150,6 +164,13 @@
                       class="avatar" />
                     <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
                   </el-upload>
+                  <el-button 
+                    class="delete-btn" 
+                    type="danger" 
+                     v-if="formData.data.officialSealList && formData.data.officialSealList.length > 0"
+                    @click="formData.data.officialSealList = []">
+                    删除
+                  </el-button>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -168,6 +189,13 @@
                       class="avatar" />
                     <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
                   </el-upload>
+                  <el-button 
+                    class="delete-btn" 
+                    type="danger" 
+                    v-if="formData.data.contractSealList && formData.data.contractSealList.length > 0" 
+                    @click="formData.data.contractSealList = []">
+                    删除
+                  </el-button>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -610,6 +638,10 @@ const contractSealListSuccess = (response, uploadFile) => {
 <style lang="scss" scoped>
 .tenant {
   padding: 20px;
+  .delete-btn{
+    margin-top: 10px;
+    margin-left: 25px;
+  }
 }
 .avatar-uploader .avatar {
   width: 110px;