Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

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/user/doctorAdvice.vue

@@ -201,7 +201,9 @@
               <span class="el-dropdown-link" v-if="scope.row.parent_id == 0">
                 <span v-if="scope.row.frequency_type ==1" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
                 <span v-if="scope.row.frequency_type ==2 && scope.row.day_count>0" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
+                <span v-if="scope.row.frequency_type ==2 && scope.row.day_count==0" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
                 <span v-if="scope.row.frequency_type ==3 && scope.row.week_day!=''" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
+                <span v-if="scope.row.frequency_type ==3 && scope.row.week_day==''" > {{ scope.row.advice_name}}</span>
                 <span v-if="scope.row.frequency_type ==0"> {{ scope.row.advice_name}}</span>
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>

src/xt_pages/workforce/appointment.vue

@@ -124,9 +124,9 @@
         <table-data ref="tableData"  :week-time="activeName" :partitions-prop="partitions"
                     :schedule-zone-row-prop="scheduleZoneRow"
                     :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
-                    @event2="changeSchedule"  @event3="changeWeekDay" @event6="changeScheduleType" @guanliu_show="guanliu" v-show="showtableOne">
+                    @event2="changeSchedule"  @event3="changeWeekDay"  @guanliu_show="guanliu" v-show="showtableOne"  @event6="changeScheduleType">
         </table-data>
-        <!--  -->
+        <!-- @event6="changeScheduleType" -->
       </div>
       <!-- 编辑 -->
        <edit-table-data ref="edittableData"  :week-time="activeName" :partitions-prop="partitions"
@@ -1332,8 +1332,8 @@ export default {
       } else if (this.activeName == 'nextTwoWeek') {
         date = date + 14 * 24 * 60 * 60 * 1000
       }
-      console.log('3333333',this.partition_id,this.activeName,this.week_date);
        this.$router.push({path: '/scheduleTablePrintSix?partition_id=' + this.partition_id + "&weekTime=" + this.activeName+"&week_date="+this.week_date+"&schedule_type="+this.schedule_type})
+
     },
     isShow() {
       let isShow = false