1

src/styles/index.scss

@@ -291,7 +291,7 @@ code {
 .el-dialog__body {
   max-height: calc(100vh - 290px) !important;
   overflow-y: scroll !important;
-  margin-right: 8px;
+  // margin-right: 8px;
   /* 针对缺省样式 (必须的) */
   &::-webkit-scrollbar {
     width: 6px;

src/xt_pages/data/components/addDrugs.vue

@@ -187,7 +187,7 @@
             <el-form-item label="代理商 : " prop="agent">
               <el-input v-model="form.agent" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
-            <el-form-item label=""  style="visibility: hidden;">
+            <el-form-item label=""  style="display:none;">
               <el-input style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
             <el-form-item label="状态 : " prop="drug_status">

src/xt_pages/stock/drugs/query.vue

@@ -2,6 +2,14 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button
+          size="small"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="setting"
+        >设置</el-button
+        >
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
@@ -22,16 +30,6 @@
         >
       </div>
 
-      <div class="cell clearfix">
-        <el-button
-          size="small"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-search"
-          @click="setting"
-        >设置</el-button
-        >
-      </div>
 
       <el-table
         :row-style="{ color: '#303133' }"

src/xt_pages/stock/selfPreparedMedicine/index.vue

@@ -18,7 +18,7 @@
                 v-model="start_time"
                 prefix-icon="el-icon-date"
                 :editable="false"
-                style="width: 196px;margin-right:10px;"
+                style="width: 160px;margin-right:10px;"
                 type="date"
                 placeholder="选择日期时间"
                 align="right"
@@ -54,9 +54,9 @@
                     <div style="display:flex;justify-content: space-between;align-items: center;">
                         <div class="tablesTitle">自备药列表</div>
                         <div>
-                            <el-button type="primary" @click="openForm(1)">添加</el-button>
-                            <el-button type="primary" @click="openForm(2)">入库</el-button>
-                            <el-button type="primary" @click="openForm(3)">出库</el-button>
+                            <el-button type="primary" size="mini" @click="openForm(1)">添加</el-button>
+                            <el-button type="primary" size="mini" @click="openForm(2)">入库</el-button>
+                            <el-button type="primary" size="mini" @click="openForm(3)">出库</el-button>
                         </div>
                     </div>
                     <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>

src/xt_pages/workforce/appointment.vue

@@ -100,7 +100,7 @@
           <span slot="label"><i class="el-icon-date"></i> 下一周 ({{theWeek.nextWeek}})</span>
         </el-tab-pane>
         <el-tab-pane name="nextTwoWeek">
-          <span slot="label"><i class="el-icon-date"></i> 下两周 ({{theWeek.nextTwoWeek}})</span>
+          <span slot="label"><i class="el-icon-date"></i> 下下周 ({{theWeek.nextTwoWeek}})</span>
         </el-tab-pane>
       </el-tabs>
       <!-- </el-col>

src/xt_pages/workforce/components/setup_template_dialog.vue

@@ -2,11 +2,11 @@
  <!-- top="5vh" -->
     <el-dialog title="设置模板" width="400px" :visible.sync="visible" :before-close="_close">
         <el-form :model="form" label-width="100px">
-            <el-form-item label="模板启用数量">
+            <el-form-item label="选择排班模板">
                 <el-select v-model="form.mode" placeholder="">
                     <el-option label="不启用模板" :value="0"></el-option>
-                    <el-option label="启用一个模板" :value="1"></el-option>
-                    <el-option label="启用两个模板" :value="2"></el-option>
+                    <el-option label="启用单周模板" :value="1"></el-option>
+                    <el-option label="启用双周模板" :value="2"></el-option>
                 </el-select>
             </el-form-item>
         </el-form>