Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/views/projectManage/components/ProjectManagement1.vue

@@ -43,7 +43,7 @@
               <div class="inpBlock">
                 <div class="label">选择分类</div>
                 <!-- <el-cascader v-model="pageType" :options="projectApplicationApply1.sortOptions" clearable></el-cascader> -->
-                <el-cascader disabled v-model="pageType" :options="sortOptions" clearable></el-cascader>
+                <el-cascader disabled style="width: 100%;" v-model="pageType" :options="sortOptions" clearable></el-cascader>
               </div>
           </div>
 
@@ -54,6 +54,7 @@
                     v-model="content.select.projectDate"
                     type="daterange"
                     disabled
+                    style="width: 100%;"
                     value-format="yyyy-MM-dd HH:mm:ss"
                     range-separator="至"
                     start-placeholder="开始日期"

src/views/projectSettlement/components/projectSettlementDetailBase_Student.vue

@@ -43,7 +43,7 @@
                 <div class="inpBlock">
                   <div class="label">选择分类</div>
                   <!-- <el-cascader v-model="pageType" :options="projectApplicationApply1.sortOptions" clearable></el-cascader> -->
-                  <el-cascader disabled v-model="pageType" :options="sortOptions" clearable></el-cascader>
+                  <el-cascader disabled style="width: 100%;" v-model="pageType" :options="sortOptions" clearable></el-cascader>
                 </div>
             </div>
   
@@ -54,6 +54,7 @@
                       v-model="content.select.projectDate"
                       type="daterange"
                       disabled
+                      style="width: 100%;"
                       value-format="yyyy-MM-dd HH:mm:ss"
                       range-separator="至"
                       start-placeholder="开始日期"
@@ -351,7 +352,7 @@
               
       <div class="baseBtn">
         <div class="blockWidth">
-          <el-button type="primary" class="backBtn" @click="audit">立即修改</el-button>
+          <el-button type="primary" class="backBtn" v-show="isUpload==0" @click="audit">立即修改</el-button>
           <el-button type="primary" class="backBtn" v-show="isUpload==1" disabled style="background-color: #c8c9cc !important;border:none;">立即修改</el-button>
           <el-button type="primary" class="backBtn" v-show="isUpload==2" disabled style="background-color: #c8c9cc !important;border:none;">立即修改</el-button>