Merge remote-tracking branch 'origin/master'

src/assets/styles/element-ui.scss

@@ -135,6 +135,14 @@
 .el-input--small {
   width: 220px !important;
 }
+.el-select--small{
+  .el-input--small .el-input__suffix {
+    .el-input__icon{
+      position: relative;
+      top: -0.1rem;
+    }
+  }
+}
 
 input::-webkit-input-placeholder {
   font-size: 14px !important;

src/assets/styles/element-variables.scss

@@ -5,7 +5,7 @@
 
 /* theme color */
 $--color-primary: #1890ff;
-$--color-success: #13ce66;
+$--color-success: #5BB647;
 $--color-warning: #ffba00;
 $--color-danger: #ff4949;
 // $--color-info: #1E1E1E;

src/assets/styles/index.scss

@@ -121,7 +121,7 @@ aside {
 
 //main-container全局样式
 .app-container {
-  padding: 20px;
+  padding: 20px 20px 35px 20px;
   min-height: calc(100vh - 50px - 24px - 24px - 5px);
 }
 
@@ -130,9 +130,9 @@ aside {
   position: relative;
 }
 
-.pagination-container {
-  margin-top: 30px;
-}
+//.pagination-container {
+//  margin-top: 30px;
+//}
 
 .text-center {
   text-align: center

src/assets/styles/ruoyi.scss

@@ -106,11 +106,10 @@
 
 /** 表格布局 **/
 .pagination-container {
-	position: relative;
-	height: 25px;
-	margin-bottom: 10px;
-	margin-top: 15px;
-	padding: 10px 20px !important;
+  height: auto;
+  padding: 24px 0 0 0!important;
+  display: flex;
+  justify-content: flex-end;
 }
 
 /* tree border */
@@ -121,10 +120,10 @@
     border-radius:4px;
 }
 
-.pagination-container .el-pagination {
-	right: 0;
-	position: absolute;
-}
+//.pagination-container .el-pagination {
+//	right: 0;
+//	position: absolute;
+//}
 
 @media ( max-width : 768px) {
   .pagination-container .el-pagination > .el-pagination__jump {

src/components/ImageUpload/index.vue

@@ -12,7 +12,7 @@
       ref="imageUpload"
       multiple
       action
-      :accept="['.jpg', '.png', 'jpeg']"
+      :accept="'.jpg,.png,jpeg'"
       list-type="picture-card"
       :on-success="handleUploadSuccess"
       :before-upload="handleBeforeUpload"
@@ -195,12 +195,14 @@ export default {
       const suffix = img === 'jpg' || img === 'png' || img === 'jpeg'
       if (!suffix) {
         this.$message.error('文件格式不正确, 请上传png/jpg/jpeg图片格式文件')
+        this.$refs.imageUpload.clearFiles()
         return false
       }
       if (this.fileSize) {
         const isLt = file.size / 1024 / 1024 < this.fileSize
         if (!isLt) {
           this.$modal.msgError(`上传图片大小不能超过 ${this.fileSize} MB`)
+          this.$refs.imageUpload.clearFiles()
           return false
         }
       }

src/views/medical-record-management/medical-edit.vue

@@ -952,7 +952,7 @@ color: #333333;"
                 <template slot-scope="scope">
                   <span v-if="scope.row.inputShow">-</span>
                   <span v-else>
-                    {{ scope.row.treatStatus ? (scope.row.treatStatus === 3 ? '已治疗' : '待治疗') : '-' }}
+                    {{ scope.row.treatStatus ? (scope.row.treatStatus.toString() === '3' ? '已治疗' : '待治疗') : '-' }}
                   </span>
                 </template>
               </el-table-column>

src/views/service-management/registration-queue/components/choose-pet.vue

@@ -54,7 +54,6 @@
       :data="petsList"
       :header-cell-style="{background:'#F4F4F4'}"
       :header-cell-class-name="cellClass"
-      row-key="id"
       @selection-change="handleSelectionChange"
     >
       <el-table-column align="center" min-width="30" reserve-selection type="selection" />
@@ -257,7 +256,6 @@ export default {
         if (valid) {
           this.queryParams.pageNum = 1
           // 重置选择
-          this.effectTableSelect([])
           this.getList()
         }
       })
@@ -280,16 +278,6 @@ export default {
       this.resetForm('queryForm')
       this.handleQuery()
     },
-    /**
-     * 控制table的选择项
-     * @param data
-     */
-    effectTableSelect(data = []) {
-      this.$refs.table.store.states.selection = data
-      this.$refs.table.store.updateSelectionByRowKey()
-      this.$refs.table.store.updateAllSelected()
-      this.$refs.table.$emit('selection-change', data)
-    },
     /** 查询宠物列表 */
     getList() {
       this.queryParams.params = { ...this.queryParams.params }

src/views/service-management/registration-queue/components/prescribing-modle.vue

@@ -165,7 +165,7 @@
                   </el-select>
                 </el-form-item>
               </div>
-              <div class="single-file">
+              <div class="single-file single-file-sp">
                 <el-form-item
                   :rules="{validator: validatePharmDrugOther(singleItem, 'recipelNum', '请输入剂量'), trigger: 'blur'}"
                   label="剂量"
@@ -181,6 +181,9 @@
                     <span class="unit-text">{{ singleItem.normsUnit || '' }}</span>
                   </div>
                 </el-form-item>
+                <el-tooltip class="item" effect="dark" :content="getSallNum(singleItem)" placement="top">
+                  <img :src="questIcon" />
+                </el-tooltip>
               </div>
               <div>
                 <el-form-item
@@ -358,7 +361,7 @@
 import { drugList, getTreatOptions, listByType } from '@/api/business/mdeicalRecord'
 import { mapGetters } from 'vuex'
 import { submitPrescribing } from '@/api/business/registration'
-
+import xiaoshoutishi from '@/assets/images/xiaoshoutishi.png'
 import moment from 'moment'
 export default {
   name: 'PrescribingModle',
@@ -394,6 +397,7 @@ export default {
       callback()
     }
     return {
+      questIcon: xiaoshoutishi,
       checkKeys: 0,
       baseURL: process.env.VUE_APP_TEST_API,
       isBatheOption: [
@@ -467,6 +471,23 @@ export default {
   },
 
   computed: {
+    getSallNum() {
+      return (data) => {
+        console.log('111111111111111111111111', data, this.drugOptions)
+        if (data.drugId && data.recipelNum) {
+          const drugInfo = this.drugOptions.find(item => data.drugId === item.drugId)
+          console.log('drugInfo', drugInfo)
+          let result = '-'
+          if (drugInfo.sallUnit !== drugInfo.normsUnit) {
+            result = data.recipelNum * drugInfo.ratioValue
+          }
+          result = result > drugInfo.sallNum ? result : drugInfo.sallNum
+          return Math.ceil(result) ? Math.ceil(result) + drugInfo.sallUnit : '-'
+        } else {
+          return '-'
+        }
+      }
+    },
     drugOptionsShow() {
       console.log('drugListShow', this.prescribingForm.medication, this.drugOptions)
       return this.drugOptions.map(item => {
@@ -594,7 +615,8 @@ export default {
             sallNum: item.smallSallNormsNum,
             standardAmount: item.sellingPrice,
             paymentStatus: '0',
-            normsUnit: item.normsUnit
+            normsUnit: item.normsUnit,
+            ratioValue: item.ratioValue
           }
         })
         console.log('drugOptions!!!!!!!!!!!!!', this.drugOptions)
@@ -685,6 +707,7 @@ export default {
           rowData['standardAmount'] = item.standardAmount
           rowData['paymentStatus'] = item.paymentStatus
           rowData['normsUnit'] = item.normsUnit
+          rowData['ratioValue'] = item.ratioValue
         }
       })
       console.log('finishSetDrugOthers', rowData)
@@ -924,6 +947,15 @@ export default {
             margin-right: 0 !important;
           }
         }
+        .single-file-sp{
+          display: flex;
+          align-content: center;
+          align-items: center;
+          img{
+            margin-bottom: 1.125rem;
+            margin-left: 5px;
+          }
+        }
       }
     }
 
@@ -944,7 +976,7 @@ export default {
     width: 188px !important;
   }
 .unit-text{
-  margin-left: unset;
+  width: 25px;
 }
   .el-input-number--small {
     width: 188px !important;