Merge remote-tracking branch 'origin/master'

src/components/Editor/index.vue

@@ -165,9 +165,9 @@ export default {
     handleBeforeUpload(file) {
       console.log('fileSize', file)
       console.log('图片file---,', file.name)
-      const nameTest = /^[^%;]*$/
+      const nameTest = /^[^;/?:@&=+$,]*$/
       if (!nameTest.test(file.name)) {
-        this.$modal.msgError('不能含有%;等特殊字符')
+        this.$modal.msgError('上传文件不能含有;/?:@&=+$,等特殊字符')
         return false
       }
       // 校检文件大小

src/components/ImageUpload/index.vue

@@ -116,7 +116,7 @@ export default {
     // 大小限制(MB)
     fileSize: {
       type: Number,
-      default: 3
+      default: 4
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
@@ -330,6 +330,10 @@ export default {
     // 上传失败
     handleUploadError() {
       this.$modal.msgError('上传图片失败，请重试')
+      this.cropperVisible = false
+      this.fileList = []
+      this.uploadList = []
+      this.number = 0
       // this.$modal.closeLoading()
     },
     // 上传结束处理

src/views/equipment-management/equipment-management/equipment-detail.vue

@@ -290,10 +290,14 @@
             >使用信息
             </div>
           </div>
-          <el-table :data="useList" :header-cell-style="{ background:'#F4F4F4'}" >
+          <el-table :data="useList" :header-cell-style="{ background:'#F4F4F4'}">
             <el-table-column label="检查项目" align="center" prop="checkItemsName" show-overflow-tooltip />
             <el-table-column label="宠物昵称" align="center" prop="petNickname" show-overflow-tooltip />
-            <el-table-column label="宠主姓名" align="center" prop="nickname" show-overflow-tooltip />
+            <el-table-column label="宠主姓名" align="center" prop="nickname" show-overflow-tooltip>
+              <template slot-scope=" scope ">
+                {{ scope.row.nickname || "-" }}
+              </template>
+            </el-table-column>
             <el-table-column label="宠主手机号" align="center" prop="phonenumber" />
             <el-table-column label="检查日期" align="center" prop="checkStartTime" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -313,7 +317,7 @@
             <el-table-column label="检查状态" align="center" prop="payType" show-overflow-tooltip>
               <template slot-scope="scope">
                 <span v-show="scope.row.checkSchedule === '0' || scope.row.checkSchedule === '1'">-</span>
-                <span v-show="scope.row.checkSchedule === '2'" style="color: #DB4747;">待检查</span>
+                <span v-show="scope.row.checkSchedule === '2'" style="color: #FF9D4E;">待检查</span>
                 <span v-show="scope.row.checkSchedule === '3'" style="color: #5FB54B;">已检查</span>
               </template>
             </el-table-column>
@@ -595,7 +599,7 @@
                 </div>
               </el-col>
             </el-row>
-<!--            8-->
+            <!--            8-->
             <el-row>
               <el-col>
                 <el-form-item label="支持服务地区" prop="serviceArea">
@@ -615,7 +619,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-<!--            9-->
+            <!--            9-->
             <el-row>
               <el-col>
                 <el-form-item label="支持检查项目" prop="checkType">
@@ -648,7 +652,7 @@
                 :click-action="cancel"
                 :is-show-confirm="true"
               />
-<!--              <el-button class="resetBtn" size="mini" icon="el-icon-back" @click="cancel">返回</el-button>-->
+              <!--              <el-button class="resetBtn" size="mini" icon="el-icon-back" @click="cancel">返回</el-button>-->
             </el-col>
           </el-row>
         </el-card>
@@ -865,7 +869,7 @@ export default {
     this.identify = this.$route.query.identify
     this.form.isPrivate = this.$route.query.isPrivate
     // console.time('start option')
-    Promise.all([this.getUserInfo(), this.getAreaData(), this.getuseList(), this.getItemByType()])
+    Promise.all([this.getAreaData(), this.getuseList(), this.getItemByType()])
       .then(_ => {
         // console.timeLog('start option')
         // console.time('detail')
@@ -1137,6 +1141,7 @@ export default {
       return getDevice(this.id).then(({ data }) => {
         data.selectedOptions = data.addressCode.split(',').map(Number)
         data.serviceArea = data.serviceArea.split(';')
+        this.getUserInfo()
         if (data.checkType != null && data.checkType !== '') {
           data.checkType = data.checkType.split(',').map(Number)
         }

src/views/equipment-management/use-management/use-details.vue

@@ -137,7 +137,7 @@
             <el-col :span="24">
               <el-form-item label="支持服务地区" prop="serviceArea">
                 <el-input
-                  v-model="form.serviceAreaText"
+                  v-model="serviceAreaText"
                   type="textarea"
                   :row="4"
                   placeholder="-"
@@ -370,13 +370,13 @@ export default {
         pms: '',
         pme: ''
       },
+      serviceAreaText: [],
       // 详情表单
       form: {
         selectedOptions: [],
         deviceName: '',
         // appointmentMethod: '',
         serviceArea: [],
-        serviceAreaText: [],
         checkTypeText: [],
         head: '',
         phone: '',
@@ -392,8 +392,8 @@ export default {
     this.getUseDetail()
     this.getCheckList()
     this.getUserLogin()
-    this.getAreaData()
     this.getUserInfo()
+    this.getAreaData()
   },
   methods: {
     removeEmptyChildren(array) {
@@ -457,11 +457,10 @@ export default {
               labelList.push('-')
             }
           }
-          this.form.serviceAreaText = labelList
+          this.serviceAreaText = labelList
 
-          console.log(labelList)
           console.log('111111111111', labelList)
-          console.log(' ----------------引人注目----------------------------his.form.serviceAreaText', this.form.serviceAreaText)
+          console.log(' ----------------引人注目----------------------------his.form.serviceAreaText', this.serviceAreaText)
         }
       })
     },
@@ -537,6 +536,7 @@ export default {
         }
         if (res.data.serviceArea !== '' && res.data.serviceArea !== null) {
           this.form.serviceArea = res.data.serviceArea.split(';')
+
           // this.serviceAreaS = this.form.serviceArea.split(';')
           // this.serviceArea = []
           // for (let i = 0; i < this.serviceAreaS.length; i++) {

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

@@ -630,13 +630,12 @@ color: #333333;"
                   </el-button>
                   <el-button
                     v-if="isEdit && scope.row.paymentStatus === '0' && !scope.row.inputShow"
-                    icon="el-icon-edit"
                     plain
                     size="mini"
                     style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(52,144,206);"
                     type="primary"
                     @click="handleUpdate(scope.$index,'stockDispenseOutboundList')"
-                  >编辑
+                  ><svg-icon icon-class="liebiao_icon_bianji" style="font-size: 11px;vertical-align: top;" />编辑
                   </el-button>
                   <el-button
                     v-if="isEdit && (scope.row.paymentStatus === '0'|| scope.row.isAdd ) && scope.row.inputShow"
@@ -830,13 +829,12 @@ color: #333333;"
                   </el-button>
                   <el-button
                     v-if="isEdit && scope.row.payType === '0' && !scope.row.inputShow"
-                    icon="el-icon-edit"
                     plain
                     size="mini"
                     style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(52,144,206);"
                     type="primary"
                     @click="handleUpdate(scope.$index,'checkManageBos')"
-                  >编辑
+                  ><svg-icon icon-class="liebiao_icon_bianji" style="font-size: 11px;vertical-align: top;" />编辑
                   </el-button>
                   <el-button
                     v-if="isEdit && (scope.row.payType === '0'|| scope.row.isAdd ) && scope.row.inputShow"
@@ -1013,13 +1011,12 @@ color: #333333;"
                   </el-button>
                   <el-button
                     v-if="isEdit && scope.row.payType === '0' && !scope.row.inputShow"
-                    icon="el-icon-edit"
                     plain
                     size="mini"
                     style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(52,144,206);"
                     type="primary"
                     @click="handleUpdate(scope.$index,'treatManageBo')"
-                  >编辑
+                  ><svg-icon icon-class="liebiao_icon_bianji" style="font-size: 11px;vertical-align: top;" />编辑
                   </el-button>
                   <el-button
                     v-if="isEdit && (scope.row.payType === '0'|| scope.row.isAdd ) && scope.row.inputShow"
@@ -1169,13 +1166,12 @@ color: #333333;"
                 <template slot-scope="scope">
                   <el-button
                     v-if="isEdit && !petInHospitalStatus && !petInHospitalUpdateShow && ( scope.row.status === '0' || scope.row.status === '1' )"
-                    icon="el-icon-edit"
                     plain
                     size="mini"
                     style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(52,144,206);"
                     type="primary"
                     @click="updatePetInHospitalShow(scope.row)"
-                  >编辑
+                  ><svg-icon icon-class="liebiao_icon_bianji" style="font-size: 11px;vertical-align: top;" />编辑
                   </el-button>
                   <el-button
                     v-if="isEdit && !petInHospitalStatus && petInHospitalUpdateShow"

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

@@ -406,7 +406,7 @@ export default {
       isBatheOption: [
         {
           value: '0',
-          label: '是'
+          label: '能'
 
         }, {
           value: '1',