Merge branch 'master' into 'master'

科室床位维护优化

See merge request lighter/vue-intergration-platform!150

src/views/dictionary/personnel/BedDeptDict.vue

@@ -12,9 +12,9 @@
               keep-source :edit-config="{mode: 'row', trigger: 'click', showStatus: true}">
               <vxe-column type="seq" width="50"></vxe-column>
               <vxe-column field="deptName" title="科室名称" width="140" />
-              <vxe-column field="openBedNum" title="标准床位" width="100" :edit-render="{}">
+              <vxe-column field="openbedNum" title="标准床位" width="100" :edit-render="{}">
                 <template #edit="{ row }">
-                  <vxe-input v-model="row.openBedNum"></vxe-input>
+                  <vxe-input v-model="row.openbedNum" type="number" :formatter="value => Number(value)"></vxe-input>
                 </template>
               </vxe-column>
               <vxe-column field="wardName" title="病房名称" width="140" />
@@ -31,7 +31,7 @@
         <div class="layout_main layout_card layout_el-table">
           <div class="layout_flex_1-y">
             <vxe-table ref="gridRefBed" :data="bedInfo.slice(pageSize * (currentPage - 1), pageSize * currentPage)" border stripe keep-source
-              height="820px" highlight-current-row :edit-config="{mode: 'row', trigger: 'click', showStatus: true, autoClear: false}">
+              height="780px" highlight-current-row :edit-config="{mode: 'row', trigger: 'click', showStatus: true, autoClear: false}">
               <vxe-column type="seq" width="50"></vxe-column>
               <vxe-column field="type" title="类别" width="100" :edit-render="{}">
                 <template #edit="{ row }">
@@ -183,7 +183,7 @@ const clickDept = ref('')
 // 科室
 const roomCode = ref('')
 const cellClickEvent = ({ row, column }) => {
-  if(column.field === 'openBedNum'){
+  if(column.field === 'openbedNum'){
     return
   }
   clickDept.value = row.wardCode
@@ -235,10 +235,10 @@ const saveDeptInfoForBed = () => {
   // 获取需要更新的床位数信息
   let data = gridRefDept.value.getUpdateRecords()
   for(let d in data){
-    let uD = {deptCode:'',wardCode: '', openBedNum: ''}
+    let uD = {deptCode:'',wardCode: '', openbedNum: ''}
     uD.deptCode = data[d].deptCode
     uD.wardCode = data[d].wardCode
-    uD.openBedNum = data[d].openBedNum
+    uD.openbedNum = data[d].openbedNum
     deptInfoList.value.push(uD)
   }
   updateDeptInfoForBed(deptInfoList.value).then((res) => {
@@ -249,6 +249,7 @@ const saveDeptInfoForBed = () => {
         duration: 2500,
         showClose: true,
       });
+      deptInfoList.value = []
       queryDeptInfoForBed()
     }
   })