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/template/DialysisPrintOrderFortySeven.vue

@@ -754,7 +754,13 @@
                             ? prescription.dialyzer_perfusion_apparatus
                             : ""
                         }}
-                        <span v-if="!prescription.dialysis_dialyszers&&!prescription.dialyzer_perfusion_apparatus">/</span>
+                        <span
+                          v-if="
+                            !prescription.dialysis_dialyszers &&
+                            !prescription.dialyzer_perfusion_apparatus
+                          "
+                          >/</span
+                        >
                         <span v-if="prescription.dialysis_dialyszers">/</span>
                         {{
                           prescription.dialysis_dialyszers
@@ -1289,7 +1295,6 @@
                                 : ""
                             }}
                           </span>
-
                         </td>
                         <!-- <td
                           v-if="
@@ -1445,11 +1450,14 @@
                           style="padding-left: 7px"
                         >
                           <span v-if="advice.parent_id > 0">---></span>
-                          <span>{{ advice.advice_name }}</span>
+                          <span v-if="advice.advice_name">{{ advice.advice_name }}</span>
+                          <span v-else>{{ advice.project.project_name }}</span>
+
                           <span v-if="advice && advice.advice_desc"
                             >({{ advice.advice_desc
                             }}{{ advice.drug_spec_unit }})</span
                           >
+                          <span v-if="advice && advice.project">{{advice.count}}{{advice.project.unit}}</span>
                           <span v-if="advice.prescribing_number"
                             >&nbsp;&nbsp; {{ advice.prescribing_number
                             }}{{ advice.prescribing_number_unit }}</span
@@ -2601,7 +2609,7 @@ export default {
       summary: {},
       receiverTreatmentAccess: {},
       org_template_info: {},
-
+      project:[],
       doctor_advices: [],
       doctor_advices_2: [],
       advice_groups: [],
@@ -3083,6 +3091,14 @@ export default {
 
         this.prescription = response.data.data.dialysisPrescription;
         console.log("透析处方", this.prescription);
+        let project_arr = response.data.data.projects
+        project_arr.forEach(o => {
+          if(o.project.project_name && o.project.project_name!=""){
+            this.project.push(o)
+          }
+        });
+        // this.project = response.data.data.projects;
+        console.log(this.project, "项目和耗材");
         this.receiverTreatmentAccess =
           response.data.data.receiverTreatmentAccess;
         this.prescription.mode = this.modeName(this.prescription.mode_id);
@@ -3229,7 +3245,9 @@ export default {
         }
         this.loading = false;
         this.doctor_advices =
-          response.data.data.advices == null ? [] : response.data.data.advices;
+          response.data.data.advices == null ? [] : response.data.data.advices.concat(this.project);
+          // .concat(this.project)
+          console.log( this.doctor_advices,' this.doctor_advices this.doctor_advices')
         for (let index = 0; index < this.doctor_advices.length; index++) {
           this.doctor_advices[index]["isShow"] = 2;
         }
@@ -3328,23 +3346,23 @@ export default {
           }
         }
 
-        this.totollength = this.doctor_advices.length + this.monitors.length;
-        if (this.totollength > 18) {
-          var temp_advice_length = 17 - this.monitors.length;
-          var doctor_advices_1 = [];
-          var doctor_advices_2 = [];
-          for (let index = 0; index < this.doctor_advices.length; index++) {
-            const element = this.doctor_advices[index];
-            if (temp_advice_length > index) {
-              doctor_advices_1.push(element);
-            } else {
-              doctor_advices_2.push(element);
-            }
-          }
-          this.doctor_advices = doctor_advices_1;
-          this.doctor_advices_2 = doctor_advices_2;
-        }
-        console.log(this.advice_groups);
+        // this.totollength = this.doctor_advices.length + this.monitors.length;
+        // if (this.totollength > 18) {
+        //   var temp_advice_length = 17 - this.monitors.length;
+        //   var doctor_advices_1 = [];
+        //   var doctor_advices_2 = [];
+        //   for (let index = 0; index < this.doctor_advices.length; index++) {
+        //     const element = this.doctor_advices[index];
+        //     if (temp_advice_length > index) {
+        //       doctor_advices_1.push(element);
+        //     } else {
+        //       doctor_advices_2.push(element);
+        //     }
+        //   }
+        //   this.doctor_advices = doctor_advices_1;
+        //   this.doctor_advices_2 = doctor_advices_2;
+        // }
+        // console.log(this.doctor_advices,'doctor_advices');
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -714,13 +714,11 @@
         this.form.p_type = 14
         this.form.sick_type = this.sick[0].id
         this.form.diagnosis = this.diagnoses[0].id
-        this.form.id_card_type = 1
+        this.form.id_card_type = 2
         this.form.certificates = 1
-
-        if (this.$store.getters.xt_user.org_id == 10188  || this.$store.getters.xt_user.org_id == 10217){
+        if (this.$store.getters.xt_user.org_id == 10188  || this.$store.getters.xt_user.org_id == 10217 || this.$store.getters.xt_user.org_id == 10191){
           this.form.id_card_type = 1
         }
-
         if (departments.length > 0) {
           this.form.department = departments[0].id
         }