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

src/api/project/project.js

@@ -230,7 +230,7 @@ export function getAllDoctorList(params){
 export function saveHisPatient(params){
 
   return request({
-    url:"/api/his/savehispatient",
+    url:"/api/register/get",
     methods:"get",
     params:params
   })

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -2549,7 +2549,7 @@
       this.getSelfMedicalList()
     },mounted(){
       console.log("~~~~~")
-      console.log(this.his_is_open)
+      console.log(this.doctor_advices)
       console.log("~~~~~")
 
 

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1546,7 +1546,7 @@
       getAfterWeight(record) {
         if (record.id > 0) {
           if (record.weight_after > 0) {
-            return record.weight_after - this.predialysis.additional_weight
+            return parseFloat(record.weight_after - this.predialysis.additional_weight).toFixed(1)
           } else {
             return ''
           }

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="dialysis-print-box-1" style="width:920px">
+  <div id="dialysis-print-box-1" style="width:940px">
     <div
       id="dialysis-print-box-1-1"
       class="dialysis-print-order print-template-two print_page_main_content"
@@ -39,9 +39,10 @@
           </div>
         </div>
         <div class="inline_block">
-          门诊：
-          <div class="under_line" style="width: 30px;text-align: center;">
-            <check-box :checked="receiverTreatmentAccess.condition == 2 ? true : false"></check-box>
+          <div class="under_line" style="width: 50px;text-align: center;">
+            <!-- <check-box :checked="receiverTreatmentAccess.condition == 2 ? true : false"></check-box> -->
+            <span v-if="receiverTreatmentAccess.condition == 2">门诊</span>
+            <span v-if="receiverTreatmentAccess.condition == 1">住院</span>
           </div>
         </div>
         <div class="inline_block">
@@ -583,7 +584,7 @@
                 <table class="inside_table">
                   <tbody>
                     <tr>
-                      <td colspan="9" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 0px 8px;line-height: 30px;">
+                      <td colspan="11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 0px 8px;line-height: 30px;">
                         监测记录
                       </td>
                     </tr>
@@ -633,7 +634,7 @@
                       </td>
                     </tr>
                     <tr>
-                      <td colspan="10" style="line-height:25px;text-align:left;">
+                      <td colspan="11" style="line-height:25px;text-align:left;">
                         医师记录：{{ summary.special_record ? summary.special_record : '' }}
                       </td>
                     </tr>

src/xt_pages/outpatientCharges/summary.vue

@@ -205,7 +205,8 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
-  import NewStatementPrint from './newStatementPrint'
+  // import NewStatementPrint from './newStatementPrint'
+  import NewStatementPrint from './statementPrint.vue'
   import listPrint from './listPrint'
   import allListPrint from './allListPrint'
   import NewStatementPrintTwo from './newStatementPrintTwo'

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1474,7 +1474,23 @@
       }, changeAllGoodInfoTableDataTwo(row) {
         this.teamList = row
       },
-      selectChange(row) {
+      selectChange(selection, row) {
+        console.log('row',row)
+        if(row.total <= 0){
+          if(row.type == 3){
+            if (selection) {
+              selection.forEach(row => {
+                if(row.total <= 0){
+                  this.$refs.tables.toggleRowSelection(row);
+                }
+              });
+            } else {
+              this.$refs.tables.clearSelection();
+            }
+            this.$message.error(row.project_name + '库存不足')
+            return
+          }
+        }
         this.teamList = row
       }, getPrescriptionTemplateInfo() {
         let params = {
@@ -1640,6 +1656,7 @@
                 price: good_info[i].retail_price,
                 medical_code: good_info[i].medical_insurance_number,
                 unit: this.getGoodUnit(good_info[i].good_unit),
+                total: good_info[i].total,
                 type: 3
               }
               this.tabProject.push(obj)
@@ -1715,6 +1732,7 @@
         getPojectListById(params).then(response => {
           if (response.data.state == 1) {
             this.teamList = []
+            let num = 0
             var project = response.data.data.project
             for (let i = 0; i < project.length; i++) {
               if (project[i].type == 2) {
@@ -1740,6 +1758,17 @@
 
                 this.teamList.push(obj)
               } else if (project[i].type == 3) {
+                if(project[i].good_info.total <= 0){
+                  num++
+                  this.$refs.tabProjectTeam.toggleRowSelection(row);
+                  setTimeout(() => {
+                    this.$message.error(project[i].good_info.good_name + '库存不足')
+                  },100)
+                }
+                if(num > 0){
+                  this.$refs.tabProjectTeam.clearSelection();
+                }
+
                 let obj = {
                   id: project[i].project_id,
                   project_name: project[i].good_info.good_name,

src/xt_pages/outpatientRegistration/index.vue

@@ -371,26 +371,26 @@
                     <!--</el-select>-->
                     <!--</el-form-item>-->
 
-                    <el-form-item label="医生：" prop="doctor" :validate-event="is_Name">
-                        <el-select v-model="form.doctor" placeholder="请选择" @change="changeDoctor">
-                            <el-option
-                                    v-for="item in doctorList"
-                                    :key="item.admin_user_id"
-                                    :label="item.user_name"
-                                    :value="item.admin_user_id">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="科室：" prop="department" :validate-event="is_Name">
-                        <el-select v-model="form.department" placeholder="请选择">
-                            <el-option
-                                    v-for="item in departmentList"
-                                    :key="item.id"
-                                    :label="item.name"
-                                    :value="item.id">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
+                    <!--<el-form-item label="医生：" prop="doctor" :validate-event="is_Name">-->
+                        <!--<el-select v-model="form.doctor" placeholder="请选择" @change="changeDoctor">-->
+                            <!--<el-option-->
+                                    <!--v-for="item in doctorList"-->
+                                    <!--:key="item.admin_user_id"-->
+                                    <!--:label="item.user_name"-->
+                                    <!--:value="item.admin_user_id">-->
+                            <!--</el-option>-->
+                        <!--</el-select>-->
+                    <!--</el-form-item>-->
+                    <!--<el-form-item label="科室：" prop="department" :validate-event="is_Name">-->
+                        <!--<el-select v-model="form.department" placeholder="请选择">-->
+                            <!--<el-option-->
+                                    <!--v-for="item in departmentList"-->
+                                    <!--:key="item.id"-->
+                                    <!--:label="item.name"-->
+                                    <!--:value="item.id">-->
+                            <!--</el-option>-->
+                        <!--</el-select>-->
+                    <!--</el-form-item>-->
                     <!-- <el-form-item>
                         <el-checkbox v-model="form.costChecked">是否需要工本费</el-checkbox>
                     </el-form-item> -->