Merge branch 'dev-20210517' of...

Merge branch 'dev-20210517' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-admin-consultation into dev-20210517

src/views/IM/diagnosis-admin/assist-list.vue

@@ -138,7 +138,7 @@
             :title="title"
             :visible.sync="setAddVisible"
             width="60%">
-            <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">
+<!--            <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">-->
               <el-form ref="setPriceForm"
                        :rules="addRules"
                        :model="model"
@@ -147,14 +147,15 @@
                        label-position="right"
                        size="mini"
                        style="width: 100%;">
-                <el-col :span="15">
+
                   <el-form-item label="助诊医生" class="required-label" prop="userName">
+                    <el-col :span="15">
                     <el-select v-model="model.userName"
                                filterable
                                remote
                                placeholder="请输入专家姓名或医院名称,多个关键字用空格隔开，至少输入两个字符"
                                clearable
-                               style="width: 170%;"
+                               style="width: 130%;"
                                :remote-method="remoteMethod"
                                :disabled="isEdit"
                                @change="nameChange"
@@ -167,64 +168,89 @@
                         <span>{{item.value}}</span>
                       </el-option>
                     </el-select>
+                    </el-col>
                    </el-form-item>
-                </el-col>
+
 <!--                <el-col :span="15" style="margin-left: 105px;">-->
 <!--                  实际收入（接诊后实际到账金额）: ￥{{tempPrice | rounding}}-->
 <!--                </el-col>-->
-                <el-col :span="15">
+
                   <el-form-item label="助诊医生职称" class="required-label">
-                    <el-input v-model="model.title" style="width: 170%;" disabled size="small" ></el-input>
+                    <el-col :span="15">
+                    <el-input v-model="model.title" style="width: 130%;" disabled size="small" ></el-input>
+                    </el-col>
                   </el-form-item>
-                </el-col>
-                <el-col :span="15">
+
+
                   <el-form-item label="助诊医生所在机构" class="required-label">
-                    <el-input v-model="model.hospitalName" style="width: 170%;" disabled size="small" ></el-input>
+                    <el-col :span="15">
+                    <el-input v-model="model.hospitalName" style="width: 130%;" disabled size="small" ></el-input>
+                    </el-col>
                   </el-form-item>
-                </el-col>
-                <el-col :span="15">
+
+
                   <el-form-item label="助诊医生所在科室" class="required-label">
-                    <el-input v-model="model.department" style="width: 170%;" disabled size="small" ></el-input>
+                    <el-col :span="15">
+                    <el-input v-model="model.department" style="width: 130%;" disabled size="small" ></el-input>
+                    </el-col>
                   </el-form-item>
-                </el-col>
-                <el-col :span="15">
+
+
                   <el-form-item label="助诊电话" class="required-label">
-                    <el-input v-model="model.mobile" style="width: 170%;" disabled size="small" ></el-input>
+                    <el-col :span="15">
+                    <el-input v-model="model.mobile" style="width: 130%;" disabled size="small" ></el-input>
+                    </el-col>
                   </el-form-item>
-                </el-col>
-                <el-col :span="16">
+
+
                 <el-form-item label="语音问诊分佣" prop="audioCommissionType" class="required-label">
+                  <el-col :span="16">
                   <el-radio-group v-model="model.audioCommissionType" size="small" style="line-height: 45px;">
+                    <div>
                     <el-radio :label="1" style="float: left;margin-top: 5px;line-height: 20px;">按比例分佣（%）</el-radio>
                     <span style="float: right;width: 100px;"><el-input-number v-model="model.audioPrice1" size="small" :precision="2" :min="0" :max="100"></el-input-number></span>
-                    <el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额（元）</el-radio>
+                    </div>
+                    <div>
+                      <el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额（元）</el-radio>
                     <span style="float: right;width: 100px;"><el-input-number v-model="model.audioPrice2" size="small" :precision="2" :min="0" :max="9999"></el-input-number></span>
+                    </div>
                   </el-radio-group>
+                  </el-col>
                 </el-form-item>
-                </el-col>
-                <el-col :span="16">
+
+
                   <el-form-item label="视频问诊分佣" prop="videoCommissionType" class="required-label">
+                    <el-col :span="16">
                     <el-radio-group v-model="model.videoCommissionType" size="small" style="line-height: 45px;">
+                      <div>
                       <el-radio :label="1" style="float: left;margin-top: 5px;line-height: 20px;">按比例分佣（%）</el-radio>
                       <span style="float: right;width: 100px;"><el-input-number v-model="model.videoPrice1"  size="small" :precision="2" :min="0" :max="100"></el-input-number></span>
-                      <el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额（元）</el-radio>
+                      </div>
+                      <div>
+                        <el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额（元）</el-radio>
                       <span style="float: right;width: 100px;"><el-input-number v-model="model.videoPrice2"  size="small" :precision="2" :min="0" :max="9999"></el-input-number></span>
+                      </div>
                     </el-radio-group>
+                    </el-col>
                   </el-form-item>
-                </el-col>
-                <el-col :span="16">
+
                   <el-form-item label="图文问诊分佣" prop="imgCommissionType" class="required-label">
+                    <el-col :span="16">
                     <el-radio-group v-model="model.imgCommissionType" size="small" style="line-height: 45px;">
+                      <div>
                       <el-radio :label="1" style="float: left;margin-top: 5px;line-height: 20px;">按比例分佣（%）</el-radio>
                       <span style="float: right;width: 100px;"><el-input-number v-model="model.imgPrice1"  size="small" :precision="2" :min="0" :max="100"></el-input-number></span>
-                      <el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额（元）</el-radio>
+                      </div>
+                      <div>
+                        <el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额（元）</el-radio>
                       <span style="float: right;width: 100px;"><el-input-number v-model="model.imgPrice2"  size="small" :precision="2" :min="0" :max="9999"></el-input-number></span>
+                      </div>
                     </el-radio-group>
+                    </el-col>
                   </el-form-item>
-                </el-col>
 
               </el-form>
-            </el-row>
+<!--            </el-row>-->
             <span slot="footer" class="dialog-footer" style="text-align: center;">
                 <el-button @click="setAddVisible = false">取 消</el-button>
                 <el-button type="primary" @click="submit">确定</el-button>

src/views/IM/diagnosis-admin/service-list.vue

@@ -156,7 +156,7 @@
             title="设置价格"
             :visible.sync="setPriceVisible"
             width="55%">
-            <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">
+<!--            <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">-->
                 <el-form ref="setPriceForm"
                 :rules="setPriceRules"
                 :model="setPriceForm"
@@ -165,23 +165,31 @@
                 label-position="right"
                 size="mini"
                 style="width: 100%;">
-                  <el-col :span="18">
+
                     <el-form-item label="问诊价格" class="required-label" prop="price">
+                      <el-col :span="18">
                       <el-input-number v-model="setPriceForm.price" size="small" :precision="2" :min="0" :max="9999" placeholder="请输入价格" @change="changePrice($event)"></el-input-number>
+                      </el-col>
                     </el-form-item>
-                  </el-col>
-                  <el-col :span="18">
+
+
                   <el-form-item label="接诊服务费结算方式（上级医生）" prop="commissionType">
+                    <el-col :span="18">
                     <el-radio-group v-model="setPriceForm.commissionType" size="small" style="line-height: 45px;">
+                      <div>
                       <el-radio :label="1" style="float: left;margin-top: 5px;line-height: 20px;">按比例分佣（%）</el-radio>
                       <span style="float: right;width: 100px;"><el-input-number v-model="setPriceForm.commissionPrice1" size="small" :precision="2" :min="0" :max="100"></el-input-number></span>
-                      <el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额（元）</el-radio>
+                      </div>
+                      <div>
+                        <el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额（元）</el-radio>
                       <span style="float: right;width: 100px;margin-left: 14px;"><el-input-number v-model="setPriceForm.commissionPrice2" size="small" :precision="2" :min="0" :max="9999"></el-input-number></span>
+                      </div>
                     </el-radio-group>
+                    </el-col>
                   </el-form-item>
-                  </el-col>
+
                 </el-form>
-            </el-row>
+<!--            </el-row>-->
             <span slot="footer" class="dialog-footer">
                 <el-button @click="setPriceVisible = false">取 消</el-button>
                 <el-button type="primary" @click="confirmSetPrice">确 定</el-button>