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

src/xt_pages/data/components/addDrugs.vue

@@ -706,6 +706,13 @@
           }
 
           this.formTitle = '编辑'
+          let unitArr = []
+          this.unitList.map(item => {
+            unitArr.push(item.id)
+          })
+          if(unitArr.indexOf(this.form.drug_dose_unit) == -1){
+            this.form.drug_dose_unit = ''
+          }
 
         }
         this.getAdviceConfig()

src/xt_pages/data/components/drugs.vue

@@ -142,7 +142,7 @@
           <div>{{scope.row.drug_status.indexOf('停用') == -1 ? '启用':'停用' }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="date" label="操作" width="250" align="center" fixed="right">
+      <el-table-column prop="date" label="操作" width="280" align="center" fixed="right">
         <template slot-scope="scope">
           <el-button @click="openForm(scope.row.id)" type="primary" size="small">编辑</el-button>
           <el-button type="danger" size="small" @click="deleteDurg(scope.row.id,scope.$index)">删除</el-button>

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -512,6 +512,46 @@ export default {
             console.log("列表数据",schedules)
             var config = resp.data.config
             console.log("config222222",config.is_open)
+            let project_config = resp.data.project_config
+            console.log('project_config',resp.data.hisAdvices)
+            if(project_config.is_open == 1){
+              this.project = resp.data.project
+              resp.data.hisAdvices.map((item,index) => {
+                if(this.project[index].project.length > 0){
+                  this.project[index].project.map(it => {
+                    let obj = {
+                      advice_doctor: it.doctor,
+                      start_time:it.start_time,
+                      advice_name: it.type == 2 ? it.project.project_name : it.good_info.good_name,
+                      execution_time:it.execution_time,
+                      execution_state:it.execution_state,
+                      execution_staff:it.execution_staff,
+                      check_time:it.check_time,
+                      check_state:it.check_state,
+                      checker:it.checker,
+                      created_time:it.ctime,
+                      delivery_way:'',
+                      execution_frequency:'',
+                      remark:'',
+                      id:it.id,
+                      patient_id:it.patient_id,
+                      parent_id:0,
+                      groupno:0
+                    }
+                    // let advice = []
+                    // advice.push(obj)
+                    // let advices = {
+                    //   advices: advice,
+                    //   group_no: 123
+                    // }
+
+                //     // console.log(11111,item.new_advice)
+                    item.doctor_advice.push(obj)
+                  })
+                }
+              })
+            }
+            console.log('resp.data.hisAdvices',resp.data.hisAdvices)
            if(config.is_open == 0 || config.is_open == 2){
             this.show = true
             this.showOne = false
@@ -638,7 +678,7 @@ export default {
             this.indexInfoList = newArr
            }
          }
-        //  console.log("列表22222",this.scheduleMap)
+         console.log("列表22222",this.indexInfoList)
         })
     },
     getValue: function(val) {
@@ -878,7 +918,7 @@ export default {
             tempSingleDoseDesc =
               ' 单次用量 ' + '  ' + row.single_dose + '' + row.single_dose_unit
           } else {
-            tempSingleDoseDesc = row.single_dose + '' + row.single_dose_unit
+            tempSingleDoseDesc = row.single_dose ? row.single_dose : '' + '' + row.single_dose_unit ? row.single_dose_unit : ''
           }
         }
 
@@ -887,7 +927,12 @@ export default {
         }
 
         if (isChild == 1) {
-          // 不是子药
+          // 不是子药 
+          console.log(tempDrugSpecDesc)
+          console.log(tempPrescribingNumberDesc)
+          console.log(tempSingleDoseDesc)
+          console.log(11,row.delivery_way)
+          console.log(22,row.execution_frequency)
 
           return (
             row.advice_name +

src/xt_pages/dialysis/doctorAdvicePrint.vue

@@ -285,6 +285,43 @@ export default {
                 if (resp.state == 1) {
                 this.admin_user = resp.data.adminUser
                 var config = resp.data.config
+                let project_config = resp.data.project_config
+                console.log('project_config',resp.data.project_config)
+                if(project_config.is_open == 1){
+                    this.project = resp.data.project
+                    resp.data.hisAdvices.map((item,index) => {
+                    item.new_advice = item.new_advice ? item.new_advice : []
+                    if(this.project[index].project.length > 0){
+                        this.project[index].project.map(it => {
+                        let obj = {
+                            advice_doctor: it.doctor,
+                            start_time:it.start_time,
+                            advice_name: it.type == 2 ? it.project.project_name : it.good_info.good_name,
+                            execution_time:it.execution_time,
+                            execution_state:it.execution_state,
+                            execution_staff:it.execution_staff,
+                            check_time:it.check_time,
+                            check_state:it.check_state,
+                            checker:it.checker,
+                            created_time:it.ctime,
+                            remark:'',
+                            id:it.id,
+                            parent_id:0,
+                            groupno:0
+                        }
+                        // let advice = []
+                        // advice.push(obj)
+                        // let advices = {
+                        //   advices: advice,
+                        //   group_no: 123
+                        // }
+
+                        // console.log(11111,item.new_advice)
+                        item.doctor_advice.push(obj)
+                        })
+                    }
+                    })
+                }
                 if(config.is_open == 0 || config.is_open == 2){
                 
                    var schedulesArr = resp.data.scheduals

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2494,6 +2494,7 @@
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
                   obj.prescribing_number = 1
                 }
+                
                 this.prescriptions[i].advices.push(obj)
               }
               this.curStatus = 1
@@ -2521,9 +2522,11 @@
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
                   obj.prescribing_number = 1
                 }
+                console.log('obj',obj)
                 this.prescriptions[i].advices.push(obj)
               }
               this.curStatus = 1
+              
             }
 
             // if(this.activeName == 2){