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

src/api/dialysis_record.js

     schedule_date: schedule_date,
     mode: mode
   }
-  console.log('data=====', data)
+
   return request({
     url: '/api/dislysis/monitor/edit',
     method: 'post',
   })
 }
 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode,washpipe_nurse,change_nurse,difficult_puncture_nurse,new_fistula_nurse) {
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
     lood_drawing: lood_drawing,
     schedual_type: schedual_type,
     mode: mode,
-    washpipe_nurse:washpipe_nurse,
-    change_nurse:change_nurse,
-    difficult_puncture_nurse:difficult_puncture_nurse,
-    new_fistula_nurse:new_fistula_nurse
+    washpipe_nurse: washpipe_nurse,
+    change_nurse: change_nurse,
+    difficult_puncture_nurse: difficult_puncture_nurse,
+    new_fistula_nurse: new_fistula_nurse
   }
-  console.log("params",params)
+  console.log('params', params)
   return request({
     url: '/api/dialysis/start_record',
     method: 'post',

src/xt_pages/dialysis/bloodPresssWatch.vue

       }
       this.SchedualPatientsTableData = [];
       getSchedualPatient(this.listQuery).then(response => {
-        console.log("2222",response.data.data.schedule)
+        console.log("排班对于23333223323223232",response.data.data.schedule)
         if (response.data.state == 0) {
           this.loading = false;
           this.$message.error(response.data.msg);
               const SchedualPatientsTable = {
                 bp: []
               };
-              SchedualPatientsTable["start_time"] = response.data.data.schedule[i].dialysis_order.start_time ? parseTime(response.data.data.schedule[i].dialysis_order.start_time,"{h}:{i}") : '';
+              if(response.data.data.schedule[i].dialysis_order!=null){
+                SchedualPatientsTable["start_time"] = response.data.data.schedule[i].dialysis_order.start_time ? parseTime(response.data.data.schedule[i].dialysis_order.start_time,"{h}:{i}") : '';
+              }
+          
               SchedualPatientsTable["sch_id"] = response.data.data.schedule[i].id;
               SchedualPatientsTable["sch_time_int"] = response.data.data.schedule[i].schedule_date;
               SchedualPatientsTable["sch_time"] = parseTime(response.data.data.schedule[i].schedule_date,"{y}-{m}-{d}");
               SchedualPatientsTable["mode_id"] = response.data.data.schedule[i].mode_id
-              SchedualPatientsTable["dialysis_no"] =
-                response.data.data.schedule[i].patient.dialysis_no;
-              SchedualPatientsTable["name"] =
-                response.data.data.schedule[i].patient.name;
-              SchedualPatientsTable["number"] =
-                response.data.data.schedule[i].device_number.number;
-              SchedualPatientsTable["gender"] =
-                response.data.data.schedule[i].patient.gender;
-              SchedualPatientsTable["source"] =
-                response.data.data.schedule[i].patient.source;
-              SchedualPatientsTable["patient_id"] =
-                response.data.data.schedule[i].patient_id;
-              SchedualPatientsTable["mode_name"] =
-                response.data.data.schedule[i].treatment_mode.name;
-              SchedualPatientsTable["target_ultrafiltration"] = response.data.data.schedule[i].prescription.target_ultrafiltration;
-              if (
-                response.data.data.schedule[i].assessment_before_dislysis.id > 0
-              ) {
-                SchedualPatientsTable["dialysis_before_weight"] =
-                  response.data.data.schedule[
-                    i
-                  ].assessment_before_dislysis.weight_before;
+              if(response.data.data.schedule[i].patient!=null){
+                 SchedualPatientsTable["dialysis_no"] = response.data.data.schedule[i].patient.dialysis_no;
+                 SchedualPatientsTable["name"] =  response.data.data.schedule[i].patient.name;
+                 SchedualPatientsTable["gender"] = response.data.data.schedule[i].patient.gender;
+                 SchedualPatientsTable["source"] = response.data.data.schedule[i].patient.source;
+                SchedualPatientsTable["patient_id"] = response.data.data.schedule[i].patient_id;
               }
-              if (
-                response.data.data.schedule[i].assessment_after_dislysis.id > 0
-              ) {
-                SchedualPatientsTable["dialysis_after_weight"] =
-                  response.data.data.schedule[
-                    i
-                  ].assessment_after_dislysis.weight_after;
+             
+              SchedualPatientsTable["number"] =  response.data.data.schedule[i].device_number.number;
+               
+              if(response.data.data.schedule[i].treatment_mode!=null){
+                SchedualPatientsTable["mode_name"] = response.data.data.schedule[i].treatment_mode.name;
+              }
+              if(response.data.data.schedule[i].prescription!=null){
+                SchedualPatientsTable["target_ultrafiltration"] = response.data.data.schedule[i].prescription.target_ultrafiltration;  
+              }
+             
+              if (response.data.data.schedule[i].assessment_before_dislysis != null) {
+                SchedualPatientsTable["dialysis_before_weight"] =response.data.data.schedule[i].assessment_before_dislysis.weight_before;
+              }
+              if (response.data.data.schedule[i].assessment_after_dislysis !=null) {
+                SchedualPatientsTable["dialysis_after_weight"] =response.data.data.schedule[i].assessment_after_dislysis.weight_after;
               }
 
               SchedualPatientsTable.bp = [];

src/xt_pages/hospitalStation/components/deskPrescription.vue

                     </el-table-column>
                     <el-table-column label="库存" width="60">
                       <template slot-scope="scope">
-                         <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
+                         <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 ">
                              <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
                              <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
                           </span>
                     </el-table-column>
                     <el-table-column label="库存" width="40">
                       <template slot-scope="scope">
-                         <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
+                         <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10088">
                             {{scope.row.stock_count}}
                         </span>
                        <span v-else> {{ scope.row.total }}</span>
         this.$refs.additionalCharges.show()
       },
       selectDrugs(selection, row) {
-      if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919){
+      if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id ==10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id ==10088 ){
             if (row.count <= 0) {
               if (selection) {
                 selection.forEach(row => {
       },
       selectChange(selection, row) {
         console.log('row', row)
-          if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id ==10245 || this.org_id == 9919 ){
+          if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id ==10245 || this.org_id == 9919 || this.org_id ==10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id ==10088){
            if (row.stock_count <= 0) {
             if (row.type == 3) {
               if (selection) {

src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue

                   <div>费别：<span style="display:inline-block;width:80px;">自费</span>
                   </div>
                   <div>电脑号：<span style="display:inline-block;width:80px;"></span></div>
-                  <div>收费日期：<span style="display:inline-block;width:100px;">{{getTime(new Date(),"{y}-{m}-{d}")?getTime(new Date(),"{y}-{m}-{d}"):""}}</span></div>
+                  <div>收费日期：<span style="display:inline-block;width:100px;">{{getTime(balanceAccounts.order.settle_accounts_date,"{y}-{m}-{d}")?getTime(balanceAccounts.order.settle_accounts_date,"{y}-{m}-{d}"):""}}</span></div>
                 </div>
                 <div style="float:right">金额单位：元</div>
             </div>

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

                     </div>
                     <div>费别：<span style="display:inline-block;width:80px;">自费</span>
                     </div>
-                    <div>收费日期：<span style="display:inline-block;width:100px;">{{getTime(new Date(),'{y}-{m}-{d}')?getTime(new Date(),'{y}-{m}-{d}'):''}}</span>
+                    <div>收费日期：<span style="display:inline-block;width:100px;">{{getTime(balanceAccounts.order.settle_accounts_date,"{y}-{m}-{d}")?getTime(balanceAccounts.order.settle_accounts_date,'{y}-{m}-{d}'):''}}</span>
                     </div>
                 </div>
                 <div style="float:right">金额单位：元</div>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10088">
                                                <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
                                               </span>
                                         </el-table-column>
                                         <el-table-column label="库存" width="40">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10088">
                                                    {{scope.row.stock_count}}
                                               </span>
                                               <span v-else> {{ scope.row.total }}</span>
       selectDrugs(selection, row) {
         console.log('selection', selection)
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10088){
             if (row.count <= 0) {
               if (selection) {
                 selection.forEach(row => {
       },
       selectChange(selection, row) {
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id ==10245 || this.org_id == 9919 ){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10088){
            if (row.stock_count <= 0) {
             if (row.type == 3) {
               if (selection) {

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

             for(let i=0;i<drugs.length;i++){
                 drugs[i].count = 0
               if(drugs[i].stock_in.length > 0){
-                 for(let j=0;j<drugs[i].stock_in.length;j++){
+                if(drugs[i].stock_in != null) {
+                  for (let j = 0; j < drugs[i].stock_in.length; j++) {
                     drugs[i].count += (drugs[i].stock_in[j].stock_max_number * drugs[i].min_number + drugs[i].stock_in[j].stock_min_number)
-                 }
+                  }
+                }
               }
             }
             this.drugs = drugs

src/xt_pages/outpatientTool/labelPrint.vue

         this.current_project_name = row.project_name
         this.current_name = row.patient_name
         this.$nextTick(() => {
-          JsBarcode('#barcode',row.feedetl_sn, {
+          JsBarcode('#barcode',row.p_project_id, {
             format: 'CODE39',
             lineColor: '#000',
             background: '#EBEEF5',

src/xt_pages/stock/drugs/inventoryPrint.vue

          }
       },
       getManufacturerName(id){
-        var name = ""
-        for(let i=0;i<this.manufacturerList.length;i++){
-          if(id == this.manufacturerList[i].id){
-             name = this.manufacturerList[i].manufacturer_name
-          }
-          return name
+       
+           var name = ""
+           for(let i=0;i<this.manufacturerList.length;i++){
+              if(id == this.manufacturerList[i].id){
+                  name = this.manufacturerList[i].manufacturer_name
+              }
+           }
+           return name
         }
-      }
+      
+      
      },
     created(){
       this.getlist()

src/xt_pages/stock/inventoryPrint.vue

          })
         },
         getManufacturerName(id){
+       
            var name = ""
            for(let i=0;i<this.manufacturerList.length;i++){
               if(id == this.manufacturerList[i].id){

src/xt_pages/stock/stockQuery.vue

        </el-table-column>
        <el-table-column label="出库数量" align="center" v-if="showOne">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779">
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id ==  10088">
             <span>
               {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info) + getCancelSotckInfo(scope.row.cancel_stock_info) }}
             </span>
 
        <el-table-column label="剩余库存量" align="center" v-if="showThree">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id == 10088">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
           <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>
          </template>
        </el-table-column>
            this.tableList[i].prodect_name = this.getManufacture(this.tableList[i].manufacturer)
            this.tableList[i].inCount =  this.getWareInfo(this.tableList[i].xt_warehouse_info)
 
-        
-          if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779){
-             this.tableList[i].outCount  = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getOverFlushInfo(this.tableList[i].xt_warehouse_info) + this.getCancelSotckInfo(this.tableList[i].cancel_stock_info) 
+          if(this.end_time == ""){
+            if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id ==  10088 ){
+              this.tableList[i].outCount  = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getOverFlushInfo(this.tableList[i].xt_warehouse_info) + this.getCancelSotckInfo(this.tableList[i].cancel_stock_info) 
+            }else{
+              this.tableList[i].outCount =  this.getAutoCount(this.tableList[i].id) + this.getOutCount(this.tableList[i].id)
+            }
+            
+            if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id ==  10088 ){
+                this.tableList[i].overplus = this.getOverFlushInfo(this.tableList[i].xt_warehouse_info)
+            }else{
+              this.tableList[i].overplus = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getAutoCount(this.tableList[i].id) - this.getOutCount(this.tableList[i].id) + this.getCancelCount(this.tableList[i].id)
+            }
           }else{
             this.tableList[i].outCount =  this.getAutoCount(this.tableList[i].id) + this.getOutCount(this.tableList[i].id)
+            this.tableList[i].overplus = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getAutoCount(this.tableList[i].id) - this.getOutCount(this.tableList[i].id) + this.getCancelCount(this.tableList[i].id)
           }
           
-           if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779){
-              this.tableList[i].overplus = this.getOverFlushInfo(this.tableList[i].xt_warehouse_info)
-           }else{
-             this.tableList[i].overplus = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getAutoCount(this.tableList[i].id) - this.getOutCount(this.tableList[i].id) + this.getCancelCount(this.tableList[i].id)
-           }
 
          }
          const data = this.formatJson(filterVal, this.tableList)