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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

             let two_count = 0
             let three_count = 0
             for (let i = 0; i < response.data.data.list.length; i++) {
-              // console.log('99999999', response.data.data.list)
+              console.log('99999999', response.data.data.list)
 
               if (response.data.data.list[i].info.prescription_status == 0 || response.data.data.list[i].info.prescription_status == 1 || response.data.data.list[i].info.prescription_status == 2) {
                 if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
   .mainCenter {
     display: flex;
     flex: 1;
+    height:100%;
   }
 
   .costBox {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="大病类型:" prop="name" label-position="right">
+          <el-form-item label="疾病类型:" prop="name" label-position="right">
 
             <el-select style="width:100%;" v-model="state1" placeholder="">
               <el-option

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

       <el-form-item label="家庭住址: " prop="name">
         <el-input v-model="patientInfo.home_address" placeholder="" :disabled="true"></el-input>
       </el-form-item>
+      <el-form-item label="疾病类型: " prop="name">
+        <el-select v-model="delivery_way" style="width:100%;" placeholder="请选择">
+         <el-option
+            v-for="item in wayOptions"
+           :key="item.id"
+           :label="item.name"
+           :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="诊断: " prop="name">
+        <el-input v-model="patientInfo.health_care_no" placeholder=""></el-input>
+      </el-form-item>
+      <el-form-item label="过敏史: " prop="name">
+        <el-input v-model="patientInfo.home_address" placeholder=""></el-input>
+      </el-form-item>
     </el-form>
     <div class="mainTitle">体格信息：</div>
     <el-form class="physiqueForm" :model="case_history" ref="form" label-width="80px">
     </el-form>
     <div class="mainTitle">病历信息：</div>
     <el-form class="recordForm" :model="case_history" ref="form" label-width="80px">
+     
+
       <el-form-item label="发病日期: " prop="name">
         <el-date-picker
           style="width:100%;"
       <el-form-item label="" prop="name">
         <el-checkbox v-model="case_history.is_infect">是否传染</el-checkbox>
       </el-form-item>
-      <el-row :gutter = "20">
-        <el-col :span="24">
-          <el-form-item label="主诉:">
-              <el-select @change="changeMainTemplate" v-model="value" style="width:200px">
-                  <el-option
-                    v-for="(item, index) in tabledata"
-                    :label="item.title"
-                    :value="item.content"
-                    :key="index"
-                  ></el-option>
-              </el-select>
-          </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item  prop="name" style="width:100%;">
-          <el-input
-            type="textarea"
-            :rows="2"
-            placeholder="请输入内容"
-            v-model="case_history.chief_conplaint">
-          </el-input>
-        </el-form-item>
-      </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="24">
-           <el-form-item label="现病史:">
-              <el-select @change="changeMainTemplateOne" v-model="valueOne" style="width:200px">
-                  <el-option
-                    v-for="(item, index) in tabledataOne"
-                    :label="item.title"
-                    :value="item.content"
-                    :key="index"
-                  ></el-option>
-              </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item  prop="name" style="width:100%;">
-            <el-input
-              type="textarea"
-              :rows="2"
-              placeholder="请输入内容"
-              v-model="case_history.history_of_present_illness">
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-         <el-col :span="24">
-           <el-form-item label="既往史:">
-            <el-select @change="changeMainTemplateTwo" v-model="valueTwo" style="width:200px">
-                  <el-option
-                    v-for="(item, index) in tabledataTwo"
-                    :label="item.title"
-                    :value="item.content"
-                    :key="index"
-                  ></el-option>
-             </el-select>
-            </el-form-item>
-         </el-col>
-         <el-col :span="24">
-            <el-form-item  prop="name" style="width:100%;">
-              <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="请输入内容"
-                v-model="case_history.past_history">
-              </el-input>
-           </el-form-item>
-         </el-col>
-      </el-row>
-     <el-row :gutter="24">
-       <el-col :span="20">
-          <el-form-item label="个人史:">
-            <el-select @change="changeMainTemplateThree" v-model="valueThree" style="width:200px">
-                  <el-option
-                    v-for="(item, index) in tabledataThree"
-                    :label="item.title"
-                    :value="item.content"
-                    :key="index"
-                  ></el-option>
-             </el-select>
-            </el-form-item>
-       </el-col>
-       <el-col :span="20">
-        <el-form-item  prop="name" style="width:100%;">
-          <el-input
-            type="textarea"
-            :rows="2"
-            placeholder="请输入内容"
-            v-model="case_history.personal_history">
-          </el-input>
-        </el-form-item>
-      </el-col>
-     </el-row>
-     <el-row :gutter="24">
-       <el-col :span="20">
-          <el-form-item  label="家族史:">
-            <el-select @change="changeMainTemplateFour" v-model="valueFour" style="width:200px">
-                  <el-option
-                    v-for="(item, index) in tabledataFour"
-                    :label="item.title"
-                    :value="item.content"
-                    :key="index"
-                  ></el-option>
-             </el-select>
-         </el-form-item>
-       </el-col>
-        <el-col :span="20">
-          <el-form-item prop="name" style="width:100%;">
-            <el-input
-              type="textarea"
-              :rows="2"
-              placeholder="请输入内容"
-              v-model="case_history.family_history">
-            </el-input>
-          </el-form-item>
-       </el-col>
-     </el-row>
-     <el-row :gutter="24">
-       <el-col :span="20">
-          <el-form-item label="诊断信息:">
-            <el-select @change="changeMainTemplateFive" v-model="valueFive" style="width:200px">
-                  <el-option
-                    v-for="(item, index) in tabledataFive"
-                    :label="item.title"
-                    :value="item.content"
-                    :key="index"
-                  ></el-option>
-             </el-select>
-         </el-form-item>
-       </el-col>
-       <el-col :span="20">
-        <el-form-item  prop="name" style="width:100%;">
-          <el-input
-            type="textarea"
-            :rows="2"
-            placeholder="请输入内容"
-            v-model="case_history.diagnostic">
-          </el-input>
+      <el-form-item label="" prop="name" style="visibility: hidden;">
+        <div></div>
+      </el-form-item>
+      <el-form-item label="主诉:" style="width:49%;">
+        <el-select @change="changeMainTemplate" v-model="value" style="width:100%;margin-bottom:10px;">
+            <el-option
+              v-for="(item, index) in tabledata"
+              :label="item.title"
+              :value="item.content"
+              :key="index"
+            ></el-option>
+        </el-select>
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.chief_conplaint">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="现病史:" style="width:49%;">
+        <el-select @change="changeMainTemplateOne" v-model="valueOne" style="width:100%;margin-bottom:10px;">
+          <el-option
+            v-for="(item, index) in tabledataOne"
+            :label="item.title"
+            :value="item.content"
+            :key="index"
+          ></el-option>
+        </el-select>
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.history_of_present_illness">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="既往史:" style="width:49%;">
+        <el-select @change="changeMainTemplateTwo" v-model="valueTwo" style="width:100%;margin-bottom:10px;">
+          <el-option
+            v-for="(item, index) in tabledataTwo"
+            :label="item.title"
+            :value="item.content"
+            :key="index"
+          ></el-option>
+        </el-select>
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.past_history">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="个人史:" style="width:49%;">
+        <el-select @change="changeMainTemplateThree" v-model="valueThree" style="width:100%;margin-bottom:10px;">
+          <el-option
+            v-for="(item, index) in tabledataThree"
+            :label="item.title"
+            :value="item.content"
+            :key="index"
+          ></el-option>
+        </el-select>
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.personal_history">
+        </el-input>
+      </el-form-item>
+      <el-form-item  label="家族史:" style="width:49%;">
+        <el-select @change="changeMainTemplateFour" v-model="valueFour" style="width:100%;margin-bottom:10px;">
+          <el-option
+            v-for="(item, index) in tabledataFour"
+            :label="item.title"
+            :value="item.content"
+            :key="index"
+          ></el-option>
+        </el-select>
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.family_history">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="诊断信息:" style="width:49%;">
+        <el-select @change="changeMainTemplateFive" v-model="valueFive" style="width:100%;margin-bottom:10px;">
+          <el-option
+            v-for="(item, index) in tabledataFive"
+            :label="item.title"
+            :value="item.content"
+            :key="index"
+          ></el-option>
+        </el-select>
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.diagnostic">
+        </el-input>
+      </el-form-item>
+
+      <el-form-item label="医嘱:" style="width:49%;">
+        <el-select @change="changeMainTemplateSix" v-model="valueSix" style="width:100%;margin-bottom:10px;">
+          <el-option
+            v-for="(item, index) in tabledataSix"
+            :label="item.title"
+            :value="item.content"
+            :key="index"
+          ></el-option>
+        </el-select>
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.doctor_advice">
+        </el-input>
+      </el-form-item>
+
+      <el-form-item label ="备注"  prop="name" style="width:49%;">
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.remark">
+        </el-input>
       </el-form-item>
-       </el-col>
-     </el-row>
-
-     <el-row :gutter="24">
-       <el-col :span="20">
-         <el-form-item label="医嘱:">
-            <el-select @change="changeMainTemplateSix" v-model="valueSix" style="width:200px">
-                  <el-option
-                    v-for="(item, index) in tabledataSix"
-                    :label="item.title"
-                    :value="item.content"
-                    :key="index"
-                  ></el-option>
-             </el-select>
-         </el-form-item>
-       </el-col>
-       <el-col :span="20">
-        <el-form-item  prop="doctor_advice" style="width:100%;">
-          <el-input
-            type="textarea"
-            :rows="2"
-            placeholder="请输入内容"
-            v-model="case_history.doctor_advice">
-          </el-input>
-        </el-form-item>
-       </el-col>
-     </el-row>
-
-        <el-form-item label ="备注"  prop="name" style="width:100%;">
-          <el-input
-            type="textarea"
-            :rows="2"
-            placeholder="请输入内容"
-            v-model="case_history.remark">
-          </el-input>
-        </el-form-item>
-    
-    
-     
-    
-    
     </el-form>
 
   </div>
         valueFour:'',
         valueFive:'',
         valueSix:'',
-        valueSeven:''
+        valueSeven:'',
+        diagnoses:[],
+        state1:"",
+        diagnose:""
       }
     },
     methods: {
             "diagnostic":this.case_history.diagnostic,
             "breathing":this.case_history.breathing,
             "doctor_advice":this.case_history.doctor_advice,
-            "remark":this.case_history.remark
+            "remark":this.case_history.remark,
+            "sick":this.case_history.sick,
+            "diagnose":this.case_history.diagnose
           }
 
           createCaseHistory(params).then(response => {
                 this.case_history.diagnostic = templatedetail.diagnostic
                 this.case_history.doctor_advice = templatedetail.doctor_advice
                 this.case_history.remark = templatedetail.remark
+                this.sick = templatedetail.sick
+                this.diagnose = templatedetail.diagnose
               }
           })
         },
           }
         }
       },
-     
+      getInitData() {
+        getInitData().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.sick = response.data.data.sick
+            this.diagnoses = response.data.data.diagnose
+          }
+        })
+
+      },
     },
     created(){
        this.getlist()
        }else if(this.patientInfo.gender = 2){
           this.patientInfo.gender = '女'
         }
-     
+     this.getInitData()
     },
     watch:{
       detalid:function(val){

src/xt_pages/outpatientDoctorStation/template/printOne.vue

               <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
           </div>
           <div class="actionBar">
-                 <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
+                 <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
                  <p>配对：</p>
                  <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
                  <p>发药：{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
+                 <p>药费：{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p> -->
+
+                 <p>审核：</p>
+                 <p>配对：</p>
+                 <p>核对：</p>
+                 <p>发药：</p>
                  <p>药费：{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p>
           </div>
           <div style="page-break-after:always"></div>
        }
        return name
      },
-     getTotalOne(id) {
-        console.log("处方数据",this.prescriptions)
+    getTotalOne(id) {
+
         var total = 0
         var addtotal = 0
         for (let i = 0; i < this.prescriptions.length; i++) {
+          if(id == this.prescriptions[i].id){
+            if (this.prescriptions[i].project != null) {
+              for (let a = 0; a < this.prescriptions[i].project.length; a++) {
+                total = total + this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count
+              }
+            }
+
+            if (this.prescriptions[i].additionalcharge != null) {
+              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
+                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
+              }
+            }
+              addtotal =  Math.floor(addtotal * 100) / 100
+        }
+       
+       }
+
+      for (let i = 0; i < this.prescriptions.length; i++) {
           if(id == this.prescriptions[i].id){
             if (this.prescriptions[i].advices != null) {
               for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
               addtotal =  Math.floor(addtotal * 100) / 100
         }
        }
-       return total + addtotal
-      }, 
+
+        return total + addtotal
+      },
 
 
    },