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

src/xt_pages/dialysis/schedualPatient.vue

       }
     },
     created() {
-      if(sessionStorage.getItem('signIn') != null){
+      if(sessionStorage.getItem('signInKey') != null){
         setTimeout(() => {    
-          if(sessionStorage.getItem('signIn') == 1){
+          if(sessionStorage.getItem('signInKey') == 1){
             this.$router.replace({ path: '/signIn' })
-          }else if(sessionStorage.getItem('signIn') == 2){
+          }
+        },1000)
+      }else if(sessionStorage.getItem('lineUpKey') != null){
+        setTimeout(() => { 
+          if(sessionStorage.getItem('lineUpKey') == 1){
             this.$router.replace({ path: '/lineUp' })
           }
         },1000)

src/xt_pages/medicalScheduling/class.vue

                     v-model="form.timeone_start"
                     :picker-options="{
                     start: '01:00',
-                    step: '00:15',
+                    step: '00:05',
                     end: '24:00'
                     }"
                     placeholder="选择时间">
                     v-model="form.timeone_end"
                     :picker-options="{
                     start: '01:00',
-                    step: '00:15',
+                    step: '00:05',
                     end: '24:00'
                     }"
                     placeholder="选择时间">
                     v-model="form.timetwo_start"
                     :picker-options="{
                     start: '01:00',
-                    step: '00:15',
+                    step: '00:05',
                     end: '24:00'
                     }"
                     placeholder="选择时间">
                     v-model="form.timetwo_end"
                     :picker-options="{
                     start: '01:00',
-                    step: '00:15',
+                    step: '00:05',
                     end: '24:00'
                     }"
                     placeholder="选择时间">
                     v-model="form.timeone_start"
                     :picker-options="{
                     start: '01:00',
-                    step: '00:15',
+                    step: '00:05',
                     end: '24:00'
                     }"
                     placeholder="选择时间">
                     v-model="form.timeone_end"
                     :picker-options="{
                     start: '01:00',
-                    step: '00:15',
+                    step: '00:05',
                     end: '24:00'
                     }"
                     placeholder="选择时间">
                     v-model="form.timetwo_start"
                     :picker-options="{
                     start: '01:00',
-                    step: '00:15',
+                    step: '00:05',
                     end: '24:00'
                     }"
                     placeholder="选择时间">
                     v-model="form.timetwo_end"
                     :picker-options="{
                     start: '01:00',
-                    step: '00:15',
+                    step: '00:05',
                     end: '24:00'
                     }"
                     placeholder="选择时间">

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

 
           <el-button v-loading="loadingtwo" v-if="this.hisPatientInfo.id > 0 && this.order.id == 0" size="small"
                      @click="open(20)"
-                     type="primary">收费
+                     type="primary">预结算！
           </el-button>
 
-
           <el-button v-loading="loadingtwo" v-if="this.hisPatientInfo.id > 0 && this.order.id == 0" size="small"
-                     @click="open(4)"
-                     type="primary">预结算
+                     @click="open(21)"
+                     type="primary">收费！
           </el-button>
 
+
+          <!--<el-button v-loading="loadingtwo" v-if="this.hisPatientInfo.id > 0 && this.order.id == 0" size="small"-->
+                     <!--@click="open(4)"-->
+                     <!--type="primary">收费-->
+          <!--</el-button>-->
+
           <el-button size="small" @click="open(5)" type="primary"
                      v-if="this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">退费
           </el-button>
         this.loadingtwo = true
         if (this.$store.getters.xt_user.org_id == 9919) {
           var that = this
-          axios.get('http://127.0.0.1:9532/api/upload/get', {
+          axios.get('http://127.0.0.1:9532/api/settle/get', {
             params: form
           })
             .then(function(response) {
           }
 
         }else if(index == 20){
+          if (this.patientInfo.id == 0) {
+            this.$message({ message: '该选择要收费的患者', type: 'error' })
+            return
+          }
+
+          if (this.hisPatientInfo.id == 0) {
+            this.$message({ message: '该患者尚未挂号,请先挂号', type: 'error' })
+            return
+          }
+
+          let ids = []
+          if (this.activeName == 'first') {
+            for (let i = 0; i < this.prescriptions.length; i++) {
+              for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+                ids.push(this.prescriptions[i].advices[a].id)
+              }
+              for (let a = 0; a < this.prescriptions[i].addition.length; a++) {
+                ids.push(this.prescriptions[i].addition[a].id)
+              }
+
+              for (let a = 0; a < this.prescriptions[i].project.length; a++) {
+                ids.push(this.prescriptions[i].project[a].id)
+              }
+            }
+            if (ids.length == 0) {
+              this.$message.error('请先到医生工作站开处方再来结算')
+              return
+            }
+          } else {
+            for (let i = 0; i < this.month_prescriptions.length; i++) {
+              for (let a = 0; a < this.month_prescriptions[i].advices.length; a++) {
+                ids.push(this.month_prescriptions[i].advices[a].id)
+              }
+
+              for (let a = 0; a < this.month_prescriptions[i].addition.length; a++) {
+                ids.push(this.month_prescriptions[i].addition[a].id)
+              }
+
+              for (let a = 0; a < this.month_prescriptions[i].project.length; a++) {
+                ids.push(this.month_prescriptions[i].project[a].id)
+              }
+            }
+            if (ids.length == 0) {
+              this.$message.error('请先到医生工作站开处方再来结算')
+              return
+            }
+          }
+
 
+          var form = {}
+          form['id'] = this.patientInfo.id
+          form['record_time'] = this.record_date
+          form['admin_user_id'] = this.$store.getters.xt_user.user.id
 
+          if (this.activeName == 'first') {
+            form['settle_accounts_type'] = 1
 
+          } else {
+            form['start_time'] = this.other_start_time
+            form['end_time'] = this.other_end_time
+            form['settle_accounts_type'] = 2
 
+          }
+          this.loadingtwo = true
+          if (this.$store.getters.xt_user.org_id == 9919) {
+            var that = this
+            axios.get('http://127.0.0.1:9532/api/upload/get', {
+              params: form
+            })
+              .then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.msg)
+                  that.loadingtwo = false
+                  that.$refs.charge.hide()
+                  return false
+                } else {
+                  that.loadingtwo = false
+                  that.state = '预结算'
+                  that.$message({ message: '预结算成功', type: 'success' })
+                }
+              })
+              .catch(function(error) {
+
+              })
+          } else {
+
+          }
+        }else if(index == 21){
+
+          if (this.patientInfo.id == 0) {
+            this.$message({ message: '该选择要收费的患者', type: 'error' })
+            return
+          }
+
+          if (this.hisPatientInfo.id == 0) {
+            this.$message({ message: '该患者尚未挂号,请先挂号', type: 'error' })
+            return
+          }
+
+          let ids = []
+          if (this.activeName == 'first') {
+            for (let i = 0; i < this.prescriptions.length; i++) {
+              for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+                ids.push(this.prescriptions[i].advices[a].id)
+              }
+              for (let a = 0; a < this.prescriptions[i].addition.length; a++) {
+                ids.push(this.prescriptions[i].addition[a].id)
+              }
+
+              for (let a = 0; a < this.prescriptions[i].project.length; a++) {
+                ids.push(this.prescriptions[i].project[a].id)
+              }
+            }
+            if (ids.length == 0) {
+              this.$message.error('请先到医生工作站开处方再来结算')
+              return
+            }
+
+          } else {
+            for (let i = 0; i < this.month_prescriptions.length; i++) {
+              for (let a = 0; a < this.month_prescriptions[i].advices.length; a++) {
+                ids.push(this.month_prescriptions[i].advices[a].id)
+              }
+
+              for (let a = 0; a < this.month_prescriptions[i].addition.length; a++) {
+                ids.push(this.month_prescriptions[i].addition[a].id)
+              }
+
+              for (let a = 0; a < this.month_prescriptions[i].project.length; a++) {
+                ids.push(this.month_prescriptions[i].project[a].id)
+              }
+            }
+            if (ids.length == 0) {
+              this.$message.error('请先到医生工作站开处方再来结算')
+              return
+            }
+          }
+          if (this.activeName == 'first') {
+            this.$refs.charge.show(this.getTotal())
+          } else {
+            this.$refs.charge.show(this.getTotalTwo())
+          }
         }
       },
 

src/xt_pages/sign/lineUp.vue

         },
     },
     created(){
-        if(sessionStorage.getItem('signIn') != null){
-            if(sessionStorage.getItem('signIn') == 2){
+        if(sessionStorage.getItem('lineUpKey') != null){
+            if(sessionStorage.getItem('lineUpKey') == 1){
                 this.dialogTableVisible = true
             }
-            sessionStorage.removeItem('signIn')
+            sessionStorage.removeItem('lineUpKey')
+            sessionStorage.removeItem('signInKey')
         }
         this.initData = {
             cmd: "queue/join",
         }, 1000);
         this.newTimes = setInterval(() => {
             // this.reload()
-            sessionStorage.setItem('signIn',2);
+            sessionStorage.setItem('lineUpKey',1);
             window.location.reload()
         }, 1000 * 60 * 30);
     },

src/xt_pages/sign/signIn.vue

         },
     },
     created(){
-        if(sessionStorage.getItem('signIn') != null){
-            if(sessionStorage.getItem('signIn') == 1){
+        if(sessionStorage.getItem('signInKey') != null){
+            if(sessionStorage.getItem('signInKey') == 1){
                 this.dialogTableVisible = true
             }
-            sessionStorage.removeItem('signIn')
+            sessionStorage.removeItem('signInKey')
+            sessionStorage.removeItem('lineUpKey')
         }
         // if(sessionStorage.getItem('signInKey') != null){
         //     if(sessionStorage.getItem('signInKey') == 1){
         // this.updateTime();
         this.newTimes = setInterval(() => {
             // this.reload()
-            sessionStorage.setItem('signIn',1);
+            sessionStorage.setItem('signInKey',1);
             window.location.reload()
         }, 1000 * 60 * 30);
     },

src/xt_pages/workforce/appointment.vue

                 <el-button @click="newVisible=false">取 消</el-button>
                 <el-button type="primary" @click="submitAction('form')">保 存</el-button>
             </div>
-      </el-dialog>            
+      </el-dialog>
     </div>
   </div>
 </template>
         clen:7,
         nowYear: new Date().getFullYear(),
         schedule_week:0,
-       
+
       }
     },
     components: {
       UploadExcel
     },
     methods: {
-    
+
       generateTxt: function(log) {
         var content = ''
         var errlog = log.err_logs
             return false
           }
           var partitions = response.data.data.partitions
-          // console.log("分区",partitions)
-          this.theWeek.lastWeek = this.theWeek.thisWeek - 1
+          console.log("分区",partitions)
           this.theWeek.thisWeek = response.data.data.theWeek
+          this.theWeek.lastWeek = this.theWeek.thisWeek - 1
           this.theWeek.nextWeek = this.theWeek.thisWeek + 1
           this.theWeek.nextTwoWeek = this.theWeek.thisWeek + 2
           // 在控制变量改变的时候进行 强制渲染更新
 
           var data = []
           console.log("33333",this.tableList)
-        
+
          this.tableList.map(item=>{
            data.push(Object.values(item))
 
        return jsonData.map(v => filterVal.map(j => v[j]))
       },
 
-     
+
       printScheduleAction: function() {
         var date = new Date().getTime()
         if (this.activeName == 'lastWeek') {
             isHas_56 && isHas_57 && isHas_58 && isHas_59 && isHas_60 &&
             isHas_61 && isHas_62 && isHas_63 && isHas_64 && isHas_65)) {
 
-         
+
 
             this.dialogVisible = true
             return
           }
         } else {
 
-        
+
 
           this.dialogVisible = true
           return
           }
         }
 
-      
+
         for (let i = 0; i < zones.length; i++) {
-         
+
 
           if (!total_zones.includes(zones[i])) {
             is_system_zone = false
           }
         }
 
-     
+
 
 
         for (let i = 0; i < deviceNumber.length; i++) {
           if (!total_device_number.includes(deviceNumber[i])) {
-           
+
             is_device_number = false
           }
         }
               let obj = {}
 
               obj['name'] = results[i + 1][key].replace(/\s/g, '')
-             
+
               if (tempObj[key] == '上午') {
                 obj['schedule_type'] = 1
               } else if (tempObj[key] == '下午') {
               return cur
             }, []) // 设置cur默认类型为数组，并且初始值为空的数组
 
-           
+
             if (tempObjArr[i][key].length > arr.length) {    //比对原数组和去重后的原数组总数，不同的话则存在重复元素
               is_exist_repeat = true
             }
 
 
         if (headers.length > 65 || !is_system_zone || !is_device_number) {
-         
+
 
           this.dialogVisible = true
           return
                var end = this.getTimestamp(end_time) - 28800
               console.log("end",end)
               var scheduleList = response.data.data.list
-             
+
               var week= []
               var nextWeek = []
               var lastWeek = []
                   }
                 }
              }
-             console.log("list22222222222",list)
              this.tableList = list
            }
          })
       getTime(val) {
         return uParseTime(val, '{y}-{m}-{d}')
       },
-      
+
       copySchedule(){
         this.newVisible = true
       },
               copy_endtime:copy_endtime,
             }
            console.log("parasm",params)
-        
+
            this.$refs[formName].validate(valid=>{
               if(valid){
                 copyPatientSchedule(params).then(response=>{
      var start_time = moment().weekday(1).format('YYYY-MM-DD');
      console.log("开始时间",start_time)
      this.start_time = start_time
-    
+
      var end_time = this.getNextWeek(2)
      console.log("结束时间222222",end_time)
      this.end_time = end_time
           }
 
         }
-       
+
     }
   }
 </script>