Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/router/index.js

src/api/business/item.js

@@ -8,7 +8,14 @@ export function listItem(query) {
     params: query
   })
 }
-
+// 查询平台项目管理列表
+export function listPlatformItem(query) {
+  return request({
+    url: '/business/item/platformList',
+    method: 'get',
+    params: query
+  })
+}
 // 根据检查类型(医院自有服务、预约外部服务)查询检查项目
 export function listItemByType(query) {
   return request({

src/assets/styles/element-ui.scss

@@ -443,9 +443,15 @@ input::-webkit-input-placeholder {
   cursor: pointer;
 }
 .el-input-number .el-input input {
-  text-align: center;
+  text-align: left;
 }
 .el-cascader{
   color: #5FB54B;
+}.el-checkbox__inner{
+  height: 14px;
+  width: 14px;
+ }
+// 调整复选框样式
+.el-table .disabledCheck .cell .el-checkbox__inner {
+  margin-right: 3px;
 }
-

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

@@ -33,9 +33,9 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item v-if="hpshow" label="医院自有设备" prop="deviceName">
+                <el-form-item v-if="hpshow" label="医院自有设备">
 
-                  <el-select v-model="form.isPrivate" style="width: 250px" placeholder="请选择医院自有设备">
+                  <el-select v-model="form.isPrivate" disabled style="width: 250px" placeholder="请选择医院自有设备">
                     <el-option
                       v-for="(item ,index) in optionss"
                       :key="index"
@@ -74,7 +74,7 @@
             </el-row>
             <!--                        3-->
             <el-row>
-              <el-col :span="8">
+              <el-col :span="16">
                 <el-form-item label="服务地点" prop="selectedOptions">
                   <el-cascader
                     v-model="form.selectedOptions"
@@ -87,19 +87,20 @@
                     @change="handleChangeAddress"
                   />
                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item prop="address" style="margin-left: 11%">
+
+                <el-form-item prop="address">
                   <el-input
                     v-model.trim="form.address"
-                    placeholder="请输入服务地址"
+                    placeholder="请输入详细地址地址(街道、楼牌号等)"
                     maxlength="40"
                     clearable
-                  >
-                    <template v-if="addtions.names !== ''" slot="prepend">{{ addtions.names }}</template>
-                  </el-input>
+                    style="width: 400px"
+                  />
                 </el-form-item>
               </el-col>
+              <!--              <el-col :span="8">-->
+              <!--              -->
+              <!--              </el-col>-->
               <el-col :span="8">
                 <el-form-item label="单位时段服务数" prop="useNum">
                   <el-input-number
@@ -261,7 +262,7 @@
             <el-row>
               <el-col>
                 <el-form-item label="支持服务地区" prop="serviceArea">
-                  <el-select v-model="form.serviceArea"  placeholder="请选择支持服务地区" style="width: 300px" multiple collapse-tags clearable>
+                  <el-select v-model="form.serviceArea" placeholder="请选择支持服务地区" style="width: 300px" multiple collapse-tags clearable>
                     <el-option
                       v-for="dict in dict.type.service_area"
                       :key="dict.label"
@@ -290,7 +291,10 @@
           </el-form>
           <el-row>
             <el-col style="display: flex;justify-content: center;margin-top: 20px">
-              <el-button class="queryBtn" type="primary" size="mini" icon="el-icon-check" @click="submitForm">提交</el-button>
+              <el-button class="queryBtn" type="primary" size="mini" icon="el-icon-check" @click="submitForm" :disabled="loading">
+                <span v-if="!loading">提交</span>
+                <span v-else>提交...</span>
+              </el-button>
               <el-button class="resetBtn" size="mini" icon="el-icon-back" @click="cancel">返 回</el-button>
             </el-col>
           </el-row>
@@ -321,6 +325,7 @@ export default {
       // 下单价格是否禁用
       disabledOrder: false,
       // 是否医院自有设备
+      loading: false,
       option: [
         {
           value: '0',
@@ -332,8 +337,8 @@ export default {
 
         }
       ],
-      //设备归属 0 平台设备 1医院设备
-      isPrivate:'',
+      // 设备归属 0 平台设备 1医院设备
+      isPrivate: '',
       cityOptions: regionData,
       // 存储省市区选中的地址码
       selectedOptions: [],
@@ -627,7 +632,6 @@ export default {
         console.log('下午结束时间结束第一层报错')
         callback(new Error('请选择下午结束时间'))
       } else {
-
         if (isEmpty(value) && isEmpty(afternoonStart)) {
           console.log('下午结束时间结束第二层报错')
           callback(new Error('请选择下午结束时间'))
@@ -639,7 +643,7 @@ export default {
     /** 提交按钮 */
     submitForm() {
       const form = deepClone(this.form)
-      console.log("this.form-----------------------",this.form)
+      console.log('this.form-----------------------', this.form)
       if (this.selectedOptions != null) {
         form.addressCode = this.selectedOptions.join(',')
       }
@@ -659,6 +663,7 @@ export default {
         form.useTime = JSON.stringify(form.useTime)
       }
       form.isPrivate = this.isPrivate
+      this.loading = true
       // TODO: please clear this log
       console.log('form=======================================', form)
       this.$refs['form'].validate(valid => {
@@ -669,6 +674,9 @@ export default {
           })
         }
       })
+      setTimeout(() => {
+        this.loading = false
+      }, 1000)
     },
     cancel() {
       this.$router.push({

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

@@ -33,14 +33,16 @@
           <el-col :span="8">
             <el-form-item
               :ref="'settingList.'+index+'.name'"
-              label="项目名称:"
+              label="项目名称"
               :prop="'settingList.'+index+'.name'"
               :rules="[
-                { required: true, message: '请输入项目名称', trigger: 'blur' }
+                { required: true, message: '请输入项目名称', trigger: 'blur' },
+                { min: 2, max: 20, message: '输入内容长度应为2~20个字符', trigger: 'blur' }
+
               ]"
             >
               <el-input
-                v-model="item.name"
+                v-model.trim="item.name"
                 :disabled="item.isUpdate === '1'"
                 placeholder="请输入项目名称"
               />
@@ -49,7 +51,7 @@
           <el-col :span="8">
             <el-form-item
               :ref="'settingList.'+index+'.type'"
-              label="检查类型:"
+              label="检查类型"
               :prop="'settingList.'+index+'.type'"
               :rules="[
                 { required: true, message: '请选择检查类型', trigger: 'change' }
@@ -72,10 +74,11 @@
           <el-col :span="8">
             <el-form-item
               :ref="'settingList.'+index+'.price'"
-              label="项目单价:"
+              label="项目单价"
               :prop="'settingList.'+index+'.price'"
               :rules="[
-                { required: true, message: '请输入项目单价', trigger: 'change' }
+                { required: true, message: '请输入项目单价', trigger: 'change' },
+
               ]"
             >
               <el-input-number
@@ -83,6 +86,7 @@
                 :min="0"
                 controls-position="right"
                 style="width: 240px"
+                @keydown.native="keydown($event)"
               />
               元
             </el-form-item>
@@ -93,7 +97,7 @@
           <el-col :span="8">
             <el-form-item
               :ref="'settingList.'+index+'.supportInsure'"
-              label="支持保险支付:"
+              label="支持保险支付"
               :prop="'settingList.'+index+'.supportInsure'"
               :rules="[
                 { required: true, message: '请选择是否支持保险支付', trigger: 'change' }
@@ -116,24 +120,24 @@
           <el-col :span="8">
             <el-form-item
               :ref="'settingList.'+index+'.sort'"
-              label="权重:"
+              label="权重"
               :prop="'settingList.'+index+'.sort'"
-              :rules="[
-                { required: true, message: '请输入权重', trigger: 'change' }
-              ]"
             >
               <el-input-number
                 v-model="item.sort"
                 :min="0"
+                :max="9999"
                 controls-position="right"
                 style="width: 256px"
+                @blur="handleBlur"
+                @keydown.native="keydown($event)"
               />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item
               :ref="'settingList.'+index+'.status'"
-              label="状态:"
+              label="状态"
               :prop="'settingList.'+index+'.status'"
               :rules="[
                 { required: true, message: '请选择状态', trigger: 'change' }
@@ -159,16 +163,16 @@
           <el-col :span="24">
             <el-form-item
               :ref="'settingList.'+index+'.content'"
-              label="描述:"
+              label="描述"
               :prop="'settingList.'+index+'.content'"
               :rules="[
                 { required: true, message: '请输入描述', trigger: 'blur' }
               ]"
             >
               <el-input
-                v-model="item.content"
+                v-model.trim="item.content"
                 type="textarea"
-                :rows="2"
+                :rows="4"
                 :disabled="item.isUpdate === '1'"
                 placeholder="请输入描述"
               />
@@ -180,7 +184,7 @@
     <div>
       <el-button class="fourWordsBtn" type="primary" size="mini" @click="handleAddItem">新增项目</el-button>
       <el-button v-loading.fullscreen.lock="fullscreenLoading" class="queryBtn" type="primary" size="mini" @click="handleSubmit">提交</el-button>
-      <el-button class="resetBtn" size="mini" @click="handleGoBack">返回</el-button>
+      <el-button class="resetBtn" size="mini" icon="el-icon-back" @click="cancel">返 回</el-button>
     </div>
   </div>
 </template>
@@ -205,12 +209,13 @@ export default {
             sort: '',
             status: '1',
             content: '',
-            itemType: '0' // 用于判断是检查的项目
+            itemType: '2' // 用于判断是检查的项目
           }
         ]
       },
       // 表单规则
       rules: {},
+
       // 检查类型
       statusOptions: [
         { value: '1', label: '已启用' },
@@ -250,6 +255,36 @@ export default {
         }
       })
     },
+
+    // 是权重不可以输入小数
+    handleBlur() {
+      const parsedValue = parseFloat(this.form.sort)
+      if (!isNaN(parsedValue)) {
+        this.form.sort = parsedValue.toFixed(0) // 保留一位小数并进行四舍五入
+      }
+    },
+    // 权重不能为0
+    validWeigh(rule, value, callback) {
+      if (value > 0) {
+        callback()
+      } else {
+        callback(new Error('权重不能为0'))
+      }
+    },
+    // 单位时段服务数不能为0
+    validUseNum(rule, value, callback) {
+      if (value > 0) {
+        callback()
+      } else {
+        callback(new Error('单位时段服务数不能为0'))
+      }
+    },
+    // 禁止输入空格
+    keydown(e) {
+      if (e.keyCode === 32) {
+        e.returnValue = false
+      }
+    },
     /** 将阿拉伯数字转成汉字（如:1变成一）*/
     convertToChineseNumeral(num) {
       // eslint-disable-next-line no-undef
@@ -327,7 +362,12 @@ export default {
         sort: '',
         status: '1',
         content: '',
-        itemType: '0'
+        itemType: '2'
+      })
+    },
+    cancel() {
+      this.$router.push({
+        path: '/equipment-management/equipment-management'
       })
     },
     // 提交
@@ -337,6 +377,7 @@ export default {
           console.log('成功通过....')
           const addList = JSON.parse(JSON.stringify(this.form.settingList))
           console.log('新增或者修改的集合', addList)
+          console.log('this.form.settingList', this.form.settingList)
           // 开始加loading遮罩, 防止操作
           // this.fullscreenLoading = true
           updateItem(addList).then(response => {
@@ -350,13 +391,13 @@ export default {
           })
         }
       })
-    },
-    // 返回
-    handleGoBack() {
-      this.$router.push({
-        path: '/service-management/medical-record-management'
-      })
     }
+    // // 返回
+    // handleGoBack() {
+    //   this.$router.push({
+    //     path: '/service-management/medical-record-management'
+    //   })
+    // }
   }
 }
 </script>

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

@@ -49,7 +49,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="设备类型">
-                  <el-select v-model="form.deviceType" disabled style="width: 250px">
+                  <el-select v-model="form.deviceType" disabled style="width: 250px" placeholder="暂无数据">
                     <el-option
                       v-for="(item,index) in dict.type.device_type"
                       :key="index"
@@ -75,7 +75,6 @@
                     expand-trigger="hover"
                     clearable
                     style="width: 250px"
-                    disabled
                     @change="handleChangeAddress"
                   />
                 </el-form-item>
@@ -84,7 +83,7 @@
                 <el-form-item prop="address" style="margin-left: 11%">
                   <el-input
                     v-model.trim="form.address"
-                    placeholder="暂无数据"
+                    placeholder="请输入详细地址地址(街道、楼牌号等)"
                     maxlength="40"
                     clearable
                     disabled
@@ -338,7 +337,7 @@
                 </el-form-item>
                 <el-form-item v-if="hpshow" label="医院自有设备" prop="deviceName">
 
-                  <el-select v-model="form.isPrivate" style="width: 250px" placeholder="请选择医院自有设备">
+                  <el-select v-model="form.isPrivate"disabled style="width: 250px" placeholder="请选择医院自有设备">
                     <el-option
                       v-for="(item ,index) in optionss"
                       :key="index"
@@ -378,32 +377,29 @@
             <!--            3-->
             <el-row>
 
-              <el-col :span="8">
-                <el-form-item label="服务地点" prop="addressCode">
+              <el-col :span="16">
+                <el-form-item label="服务地点" prop="selectedOptions">
                   <el-cascader
-
                     ref="serviceArea"
-                    v-model="form.selectedOptions"
+                    v-model="selectedOptions"
                     size="large"
                     :options="cityOptions"
-                    placeholder="请选择地区"
+                    placeholder="请选择服务地点"
                     expand-trigger="hover"
                     clearable
                     style="width: 250px"
                     @change="handleChangeAddress"
                   />
                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item prop="address" style="margin-left: 8.5%">
+
+                <el-form-item prop="address">
                   <el-input
                     v-model.trim="form.address"
-                    placeholder="请输入服务地址"
-                    maxlength="60"
+                    placeholder="请输入详细地址地址(街道、楼牌号等)"
+                    maxlength="40"
                     clearable
-                  >
-                    <template v-if="addtions.names !== ''" slot="prepend">{{ addtions.names }}</template>
-                  </el-input>
+                    style="width: 400px"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -564,7 +560,7 @@
             <el-row>
               <el-col>
                 <el-form-item label="支持服务地区" prop="serviceArea">
-                  <el-select v-model="form.serviceArea"  placeholder="请选择" style="width: 300px"multiple collapse-tags clearable>
+                  <el-select v-model="form.serviceArea" placeholder="请选择" style="width: 300px"multiple collapse-tags clearable>
                     <el-option
                       v-for="dictServiceArea in dict.type.service_area"
                       :key="dictServiceArea.label"
@@ -666,6 +662,7 @@ export default {
       },
       // 表单参数
       form: {
+        selectedOptions: [],
         deviceName: '',
         // appointmentMethod: '',
         serviceArea: '',
@@ -967,7 +964,7 @@ export default {
     // 提交
     submitForm() {
       const form = deepClone(this.form)
-      console.log('selectedOptions', this.form.addressCode)
+      console.log('selectedOptions', this.selectedOptions)
       if (this.selectedOptions != null) {
         form.addressCode = this.selectedOptions.join(',')
       }
@@ -1025,8 +1022,11 @@ export default {
     handleUpdate() {
       getDevice(this.id).then(response => {
         this.form = response.data
-        if (this.form.selectedOptions != null && this.form.selectedOptions !== '') {
-          this.form.selectedOptions = response.data.addressCode.split(',')
+        if (this.selectedOptions != null && this.selectedOptions !== '') {
+          this.selectedOptions = response.data.addressCode.split(',')
+          console.log(':fsdfsddddddddd???????', response.data.addressCode)
+          console.log('详细个bbbbb', this.selectedOptions)
+          console.log('详细个ccccccccccc', this.form.selectedOptions)
         }
         if (this.form.serviceArea != null && this.form.serviceArea !== '') {
           this.form.serviceArea = response.data.serviceArea.split(',')
@@ -1041,7 +1041,6 @@ export default {
         // this.checkType = response.data.checkType.split(',')
 
         console.log('详情数据---', this.form)
-        console.log('form.usertadasd', this.form.ams)
         // this.serviceAreaS = this.form.serviceArea.split(';')
         // this.serviceArea = []
         // for (let i = 0; i < this.serviceAreaS.length; i++) {

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

@@ -116,7 +116,7 @@
           class="fourWordsBtn"
           icon="el-icon-download"
           size="mini"
-          @click="checkItem()"
+          @click="handlecheck"
         >检查项目</el-button>
       </el-col>
       <el-col :span="12" style="padding-bottom: 20px;text-align: end;">
@@ -163,10 +163,10 @@
 
       <el-table-column label="服务地点" align="left" show-overflow-tooltip>
         <template slot-scope="scope">
-
           <span>{{ scope.row.addressText + scope.row.address || "-" }}</span>
         </template>
       </el-table-column>
+
       <el-table-column label="预约方式" align="left" prop="reservationMethod" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ scope.row.reservationMethod == 1 ? "按时段预约" :"-" }}</span>
@@ -530,12 +530,7 @@ export default {
         this.loading = false
       })
     },
-    // 点击检查项目
-    checkItem() {
-      this.$router.push({
-        name: 'CheckItem'
-      })
-    },
+
     // // 取消按钮
     // cancel() {
     //   this.open = false
@@ -633,6 +628,12 @@ export default {
         name: 'EquipmentAdd'
       })
     },
+    // 点击检查项目
+    handlecheck() {
+      this.$router.push({
+        name: 'EquipmentCheck'
+      })
+    },
 
     /**
      * 全部选择