See999 4 年前
父节点
当前提交
46a5b6e662

+ 1 - 1
src/styles/index.scss 查看文件

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

+ 1 - 1
src/xt_pages/data/components/addDrugs.vue 查看文件

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

+ 8 - 10
src/xt_pages/stock/drugs/query.vue 查看文件

2
   <div class="main-contain">
2
   <div class="main-contain">
3
     <div class="position">
3
     <div class="position">
4
       <bread-crumb :crumbs="crumbs"></bread-crumb>
4
       <bread-crumb :crumbs="crumbs"></bread-crumb>
5
+      <el-button
6
+          size="small"
7
+          class="filter-item"
8
+          type="primary"
9
+          icon="el-icon-search"
10
+          @click="setting"
11
+        >设置</el-button
12
+        >
5
     </div>
13
     </div>
6
     <div class="app-container ">
14
     <div class="app-container ">
7
       <div class="cell clearfix">
15
       <div class="cell clearfix">
22
         >
30
         >
23
       </div>
31
       </div>
24
 
32
 
25
-      <div class="cell clearfix">
26
-        <el-button
27
-          size="small"
28
-          class="filter-item"
29
-          type="primary"
30
-          icon="el-icon-search"
31
-          @click="setting"
32
-        >设置</el-button
33
-        >
34
-      </div>
35
 
33
 
36
       <el-table
34
       <el-table
37
         :row-style="{ color: '#303133' }"
35
         :row-style="{ color: '#303133' }"

+ 4 - 4
src/xt_pages/stock/selfPreparedMedicine/index.vue 查看文件

18
                 v-model="start_time"
18
                 v-model="start_time"
19
                 prefix-icon="el-icon-date"
19
                 prefix-icon="el-icon-date"
20
                 :editable="false"
20
                 :editable="false"
21
-                style="width: 196px;margin-right:10px;"
21
+                style="width: 160px;margin-right:10px;"
22
                 type="date"
22
                 type="date"
23
                 placeholder="选择日期时间"
23
                 placeholder="选择日期时间"
24
                 align="right"
24
                 align="right"
54
                     <div style="display:flex;justify-content: space-between;align-items: center;">
54
                     <div style="display:flex;justify-content: space-between;align-items: center;">
55
                         <div class="tablesTitle">自备药列表</div>
55
                         <div class="tablesTitle">自备药列表</div>
56
                         <div>
56
                         <div>
57
-                            <el-button type="primary" @click="openForm(1)">添加</el-button>
58
-                            <el-button type="primary" @click="openForm(2)">入库</el-button>
59
-                            <el-button type="primary" @click="openForm(3)">出库</el-button>
57
+                            <el-button type="primary" size="mini" @click="openForm(1)">添加</el-button>
58
+                            <el-button type="primary" size="mini" @click="openForm(2)">入库</el-button>
59
+                            <el-button type="primary" size="mini" @click="openForm(3)">出库</el-button>
60
                         </div>
60
                         </div>
61
                     </div>
61
                     </div>
62
                     <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>
62
                     <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>

+ 1 - 1
src/xt_pages/workforce/appointment.vue 查看文件

100
           <span slot="label"><i class="el-icon-date"></i> 下一周 ({{theWeek.nextWeek}})</span>
100
           <span slot="label"><i class="el-icon-date"></i> 下一周 ({{theWeek.nextWeek}})</span>
101
         </el-tab-pane>
101
         </el-tab-pane>
102
         <el-tab-pane name="nextTwoWeek">
102
         <el-tab-pane name="nextTwoWeek">
103
-          <span slot="label"><i class="el-icon-date"></i> 下周 ({{theWeek.nextTwoWeek}})</span>
103
+          <span slot="label"><i class="el-icon-date"></i> 下周 ({{theWeek.nextTwoWeek}})</span>
104
         </el-tab-pane>
104
         </el-tab-pane>
105
       </el-tabs>
105
       </el-tabs>
106
       <!-- </el-col>
106
       <!-- </el-col>

+ 3 - 3
src/xt_pages/workforce/components/setup_template_dialog.vue 查看文件

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