柳香萍 6 gadus atpakaļ
vecāks
revīzija
c5fb5f7ecb

+ 1 - 1
src/icons/svg/dashboard.svg Parādīt failu

@@ -1 +1 @@
1
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1559126278025" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4738" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M553.86203002 156.61769104a59.43740844 59.43740844 0 0 0-79.86785887 0L151.037323 463.27838135a29.79286192 29.79286192 0 0 0 39.89685059 44.25361632l5.13542175-4.87586974V822.72082519a59.58572388 59.58572388 0 0 0 59.58572388 59.6598816h173.39927672v-179.3875122a41.95472718 41.95472718 0 0 1 41.97326661-42.01034547h81.59202576a41.95472718 41.95472718 0 0 1 41.97326659 42.01034547v179.3875122h177.51502992a59.58572388 59.58572388 0 0 0 59.6042633-59.6598816V506.56794739c13.2371521 11.97647094 32.01759338 11.06803894 43.03001403-1.20506286a29.79286192 29.79286192 0 0 0-2.15057372-42.08450318L553.86203002 156.63623047z" fill="#333333" p-id="4739"></path></svg>
1
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1559132638469" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1438" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M563.197497 0 460.802503 0 0.012259 486.388227c0 0 0.901006 102.396016 51.200051 102.396016s76.797012 0 76.797012 0 0 232.496449 0 332.816677c0 100.300818 102.397038 102.399081 102.397038 102.399081l204.79714 0c0 0 0-272.419617 0-358.416702 0-25.647017 25.600026-25.600026 25.600026-25.600026l102.394994 0c0 0 25.601047 0.851972 25.601047 25.600026 0 92.198911 0 358.416702 0 358.416702s99.647027 0 204.795097 0c105.147048 0 102.398059-102.399081 102.398059-102.399081L895.992721 563.185239c0 0 27.19875 0 76.799055 0 49.59724 0 51.195965-76.79599 51.195965-76.79599L563.197497 0z" p-id="1439" fill="#bfcbd9"></path></svg>

+ 2 - 2
src/styles/index.scss Parādīt failu

@@ -318,8 +318,8 @@ code {
318 318
 }
319 319
 
320 320
 .NoData {
321
-  width: 200px;
322
-  margin: 0 auto;
321
+  width: 180px;
322
+  margin: 40px auto;
323 323
   img {
324 324
     width: 100%;
325 325
   }

+ 0 - 2
src/views/login/index.vue Parādīt failu

@@ -1,8 +1,6 @@
1 1
 <template>
2 2
   <div class="login-container">
3
-
4 3
     <el-form class="login-form" autoComplete="on" :model="loginForm" :rules="loginRules" ref="loginForm" label-position="left">
5
-
6 4
       <div class="title-container">
7 5
         <h3 class="title">{{$t('login.title')}}</h3>
8 6
         <lang-select class="set-language"></lang-select>

+ 1 - 1
src/views/table/complexTable.vue Parādīt failu

@@ -84,7 +84,7 @@
84 84
     </div>
85 85
 
86 86
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
87
-      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="left" label-width="70px" style='width: 400px; margin-left:50px;'>
87
+      <el-form :rules="rules" ref="dataForm" :model="temp"  label-width="70px" style='width: 400px; margin-left:50px;'>
88 88
         <el-form-item :label="$t('table.type')" prop="type">
89 89
           <el-select class="filter-item" v-model="temp.type" placeholder="Please select">
90 90
             <el-option v-for="item in  calendarTypeOptions" :key="item.key" :label="item.display_name" :value="item.key">

+ 1 - 1
src/xt_pages/data/components/table.vue Parādīt failu

@@ -16,7 +16,7 @@
16 16
     </el-table>
17 17
 
18 18
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
19
-      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="left" label-width="70px" style='width: 500px; margin-left:50px;'>
19
+      <el-form :rules="rules" ref="dataForm" :model="temp" label-width="70px" style='width: 500px; margin-left:50px;'>
20 20
         <el-form-item :label="$t('data_config.config_name')"  prop="config_name">
21 21
           <el-input v-model="temp.name" placeholder="请输入名称"></el-input>
22 22
         </el-form-item>

+ 1 - 32
src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue Parādīt failu

@@ -41,55 +41,24 @@
41 41
           </el-col>
42 42
         </el-row>
43 43
 
44
-        <el-row style="margin-bottom: 20px;margin-top: 20px">
44
+        <el-row style="margin:20px 60px;">
45 45
           <el-col :span="5">
46
-            <!--<el-button-->
47
-            <!--:disabled="$store.getters.xt_user.subscibe.state==3?true:false"-->
48
-            <!--type="primary"-->
49
-            <!--@click="openAdviceTemplate()"-->
50
-            <!--&gt;选择医嘱模板</el-button>-->
51
-
52 46
             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round
53 47
                        @click="openAdviceTemplate()">选择医嘱模板
54 48
             </el-button>
55
-
56
-
57 49
           </el-col>
58
-          <!-- <el-col :span="1">&nbsp;</el-col> -->
59 50
           <el-col :span="5">
60
-            <!--<el-button-->
61
-            <!--:disabled="$store.getters.xt_user.subscibe.state==3?true:false"-->
62
-            <!--type="primary"-->
63
-            <!--@click="openGroupAdvice(0)"-->
64
-            <!--&gt;新增医嘱内容</el-button>-->
65
-
66 51
             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round
67 52
                        @click="openGroupAdvice(0)">新增医嘱内容
68 53
             </el-button>
69
-
70 54
           </el-col>
71
-          <!-- <el-col :span="1">&nbsp;</el-col> -->
72 55
           <el-col :span="5">
73
-            <!--<el-button-->
74
-            <!--:disabled="$store.getters.xt_user.subscibe.state==3?true:false"-->
75
-            <!--type="primary"-->
76
-            <!--@click="openGroupAdvice(1)"-->
77
-            <!--&gt;修改医嘱内容</el-button>-->
78
-
79 56
             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round
80 57
                        @click="openGroupAdvice(1)">修改医嘱内容
81 58
             </el-button>
82 59
 
83 60
           </el-col>
84
-
85
-          <!-- <el-col :span="1">&nbsp;</el-col> -->
86 61
           <el-col :span="5">
87
-            <!--<el-button-->
88
-            <!--:disabled="$store.getters.xt_user.subscibe.state==3?true:false"-->
89
-            <!--type="primary"-->
90
-            <!--@click="openDeleteGroupAdvice()"-->
91
-            <!--&gt;删除医嘱内容</el-button>-->
92
-
93 62
             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round
94 63
                        @click="openDeleteGroupAdvice()">删除医嘱内容
95 64
             </el-button>

+ 1 - 5
src/xt_pages/dialysis/schedualPatient.vue Parādīt failu

@@ -17,8 +17,7 @@
17 17
       <label class="title"><span class="name">排班班次</span> : </label>
18 18
       <div class="time ">
19 19
         <ul class="">
20
-          <li v-for="option in schedule_type_options" :key="option.value" @click="handletimeType(option.value)" :class="schedule_type_selected == option.value ? 'active' : ''" >
21
-            {{option.text}}
20
+          <li v-for="option in schedule_type_options" :key="option.value" @click="handletimeType(option.value)" :class="schedule_type_selected == option.value ? 'active' : ''" >{{option.text}}
22 21
           </li>
23 22
         </ul>
24 23
       </div>
@@ -346,8 +345,5 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
346 345
       }
347 346
     }
348 347
   }
349
-  .NoData {
350
-    text-align: center;
351
-  }
352 348
 </style>
353 349
 

+ 16 - 16
src/xt_pages/home/modify_user_info_dialog.vue Parādīt failu

@@ -1,15 +1,15 @@
1 1
 <template>
2 2
     <div>
3
-        <el-dialog title="修改个人信息" width="50%" top="10vh" :visible.sync="visible" :before-close="_close">
4
-            <el-form ref="form" :model="form" label-position="left" :rules="rules" label-width="80px" 
3
+        <el-dialog title="修改个人信息" modal-append-to-body="false" append-to-body="true" width="50%" :visible.sync="visible" :before-close="_close">
4
+            <el-form ref="form" :model="form"  :rules="rules" label-width="80px" 
5 5
                     v-loading="uploading">
6
-                <el-form-item label="账号">
6
+                <el-form-item label="账号:">
7 7
                     <span>{{ this.$store.getters.xt_user.user.mobile }}</span>
8 8
                 </el-form-item>
9
-                <el-form-item label="姓名" prop="user_name">
9
+                <el-form-item label="姓名:" prop="user_name">
10 10
                     <el-input v-model="form.user_name" style="width: 300px;"></el-input>
11 11
                 </el-form-item>
12
-                <el-form-item label="头像">
12
+                <el-form-item label="头像:">
13 13
                     <el-upload  
14 14
                     style="width:100%;"
15 15
                     :data="qn_upload_data"
@@ -27,29 +27,29 @@
27 27
                     </el-upload>
28 28
                     <span style="display: block; font-size: 11px; color: gray">仅支持JPG/PNG/JPEG, 大小在300K以内</span>
29 29
                 </el-form-item>
30
-                <el-form-item>
31
-                    <el-button type="primary" @click="submitAction">确定</el-button>
32
-                    <el-button type="primary" @click="modifyPwdAction">修改密码</el-button>
33
-                </el-form-item>
34 30
             </el-form>
31
+            <div slot="footer" class="dialog-footer">
32
+                    <el-button type="primary" @click="submitAction">保存</el-button>
33
+                    <el-button type="primary" @click="modifyPwdAction">修改密码</el-button>
34
+            </div>
35 35
         </el-dialog>
36 36
 
37
-        <el-dialog title="修改密码" append-to-body :visible.sync="pwd_dialog_visible">
37
+        <el-dialog title="修改密码" modal-append-to-body="false" append-to-body="true" :visible.sync="pwd_dialog_visible">
38 38
             <el-form ref="pwd_form" :model="pwd_form" label-width="80px">
39
-                <el-form-item label="账号">
39
+                <el-form-item label="账号:">
40 40
                     <span>{{ this.$store.getters.xt_user.user.mobile }}</span>
41 41
                 </el-form-item>
42
-                <el-form-item label="新密码" prop="new_password">
42
+                <el-form-item label="新密码:" prop="new_password">
43 43
                     <el-input v-model="pwd_form.new_password" style="width: 260px;"></el-input>
44 44
                 </el-form-item>
45
-                <el-form-item label="验证码" prop="code">
45
+                <el-form-item label="验证码:" prop="code">
46 46
                     <el-input v-model="pwd_form.code" style="width: 135px;"></el-input>
47 47
                     <el-button :type="count_downing ? 'info' : 'primary'" :disabled="count_downing" @click="getCodeAction" style="width: 122px; padding-left: 5px; padding-right: 5px;">{{ code_btn_title }}</el-button>
48 48
                 </el-form-item>
49
-                <el-form-item>
50
-                    <el-button :loading="modify_pwd_loading" type="primary" @click="submitModifyPwdAction">确定</el-button>
51
-                </el-form-item>
52 49
             </el-form>
50
+            <div slot="footer" class="dialog-footer">
51
+                    <el-button :loading="modify_pwd_loading" type="primary" @click="submitModifyPwdAction">保存</el-button>
52
+            </div>
53 53
         </el-dialog>
54 54
     </div>
55 55
 </template>

+ 239 - 255
src/xt_pages/stock/config/dealer.vue Parādīt failu

@@ -97,108 +97,108 @@
97 97
 </template>
98 98
 
99 99
 <script>
100
-  import manufacturerOrDealerDialog from '../Dialog/manufacturerOrDealerDialog'
101
-  import {
102
-    createDealer,
103
-    modifyDealer,
104
-    getDealersList,
105
-    deleteDealer,
106
-    GetDealer
107
-  } from "@/api/stock";
108
-
109
-  export default {
110
-    components: {
111
-      manufacturerOrDealerDialog
112
-    },
113
-    name: "dealer",
114
-    data() {
115
-      return {
116
-        thedefaultActive:'1-2',
117
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
118
-        dealerData: [],
119
-        total: 0,
120
-        pageTotal: 0,
121
-        pageSelect: 0,
122
-        page: 1,
123
-        limit: 7,
124
-
125
-        loading:false,
126
-
127
-        dealer_code: '',
128
-        editId: '',
129
-        editIndex:'',
130
-        dealerDialog: {
131
-          titles: '新增经销商',
132
-          isVisibility: false,
133
-          type: 1, //1.经销商 2.厂家
134
-          isCreated: 1, //1.创建 2.编辑 3.查看详情
135
-          formValue: {
136
-            manufacturer_name: '',
137
-            dealer_name: '',
138
-            contact: '',
139
-            contact_phone: '',
140
-            platform_number: '',
141
-            email: '',
142
-            contact_address: '',
143
-            remark: '',
144
-          },
145
-          resetForm: {
146
-            manufacturer_name: '',
147
-            dealer_name: '',
148
-            contact: '',
149
-            contact_phone: '',
150
-            platform_number: '',
151
-            email: '',
152
-            contact_address: '',
153
-            remark: '',
154
-          },
100
+import manufacturerOrDealerDialog from "../Dialog/manufacturerOrDealerDialog";
101
+import {
102
+  createDealer,
103
+  modifyDealer,
104
+  getDealersList,
105
+  deleteDealer,
106
+  GetDealer
107
+} from "@/api/stock";
108
+
109
+export default {
110
+  components: {
111
+    manufacturerOrDealerDialog
112
+  },
113
+  name: "dealer",
114
+  data() {
115
+    return {
116
+      thedefaultActive: "1-2",
117
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
118
+      dealerData: [],
119
+      total: 0,
120
+      pageTotal: 0,
121
+      pageSelect: 0,
122
+      page: 1,
123
+      limit: 7,
124
+
125
+      loading: false,
126
+
127
+      dealer_code: "",
128
+      editId: "",
129
+      editIndex: "",
130
+      dealerDialog: {
131
+        titles: "新增经销商",
132
+        isVisibility: false,
133
+        type: 1, //1.经销商 2.厂家
134
+        isCreated: 1, //1.创建 2.编辑 3.查看详情
135
+        formValue: {
136
+          manufacturer_name: "",
137
+          dealer_name: "",
138
+          contact: "",
139
+          contact_phone: "",
140
+          platform_number: "",
141
+          email: "",
142
+          contact_address: "",
143
+          remark: ""
144
+        },
145
+        resetForm: {
146
+          manufacturer_name: "",
147
+          dealer_name: "",
148
+          contact: "",
149
+          contact_phone: "",
150
+          platform_number: "",
151
+          email: "",
152
+          contact_address: "",
153
+          remark: ""
155 154
         }
156
-
157
-
155
+      }
156
+    };
157
+  },
158
+  methods: {
159
+    handleEdit: function(index, row) {
160
+      this.editId = row.id;
161
+      this.editIndex = index;
162
+      let params = {
163
+        id: row.id
158 164
       };
159
-    },
160
-    methods: {
161
-      handleEdit: function (index, row) {
162
-        this.editId = row.id
163
-        this.editIndex = index
164
-        let params = {
165
-          id: row.id
165
+      this.loading = true;
166
+      GetDealer(params).then(response => {
167
+        if (response.data.state == 0) {
168
+          this.$message.error(response.data.msg);
169
+          this.loading = false;
170
+          return false;
171
+        } else {
172
+          this.loading = false;
173
+          this.dealerDialog.formValue.dealer_name =
174
+            response.data.data.dealer.dealer_name;
175
+          this.dealerDialog.formValue.contact =
176
+            response.data.data.dealer.contact;
177
+          this.dealerDialog.formValue.contact_phone =
178
+            response.data.data.dealer.contact_phone;
179
+          this.dealerDialog.formValue.platform_number =
180
+            response.data.data.dealer.platform_number;
181
+          this.dealerDialog.formValue.email = response.data.data.dealer.email;
182
+          this.dealerDialog.formValue.contact_address =
183
+            response.data.data.dealer.contact_address;
184
+          this.dealerDialog.formValue.remark = response.data.data.dealer.remark;
185
+          this.dealerDialog.isCreated = 2;
186
+          this.$refs.dialog.show();
187
+
188
+          this.dealer_code = response.data.data.dealer.dealer_code;
166 189
         }
167
-        this.loading = true
168
-        GetDealer(params).then(response => {
169
-          if (response.data.state == 0) {
170
-            this.$message.error(response.data.msg);
171
-            this.loading = false
172
-            return false;
173
-          } else {
174
-            this.loading = false
175
-            this.dealerDialog.formValue.dealer_name = response.data.data.dealer.dealer_name
176
-            this.dealerDialog.formValue.contact = response.data.data.dealer.contact
177
-            this.dealerDialog.formValue.contact_phone = response.data.data.dealer.contact_phone
178
-            this.dealerDialog.formValue.platform_number = response.data.data.dealer.platform_number
179
-            this.dealerDialog.formValue.email = response.data.data.dealer.email
180
-            this.dealerDialog.formValue.contact_address = response.data.data.dealer.contact_address
181
-            this.dealerDialog.formValue.remark = response.data.data.dealer.remark
182
-            this.dealerDialog.isCreated = 2
183
-            this.$refs.dialog.show()
184
-
185
-            this.dealer_code = response.data.data.dealer.dealer_code
186
-
187
-          }
188
-        });
189
-
190
-      },
191
-      handleDelete: function (index, row) {
192
-
193
-
194
-        this.$confirm('确认删除这条经销商信息?', '删除经销商信息', {
195
-          confirmButtonText: '确定',
196
-          cancelButtonText: '取消',
197
-          type: 'warning'
198
-        }).then(() => {
190
+      });
191
+    },
192
+    handleDelete: function(index, row) {
193
+      this.$confirm("确认删除这条经销商信息?", "删除经销商信息", {
194
+        confirmButtonText: "确定",
195
+        cancelButtonText: "取消",
196
+        type: "warning"
197
+      })
198
+        .then(() => {
199 199
           let params = {
200 200
             id: row.id
201
-          }
201
+          };
202 202
 
203 203
           deleteDealer(params).then(response => {
204 204
             if (response.data.state == 0) {
@@ -207,192 +207,176 @@
207 207
             } else {
208 208
               this.dealerData.splice(index, 1);
209 209
 
210
-              this.$message.success("删除成功")
210
+              this.$message.success("删除成功");
211 211
             }
212 212
           });
213
-        }).catch(() => {
214
-        });
215
-
213
+        })
214
+        .catch(() => {});
215
+    },
216
+    showDetails: function(index, row) {
217
+      let params = {
218
+        id: row.id
219
+      };
220
+      GetDealer(params).then(response => {
221
+        if (response.data.state == 0) {
222
+          this.$message.error(response.data.msg);
223
+          return false;
224
+        } else {
225
+          this.dealerDialog.formValue.dealer_name =
226
+            response.data.data.dealer.dealer_name;
227
+          this.dealerDialog.formValue.contact =
228
+            response.data.data.dealer.contact;
229
+          this.dealerDialog.formValue.contact_phone =
230
+            response.data.data.dealer.contact_phone;
231
+          this.dealerDialog.formValue.platform_number =
232
+            response.data.data.dealer.platform_number;
233
+          this.dealerDialog.formValue.email = response.data.data.dealer.email;
234
+          this.dealerDialog.formValue.contact_address =
235
+            response.data.data.dealer.contact_address;
236
+          this.dealerDialog.formValue.remark = response.data.data.dealer.remark;
237
+          this.dealerDialog.isCreated = 3;
238
+          this.dealerDialog.isVisibility = true;
239
+        }
240
+      });
241
+    },
242
+    manufacturerDialogComfirm: function(val) {
243
+      this.$refs.dialog.hide();
216 244
 
217
-      },
218
-      showDetails: function (index, row) {
245
+      if (val.isCreated == 2) {
246
+        //修改
219 247
         let params = {
220
-          id: row.id
221
-        }
222
-        GetDealer(params).then(response => {
248
+          dealer_name: val.dealer_name,
249
+          contact: val.contact,
250
+          contact_phone: val.contact_phone,
251
+          platform_number: val.platform_number,
252
+          email: val.email,
253
+          contact_address: val.contact_address,
254
+          remark: val.remark,
255
+          dealer_code: this.dealer_code,
256
+          id: this.editId
257
+        };
258
+        modifyDealer(params).then(response => {
223 259
           if (response.data.state == 0) {
224 260
             this.$message.error(response.data.msg);
225 261
             return false;
226 262
           } else {
227
-            this.dealerDialog.formValue.dealer_name = response.data.data.dealer.dealer_name
228
-            this.dealerDialog.formValue.contact = response.data.data.dealer.contact
229
-            this.dealerDialog.formValue.contact_phone = response.data.data.dealer.contact_phone
230
-            this.dealerDialog.formValue.platform_number = response.data.data.dealer.platform_number
231
-            this.dealerDialog.formValue.email = response.data.data.dealer.email
232
-            this.dealerDialog.formValue.contact_address = response.data.data.dealer.contact_address
233
-            this.dealerDialog.formValue.remark = response.data.data.dealer.remark
234
-            this.dealerDialog.isCreated = 3
235
-            this.dealerDialog.isVisibility = true
263
+            this.dealerData[this.editIndex].dealer_name =
264
+              response.data.data.dealer.dealer_name;
265
+            this.dealerData[this.editIndex].contact =
266
+              response.data.data.dealer.contact;
267
+            this.dealerData[this.editIndex].contact_phone =
268
+              response.data.data.dealer.contact_phone;
269
+            this.dealerData[this.editIndex].platform_number =
270
+              response.data.data.dealer.platform_number;
271
+            this.dealerData[this.editIndex].email =
272
+              response.data.data.dealer.email;
273
+            this.dealerData[this.editIndex].contact_address =
274
+              response.data.data.dealer.contact_address;
275
+            this.dealerData[this.editIndex].remark =
276
+              response.data.data.dealer.remark;
277
+            this.dealerData[this.editIndex].dealer_code =
278
+              response.data.data.dealer.dealer_code;
279
+
280
+            this.$message.success("修改成功");
236 281
           }
237 282
         });
238
-      },
239
-      manufacturerDialogComfirm: function (val) {
240
-        this.$refs.dialog.hide()
241
-
242
-
243
-        if (val.isCreated == 2) { //修改
244
-          let params = {
245
-            'dealer_name': val.dealer_name,
246
-            'contact': val.contact,
247
-            'contact_phone': val.contact_phone,
248
-            'platform_number': val.platform_number,
249
-            'email': val.email,
250
-            'contact_address': val.contact_address,
251
-            'remark': val.remark,
252
-            'dealer_code': this.dealer_code,
253
-            'id': this.editId
254
-          }
255
-          modifyDealer(params).then(response => {
256
-            if (response.data.state == 0) {
257
-              this.$message.error(response.data.msg);
258
-              return false;
259
-            } else {
260
-              this.dealerData[this.editIndex].dealer_name = response.data.data.dealer.dealer_name
261
-              this.dealerData[this.editIndex].contact = response.data.data.dealer.contact
262
-              this.dealerData[this.editIndex].contact_phone = response.data.data.dealer.contact_phone
263
-              this.dealerData[this.editIndex].platform_number = response.data.data.dealer.platform_number
264
-              this.dealerData[this.editIndex].email = response.data.data.dealer.email
265
-              this.dealerData[this.editIndex].contact_address = response.data.data.dealer.contact_address
266
-              this.dealerData[this.editIndex].remark = response.data.data.dealer.remark
267
-              this.dealerData[this.editIndex].dealer_code = response.data.data.dealer.dealer_code
268
-
269
-              this.$message.success("修改成功")
270
-
271
-
272
-            }
273
-          });
274
-
275
-        } else if (val.isCreated == 1) { //新增
276
-          createDealer(val).then(response => {
277
-            if (response.data.state == 0) {
278
-              this.$message.error(response.data.msg);
279
-              return false;
280
-            } else {
281
-              this.dealerData.unshift(response.data.data.dealer)
282
-
283
-              this.$message.success("新增成功")
284
-
285
-
286
-            }
287
-          });
288
-
289
-        }
290
-
291
-
292
-      },
293
-      manufacturerDialogCancle: function () {
294
-        this.$refs.dialog.hide()
295
-
296
-      },
297
-      showDialog: function () {
298
-        // this.manufacturerDialog.formValue = {}
299
-        this.dealerDialog.formValue = Object.assign({}, this.dealerDialog.resetForm)
300
-        this.$refs.dialog.show()
301
-
302
-        this.dealerDialog.isCreated = 1
303
-
304
-      }, handleSizeChange(val) {
305
-        this.limit = val;
306
-        this.getList();
307
-      }, handleCurrentChange(val) {
308
-        this.page = val;
309
-        this.getList();
310
-      },getList(){
311
-        let params = {
312
-          'page':this.page,
313
-          'limit':this.limit
314
-        }
315
-        this.loading = true
316
-        getDealersList(params).then(response => {
283
+      } else if (val.isCreated == 1) {
284
+        //新增
285
+        createDealer(val).then(response => {
317 286
           if (response.data.state == 0) {
318
-            this.loading = false
319
-
320 287
             this.$message.error(response.data.msg);
321 288
             return false;
322 289
           } else {
323
-            this.loading = false
324
-            this.total = response.data.data.total
325
-            this.dealerData = []
326
-            for (let i = 0; i < response.data.data.dealer.length; i++) {
327
-              this.dealerData.push(response.data.data.dealer[i])
290
+            this.dealerData.unshift(response.data.data.dealer);
328 291
 
329
-            }
292
+            this.$message.success("新增成功");
330 293
           }
331 294
         });
332
-
333 295
       }
334 296
     },
335
-    created() {
336
-      this.getList()
337
-
297
+    manufacturerDialogCancle: function() {
298
+      this.$refs.dialog.hide();
299
+    },
300
+    showDialog: function() {
301
+      // this.manufacturerDialog.formValue = {}
302
+      this.dealerDialog.formValue = Object.assign(
303
+        {},
304
+        this.dealerDialog.resetForm
305
+      );
306
+      this.$refs.dialog.show();
307
+
308
+      this.dealerDialog.isCreated = 1;
309
+    },
310
+    handleSizeChange(val) {
311
+      this.limit = val;
312
+      this.getList();
313
+    },
314
+    handleCurrentChange(val) {
315
+      this.page = val;
316
+      this.getList();
317
+    },
318
+    getList() {
319
+      let params = {
320
+        page: this.page,
321
+        limit: this.limit
322
+      };
323
+      this.loading = true;
324
+      getDealersList(params).then(response => {
325
+        if (response.data.state == 0) {
326
+          this.loading = false;
327
+
328
+          this.$message.error(response.data.msg);
329
+          return false;
330
+        } else {
331
+          this.loading = false;
332
+          this.total = response.data.data.total;
333
+          this.dealerData = [];
334
+          for (let i = 0; i < response.data.data.dealer.length; i++) {
335
+            this.dealerData.push(response.data.data.dealer[i]);
336
+          }
337
+        }
338
+      });
338 339
     }
339
-  };
340
+  },
341
+  created() {
342
+    this.getList();
343
+  }
344
+};
340 345
 </script>
341 346
 
342 347
 <style rel="stylesheet/css" lang="scss" scoped>
343
-  .information {
344
-    border: 1px #dcdfe6 solid;
345
-    padding: 30px 20px 30px 20px;
348
+.information {
349
+  border: 1px #dcdfe6 solid;
350
+  padding: 30px 20px 30px 20px;
346 351
 
347
-    .border {
348
-      border-bottom: 1px #dcdfe6 solid;
349
-      margin: 0px 0 20px 0;
350
-    }
352
+  .border {
353
+    border-bottom: 1px #dcdfe6 solid;
354
+    margin: 0px 0 20px 0;
351 355
   }
352
-
353
-  .title {
354
-    height: 44px;
355
-    line-height: 44px;
356
-    padding: 0 0 0 10px;
357
-    margin: 0 0 10px 0;
358
-    // border-radius: 4px 4px 0 0;
359
-  }
360
-
361
-  .edit_separater {
362
-    border-top: 1px solid rgb(233, 233, 233);
363
-    margin-top: 15px;
364
-    margin-bottom: 15px;
365
-  }
366
-
356
+}
357
+
358
+.title {
359
+  height: 44px;
360
+  line-height: 44px;
361
+  padding: 0 0 0 10px;
362
+  margin: 0 0 10px 0;
363
+  // border-radius: 4px 4px 0 0;
364
+}
365
+
366
+.edit_separater {
367
+  border-top: 1px solid rgb(233, 233, 233);
368
+  margin-top: 15px;
369
+  margin-bottom: 15px;
370
+}
367 371
 </style>
368 372
 
369 373
 <style>
370
-  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
371
-    font-size: 12px;
372
-  }
373
-
374
-  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
375
-    background: #6fb5fa;
376
-  }
374
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
375
+  font-size: 12px;
376
+}
377 377
 
378
-  .dataTitle {
379
-    color: #409eff;
380
-    font-size: 16px;
381
-    border-bottom: 1px #409eff solid;
382
-    height: 36px;
383
-    line-height: 10px;
384
-    margin: 0 0 10px 0;
385
-    position: relative;
386
-    padding: 0 0 6px 10px;
387
-  &::before {
388
-     position: absolute;
389
-     left: 0;
390
-     bottom: 10px;
391
-     content: "";
392
-     width: 2px;
393
-     height: 20px;
394
-     background: #409eff;
395
-   }
396
-  }
378
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
379
+  background: #6fb5fa;
380
+}
397 381
 
398 382
 </style>

+ 202 - 237
src/xt_pages/stock/config/goodType.vue Parādīt failu

@@ -140,91 +140,90 @@
140 140
 </template>
141 141
 
142 142
 <script>
143
-  import goodTypeDialog from '../Dialog/goodTypeDialog'
144
-  import {
145
-    createGoodType,
146
-    modifyGoodType,
147
-    getGoodTypeList,
148
-    deleteGoodType,
149
-    GetGoodType,
150
-
151
-    createGoodInfo,
152
-    modifyGoodInfo,
153
-    getGoodInfoList,
154
-    deleteGoodInfo,
155
-    GetGoodInfoByGoodId,
156
-    GetGoodInfo,
157
-    GetAllDeals,
158
-    GetAllManufacturer,
159
-    GetAllGoodType
160
-  } from "@/api/stock";
161
-  import GoodInfoDailog from "../Dialog/goodInfoDailog";
162
-
163
-  export default {
164
-    components: {
165
-      goodTypeDialog
166
-    },
167
-    name: "goodType",
168
-    data() {
169
-      return {
170
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
171
-        total: 0,
172
-        pageTotal: 0,
173
-        pageSelect: 0,
174
-        page: 1,
175
-        limit: 7,
176
-
177
-        goodType: {
178
-          loading: false,
179
-          goodTypeData: [],
180
-          type_code: '',
181
-          editInfoId: '',
182
-          editInfoIndex: '',
183
-          tableCurrentIndex: -1,
184
-          goodTypeDialog: {
185
-            goodTypeTitle: '新增商品类型',
186
-            isCreated: 1, //1.创建 2.编辑 3.查看详情
187
-            formValue: {
188
-              type_name: '',
189
-              remark: '',
190
-            },
191
-            isVisibility: false,
143
+import goodTypeDialog from "../Dialog/goodTypeDialog";
144
+import {
145
+  createGoodType,
146
+  modifyGoodType,
147
+  getGoodTypeList,
148
+  deleteGoodType,
149
+  GetGoodType,
150
+  createGoodInfo,
151
+  modifyGoodInfo,
152
+  getGoodInfoList,
153
+  deleteGoodInfo,
154
+  GetGoodInfoByGoodId,
155
+  GetGoodInfo,
156
+  GetAllDeals,
157
+  GetAllManufacturer,
158
+  GetAllGoodType
159
+} from "@/api/stock";
160
+import GoodInfoDailog from "../Dialog/goodInfoDailog";
161
+
162
+export default {
163
+  components: {
164
+    goodTypeDialog
165
+  },
166
+  name: "goodType",
167
+  data() {
168
+    return {
169
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
170
+      total: 0,
171
+      pageTotal: 0,
172
+      pageSelect: 0,
173
+      page: 1,
174
+      limit: 7,
175
+
176
+      goodType: {
177
+        loading: false,
178
+        goodTypeData: [],
179
+        type_code: "",
180
+        editInfoId: "",
181
+        editInfoIndex: "",
182
+        tableCurrentIndex: -1,
183
+        goodTypeDialog: {
184
+          goodTypeTitle: "新增商品类型",
185
+          isCreated: 1, //1.创建 2.编辑 3.查看详情
186
+          formValue: {
187
+            type_name: "",
188
+            remark: ""
192 189
           },
190
+          isVisibility: false
193 191
         }
192
+      }
193
+    };
194
+  },
195
+  methods: {
196
+    handleEdit: function(index, row) {
197
+      this.goodType.editTypeId = row.id;
198
+      this.goodType.editTypeIndex = index;
199
+      let params = {
200
+        id: row.id
194 201
       };
195
-    },
196
-    methods: {
197
-      handleEdit: function (index, row) {
198
-        this.goodType.editTypeId = row.id
199
-        this.goodType.editTypeIndex = index
200
-        let params = {
201
-          id: row.id
202
+      GetGoodType(params).then(response => {
203
+        if (response.data.state == 0) {
204
+          this.$message.error(response.data.msg);
205
+          return false;
206
+        } else {
207
+          this.goodType.goodTypeDialog.formValue.remark =
208
+            response.data.data.goodType.remark;
209
+          this.goodType.goodTypeDialog.formValue.type_name =
210
+            response.data.data.goodType.type_name;
211
+          this.goodType.goodTypeDialog.isCreated = 2;
212
+          this.$refs.dialog.show();
213
+          this.goodType.type_code = response.data.data.goodType.type_code;
202 214
         }
203
-        GetGoodType(params).then(response => {
204
-          if (response.data.state == 0) {
205
-            this.$message.error(response.data.msg);
206
-            return false;
207
-          } else {
208
-            this.goodType.goodTypeDialog.formValue.remark = response.data.data.goodType.remark
209
-            this.goodType.goodTypeDialog.formValue.type_name = response.data.data.goodType.type_name
210
-            this.goodType.goodTypeDialog.isCreated = 2
211
-            this.$refs.dialog.show()
212
-            this.goodType.type_code = response.data.data.goodType.type_code
213
-
214
-          }
215
-        });
216
-
217
-      },
218
-      handleDelete: function (index, row) {
219
-
220
-        this.$confirm('确认删除这条商品类型?', '删除商品类型', {
221
-          confirmButtonText: '确定',
222
-          cancelButtonText: '取消',
223
-          type: 'warning'
224
-        }).then(() => {
215
+      });
216
+    },
217
+    handleDelete: function(index, row) {
218
+      this.$confirm("确认删除这条商品类型?", "删除商品类型", {
219
+        confirmButtonText: "确定",
220
+        cancelButtonText: "取消",
221
+        type: "warning"
222
+      })
223
+        .then(() => {
225 224
           let params = {
226 225
             id: row.id
227
-          }
226
+          };
228 227
 
229 228
           deleteGoodType(params).then(response => {
230 229
             if (response.data.state == 0) {
@@ -232,197 +231,163 @@
232 231
               return false;
233 232
             } else {
234 233
               this.goodType.goodTypeData.splice(index, 1);
235
-              this.goodType.tableCurrentIndex = -1
234
+              this.goodType.tableCurrentIndex = -1;
236 235
 
237
-              this.$message.success("删除成功")
236
+              this.$message.success("删除成功");
238 237
             }
239 238
           });
240
-        }).catch(() => {
241
-        });
239
+        })
240
+        .catch(() => {});
241
+    },
242
+    showDetails: function(index, row) {
243
+      let params = {
244
+        id: row.id
245
+      };
246
+      GetGoodType(params).then(response => {
247
+        if (response.data.state == 0) {
248
+          this.$message.error(response.data.msg);
249
+          return false;
250
+        } else {
251
+          this.goodType.goodTypeDialog.formValue.type_name =
252
+            response.data.data.goodType.type_name;
253
+          this.goodType.goodTypeDialog.formValue.remark =
254
+            response.data.data.goodType.remark;
255
+          this.goodType.goodTypeDialog.isCreated = 3;
256
+          this.goodType.goodTypeDialog.isVisibility = true;
257
+        }
258
+      });
259
+    },
242 260
 
261
+    goodTypeDialogComfirm: function(val) {
262
+      this.$refs.dialog.hide();
243 263
 
244
-      },
245
-      showDetails: function (index, row) {
264
+      if (val.isCreated == 2) {
265
+        //修改
246 266
         let params = {
247
-          id: row.id
248
-        }
249
-        GetGoodType(params).then(response => {
267
+          type_name: val.type_name,
268
+          remark: val.remark,
269
+          type_code: this.goodType.type_code,
270
+          id: this.goodType.editTypeId
271
+        };
272
+
273
+        modifyGoodType(params).then(response => {
250 274
           if (response.data.state == 0) {
251 275
             this.$message.error(response.data.msg);
252 276
             return false;
253 277
           } else {
254
-            this.goodType.goodTypeDialog.formValue.type_name = response.data.data.goodType.type_name
255
-            this.goodType.goodTypeDialog.formValue.remark = response.data.data.goodType.remark
256
-            this.goodType.goodTypeDialog.isCreated = 3
257
-            this.goodType.goodTypeDialog.isVisibility = true
258
-          }
259
-        });
260
-      },
278
+            this.goodType.goodTypeData[this.goodType.editTypeIndex].type_name =
279
+              response.data.data.goodTypes.type_name;
280
+            this.goodType.goodTypeData[this.goodType.editTypeIndex].remark =
281
+              response.data.data.goodTypes.remark;
261 282
 
262
-
263
-      goodTypeDialogComfirm: function (val) {
264
-        this.$refs.dialog.hide()
265
-
266
-        if (val.isCreated == 2) { //修改
267
-          let params = {
268
-            'type_name': val.type_name,
269
-            'remark': val.remark,
270
-            'type_code': this.goodType.type_code,
271
-            'id': this.goodType.editTypeId
283
+            this.$message.success("修改成功");
272 284
           }
273
-
274
-
275
-          modifyGoodType(params).then(response => {
276
-            if (response.data.state == 0) {
277
-              this.$message.error(response.data.msg);
278
-              return false;
279
-            } else {
280
-              this.goodType.goodTypeData[this.goodType.editTypeIndex].type_name = response.data.data.goodTypes.type_name
281
-              this.goodType.goodTypeData[this.goodType.editTypeIndex].remark = response.data.data.goodTypes.remark
282
-
283
-              this.$message.success("修改成功")
284
-
285
-
286
-            }
287
-          });
288
-
289
-        } else if (val.isCreated == 1) { //新增
290
-          createGoodType(val).then(response => {
291
-            if (response.data.state == 0) {
292
-              this.$message.error(response.data.msg);
293
-              return false;
294
-            } else {
295
-              this.goodType.goodTypeData.unshift(response.data.data.goodTypes)
296
-
297
-              this.$message.success("新增成功")
298
-
299
-
300
-            }
301
-          });
302
-
303
-        }
304
-
305
-      },
306
-      goodTypeDialogCancle: function () {
307
-        this.$refs.dialog.hide()
308
-
309
-
310
-
311
-      }, showDialog: function () {
312
-        this.$refs.dialog.show()
313
-
314
-
315
-      }, getList() {
316
-        this.goodType.loading = true
317
-
318
-        let params = {
319
-          'page': this.page,
320
-          'limit': this.limit
321
-        }
322
-        getGoodTypeList(params).then(response => {
285
+        });
286
+      } else if (val.isCreated == 1) {
287
+        //新增
288
+        createGoodType(val).then(response => {
323 289
           if (response.data.state == 0) {
324
-            this.goodType.loading = false
325 290
             this.$message.error(response.data.msg);
326 291
             return false;
327 292
           } else {
328
-            this.goodType.loading = false
329
-            this.total = response.data.data.total
330
-            this.goodType.goodTypeData = []
331
-            for (let i = 0; i < response.data.data.list.length; i++) {
332
-              this.goodType.goodTypeData.push(response.data.data.list[i])
293
+            this.goodType.goodTypeData.unshift(response.data.data.goodTypes);
333 294
 
334
-            }
295
+            this.$message.success("新增成功");
335 296
           }
336 297
         });
298
+      }
299
+    },
300
+    goodTypeDialogCancle: function() {
301
+      this.$refs.dialog.hide();
302
+    },
303
+    showDialog: function() {
304
+      this.$refs.dialog.show();
305
+    },
306
+    getList() {
307
+      this.goodType.loading = true;
337 308
 
338
-      }, tableRowClassName({row, rowIndex}) {
339
-        //把每一行的索引放进row
340
-        row.index = rowIndex;
341
-      },
342
-      onRowClick(row, event, column) {
343
-        this.goodType.tableCurrentIndex = row.index;
344
-
345
-      },
346
-      showInfoDialog: function () {
347
-
348
-
349
-        if (this.goodType.tableCurrentIndex == -1) {
350
-          this.$message.error("请先选择商品类型");
351
-          return
309
+      let params = {
310
+        page: this.page,
311
+        limit: this.limit
312
+      };
313
+      getGoodTypeList(params).then(response => {
314
+        if (response.data.state == 0) {
315
+          this.goodType.loading = false;
316
+          this.$message.error(response.data.msg);
317
+          return false;
352 318
         } else {
353
-          this.getAllGoodType()
319
+          this.goodType.loading = false;
320
+          this.total = response.data.data.total;
321
+          this.goodType.goodTypeData = [];
322
+          for (let i = 0; i < response.data.data.list.length; i++) {
323
+            this.goodType.goodTypeData.push(response.data.data.list[i]);
324
+          }
354 325
         }
355
-
356
-      }, handleSizeChange(val) {
357
-        this.limit = val;
358
-        this.getList();
359
-      }, handleCurrentChange(val) {
360
-        this.page = val;
361
-        this.getList();
326
+      });
327
+    },
328
+    tableRowClassName({ row, rowIndex }) {
329
+      //把每一行的索引放进row
330
+      row.index = rowIndex;
331
+    },
332
+    onRowClick(row, event, column) {
333
+      this.goodType.tableCurrentIndex = row.index;
334
+    },
335
+    showInfoDialog: function() {
336
+      if (this.goodType.tableCurrentIndex == -1) {
337
+        this.$message.error("请先选择商品类型");
338
+        return;
339
+      } else {
340
+        this.getAllGoodType();
362 341
       }
363 342
     },
364
-    created() {
365
-      this.getList()
343
+    handleSizeChange(val) {
344
+      this.limit = val;
345
+      this.getList();
346
+    },
347
+    handleCurrentChange(val) {
348
+      this.page = val;
349
+      this.getList();
366 350
     }
367
-  };
351
+  },
352
+  created() {
353
+    this.getList();
354
+  }
355
+};
368 356
 </script>
369 357
 
370 358
 <style rel="stylesheet/css" lang="scss" scoped>
371
-  .information {
372
-    border: 1px #dcdfe6 solid;
373
-    padding: 30px 20px 30px 20px;
359
+.information {
360
+  border: 1px #dcdfe6 solid;
361
+  padding: 30px 20px 30px 20px;
374 362
 
375
-    .border {
376
-      border-bottom: 1px #dcdfe6 solid;
377
-      margin: 0px 0 20px 0;
378
-    }
379
-  }
380
-
381
-  .title {
382
-    height: 44px;
383
-    line-height: 44px;
384
-    padding: 0 0 0 10px;
385
-    margin: 0 0 10px 0;
386
-    // border-radius: 4px 4px 0 0;
363
+  .border {
364
+    border-bottom: 1px #dcdfe6 solid;
365
+    margin: 0px 0 20px 0;
387 366
   }
388
-
389
-  .edit_separater {
390
-    border-top: 1px solid rgb(233, 233, 233);
391
-    margin-top: 15px;
392
-    margin-bottom: 15px;
393
-  }
394
-
367
+}
368
+
369
+.title {
370
+  height: 44px;
371
+  line-height: 44px;
372
+  padding: 0 0 0 10px;
373
+  margin: 0 0 10px 0;
374
+  // border-radius: 4px 4px 0 0;
375
+}
376
+
377
+.edit_separater {
378
+  border-top: 1px solid rgb(233, 233, 233);
379
+  margin-top: 15px;
380
+  margin-bottom: 15px;
381
+}
395 382
 </style>
396 383
 
397 384
 <style>
398
-  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
399
-    font-size: 12px;
400
-  }
385
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
386
+  font-size: 12px;
387
+}
401 388
 
402
-  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
403
-    background: #6fb5fa;
404
-  }
389
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
390
+  background: #6fb5fa;
391
+}
405 392
 
406
-  .dataTitle {
407
-    color: #409eff;
408
-    font-size: 16px;
409
-    border-bottom: 1px #409eff solid;
410
-    height: 36px;
411
-    line-height: 30px;
412
-    margin: 0 0 15px 0;
413
-    position: relative;
414
-    padding: 0 0 6px 15px;
415
-
416
-  &
417
-  ::before {
418
-    position: absolute;
419
-    left: 0;
420
-    bottom: 10px;
421
-    content: "";
422
-    width: 2px;
423
-    height: 20px;
424
-    background: #409eff;
425
-  }
426
-
427
-  }
428 393
 </style>

+ 1 - 19
src/xt_pages/user/components/PatientDetail.vue Parādīt failu

@@ -1081,25 +1081,6 @@ export default {
1081 1081
 </script>
1082 1082
 
1083 1083
 <style rel="stylesheet/scss" lang="scss" scoped>
1084
-// .dataTitle {
1085
-//   color: #409eff;
1086
-//   font-size: 16px;
1087
-//   border-bottom: 1px #409eff solid;
1088
-//   height: 36px;
1089
-//   line-height: 30px;
1090
-//   margin: 0 0 15px 0;
1091
-//   // position: relative;
1092
-//   padding: 0 0 6px 15px;
1093
-//   &::before {
1094
-//     position: absolute;
1095
-//     left: 0;
1096
-//     bottom: 10px;
1097
-//     content: "";
1098
-//     width: 2px;
1099
-//     height: 20px;
1100
-//     background: #409eff;
1101
-//   }
1102
-// }
1103 1084
 .uploadHead {
1104 1085
   margin-top: 25%;
1105 1086
 }
@@ -1111,6 +1092,7 @@ export default {
1111 1092
   .el-col-6,
1112 1093
   .el-col-8 {
1113 1094
     width: 360px;
1095
+    height:59px!important;
1114 1096
   }
1115 1097
   .el-form-item {
1116 1098
     // margin-bottom: 17px !important;

+ 5 - 4
src/xt_pages/user/components/PatientForm.vue Parādīt failu

@@ -3,7 +3,7 @@
3 3
     
4 4
   <div class="app-container " v-loading="pageLoad">
5 5
     <el-form ref="form" :rules="rules" :model="form" label-width="124px" class="clearfix" >
6
-        <div class="" style="z-index: 9999;position: absolute;right: 20px;">
6
+        <div class="" style="z-index: 99;position: absolute;right: 20px;">
7 7
         <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
8 8
         <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" v-if="this.isEdit==false" @click="resetForm('form')"  icon="el-icon-circle-plus-outline" size="small">新增</el-button>
9 9
         <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" @click="onSubmit('form')"  size="small" type="primary" icon="el-icon-setting" >保存</el-button>
@@ -47,7 +47,7 @@
47 47
                   </el-select>
48 48
                 </el-form-item>
49 49
               </el-col> -->
50
-              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:59px;" >
50
+              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:58px;" >
51 51
                 <el-form-item label="性别 : " class="is-required" prop="gender" >
52 52
                   <el-radio-group v-model="form.gender" @change="changeGender">
53 53
                     <el-radio v-for="item in sexOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
@@ -77,14 +77,14 @@
77 77
                 <el-input v-model="form.homeTelephone" maxlength="20"></el-input>
78 78
               </el-form-item>
79 79
             </el-col>
80
-            <el-col :span="8" :style="isEdit?'width:360px':''" style="height:59px;" >
80
+            <el-col :span="8" :style="isEdit?'width:360px':''" style="height:58px;" >
81 81
               <el-form-item label="患者来源 : " class="is-required" prop="source" >
82 82
                 <el-radio-group v-model="form.source">
83 83
                   <el-radio v-for="item in sourceOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
84 84
                 </el-radio-group>
85 85
               </el-form-item>
86 86
             </el-col>
87
-            <el-col :span="8" :style="isEdit?'width:360px':''" style="height:59px;">
87
+            <el-col :span="8" :style="isEdit?'width:360px':''" style="height:58px;">
88 88
               <el-form-item label="治疗状态(转归) : " class="is-required" prop="lapseto" >
89 89
                 <el-radio-group v-model="form.lapseto">
90 90
                   <!-- <el-radio :disabled="isEdit" v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio> -->
@@ -996,6 +996,7 @@ export default {
996 996
 .el-form{
997 997
     .el-col-6,.el-col-8{
998 998
     width: 430px;
999
+    height: 59px!important;
999 1000
     }
1000 1001
   .el-form-item {
1001 1002
     .el-select {

+ 6 - 19
src/xt_pages/user/registration.vue Parādīt failu

@@ -580,25 +580,6 @@ export default {
580 580
 </script>
581 581
 
582 582
 <style rel="stylesheet/scss" lang="scss" scoped>
583
-.dataTitle {
584
-  color: #409eff;
585
-  font-size: 16px;
586
-  border-bottom: 1px #409eff solid;
587
-  height: 36px;
588
-  line-height: 30px;
589
-  margin: 0 0 15px 0;
590
-  position: relative;
591
-  padding: 0 0 6px 15px;
592
-  &::before {
593
-    position: absolute;
594
-    left: 0;
595
-    bottom: 10px;
596
-    content: "";
597
-    width: 2px;
598
-    height: 20px;
599
-    background: #409eff;
600
-  }
601
-}
602 583
 .uploadHead {
603 584
   margin-top: 25%;
604 585
 }
@@ -622,5 +603,11 @@ export default {
622 603
     border-radius: 4px;
623 604
   }
624 605
 }
606
+.el-form{
607
+    .el-col-6,.el-col-8{
608
+    height: 59px!important;
609
+}
610
+}
611
+
625 612
 </style>
626 613