qymljy 3 месяцев назад
Родитель
Сommit
ea8fc603b6

+ 8 - 0
prsx/dealer/Department/index.wxml

@@ -50,6 +50,14 @@
       <text style="color: #666;">负责人:</text>
       <text>{{item.leader[0].name}}</text>
     </view>
+    <view class="replenish">
+      <text style="color: #666;">科室床位:</text>
+      <text>{{item.bedcount}}</text>
+    </view>
+    <view class="replenish">
+      <text style="color: #666;">医生数量:</text>
+      <text>{{item.doctorcount}}</text>
+    </view>
     <view class="replenish">
       <text style="color: #666;">备注:</text>
       <text>{{item.remarks || '--'}}</text>

+ 13 - 1
prsx/department/detail.js

@@ -98,7 +98,13 @@ Page({
         }, {
             label: "开发阶段",
             value: res.data.stagename
-        }, ];
+        },{
+          label: "科室床位",
+          value: res.data.bedcount == 0?'0':res.data.bedcount
+      }, {
+          label: "医生数量",
+          value: res.data.doctorcount == 0?'0':res.data.doctorcount
+      } ];
 
         /* 基本信息 */
         let list1 = [{
@@ -117,6 +123,12 @@ Page({
             label: "科室负责人",
             value: res.data.doctors
         }, {
+          label: "科室床位",
+          value: res.data.bedcount == 0?'0':res.data.bedcount
+      }, {
+          label: "医生数量",
+          value: res.data.doctorcount == 0?'0':res.data.doctorcount
+      },{
             label: "备注",
             value: res.data.remarks
         }, {

+ 1 - 0
prsx/department/detail.wxml

@@ -24,6 +24,7 @@
     <Record slot="操作" id="Record" ownertable='sa_hospitaldep' ownerid='{{sa_hospitaldepid}}' />
     <Files slot="附件" id="Files" ownertable='sa_hospitaldep' ownerid='{{sa_hospitaldepid}}' disabled="{{detail.status != '已终止'}}" />
 </Yl_FunTabs>
+<view style="height: 70rpx;" />
 <!-- 底部 -->
 <Yl_Tabbar wx:if="{{tabbarList.length}}" list='{{tabbarList}}' bind:callback="tabbarOnClick" />
 <wxs src='../../utils/wxmlQueryPer.wxs' module="per" />

+ 8 - 0
prsx/hospital/Department/index.wxml

@@ -47,6 +47,14 @@
 			<text style="color: #666;">负责人:</text>
 			<text>{{item.leader[0].name}}</text>
 		</view>
+    <view class="replenish">
+      <text style="color: #666;">科室床位:</text>
+      <text>{{item.bedcount}}</text>
+    </view>
+    <view class="replenish">
+      <text style="color: #666;">医生数量:</text>
+      <text>{{item.doctorcount}}</text>
+    </view>
 		<view class="replenish">
 			<text style="color: #666;">备注:</text>
 			<text>{{item.remarks || '--'}}</text>

+ 10 - 12
prsx/hospital/Surgery/update.js

@@ -55,15 +55,15 @@ Page({
         interrupt: true
       },
       {
-        label: "医生",
+        label: "科室",
         id: 1,
         error: false,
         errMsg: "",
         type: "route",
-        url: "/prsx/select/docter/index",
+        url: "/prsx/select/department/index",
         value: '',
-        placeholder: "医生",
-        valueName: "sa_doctorid",
+        placeholder: "科室",
+        valueName: "sa_hospitaldepid",
         checking: "base",
         required: true,
         params: {
@@ -75,11 +75,10 @@ Page({
               "condition": ""
             }
           },
-          "id": 2025102310134602,
+          "id": 2025102310143002,
         },
         query: "&radio=true",
         interrupt: true,
-        required: false
       }
     ]
     this.setData({
@@ -128,7 +127,6 @@ Page({
       qty: '',
       rowindex: 1,
       sa_customersid: this.data.sa_customersid,
-      sa_doctorid: '',
       sa_hospitaldepid: '',
       sa_surgeryforecast_itemsid: 0,
       sa_surgeryforecastid: this.data.content.sa_surgeryforecastid,
@@ -168,8 +166,8 @@ Page({
       temporary
     } = e.detail;
  
-    if (temporary.item.label == '医生') {
-      form.find(v => v.label == '医生').value = data.value;
+    if (temporary.item.label == '科室') {
+      form.find(v => v.label == '科室').value = data.value;
       wx.navigateBack()
     }
     this.selectComponent("#Form").confirm();
@@ -262,7 +260,7 @@ Page({
       })
       let data = this.selectComponent("#Form").submit(),
         content = this.data.content
-      data.sa_doctorid = data.sa_doctorid.length ? data.sa_doctorid[1][0] : 0
+      data.sa_hospitaldepid = data.sa_hospitaldepid.length ? data.sa_hospitaldepid[1][0] : 0
       _Http.basic({
         "id": 2025111315454902,
         "content": {
@@ -320,8 +318,8 @@ Page({
       oldQty:data.qty
     })
     let form = this.data.formData.map(v => {
-      if (v.valueName == 'sa_doctorid') {
-        v.value = [data.doctorname, [data.sa_doctorid]]
+      if (v.valueName == 'sa_hospitaldepid') {
+        v.value = [data.hospitaldepname, [data.sa_hospitaldepid]]
       } else {
         v.value = data[v.valueName] || "";
       }

+ 2 - 2
prsx/hospital/Surgery/update.wxml

@@ -36,8 +36,8 @@
         <text style="color: #3874F6;">{{item.qty || 0}}</text>
       </view>
       <view class="replenish">
-        <text style="color: #666;">医生:</text>
-        <text>{{item.doctorname || '--'}}</text>
+        <text style="color: #666;">科室:</text>
+        <text>{{item.hospitaldepname || '--'}}</text>
       </view>
     </view>
     <view class="iconfont-box {{disabled ? 'grey' : 'orange'}}" wx:if="{{nowIndex == item.rowindex}}" data-item="{{item}}" bind:tap="submit">