Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/drug/drug.js

   })
 }
 
+export function getPurchaseDrugQueryList(params){
+  
+  return request({
+    url:"/api/stock/getpurchaseDrugQueryList",
+    method:"get",
+    params:params,
+  })
+}
+
 export function getGoodOverCount(params) {
   return request({
     url: '/api/stock/getgoodovercount',

src/xt_pages/dialysis/details/consumable/dialysisGather.vue

              </template>
           </el-table-column>
 
+          <el-table-column align="center" label="穿刺针" v-if="gatherSetting.puncture_needle==1">
+             <template slot-scope="scope">
+               <span>{{ scope.row.assessment_befor_dislysis.puncture_needle }}</span>
+             </template>
+          </el-table-column>
+
           <el-table-column align="center" label="封管液" v-if="gatherSetting.tube==1">
              <template slot-scope="scope">
                <span v-if="getBloodAccessOption(scope.row.dialysis_prescription.blood_access).indexOf('导管')!==-1">1</span>

src/xt_pages/dialysis/details/consumable/dialysisGatherPrint.vue

                   <td width="100"  v-if="gatherSetting.dialysis_irrigation ==1">灌流器</td>
                   <td width="100"  v-if="gatherSetting.dialysis_strainer ==1">滤过器</td>
                   <td width="100"  v-if="gatherSetting.change_nurse ==1">换药包/穿刺针</td>
+                  <td width="100"  v-if="gatherSetting.puncture_needle ==1">穿刺针</td>
                   <td width="100" v-if="gatherSetting.anticoagulant==1">抗凝剂(首剂)(维持)(总量)</td>
                   <td width="200" v-if="gatherSetting.tube==1">封管液</td>
                   <td width="100" v-if="gatherSetting.kalium==1">钾</td>
                     <span v-if="(getBloodAccessOption(item.dialysis_prescription.blood_access)).indexOf('内瘘')==-1">0</span>
                     <span v-if="(getBloodAccessOption(item.dialysis_prescription.blood_access)).indexOf('内瘘')!=-1">1</span>
                   </td>
+                  <td  width="100"  v-if="gatherSetting.puncture_needle ==1">
+                    {{ item.assessment_befor_dislysis.puncture_needle }}
+                  </td>
                   <td width="100" v-if="gatherSetting.anticoagulant==1">
                   
 

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

                 org_id == 10551 ||
                 org_id == 10599 ||
                 org_id == 10597 ||
-                org_id == 10599) &&
+                org_id == 10599 || 
+                org_id == 10610) &&
                 org_id!=10387
             "
           >
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10610)
               || org_id == 10387
             "
           >
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10610)
                 && org_id!=10387
             "
           >
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599 ) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10610 ) ||
               org_id == 10387
             "
           >
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551) &&
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10610) &&
                 org_id!=10387
             "
           >
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10485 &&
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551)
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10610)
               || org_id == 10387
             "
           >
                 org_id == 10480 ||
                 org_id == 10551 ||
                 org_id == 10597||
-                org_id == 10599)
+                org_id == 10599 ||
+                org_id ==10610)
                 && org_id!=10387
             "
           >
               org_id!=10480 &&
               org_id!=10551 &&
               org_id!=10597 &&
-              org_id!=10599
+              org_id!=10599 &&
+              org_id!=10610
               )
               || org_id == 10387
             "

src/xt_pages/dialysis/details/dialysisMonitoring.vue

           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10610) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10610) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10610) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10610 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410) && org_id!=10558" width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/template/DialysisPrintOrderseventyone.vue

             </td>
             <td style="min-width: 45px">
               <span v-if="getTime(monitor.operate_time) != ''">
-                {{
+                <span v-if="monindex == 1">0</span>
+                <span v-if="monindex != 1">
+                  {{
                   monitor.ultrafiltration_volume
                     ? monitor.ultrafiltration_volume
                     : " "
-                }}
+                 }}
+                </span>
+              
               </span>
             </td>
             <!-- 生命体征 -->
               <template 
               v-if=" (dialysisOrder && monitor.operate_time == dialysisOrder.start_time)&&(org_id!=10414) "
               >
-                【开始透析】
+                开始上机，引血100ml/min
               </template>
-              <span v-if="monitor.symptom || monitor.dispose || monitor.result">
-                {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{
+              <span v-if="monitor.symptom || monitor.dispose || monitor.result || monitor.end ">
+                {{ monitor.end }}  {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{
                   monitor.result
                 }}
               </span>
               this.monitors.push([]);
             }
           }
+
+          var tempmonitorflag = true;
+          for (let index = 0; index < this.monitors.length; index++) {
+            const monitor = this.monitors[index];
+            this.monitors[index].end = "";
+            if (Object.keys(monitor).length > 0 && index > 1) {
+              if (
+                (this.dialysisOrder &&
+                monitor.operate_time == this.dialysisOrder.end_time)&&(this.org_id!=10414)
+              ) {
+                this.monitors[index].end = "结束治疗，予下机";
+                tempmonitorflag = false;
+              }
+              if ((tempmonitorflag && index == this.monitors.length - 1)&&(this.org_id!=10414)) {
+                this.monitors[index].end = "结束治疗，予下机";
+              }
+            }
+          }
+
           this.jilurow = this.monitors.length + 1;
 
           this.advice_jilurow = this.advices.length + 1;
       }
     },
     "prescription.dialyzate": function() {
+      console.log("this.prescription",this.prescription.dialyzate)
       if(this.prescription.dialyzate !='undefined'){
-        if(prescription.dialyzate.indexOf('碳酸')>-1){
+        this.prescription.dialyzate="碳酸"
+        if(this.prescription.dialyzate.indexOf('碳酸')>-1){
           this.prescription_dialyzate1 =true
           this.prescription_dialyzate2 = false
-        }else if(prescription.dialyzate.indexOf('醋酸')>-1){
+        }else if(this.prescription.dialyzate.indexOf('醋酸')>-1){
           this.prescription_dialyzate1 =false
           this.prescription_dialyzate2 = true
         }else{

src/xt_pages/outpatientCharges/chargeDetailManagement.vue

                           </el-option>
                         </el-select>
 
+                        <label>
+                          就诊类型：
+                        </label>
+                        <el-select filterable v-model="charge_type" placeholder="请选择就诊类型">
+                          <el-option
+                            v-for="(item,index) in register"
+                            :key="index"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+
                       </div>
 
                       <!--<prescription-table :preTableData='preTableData'></prescription-table>-->
       </div>
     </div>
 
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="30%"
+    >
+      <el-select
+                 style="width:50%;" v-model="charge_type"
+                 placeholder="上传费用类型" >
+        <el-option
+          v-for="(item,index) in register"
+          :key="index"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+
+      <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="comfirmChangeMedType">确 定</el-button>
+             </span>
+    </el-dialog>
+
   </div>
 
 </template>
   },
   data() {
     return {
+      dialogVisible:false,
+      charge_type:1,
       isloading: false,
       isdisabled: false,
       register: [
-        { value: 11, label: '普通门诊' },
+        { value: 1, label: '门诊' },
         // { value: 12, label: '门诊挂号' },
         // { value: 13, label: '急诊' },
-        { value: 14, label: '门诊慢性病' }
+        { value: 2, label: '住院' }
         // { value: 15, label: '门诊统筹' },
         // { value: 16, label: '门诊慢性病' },
         // { value: 21, label: '普通住院' }
           sick_type: this.sick_type,
           settle_type: this.activeName,
           p_id:id,
+          charge_type:this.charge_type,
         }
         if (this.activeName == "first"){
           obj['settle_accounts_type'] = 2

src/xt_pages/outpatientCharges/components/callUnAssociationPrescription.vue

+<template>
+  <el-dialog
+    :title="name"
+    :visible.sync="isLastOrNextVisible"
+    @close="hide"
+    width="1010px"
+    class="callPrescription"
+    :modal-append-to-body="false"
+  >
+    <div v-for="(item,index) in allPrescription" :key="index">
+      <div class="quote" v-if="item.prescriptions.length > 0">引用 {{getTime(item.record_date, '{y}年{m}月{d}日')}} 的处方</div>
+      <el-checkbox-group v-model="item.check_group">
+        <div v-for="(subItem,index2) in item.prescriptions" :key="index2">
+          <el-checkbox style="margin:10px 0;" :label="subItem.id">{{'处方' + (index2+ 1)}}</el-checkbox>
+          <el-table v-if="subItem.type  == 1" :data="subItem.doctor_advice" border style="width: 99%;"
+                    :row-style="{ color: '#303133' }"
+                    :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+            <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
+            <el-table-column align="center" prop="drug_name"  width="160" label="名称">
+              <template slot-scope="scope">
+                <span>{{ scope.row.advice_name }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
+              <template slot-scope="scope">
+                <div>{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</div>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="delivery_way" width="100" label="用法">
+              <template slot-scope="scope">
+                {{scope.row.delivery_way}}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
+              <template slot-scope="scope">
+                {{scope.row.execution_frequency}}
+              </template>
+            </el-table-column>
+
+            <el-table-column align="center" prop="day" width="60" label="天数">
+              <template slot-scope="scope">
+                {{scope.row.day}}
+              </template>
+            </el-table-column>
+
+            <el-table-column align="center" prop="prescribing_number" width="100" label="总量">
+              <template slot-scope="scope">
+                <div>{{scope.row.prescribing_number}} {{scope.row.prescribing_number_unit}}</div>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="retail_price" width="80" label="单价">
+              <template slot-scope="scope">
+                <div>{{scope.row.price}}元</div>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="remark" label="备注">
+              <template slot-scope="scope">
+                <div>{{scope.row.remark}}</div>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-table v-if="subItem.type == 2" :data="subItem.project" border style="width: 99%;"
+                    :row-style="{ color: '#303133' }"
+                    :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+            <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
+            <el-table-column align="center" prop="project_name" width="160" label="名称">
+              <template slot-scope="scope">
+                <span>{{ scope.row.type == 2?scope.row.project.project_name:scope.row.good_info.good_name}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="statistical_classification" width="100" label="组">
+              <template slot-scope="scope">{{scope.row.type == 2 ?getGroup(scope.row.statistical_classification):"耗材"}}</template>
+            </el-table-column>
+            <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
+              <template slot-scope="scope">
+                <!--<el-input v-model="scope.row.single_dose" placeholder=""></el-input>-->
+                <span>{{ scope.row.single_dose }}</span>
+
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="delivery_way" width="100" label="用法">
+              <template slot-scope="scope">
+                <!--<el-input v-model="scope.row.delivery_way" placeholder=""></el-input>-->
+                <span>{{ scope.row.delivery_way }}</span>
+
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
+              <template slot-scope="scope">
+                <!--<el-input v-model="scope.row.execution_frequency" placeholder=""></el-input>-->
+                <span>{{ scope.row.execution_frequency }}</span>
+
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="number_days" width="70" label="天数">
+              <template slot-scope="scope">
+                <!--<el-input v-model="scope.row.number_days" placeholder=""></el-input>-->
+                <span>{{ scope.row.number_days }}</span>
+
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="total" width="70" label="总量">
+              <template slot-scope="scope">
+                <div>{{ scope.row.count }}{{scope.row.unit}}</div>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" width="60" label="单价">
+              <template slot-scope="scope">
+                <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
+                <span>{{ scope.row.price }}</span>
+
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="备注">
+              <template slot-scope="scope">
+                <!--<el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>-->
+                <span>{{ scope.row.remark }}</span>
+
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </el-checkbox-group>
+
+    </div>
+
+
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="isLastOrNextVisible = false">取 消</el-button>
+      <el-button type="primary" @click="save">保存</el-button>
+    </div>
+  </el-dialog>
+
+
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { getDictionaryDataConfig} from "@/utils/data";
+  const moment = require('moment')
+  import {
+    getCallHisPrescription
+  } from '@/api/his/his'
+  export default {
+    name: "callUnAssociationPrescription",
+    data() {
+      return {
+        start_time:"",
+        end_time:"",
+        name:"",
+        request_record_date:'',
+        patient_id:0,
+        allPrescription: [],
+        isLastOrNextVisible: false,
+
+      }
+    }, methods: {
+      changeTime(){
+        let params={
+          patient_id:this.patient_id,
+          start_time: this.start_time,
+          end_time:this.end_time,
+          p_type:2,
+        };
+        this.GetCallHisPrescription(params)
+      },
+      changeEndTime(){
+        let params={
+          patient_id:this.patient_id,
+          start_time: this.start_time,
+          end_time:this.end_time,
+          p_type:2,
+
+        };
+        this.GetCallHisPrescription(params)
+      },
+      GetCallHisPrescription(params){
+        console.log("param222222222",params)
+        getCallHisPrescription(params).then(response => {
+          if (response.data.state == 1) {
+            this.allPrescription = response.data.data.prescriptions;
+            for (let i = 0; i < this.allPrescription.length; i++){
+              this.allPrescription[i].check_group = []
+            }
+            this.request_record_date = uParseTime(response.data.data.prescriptions[0].record_date, '{y}-{m}-{d}')
+          } else {
+            this.$message.error(response.data.msg)
+
+          }
+        })
+      },
+      save() {
+        let replace_one = [];
+        let replace_two = [];
+
+        let checkGroup = [];
+        let allPrescriptions = [];
+        let targetPrescriptions = [];
+        let prescriptions = [];
+
+
+
+
+
+
+        for (let i = 0; i < this.allPrescription.length; i++) {
+          for (let a = 0; a < this.allPrescription[i].check_group.length; a++) {
+            checkGroup.push(this.allPrescription[i].check_group[a])
+          }
+          for (let a = 0; a < this.allPrescription[i].prescriptions.length; a++) {
+            allPrescriptions.push(this.allPrescription[i].prescriptions[a])
+          }
+        }
+        for (let i = 0; i < allPrescriptions.length; i++){
+          for (let a = 0; a < checkGroup.length; a++){
+            if(allPrescriptions[i].id == checkGroup[a]){
+              targetPrescriptions.push(allPrescriptions[i])
+            }
+          }
+        }
+
+        for (let i = 0; i < targetPrescriptions.length; i++) {
+          var prescription = targetPrescriptions[i];
+          for (let b = 0; b < prescription.doctor_advice.length; b++) {
+            console.log(prescription.doctor_advice[b].drug.is_special_diseases)
+            if (prescription.med_type == "14" && prescription.doctor_advice[b].drug.is_special_diseases != 1) {
+              prescription.doctor_advice.splice(b--,1)
+            }
+          }
+          for (let b = 0; b < prescription.project.length; b++) {
+            if(prescription.project[b].type == 2){
+              if (prescription.med_type == "14" && prescription.project[b].project.disease_directory != 1) {
+                prescription.project.splice(b--,1)
+              }
+            }else if(prescription.project[b].type == 3){
+              if (prescription.med_type == "14" && prescription.project[b].good_info.is_special_diseases != 1) {
+                prescription.project.splice(b--,1)
+              }
+            }
+          }
+        }
+
+
+
+        if (targetPrescriptions.length > 0) {
+          for (let i = 0; i < targetPrescriptions.length; i++) {
+            var prescription = targetPrescriptions[i];
+            let tempAdvice = [];
+            let tempProject = [];
+            let tempAddition = [];
+            for (let b = 0; b < prescription.doctor_advice.length; b++) {
+              let index = b + 1
+              let obj = {
+                advice_id: 0,
+                drug_name: prescription.doctor_advice[b].advice_name,
+                single_dose: prescription.doctor_advice[b].single_dose,
+                delivery_way: prescription.doctor_advice[b].delivery_way,
+                execution_frequency: prescription.doctor_advice[b].execution_frequency,
+                // retail_price: prescription.doctor_advice[b].price.toString(),
+                remark: prescription.doctor_advice[b].remark,
+                day:prescription.doctor_advice[b].day,
+                prescribing_number:prescription.doctor_advice[b].prescribing_number.toString(),
+                single_dose_unit:prescription.doctor_advice[b].single_dose_unit,
+                prescribing_number_unit:prescription.doctor_advice[b].prescribing_number_unit,
+                medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
+                id:prescription.doctor_advice[b].drug_id,
+                drug:prescription.doctor_advice[b].drug,
+                groupno: index,
+                hosp_appr_flag:"1",
+              };
+              if (obj.prescribing_number_unit == prescription.doctor_advice[b].drug.min_unit){
+                obj['retail_price'] =  prescription.doctor_advice[b].drug.min_price
+              } else if(obj.prescribing_number_unit == prescription.doctor_advice[b].drug.max_unit){
+                obj['retail_price'] =  prescription.doctor_advice[b].drug.retail_price
+              } else {
+                obj['retail_price'] =  prescription.doctor_advice[b].drug.min_price
+              }
+
+              tempAdvice.push(obj)
+
+            }
+
+
+
+            for (let b = 0; b < prescription.project.length; b++) {
+              let obj = {
+                id: 0,
+                project_id: prescription.project[b].project_id,
+                project_name: prescription.project[b].project.project_name,
+                statistical_classification: prescription.project[b].project.statistical_classification,
+                single_dose: prescription.project[b].single_dose,
+                delivery_way: prescription.project[b].delivery_way,
+                execution_frequency: prescription.project[b].execution_frequency,
+                number_days: prescription.project[b].day,
+                total:prescription.project[b].count,
+                remark:prescription.project[b].remark,
+                unit: prescription.project[b].unit,
+                type: prescription.project[b].type,
+                // medical_code:prescription.project[b].project.medical_code,
+              };
+              if(prescription.project[b].type == 2){
+                obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                obj['medical_code'] =  prescription.project[b].project.medical_code
+                obj['project_name'] =  prescription.project[b].project.project_name
+                obj['price'] = prescription.project[b].project.price
+                obj['project']=prescription.project[b].project
+
+              }else if(prescription.project[b].type == 3){
+                obj['statistical_classification'] = ""
+                obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                obj['project_name'] =  prescription.project[b].good_info.good_name
+                obj['price'] = prescription.project[b].good_info.packing_price
+                obj['good_info']=prescription.project[b].good_info
+
+              }
+
+              tempProject.push(obj)
+            }
+            let obj = {
+              id: 0,
+              advices: tempAdvice,
+              project: tempProject,
+              addition:tempAddition,
+              type:prescription.type,
+              order_status:0,
+              med_type: parseInt(prescription.med_type)
+
+            };
+            prescriptions.push(obj)
+          }
+        }
+
+          this.$emit('call',prescriptions)
+        }
+      },
+      show(name,id,end_time, start_time,prescriptions){
+        this.isLastOrNextVisible = true
+        this.start_time  = start_time
+        this.end_time = end_time;
+
+        this.patient_id = id;
+        this.name = '处方调用' + '（'+name +'）';
+
+        this.allPrescription = prescriptions;
+        for (let i = 0; i < this.allPrescription.length; i++){
+          this.allPrescription[i].check_group = []
+        }
+
+      },close(){
+        this.isLastOrNextVisible = false
+      },hide(){
+        this.$emit('callCancel')
+
+      },getTime(time, template){
+        return uParseTime(time,template)
+
+      }, getGroup(id){
+        var name = "";
+        var statistics_category =  getDictionaryDataConfig('system','statistics_category');
+        for(let i=0;i<statistics_category.length;i++){
+          if(id == statistics_category[i].id){
+            name = statistics_category[i].name
+          }
+        }
+        return name
+      },   getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
+    }
+  }
+</script>
+
+<style lang="scss">
+.callPrescription{
+  .el-dialog__body{
+    padding:0px 20px 30px;
+  }
+  .quote{
+    margin-top: 10px;
+    font-size: 14px;
+  }
+}
+</style>

src/xt_pages/stock/drugs/components/purchaseDrugQuery.vue

             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
+            :picker-options="pickerOptions"
             @change="startTimeChange"
-             :picker-options="pickerOptions"
-             :clearable="false"
+            :clearable="false"
            ></el-date-picker>
             <span>-</span>
             <el-date-picker
               align="right"
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
-              @change="endTimeChange"
               :picker-options="pickerOptions"
+              @change="endTimeChange"
               :clearable="false"
           ></el-date-picker>
           <span style="font-size:14px;color:#606266">药品类型:</span>
                  {{getDrugTypeName(scope.row.drug_type)}}
               </template>
             </el-table-column>
+            <el-table-column label="药品别名" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.drug_alias}}
+              </template>
+            </el-table-column>
             <el-table-column label="药品名称" align="center">
               <template slot-scope="scope">
                  {{scope.row.drug_name}}
                  {{getDearName(scope.row.dealer)}}
               </template>
             </el-table-column>
+            <el-table-column label="单位" align="center">
+              <template slot-scope="scope">
+                 {{ scope.row.min_unit }}
+              </template>
+            </el-table-column>
             <el-table-column label="期初结余" align="center">
 
                  <el-table-column prop="drugIn" label="数量" width="100" align="center">
   </div>
 </template>
 <script>
-import { getStorehouseList,getPurchaseDrugQuery } from "@/api/drug/drug"
+import { getStorehouseList,getPurchaseDrugQueryList,getDrugOverCount } from "@/api/drug/drug"
 const moment = require('moment')
 import { uParseTime } from '@/utils/tools'
 export default {
      loading:false,
      pickerOptions:{ //禁用当前日期之前的日期
            disabledDate(v) {
-            return v.getTime() < 1667232000000
+            return v.getTime() < 1667491200000
           },
       },
      dealerList:[]
            this.manufacturerList = response.data.data.manufacturerList
 
            this.patientList = response.data.data.patientList
-
            this.dealerList = response.data.data.dealerList
          }
       })
           start_time:this.start_time,
           end_time:this.end_time,
         }
-      getPurchaseDrugQuery(params).then(response=>{
+        getPurchaseDrugQueryList(params).then(response=>{
          if(response.data.state == 1){
             this.loading = false
             var list = response.data.data.list
              }
             }
 
-          
+            console.log("list23323223322332232323322323wode",list)
             for(let i=0;i<list.length;i++){
               list[i].last_price_in = 0
-              list[i].drugInOne = 0
-              list[i].drugAddOne =0
+              list[i].drugAddOne= 0
               list[i].drugOutOne =0
-              list[i].drugIn = this.getDrugWarehouseInfoOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
-              list[i].drugInOne = this.getDrugWarehouseInfoTwentyOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
-              list[i].drugInMoney = this.getDrugInMoneyOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
-              list[i].drugSaleMoney = this.getSaleMoneyOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
+              list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
+          
+              list[i].drugInMoney = list[i].last_price
+              list[i].drugSaleMoney = (list[i].drugIn * list[i].drugInMoney).toFixed(2)
 
               list[i].drugAdd = this.drugAddInfo(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
-              list[i].drugAddOne = this.drugAddInfoTwetyOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
-              list[i].drugAddPrice = this.getdrugAddPrice(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
-              list[i].drugAddSalePrice = this.drugAddSalePrice(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
+              list[i].drugAddOne = this.drugAddInfoOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
+           
+              list[i].drugAddPrice = list[i].last_price
+              list[i].drugAddSalePrice = (list[i].drugAdd * list[i].drugAddPrice).toFixed(2)
 
               list[i].drugOut=  this.getDrugOut(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
-              list[i].drugOutOne=  this.getDrugOutTwetyOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
-              list[i].drugOutPrice = this.getDrugOutPrice(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
-              list[i].drugOutSalePrice = this.getDrugOutSaleprice(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
-
-              // list[i].overDrug = this.getDrugWarehouseInfo(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
-              list[i].overDrug = this.getOverDrug(list[i].drugInOne,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
-              list[i].overDrugPrice =  this.getDrugInMoney(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
-              list[i].oveDrugSaleMoney =  this.getSaleMoney(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
+              list[i].drugOutOne =this.getDrugOutOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
+           
+              list[i].drugOutPrice = list[i].min_price
+              list[i].drugOutSalePrice = (list[i].drugOut*list[i].drugOutPrice).toFixed(2)
+
+          
+           
+             list[i].overDrug = this.GetDrugOver(list[i].DrugStatFlow.over_count,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
+            
+            
+             list[i].overDrugPrice = list[i].last_price
+             list[i].oveDrugSaleMoney = (list[i].overDrug * list[i].overDrugPrice).toFixed(2)
             }
-            console.log("我的世界搜哦对哦奥法",list)
             this.tableList = list;
             this.total = response.data.data.total
             this.manufacturerList = response.data.data.manufacturerList
       totalfive += arr5[i].count
      }
   }
-  
+  // console.log("totalONE223323232323232",totalOne)
+  // console.log("totalTwo2oo2o32o3o32o23",totalTwo)
+  // console.log("totalfive",totalfive)
+  // console.log("00-------------------------")
   total = totalOne - totalTwo + totalthree - totalfour + totalfive
   if (total < min_number) {
      min_str = total + min_unit;
   }
 
 
-  },
-
-  getDrugWarehouseInfoTwentyOne(arr,min_number,min_unit,max_unit,arr2,arr3,arr4,arr5){
-   var total = 0
-   var totalOne =0
-   var totalTwo = 0
-   var totalthree= 0
-   var totalfour = 0
-   var totalfive = 0
-   var max_str = "";
-   var min_str = "";
-   if(arr!=null && arr.length > 0){
-    for(let i=0;i<arr.length;i++){
-      totalOne += arr[i].count
-     }
-   }
-   if(arr2!=null && arr2.length > 0){
-    for(let i=0;i<arr2.length;i++){
-      totalTwo += arr2[i].count
-     }
-   }
-   if(arr3!=null && arr3.length > 0){
-    for(let i=0;i<arr3.length;i++){
-      totalthree += arr3[i].count
-     }
-   }
-  if(arr4!=null && arr4.length > 0){
-    for(let i=0;i<arr4.length;i++){
-      totalfour += arr4[i].count
-     }
-  }
-
-  if(arr5!=null && arr5.length > 0){
-    for(let i=0;i<arr5.length;i++){
-      totalfive += arr5[i].count
-     }
-  }
-  
-  total = totalOne - totalTwo + totalthree - totalfour + totalfive
- 
-  
-   return total
   },
   getDrugWarehouseInfo(arr,arr4,min_number,min_unit,max_unit,arr2,arr3,arr5){
    var total = 0
    }
 
    total_price =(totalOne - totalTwo + total_three - total_four + totalFive).toFixed(2)
-   console.log("totalONE232332323323223322323wi",totalOne)
-   console.log("totalTwo99999999999999988888888",totalTwo)
-   console.log("total_three99999999999999988888888",total_three)
-   console.log("total_four99999999999999988888888",total_four)
-   console.log("totalFive99999999999999988888888",totalFive)
-   console.log("-------------------------------------------")
+ 
    if(total_price >0){
     return total_price
    }else{
    }
   },
    open(){
-    // this.start_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
+   
+    // this.start_time = moment().year(2022).month(10).date(4).format('YYYY-MM-DD')
     this.start_time = moment().startOf('month').format('YYYY-MM-DD')
     this.end_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
     this.houseList= []
     }
     total = totalone + totaltwo
 
-    if (total < min_number) {
-      min_str = total + min_unit;
-    }
-    if (total == 0) {
-      min_str = "";
-      max_str = "";
-    }
-    if (total >= min_number) {
-      if (parseInt(total / min_number) != 0) {
-        max_str = parseInt(total / min_number) + max_unit;
-      }
-      if (total % min_number != 0) {
-        min_str = (total % min_number) + min_unit;
-      }
-    }
-    if(max_str == "" && min_str == ""){
-      return "0"
-    }else{
-      return max_str + min_str
-    }
+     
+    return total
 
    },
-
-  drugAddInfoTwetyOne(arr,min_number,min_unit,max_unit,arr2){
+   drugAddInfoOne(arr,min_number,min_unit,max_unit,arr2){
     var total = 0
     var totalone = 0
     var totaltwo = 0
     total = totalone + totaltwo
 
     
-    
     return total
 
    },
         totalthree +=arr3[i].count
       }
     }
+   
     total = totalone + totaltwo - totalthree
-    if (total < min_number) {
-      min_str = total + min_unit;
-    }
-    if (total == 0) {
-      min_str = "";
-      max_str = "";
-    }
-    if (total >= min_number) {
-      if (parseInt(total / min_number) != 0) {
-        max_str = parseInt(total / min_number) + max_unit;
-      }
-      if (total % min_number != 0) {
-        min_str = (total % min_number) + min_unit;
-      }
-   }
-   if(max_str == "" && min_str == ""){
-     return "0"
-   }else{
-    return max_str + min_str;
-   }
+    
+    return total
 
    },
-   getDrugOutTwetyOne(arr,min_number,min_unit,max_unit,arr2,arr3){
+   getDrugOutOne(arr,min_number,min_unit,max_unit,arr2,arr3){
     var total = 0
     var totalone = 0
     var totaltwo = 0
       }
     }
     total = totalone + totaltwo - totalthree
-     
+    
     return total
 
    },
     this.$router.push({path:"/drugs/purchase/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&page="+this.page+"&limit="+this.limit+"&keyword="+this.keyword+"&good_type="+this.good_type})
    },
     exportList: function() {
+       
        for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
           this.tableList[i].query_date = this.start_time+"~"+this.end_time
           this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
           this.tableList[i].specification_name = this.tableList[i].dose + this.tableList[i].dose_unit +"*"+this.tableList[i].min_number + this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
 
+          // this.tableList[i].drugInMoney = this.tableList[i].last_price
+
         }
         import('@/vendor/Export2Excel').then(excel => {
-           const multiHeader = [['序号', '查询日期','  药品类型','药品名称','规格&单位','生产产商','经销商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
-           const header = ['', '','','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
-           const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:G2','H1:J1', 'K1:M1', 'N1:P1', 'Q1:S1']
-           const filterVal = ['index', 'query_date', 'good_type','drug_name','specification_name','manufacturer_name','dealer_name','drugIn','drugInMoney','drugSaleMoney','drugAdd','drugAddPrice','drugAddSalePrice','drugOut','drugOutPrice','drugOutSalePrice','overDrug','overDrugPrice','oveDrugSaleMoney']
+           const multiHeader = [['序号', '查询日期','  药品类型','药品别名','药品名称','规格&单位','生产产商','经销商','单位', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
+           const header = ['', '','','','','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
+           const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:G2','H1:H2','I1:I2', 'J1:L1', 'M1:O1', 'P1:R1','S1:U1']
+           const filterVal = ['index', 'query_date', 'good_type','drug_alias','drug_name','specification_name','manufacturer_name','dealer_name','min_unit','drugIn','drugInMoney','drugSaleMoney','drugAdd','drugAddPrice','drugAddSalePrice','drugOut','drugOutPrice','drugOutSalePrice','overDrug','overDrugPrice','oveDrugSaleMoney']
 
            const data = this.formatJson(filterVal, this.tableList)
 
     formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => v[j]));
     },
-    getDearName(id){
-      var dear_name = ""
-      for(let i=0;i<this.dealerList.length;i++){
-        if(id == this.dealerList[i].id){
-          dear_name = this.dealerList[i].dealer_name
-        }
-      }
-      return dear_name
+    GetDrugStartFlow(total,min_number,min_unit,max_unit){
+      // var min_str = ""
+      // var max_str = ""
+      // if (total < min_number) {
+      //   min_str = total + min_unit;
+      // }
+      // if (total == 0) {
+      //   min_str = "";
+      //   max_str = "";
+      // }
+      // if (total >= min_number) {
+      //   if (parseInt(total / min_number) != 0) {
+      //       max_str = parseInt(total / min_number) + max_unit;
+      //   }
+      //   if (total % min_number != 0) {
+      //       min_str = (total % min_number) + min_unit;
+      //   }
+      // }
+      //   if(max_str == "" && min_str == ""){
+      //       return "0"
+      //   }else{
+      //       return max_str + min_str;
+      //   }
+      return total
     },
-    getOverDrug(totalone,totaltwo,totalthree,min_number,min_unit,max_unit){
-      var total = 0
-      total = totalone + totaltwo - totalthree
-      if (total < min_number) {
+
+  
+    GetDrugEndFlow(total,min_number,min_unit,max_unit){
+
+     var min_str = ""
+     var max_str = ""    
+     if (total < min_number) {
         min_str = total + min_unit;
       }
       if (total == 0) {
       }
       if (total >= min_number) {
         if (parseInt(total / min_number) != 0) {
-          max_str = parseInt(total / min_number) + max_unit;
+            max_str = parseInt(total / min_number) + max_unit;
         }
         if (total % min_number != 0) {
-          min_str = (total % min_number) + min_unit;
+            min_str = (total % min_number) + min_unit;
         }
+      }
+     if(max_str == "" && min_str == ""){
+            return "0"
+        }else{
+            return max_str + min_str;
+       }
+    },
+    toOverCount(){
+      getDrugOverCount().then(response=>{
+        if(response.data.state == 1){
+          var msg = response.data.data.msg
+          this.$message.success("调试成功")
+        }
+      })  
+    },
+    getDearName(id){
+      var dear_name = ""
+      for(let i=0;i<this.dealerList.length;i++){
+        if(id == this.dealerList[i].id){
+          dear_name = this.dealerList[i].dealer_name
+        }
+      }
+      return dear_name
+    },
+    GetDrugOver(totalone,totaltwo,totalthree,min_number,min_unit,max_unit){
+      var total = 0
+    
+      total = totalone + totaltwo - totalthree
+      return total
     }
-    if(max_str == "" && min_str == ""){
-      return "0"
-    }else{
-      return max_str + min_str;
-    }
-   }
   }
 }
 </script>

src/xt_pages/stock/drugs/drugNewQuery.vue

               <DrugQuery></DrugQuery>
             </el-tab-pane>
           
-           <!-- <el-tab-pane label="进销存查询" name="second">
-              <PurchaseDrugQuery ref="mychild"></PurchaseDrugQuery>
-            </el-tab-pane>  -->
-
-             <el-tab-pane label="进销存查询" name="five">
+           <el-tab-pane label="进销存查询" name="five">
                <PurchaseNewDrugQuery ref="mychildfive"></PurchaseNewDrugQuery>
             </el-tab-pane>
         
+            <!-- <el-tab-pane label="进销存查询" name="second">
+              <PurchaseDrugQuery ref="mychild"></PurchaseDrugQuery>
+            </el-tab-pane>  -->
+
             <el-tab-pane label="有效期查询" name="third">
                 <ExpiryDateDrugQuery ref="mychildOne"></ExpiryDateDrugQuery>
             </el-tab-pane>

src/xt_pages/user/physiqueprinting.vue

             {{ patient.diagnose }}
             <span style="font-weight: bold;">病历书写者：</span>
             {{getDoctorName(item.doctor_id)}}
+          
+          </div>
+          <div style="float: right;">
             <span style="font-weight: bold;">日期：</span>
             {{getTime(item.record_time,'{y}-{m}-{d}')}}
           </div>