Merge branch 'master' of http://47.110.224.240:13000/pengqiang/xiangan_pc

src/components/360View/opticalFile/index.vue

@@ -3,7 +3,7 @@
   <div class="opticalFile">
     <div class="opticalFile-content">
       <div class="content-left">
-        <div class="content-left-top">
+        <div class="content-left-top" :class="[isSearch !== '3' ? 'height100' : '']">
           <div v-for="(item, index) in formList" :key="index" class="formBox" :class="[index === curIndex ? 'active' : '']" @click="handleForm(index, item)">
             <p :class="[index === curIndex ? 'activeFont' : 'curFont']">{{ item.createTime }}</p>
             <p>{{ item.name }}</p>
@@ -11,7 +11,7 @@
           <img v-if="!formList.length" src="@/assets/img/nodata.png" alt="" class="nodata">
           <!-- <div class="button"><i class="el-icon-plus" /> 新建表单</div> -->
         </div>
-        <div class="content-left-bottom">
+        <div class="content-left-bottom" v-if="isSearch === '3'">
           <div class="commonForm-text">
             <span>常用表单</span>
             <span class="line" />
@@ -232,6 +232,9 @@ export default {
 <style lang="scss" scoped>
 .opticalFile {
   height: 100%;
+  .height100 {
+    height: 100% !important;
+  }
   .active {
     color: white;
     background-color: #1C76FD;

src/page-subspecialty/views/modules/nurseManagement/addProject.vue

@@ -12,20 +12,20 @@
         </el-select>
       </el-form-item>
       <div style="display: flex">
-        <el-form-item style="flex: 1" required label="上班时间 上午:">
+        <el-form-item required label="上班时间 上午:">
           <el-time-picker v-model="form.date" placeholder="选择时间" style="width: 100%;" />
         </el-form-item>
-        <el-form-item style="flex: 1" required label="时间间隔:">
+        <el-form-item required label="时间间隔:">
           <el-input v-model="form.minutes" placeholder="">
             <template slot="append">分钟</template>
           </el-input>
         </el-form-item>
       </div>
       <div style="display: flex">
-        <el-form-item style="flex: 1" required label="下班时间 下午:">
+        <el-form-item required label="下班时间 下午:">
           <el-time-picker v-model="form.date2" placeholder="选择时间" style="width: 100%;" />
         </el-form-item>
-        <el-form-item style="flex: 1" required label="人数上限:">
+        <el-form-item required label="人数上限:">
           <el-input v-model="form.minutes" placeholder="">
             <template slot="append">人</template>
           </el-input>