Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/utils/move.js

@@ -0,0 +1,52 @@
+// 鼠标移动滚动位置类
+class Drag {
+  constructor(vm) {
+    this.dragWrap = vm;// 要挂载的容器
+    this._dom = {};
+    this._x = 0;
+    this._y = 0;
+    this._top = 0;
+    this._left = 0;
+    this.move = false;
+    this.down = false;
+    this.init.apply(this, arguments);
+  }
+
+  // 绑定事件
+  init() {
+    this.bindEvent();
+  }
+
+  // 给要素增加鼠标事件mousedown，mouseup，mousemove
+  bindEvent() {
+    var t = this;
+    this.dragWrap.addEventListener('mousedown', function (e) {
+      e && e.preventDefault();
+      if (!t.move) {
+        t.move = false;
+        t.down = true;
+        t._x = e.clientX;
+        t._y = e.clientY;
+        t._top = t.dragWrap.scrollTop;
+        t._left = t.dragWrap.scrollLeft;
+      }
+    });
+    this.dragWrap.addEventListener('mouseup', function (e) {
+      e && e.preventDefault();
+      t.move = false;
+      t.down = false;
+    });
+    this.dragWrap.addEventListener('mousemove', function (e) {
+      if (t.down) {
+        e && e.preventDefault();
+        t.move = true;
+        let x = t._x - e.clientX;
+        let y = t._y - e.clientY;
+        t.dragWrap.scrollLeft = t._left + x;
+        t.dragWrap.scrollTop = t._top + y;
+      }
+    });
+  }
+}
+export default Drag;
+

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -3426,7 +3426,7 @@ export default {
         }
 
       } else if (index == 9) {
-        if (this.org_id == 10375){
+        if (this.org_id == 10375 && this.hisPatientInfo.balance_accounts_type == 1){
           var that = this
           axios
             .get('http://127.0.0.1:9532/api/settle/query', {

src/xt_pages/workforce/components/tableData.vue

@@ -91,7 +91,6 @@
         </el-switch>
       </div>
     </div>
-
     <!-- <el-dialog :visible.sync="searchTableVisible" width="80%" class="eldialog">
       <div style="position: relative;">
         <el-table
@@ -267,7 +266,7 @@
         show-summary
         :cell-class-name="cellClass"
         sum-text="总数"
-        height="600"
+        height="calc(100vh - 150px)"
         ref="table"
         style="table-layout: fixed;"
       >
@@ -793,7 +792,7 @@ export default {
   },
   data() {
     return {
-      // tableContainHeight:"calc(100% - 50px)",
+      // tableContainHeight:null,
       value1:false,
       modename_value:true,
       weeks:weekOptions,
@@ -931,27 +930,27 @@ export default {
   },
 
   watch: {
-    // schedule_type:function (){
-    //   this.isShowShangWu = false
-    //   this.isShowXiaWu = false
-    //   this.isShowWanShang = false
-    //   if(this.schedule_type.length > 0) {
-    //     for (let i = 0; i < this.schedule_type.length; i++) {
-    //       if (this.schedule_type[i] == 1) {
-    //         this.isShowShangWu = true
-    //       } else if (this.schedule_type[i] == 2) {
-    //         this.isShowXiaWu = true
-    //       } else if (this.schedule_type[i] == 3) {
-    //         this.isShowWanShang = true
-    //       }
-    //     }
-    //   }else{
-    //     this.isShowShangWu = true
-    //     this.isShowXiaWu = true
-    //     this.isShowWanShang = true
-    //   }
+     schedule_type:function (){
+       this.isShowShangWu = false
+      this.isShowXiaWu = false
+      this.isShowWanShang = false
+      if(this.schedule_type.length > 0) {
+        for (let i = 0; i < this.schedule_type.length; i++) {
+          if (this.schedule_type[i] == 1) {
+            this.isShowShangWu = true
+          } else if (this.schedule_type[i] == 2) {
+            this.isShowXiaWu = true
+          } else if (this.schedule_type[i] == 3) {
+            this.isShowWanShang = true
+          }
+        }
+      }else{
+        this.isShowShangWu = true
+        this.isShowXiaWu = true
+        this.isShowWanShang = true
+      }
 
-    // },
+    },
      week_type:function () {
       // console.log(this.week_type)
       // console.log(this.schedule_type)
@@ -3464,7 +3463,7 @@ textarea{
 }
 
 #table_data {
-  min-height: calc(100vh - 350px);
+  //min-height: calc(100vh - 350px);
   .switch{
     margin-left: 10px;
   }