Browse Source

Merge branch '11/24SAAS' into 0601Action

mo 3 years ago
parent
commit
37ebc6fd06

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 1 - 1
dist/static/css/chunk-b5e0a25a.ce0ba023.css → dist/static/css/chunk-0cd5ddfa.f09dfc3e.css

@@ -1 +1 @@
-.process[data-v-2e4894ee]{padding:10px;max-height:400px;overflow-y:auto}.process .name[data-v-2e4894ee]{font-size:16px;font-weight:700;color:#262626;margin-bottom:8px}.process .concat[data-v-2e4894ee]{font-size:14px}.process .concat[data-v-2e4894ee],.process .timer[data-v-2e4894ee]{font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#666;line-height:18px;margin-bottom:8px}.process .timer[data-v-2e4894ee]{font-size:12px}.el-timeline-item__content[data-v-2e4894ee]{position:relative}[data-v-2e4894ee] .el-timeline-item__node{background-color:var(--color-primary)}[data-v-2e4894ee] .el-timeline-item__tail{border-left:2px solid var(--color-primary)}.courseMask .el-dialog__body[data-v-24316af6]{padding-bottom:0}.process[data-v-559bd184]{padding:10px;max-height:600px;overflow-y:auto}.process .name[data-v-559bd184]{font-size:16px;font-weight:700}.process div[data-v-559bd184]{line-height:30px}.detailImgList[data-v-559bd184]{padding:0 20px}.horizontal[data-v-559bd184]{width:208x;height:208px}.vertical[data-v-559bd184]{width:208px;height:208px}.imgWrapItem[data-v-559bd184]{margin-bottom:20px;font-size:14px;font-family:PingFangSC-Medium,PingFang SC;font-weight:500;color:#666;line-height:20px}.imgWrapItem p[data-v-559bd184]{margin-bottom:8px}.imgWrapItem .el-image[data-v-559bd184],.logo[data-v-559bd184]{border:1px solid #dedede;border-radius:4px;background:#fff}.logo[data-v-559bd184]{color:var(--color-primary);width:208px;height:208px;display:inline-block;line-height:208px;text-align:center}[data-v-559bd184] .el-image__error{width:206px}.courseMask .el-dialog__body[data-v-36b0810b],.courseMask .el-dialog__body[data-v-74db3f70]{padding-bottom:0}
+.process[data-v-2e4894ee]{padding:10px;max-height:400px;overflow-y:auto}.process .name[data-v-2e4894ee]{font-size:16px;font-weight:700;color:#262626;margin-bottom:8px}.process .concat[data-v-2e4894ee]{font-size:14px}.process .concat[data-v-2e4894ee],.process .timer[data-v-2e4894ee]{font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#666;line-height:18px;margin-bottom:8px}.process .timer[data-v-2e4894ee]{font-size:12px}.el-timeline-item__content[data-v-2e4894ee]{position:relative}[data-v-2e4894ee] .el-timeline-item__node{background-color:var(--color-primary)}[data-v-2e4894ee] .el-timeline-item__tail{border-left:2px solid var(--color-primary)}.courseMask .el-dialog__body[data-v-24316af6]{padding-bottom:0}.process[data-v-705461eb]{padding:10px;max-height:600px;overflow-y:auto}.process .name[data-v-705461eb]{font-size:16px;font-weight:700}.process div[data-v-705461eb]{line-height:30px}.detailImgList[data-v-705461eb]{padding:0 20px}.horizontal[data-v-705461eb]{width:208x;height:208px}.vertical[data-v-705461eb]{width:208px;height:208px}.imgWrapItem[data-v-705461eb]{margin-bottom:20px;font-size:14px;font-family:PingFangSC-Medium,PingFang SC;font-weight:500;color:#666;line-height:20px}.imgWrapItem p[data-v-705461eb]{margin-bottom:8px}.imgWrapItem .el-image[data-v-705461eb],.logo[data-v-705461eb]{border:1px solid #dedede;border-radius:4px;background:#fff}.logo[data-v-705461eb]{color:var(--color-primary);width:208px;height:208px;display:inline-block;line-height:208px;text-align:center}[data-v-705461eb] .el-image__error{width:206px}.courseMask .el-dialog__body[data-v-74db3f70],.courseMask .el-dialog__body[data-v-90ce9be4]{padding-bottom:0}

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.c86bd7b2.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-0cd5ddfa.68ebbe8d.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-2873911e.5e07d733.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-b5e0a25a.b5b64e29.js


+ 6 - 0
src/views/organManager/organOperation.vue

@@ -72,11 +72,17 @@ export default {
         this.config = { ...con }
         this.productInfo = productInfo
         this.info = { ...other, theme, themeColor, corporateChops, corporateFinanceChops }
+        if(!this.info.recommender || this.info.recommender==0){
+          this.info.recommender = null
+        }
         this.productInfo.payState = this.info.payState
       } catch(e) {}
     }else {
       if(this.$route.query){
         this.info = {...this.$route.query}
+           if(!this.info.recommender || this.info.recommender==0){
+          this.info.recommender = null
+        }
         // this.info.logo= null
       }
     }

+ 2 - 2
src/views/platformManager/tenantApply/component/tenandInFor.vue

@@ -64,8 +64,8 @@
           prop="enterpriseLiableName"
         >
         </el-table-column>
-        <el-table-column align="center" label="项目负责人" prop="contacts">
-        </el-table-column>
+        <!-- <el-table-column align="center" label="项目负责人" prop="contacts">
+        </el-table-column> -->
         <el-table-column align="center" label="提交时间" prop="createdTime">
         </el-table-column>
         <el-table-column align="center" label="是否创建机构" prop="state">

Some files were not shown because too many files changed in this diff