bug修复

components/Yl_Filtrate1/index.wxml

@@ -48,7 +48,7 @@
         </view>
         <slot />
     </Yl_ListBox>
-    <view class="footer" bindtap="onClick">
+    <view class="footer" bindtap="onClick" style="padding-top: 20rpx;">
         <van-button data-name="close" custom-class='v-but'>{{language['关闭']||'关闭'}}</van-button>
         <van-button wx:if="{{isReset}}" data-name="reset" custom-class='v-but'>{{language['重置']||'重置'}}</van-button>
         <van-button data-name="confirm" custom-class='v-but confirm'>{{language['确定']||'确定'}}</van-button>

components/personnel/index.js

@@ -31,7 +31,7 @@ Component({
       name: ""
     },
     users: {
-      active: {}
+      active: ''
     },
     isleave: 1,
     tabs: [{
@@ -55,10 +55,12 @@ Component({
   methods: {
     userList() {
       const nowUserid = wx.getStorageSync('userMsg').userid
-      const userid = this.data.users.active != nowUserid ? this.data.users.active : nowUserid
-
-      console.log(wx.getStorageSync('userMsg').userid)
-      console.log(userid,'userid555')
+     console.log(this.data.users.active)
+     console.log(nowUserid)
+     console.log(this.data.users.active != nowUserid)
+      const userid = this.data.users.active !== nowUserid && this.data.users.active !== '' ? this.data.users.active  : nowUserid
+      const accountno = wx.getStorageSync('userMsg').accountno
+      console.log(userid,'userid')
       this.setData({
         'users.active':userid
       })
@@ -66,20 +68,22 @@ Component({
         "id": 2025122211095302,
         "content": {}
       }).then(res => {
-        console.log(res,'数据222')
         res.data.unshift({
           name:"我",
-          userid: 2800
+          userid: nowUserid,
+          accountno:accountno
         })
+        
         this.setData({
-          'users.list':res.data
+          'users.list':res.data,
+          'users.active':userid
         })
       })
     },
     searchChange({
       detail
     }) {
-      console.log('输出底层', detail)
+      
       if (detail.length == 0) return this.searchClear()
       let list = JSON.parse(JSON.stringify(this.data.users.copyList));
       this.setData({
@@ -91,100 +95,8 @@ Component({
         'users.list': JSON.parse(JSON.stringify(this.data.users.copyList))
       })
     },
-    changLeave(e) {
-      this.setData({
-        isleave: e.currentTarget.dataset.value,
-        'result.isleave': e.currentTarget.dataset.value
-      })
-      console.log("result", this.data.result)
-      this.initDepAndUser(false);
-    },
-    initDepAndUser(init = true) {
-      if (init) this.setData({
-        takeEffect: "", //生效筛选项
-        result: {},
-      })
-      let content = {
-        isleave: this.data.isleave
-      }
-      return new Promise((resolve) => {
-        _Http.basic({
-          "id": 20230620102004,
-          content
-        }).then(res => {
-          console.log("获取部门", res)
-          if (this.data.isdep && this.data.depGroud.length == 0) this.setData({
-            depGroud: [{
-              label: "部门",
-              list: res.data.dep,
-              active: ""
-            }]
-          })
-          console.log("depGroud", this.data.depGroud)
-          console.log("result", this.data.result)
-          console.log("active", this.data.active)
-
-          if (this.data.isusers) {
-            let active = this.data.users.active;
-            if (this.data.defaultMy && this.data.result.name == '') {
-              let user = res.data.hr.find(v => v.userid == wx.getStorageSync('userMsg').userid)
-              if (user) {
-                active = user.userid;
-                resolve(user)
-                this.setData({
-                  takeEffect: "user",
-                  result: user
-                })
-              } else {
-                this.setData({
-                  takeEffect: "",
-                  result: {}
-                })
-              }
-            }
-            this.setData({
-              users: {
-                label: "业务员",
-                list: res.data.hr,
-                copyList: res.data.hr,
-                active
-              }
-            })
-          }
-          if (init) this.setData({
-            isleave: this.data.defaultIsleave
-          })
-          resolve({})
-        })
-      })
-    },
-    selectDep(e) {
-      const {
-        item,
-        index
-      } = e.currentTarget.dataset;
-      let depGroud = this.data.depGroud.slice(0, index + 1);
-      depGroud[index].active = item.sa_saleareaid;
-      if (item.subdep.length) {
-        item.subdep.unshift(JSON.parse(JSON.stringify(item)))
-        item.subdep[0].depname = getApp().globalData.Language.getMapText('全部');
-        item.subdep[0].subdep = [];
-        depGroud.push({
-          label: item.depname + getApp().globalData.Language.getMapText('下级部门'),
-          list: item.subdep,
-          active: item.sa_saleareaid
-        })
-      }
-      item.name = item.depname
-      item.isleave = this.data.isleave;
-      this.setData({
-        depGroud,
-        takeEffect: "dep",
-        result: item
-      })
-    },
+   
     selectUser(e) {
-      console.log(e,'输出3333')
       const {
         item
       } = e.currentTarget.dataset;

components/personnel/index.scss

@@ -58,7 +58,7 @@
       width: 100%;
 
       .but {
-          min-width: 188rpx;
+          min-width: 300rpx;
           height: 72rpx;
           background: #F5F5F5;
           border-radius: 8rpx;
@@ -109,8 +109,8 @@
 
   .content {
       .active {
-          border: 0px solid #3874F6;
-          color: #333333;
+          border: 2px solid #3874F6;
+          color: #3874F6;
           font-weight: bold;
           background-color: #F5F5F5;
       }

components/personnel/index.wxml

@@ -10,8 +10,8 @@
         </view>
     </view>
     <view class="content">
-        <van-button custom-class='but {{item.userid == users.active?" active":""}}' 
-        wx:for="{{users.list}}" wx:key="userid" data-item="{{item}}" bindtap="selectUser">{{item.name}} {{item.userid}}</van-button>
+        <van-button wx:for="{{users.list}}" custom-class='but {{item.userid == users.active? "active":""}}' 
+         wx:key="userid" data-item="{{item}}" bindtap="selectUser">{{item.name}} {{item.accountno}} </van-button>
     </view>
 </view>
 

prsx/calendar/task/list.wxml

@@ -12,7 +12,7 @@
 	</view>
 </view>
 
-<view class="project-item"  wx:key="sa_doctorid">
+<view class="project-item"  wx:key="sa_doctorid" wx:if="{{list.sys_taskid != 0}}">
 	<view class="main">
 		<view class="label" style="font-weight: bold;">
 			{{list.tasktitle}}
@@ -25,4 +25,4 @@
 		</view>
 	</view>
 </view>
-<My_empty wx:if="{{list.length==0}}" />
+<My_empty wx:else />

prsx/hospital/Surgery/update.js

@@ -169,6 +169,13 @@ Page({
     if (temporary.item.label == '科室') {
       form.find(v => v.label == '科室').value = data.value;
       wx.navigateBack()
+    }else if (temporary.item.label == '手术类型') {
+      let repeatList = this.data.list.filter(item => item.type == data.value)
+      if (repeatList.length > 0) {
+        form.find(v => v.label == '手术类型').errMsg = '该手术类型已存在'
+      }else {
+        form.find(v => v.label == '手术类型').errMsg = ''
+      }
     }
     this.selectComponent("#Form").confirm();
     this.setData({

prsx/trace/add/index.js

@@ -463,7 +463,7 @@ Page({
     })
     let content = Object.assign(this.data.content, this.selectComponent("#Form").submit())
     content.resource = this.data.resource || ''
-
+    console.log(content,'content343')
     if (this.data.special) {
       content.target = this.data.list.find(v => v.label == '目的').value
       content.content = this.data.list.find(v => v.label == '过程').value