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

src/utils/tools.js

   // console.log((shouji + (shichang - t) * weichi).toFixed(1))
   return (shouji + (shichang - t) * weichi).toFixed(1)
 }
+
+
+export function formatDate (date, format) {
+  if (/(y+)/.test(format)) {
+      format= format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+  }
+  let o = {
+      'M+': date.getMonth() + 1,
+      'd+': date.getDate(),
+      'h+': date.getHours(),
+      'm+': date.getMinutes(),
+      's+': date.getSeconds()
+  };
+  for (let k in o) {
+      if (new RegExp(`(${k})`).test(format)) {
+          let str = o[k] + '';
+          format= format.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
+      }
+  }
+  return format;
+};
+
+function padLeftZero (str) {
+  return ('00' + str).substr(str.length);
+};

src/xt_pages/data/components/additionDialog.vue

           name: [
             { required: true, message: '请输入费用名称', trigger: 'blur' }
           ],
-          code: [
-            { required: true, message: '请输入国家编码', trigger: 'blur' }
-          ]
-
         }
       }
     },

src/xt_pages/data/components/addtion.vue

             this.$message.error(response.data.msg)
             return false
           } else {
-            this.Dialog.formValue.class_name =
+            this.Dialog.formValue.name =
               response.data.data.addition.name
-            this.Dialog.formValue.content_code =
+            this.Dialog.formValue.code =
               response.data.data.addition.code
             this.Dialog.formValue.price =
               response.data.data.addition.price

src/xt_pages/data/specialDictionary.vue

           <!--<supplier></supplier>-->
           <dealer></dealer>
         </el-tab-pane>
-
         <el-tab-pane label="疾病类型" name="7">
-          <!--<manufacturer></manufacturer>-->
-          <diagnosis></diagnosis>
-        </el-tab-pane>
-
+        <!--<manufacturer></manufacturer>-->
+        <diagnosis></diagnosis>
+      </el-tab-pane>
         <!--<el-tab-pane label="医疗类别" name="8">-->
           <!--&lt;!&ndash;<manufacturer></manufacturer>&ndash;&gt;-->
           <!--<diagnosis></diagnosis>-->
         <el-tab-pane label="配置项字典" name="9">
           <configure></configure>
         </el-tab-pane>
+
+        <el-tab-pane label="诊断信息" name="10">
+          <diagnosis></diagnosis>
+        </el-tab-pane>
+
       </el-tabs>
     </div>
   </div>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

               <div style="display:flex;height:100%;">
                 <div class="centerLeft">
                   <div class="tabsBox">
-                    <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>
+                    <!--<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>-->
                     <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card" @tab-click="tabclickEvent">
                       <el-tab-pane
                         v-for="(item, index) in prescriptions"

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

           this.order_status = '已退费'
         }
 
+        console.log(info)
+
+
         if(info.id > 0){
+          console.log("!Q!!!!")
+
           this.doctorValue = info.doctor_id
           this.departmentValue = info.department
         }else{
+          console.log("------")
           this.doctorValue = ''
           this.departmentValue = ''
 
           return false
         }
       },
-      open(index) {
+      open(index,isLoading) {
         if (this.curPrescriptions.order_status == 2) {
           this.$message.error('当前处方已经结算,无法保存')
           return
           let data = {
             'prescriptions': this.prescriptions
           }
+          isLoading = true
           createHisPrescription(data, params).then(response => {
             if (response.data.state == 1) {
               this.$emit("change")

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

             <el-tab-pane label="电子病历" name="电子病历"></el-tab-pane>
           </el-tabs>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
-            <el-button size="small" ref="button_one" @click="open(1)" type="primary">保存</el-button>
+            <el-button size="small" ref="button_one" @click="open(1)" type="primary" v-loading="saveLoading">保存</el-button>
             <el-popover
               placement="bottom"
               width="200"
     data() {
       return {
         tableHeight:'',
+        saveloading:false,
         fullHeight: document.documentElement.clientHeight,
         prescriptions: [
           {
         selecting_schs: [],
         index:0,
         admin_info:{},
+        saveLoading:false,
       }
     },
     methods: {
 
 
       },changeTab(){
+        this.saveLoading = false
+
         this.radio = 2
         let params = {
           'record_date': this.record_date,
            for (let i = 0; i< this.patientTableData.length; i++){
              if(this.patientTableData[i].patients.id == this.patientid){
                this.$refs.tab.setCurrentRow(this.patientTableData[i])
+               this.getPatientInfo(this.patientTableData[i])
+
              }
            }
 
+
           }
         })
 
 
       },
       open(index) {
-        console.log("index0999999",this.prescriptions)
          if(this.prescriptions[0].advices.length == 0 && this.prescriptions[0].project.length == 0){
            this.$message.error("请先开处方")
            return
           }
         this.index = index
         if (index == 1) {
-          this.$refs.prescriptions.open(1)
+          this.$refs.prescriptions.open(1,this.saveLoading)
         } else if (index == 2) {
 
           this.getPrescriptionList(this.patientid)
       },
 
       opentwo(index) {
-        console.log("index",index)
         if (index == 1) {
           if(this.patientInfo.id == undefined){
             this.$message.error("请先选择病人")