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

src/vendor/Export2Excel.js

@@ -405,11 +405,11 @@ export function export_json_to_excel3({
   filename = filename || 'excel-list'
   data = [...data]
   data.unshift(header);
-  console.log('wwwww',data);
+  // console.log('wwwww',data);
   for (let i = multiHeader.length - 1; i > -1; i--) {
     data.unshift(multiHeader[i])
   }
-  console.log('qqqqq',data);
+  // console.log('qqqqq',data);
   var ws_name = "SheetJS";
   var wb = new Workbook(),
     ws = sheet_from_array_of_arrays(data);

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -757,40 +757,51 @@
                 that.$message.error(response.data.msg)
                 return false
               } else {
-                var patient = response.data.data.patient
-
-                if (that.form.id_card_type == 1) {
-                  that.form.id = patient.id
-                  that.form.name = patient.name
-                  that.form.gender = patient.gender
-                  that.form.age = patient.age
-                  that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
-                  that.form.phone = patient.phone
-                  that.form.id_card = patient.id_card_no
-                  that.form.medical_insurance_card = response.data.data.number
-                  that.form.social_type = parseInt(response.data.data.insutype)
+                if (response.data.data.failed_code == -10) {
+                  // that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
 
+                  }).catch(() => {
+                  })
 
-                } else if (that.form.id_card_type == 2) {
-                  that.form.id = patient.id
-                  that.form.name = patient.name
-                  that.form.gender = patient.gender
-                  that.form.age = patient.age
-                  that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
-                  that.form.phone = patient.phone
-                  that.form.id_card = patient.id_card_no
-                } else {
-                  that.form.id = patient.id
-                  that.form.name = patient.name
-                  that.form.gender = patient.gender
-                  that.form.age = patient.age
-                  that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
-                  that.form.phone = patient.phone
-                  that.form.id_card = patient.id_card_no
-                  that.form.social_type = parseInt(response.data.data.insutype)
+                }else {
+                  var patient = response.data.data.patient
+
+                  if (that.form.id_card_type == 1) {
+                    that.form.id = patient.id
+                    that.form.name = patient.name
+                    that.form.gender = patient.gender
+                    that.form.age = patient.age
+                    that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                    that.form.phone = patient.phone
+                    that.form.id_card = patient.id_card_no
+                    that.form.medical_insurance_card = response.data.data.number
+                    that.form.social_type = parseInt(response.data.data.insutype)
+
+                  } else if (that.form.id_card_type == 2) {
+                    that.form.id = patient.id
+                    that.form.name = patient.name
+                    that.form.gender = patient.gender
+                    that.form.age = patient.age
+                    that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                    that.form.phone = patient.phone
+                    that.form.id_card = patient.id_card_no
+                  } else {
+                    that.form.id = patient.id
+                    that.form.name = patient.name
+                    that.form.gender = patient.gender
+                    that.form.age = patient.age
+                    that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                    that.form.phone = patient.phone
+                    that.form.id_card = patient.id_card_no
+                    that.form.social_type = parseInt(response.data.data.insutype)
 
+                  }
+                  that.$message({ message: '读卡成功', type: 'success' })
                 }
-                that.$message({ message: '读卡成功', type: 'success' })
               }
             })
             .catch(function(error) {

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -3618,6 +3618,7 @@ export default {
       } else if(index == 40){
         var that = this
         let params = {
+          'admin_user_id': this.$store.getters.xt_user.user.id
         }
         axios.get('http://127.0.0.1:9532/9001', {
           params: params

src/xt_pages/workforce/components/tableData.vue

@@ -244,28 +244,34 @@
     </el-dialog>
 
     <div class="center-tab">
+      <!-- <h2>div move</h2>
+      <div ref="main" class="main" style="width: 300px;height: 300px;overflow: auto;">
+        <div style="width: 400px;height: 400px;padding-top: 100px;background-color: rgb(13, 255, 0);cursor: pointer;">
+          <div>1111111111111111111111</div>
+        </div>
+      </div>   "calc(100% - 50px)"-->
+
       <el-table
         :row-style="{ color: '#303133' }"
         :header-cell-style="{
           backgroundColor: 'rgb(245, 247, 250)',
           color: '#606266',
-          // border: '1px solid aqua',
         }"
         :fit="true"
         :data="scheduleZone"
         :span-method="objectSpanMethod"
         @cell-click="clickThis"
         @cell-mouse-enter="hoverMouse"
+        :cell-style ='cellstyle'
         :summary-method="getSummaries"
         show-summary
         :cell-class-name="cellClass"
-
         sum-text="总数"
-        :height="tableContainHeight"
+        height="600"
         ref="table"
         style="table-layout: fixed;"
       >
-<!-- :cell-style ='cellstyle' -->
+      <!-- :height="tableContainHeight" -->
         <el-table-column
           prop="area"
           label="分区"
@@ -286,9 +292,7 @@
           :label="' 周一(' + weekTitle[0] + ')'"
           v-if="isShowOne"
           align="center"
-
         >
-        <!-- :width="flexColumnWidth('Mon_M',scheduleZone)" -->
           <el-table-column  prop="Mon_M" label="上" min-width="40" align="center"  v-if="isShowShangWu" >
             <schedule-item
               slot-scope="scope"
@@ -521,7 +525,7 @@
               :schedulFlag="value1"
               :schedulMode="modename_value"
             >
-            <!--  -->
+
           </schedule-item>
           </el-table-column>
         </el-table-column>
@@ -733,6 +737,7 @@
 </template>
 
 <script>
+import Drag from '@/utils/move.js';
 import { uParseTime } from "@/utils/tools";
 import print from 'print-js'
 const moment = require('moment')
@@ -788,7 +793,7 @@ export default {
   },
   data() {
     return {
-      tableContainHeight:null,
+      // tableContainHeight:"calc(100% - 50px)",
       value1:false,
       modename_value:true,
       weeks:weekOptions,
@@ -926,27 +931,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)
@@ -1068,6 +1073,7 @@ export default {
     // 班次选择
     scheduleType_change(val){
       console.log('vvvvvv',val);
+      this.$emit('event2', val)
       if(val==1){
         this.isShowShangWu = true
         this.isShowXiaWu = false
@@ -1095,6 +1101,7 @@ export default {
       }else{
          sessionStorage.setItem('value1',this.value1)
       }
+      this.$emit('guanliu_show',this.value1)
         console.log('this.value1',this.value1);
         console.log('flag',flag);
     },
@@ -1409,9 +1416,9 @@ export default {
         return "";
       } else {
         if (this.weekTime == "lastWeek") {
-          // if(column.label == '晚' ){
-          //   return 'evening_border schedule-table-cell-disable'
-          // }
+           if(column.label == '晚' ){
+             return 'evening_border schedule-table-cell-disable'
+           }
           if(row[column.property].patient_id > 0 && row[column.property].patient_id == this.patient_id_hover ){
             return 'hover-td schedule-table-cell-disable'
           }else {
@@ -1426,15 +1433,15 @@ export default {
             if(row[column.property].patient_id > 0 && row[column.property].patient_id == this.patient_id_hover ){
               return 'hover-td schedule-table-cell-disable'
             }
-            // if(column.label == '晚'){
-            //   return 'evening_border schedule-table-cell-disable'
-            // }
+             if(column.label == '晚'){
+               return 'evening_border schedule-table-cell-disable'
+             }
             return "schedule-table-cell-disable";
           }else{
             // 分日期
-            // if(column.label == '晚' ){
-            //     return 'evening_border'
-            // }
+            if(column.label == '晚' ){
+                return 'evening_border'
+            }
             if(row[column.property].patient_id > 0 && row[column.property].patient_id == this.patient_id_hover){
               return 'hover-td '
             }else {
@@ -1449,17 +1456,17 @@ export default {
       }
       return "";
     },
-    // cellstyle({ row, column, rowIndex, columnIndex }){
-    //   // 分区蓝线
-    //   for(let i=0;i<this.subzone.length;i++){
-    //     const subslice=this.subzone[i].jihaos.slice(-1)
-    //     console.log('这是row',subslice);
-    //     if(row.zone_id==subslice[0].zone_id && row.jihao_id == subslice[0].id ){
-    //       // console.log('33333333333');
-    //       return 'border-top: 1px solid aqua;'
-    //     }
-    //   }
-    // },
+    cellstyle({ row, column, rowIndex, columnIndex }){
+      // 分区蓝线
+      // for(let i=0;i<this.subzone.length;i++){
+      //   const subslice=this.subzone[i].jihaos.slice(-1)
+      //   // console.log('这是row',subslice);
+      //   if(row.zone_id==subslice[0].zone_id && row.jihao_id == subslice[0].id ){
+      //     // console.log('33333333333',subslice);
+      //     return 'border-top: 1px solid red;'
+      //   }
+      // }
+    },
 
     changeSearchContagion(id) {
       this.patientQuery.contagion = id;
@@ -3363,6 +3370,7 @@ export default {
     },
     changeSchedule_type(val) {
       this.$emit('event2', val)
+      console.log('yyyyy',val);
       this.schedule_type = val
       this.getSchedules()
     },
@@ -3374,7 +3382,7 @@ export default {
     ScheduleItem
   },
   mounted() {
-
+    new Drag(this.$refs.main);
     this.tableContainHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 120;
 
     // var theType = this.weekType(this.weekTime);
@@ -3499,22 +3507,22 @@ textarea{
     background-color: #409eff !important;
     color: #fff;
   }
-  .Infectious_disease{
-    background-color: red !important;
-    color: white;
-    border-left: 1px solid aqua;
-    border-right: 1px solid aqua;
-  }
-  .border_bott{
-    border-left: 1px solid aqua;
-    border-right: 1px solid aqua;
-  }
-  .border_left{
-    border-left: 1px solid aqua;
-  }
-  .evening_border{
-    border-right: 1px solid aqua;
-  }
+  // .Infectious_disease{
+  //   background-color: red !important;
+  //   color: white;
+  //   border-left: 1px solid aqua;
+  //   border-right: 1px solid aqua;
+  // }
+  // .border_bott{
+  //   border-left: 1px solid aqua;
+  //   border-right: 1px solid aqua;
+  // }
+  // .border_left{
+  //   // border-left: 1px solid aqua;
+  // }
+  // .evening_border{
+  //   border-right: 1px solid rgb(236, 41, 41);
+  // }
 
 }
 .backPurple{
@@ -3539,3 +3547,4 @@ textarea{
 //   padding: 0px 0px !important;
 // }
 </style>
+