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

src/api/supply.js

 
 export function saveGoodReturnOrder(data, warehouse_out_id, start_time, rate_of_concession, discount_amount, arrearage, payment, supplier_id) {
   return request({
-    url: '/api/supply/savegoodreturnOrder?warehouse_out_id=' + warehouse_out_id + '&start_time=' + start_time + '&rate_of_concession=' + rate_of_concession + '&discount_amount=' + discount_amount + '&arrearage=' + arrearage + '&payment=' + payment + '&supplier_id=' + supplier_id,
+    url: '/api/supply/savegoodreturnOrder?warehouse_out_id=' + warehouse_out_id + '&start_time=' + start_time + '&rate_of_concession=' + rate_of_concession + '&discount_amount=' + discount_amount + '&arrerage=' + arrearage + '&payment=' + payment + '&supplier_id=' + supplier_id,
     method: 'post',
     data: data
   })

src/views/layout/Layout.vue

           <p>透析管理</p>
         </div>
 
-         <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
+         <!-- <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
            <i class="iconfont icon-kccx navIcon"></i>
            <p>采购管理</p>
-        </div>
+        </div> -->
         
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
           <i class="iconfont icon-kccx navIcon"></i>

src/xt_pages/data/components/consumables.vue

               register_number:"",
               is_user:"2",
               number:"",
+              is_warehouse:"1",
             },
             isVisibility: false,
           }
             this.goodInfo.goodInfoDialog.formValue.number = response.data.data.goodInfo.number
            
             this.goodInfo.goodInfoDialog.formValue.is_user = response.data.data.goodInfo.is_user.toString()
+
+            this.goodInfo.goodInfoDialog.formValue.is_warehouse = response.data.data.goodInfo.is_warehouse.toString()
             
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
 

src/xt_pages/dialysis/details/DialysisPrescription.vue

           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_shouji != "0" ? anticoagulant_shouji : "" }}</span>
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
-            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.template_id != 45">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38  || this.$store.getters.xt_user.template_info.template_id == 45)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span >
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_weichi != "0" ? anticoagulant_weichi : "" }}</span>
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1"></span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 45">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 45)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>

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

                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987 '
+                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987  && this.$store.getters.xt_user.template_info.template_id != 45'
                                     :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
                             </el-form-item>
 
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.org_id == 9987'
                                     :label="'首剂(mg) : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
                             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
-                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987">
+                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 45">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
                             </el-form-item>
                             <el-form-item :label="'维持(mg/h) : '"
-                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987">
+                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987 ||  this.$store.getters.xt_user.template_info.template_id == 45">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"

src/xt_pages/dialysis/dialysisPrintOrder.vue

           >打印</el-button
         >
       </template>
-
+      <template v-if="org_template_info.template_id == 46">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
       <template v-if="org_template_info.template_id == 5">
         <div>
           <el-button
           >打印</el-button
         >
       </template>
-      <template v-if="org_template_info.template_id == 46">
-        <el-button
-          :loading="loading"
-          size="small"
-          icon="el-icon-printer"
-          @click="printThisPage"
-          type="primary"
-          >打印</el-button
-        >
-      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
             v-if="org_template_info.template_id == 46"
           >
           </DialysisPrintOrderFortySix>
+
+          <DialysisPrintOrderFortySeven
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 47"
+          >
+          </DialysisPrintOrderFortySeven>
         </div>
       </el-container>
     </div>
 import DialysisPrintOrderFortyFour from "./template/DialysisPrintOrderFortyFour";
 import DialysisPrintOrderFortyFive from "./template/DialysisPrintOrderFortyFive";
 import DialysisPrintOrderFortySix from "./template/DialysisPrintOrderFortySix";
+import DialysisPrintOrderFortySeven from "./template/DialysisPrintOrderFortySeven";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderFortySeven,
     DialysisPrintOrderFortySix,
     DialysisPrintOrderFortyFive,
     DialysisPrintOrderFortyFour,
       } else if (
         this.org_template_info.template_id == 6 ||
         this.org_template_info.template_id == 10 ||
-        this.org_template_info.template_id == 11 ||
-        this.org_template_info.template_id == 46
+        this.org_template_info.template_id == 11
       ) {
         printJS({
           printable: "dialysis-print-box-1",

src/xt_pages/dialysis/template/DialysisPrintOrderFortySix.vue

           </div>
           <div class="inline_block" style="margin-left: 5px">
             住院号/门诊号：
-            <div
-              class="under_line"
-              style="width: 70px; text-align: left"
-            >
+            <div class="under_line" style="width: 70px; text-align: left">
               {{ patientInfo.admission_number }}
             </div>
           </div>
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
+                    <div class="inline_block" style="flex: 1">
+                      干体重：
+                      <div
+                        class="under_line"
+                        style="width: 100px; text-align: center"
+                      >
+                        {{
+                          predialysis.dry_weight ? predialysis.dry_weight : "/"
+                        }}
+                      </div>
+                      kg
+                    </div>
                     <div class="inline_block" style="flex: 1">
                       上次透后体重：
                       <div
                       kg
                     </div>
                     <div class="inline_block" style="flex: 1">
-                      计划超滤量：
+                      目标超滤量：
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
                       </div>
                       L
                     </div>
-                    <div class="inline_block" style="flex: 1">
-                      干体重：
-                      <div
-                        class="under_line"
-                        style="width: 100px; text-align: center"
-                      >
-                        {{
-                          predialysis.dry_weight ? predialysis.dry_weight : "/"
-                        }}
+                  </div>
+
+                  <div class="row" style="padding:2px 0;line-height: 23px">
+                    <div class="inline_block" style="flex:1;">
+                      透后体重：
+                      <div class="under_line" style="width: 70px;text-align: center">
+                        {{ afterdialysis.weight_after ? parseFloat(afterdialysis.weight_after - afterdialysis.additional_weight).toFixed(1) : "/" }}
                       </div>
                       kg
                     </div>
             </div>
             <div class="inline_block" style="margin-left: 5px">
               住院号/门诊号：
-              <div
-                class="under_line"
-                style="width: 70px; text-align: left"
-              >
+              <div class="under_line" style="width: 70px; text-align: left">
                 {{ patientInfo.admission_number }}
               </div>
-             
             </div>
           </div>
         </template>
                   </td>
                 </tr>
               </template>
+              <tr>
+                <td
+                  colspan="7"
+                  style="
+                    letter-spacing: 5px;
+                    text-align: center;
+                    font-weight: 520;
+                    font-size: 16px;
+                    padding: 6px 8px;
+                    line-height: 30px;
+                  "
+                >
+                  透析后情况
+                </td>
+              </tr>
+              <tr>
+                <td colspan="7">
+                  <div
+                    class="row"
+                    style="padding: 2px 0; line-height: 23px; display: flex"
+                  >
+                    <div
+                      class="inline_block"
+                      style="flex: 1; display: inline-block"
+                    >
+                      治疗小结：
+                      <div
+                        class="under_line"
+                        style="
+                          width: 860px;
+                          line-height: 25px;
+                          text-align: left;
+                          margin-left: 2px;
+                          display: inline-block;
+                          white-space: normal;
+                        "
+                      >
+                        {{
+                          summary.dialysis_summary
+                            ? summary.dialysis_summary
+                            : "/"
+                        }}
+                      </div>
+                    </div>
+                  </div>
+                </td>
+              </tr>
+
               <tr>
                 <td colspan="7">
                   <div

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

     <el-dialog
         title="打印"
         :visible.sync="centerDialogVisible"
-        width="600px"
+        width="620px"
         center>
       <el-button @click="allCheck">全选</el-button>
       <div style="text-align:center;margin-top:10px;font-weight:bold;font-size:20px;">处方笺打印</div>

src/xt_pages/outpatientDoctorStation/template/printSix.vue

           {{ orgname }}第二类精神处方笺
         </div>
         <div
-            v-if="prescriptions[index].med_type != '1112' && prescriptions[index].med_type != '1111'"
+          v-if="
+            prescriptions[index].med_type != '1112' &&
+            prescriptions[index].med_type != '1111'
+          "
           class="printTitle"
         >
-          {{ orgname }}处方笺  普通
-<!--        <div v-else style="line-height: 60px;font-size: 30px;">{{ orgname }}处方笺</div>-->
-<!--          <img class="logo" src="../assets/shuiyin.jpg" alt="加载失败..">-->
+          {{ orgname }}处方笺 普通
+          <!--        <div v-else style="line-height: 60px;font-size: 30px;">{{ orgname }}处方笺</div>-->
+          <!--          <img class="logo" src="../assets/shuiyin.jpg" alt="加载失败..">-->
         </div>
 
+        <div class="infoTitle" style="border-bottom: 1px solid #000">
+          <p style="width: 174px">科室：{{ item.info ? getDepart(item.info.departments) : "" }}</p>
+          <p style="width: 176px">费别：</p>
+          <p style="width: 198px" v-if="hisPatient.number.length <= 12">
+            门诊号：{{ hisPatient.number ? hisPatient.number : "" }}
+          </p>
 
-
-        <div class="infoTitle" style="border-bottom:1px solid #000;">
-          <p>科室：{{ item.info ? getDepart(item.info.departments) : "" }}</p>
-          <p>费别：</p>
-          <p>门诊号：{{ hisPatient.number ? hisPatient.number : "" }}</p>
-          <p>
-            <span>{{record_date.split("-")[0]}}年</span> <span>{{record_date.split("-")[1]}}月</span> <span>{{record_date.split("-")[2]}}日</span>
+          <p style="text-align: right; width: 155px">
+            <span>{{ record_date.split("-")[0] }}年</span
+            ><span>{{ record_date.split("-")[1] }}月</span
+            ><span>{{ record_date.split("-")[2] }}日</span>
             <!-- {{getTime(item.ctime)?getTime(item.ctime):""}} -->
           </p>
         </div>
-
-        <div class="infoTitle" style="border-bottom:1px solid #000;">
+        <div
+          class="infoTitle"
+          style="border-bottom: 1px solid #000"
+          v-if="hisPatient.number.length > 12"
+        >
+          <p>
+            门诊号：{{
+              hisPatient.number ? hisPatient.number : ""
+            }}
+          </p>
+        </div>
+        <div class="infoTitle" style="border-bottom: 1px solid #000">
           <p>姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
           <p>
             性别：
             <span v-if="item.patient.gender == 2">女</span>
           </p>
           <p>年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
-          <p>电话：{{item.patient.phone}}</p>
+          <p>电话：{{ item.patient.phone }}</p>
         </div>
-        <div class="infoTitle" style="border-bottom:1px solid #000;">
-          <p>地址：{{ item.patient.home_address }}</p>
+        <div class="infoTitle" style="border-bottom: 1px solid #000">
+          <p style="width:100%">地址：{{ item.patient.home_address }}</p>
         </div>
         <div class="infoTitle">
-          <p>诊断：{{ getDiagnosis(item.info.diagnosis) }}</p>
+          <p style="width:100%">诊断：{{ getDiagnosis(item.info.diagnosis) }}</p>
         </div>
 
         <div class="prescriptionBox">
           >
             <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
             <div class="drugsOne">
-              <span style="font-weight: bold">{{ index + 1 + "." }}</span
-              >{{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;<span
+              <!-- <span style="font-weight: bold">{{ index + 1 + "." }}</span> -->
+              {{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;<span
                 v-if="it.drug.min_unit != it.drug.dose_unit"
                 >{{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* &nbsp;</span
               >{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{
             :key="index"
           >
             <div class="drugsOne">
-              <span style="font-weight: bold">{{ index + 1 + "." }}</span
-              >{{
+              <!-- <span style="font-weight: bold">{{ index + 1 + "." }}</span> -->
+              {{
                 it.type == 2
                   ? getProjectName(it.project_id)
                     ? getProjectName(it.project_id)
         <div class="infoTitle"></div>
         <div class="actionBar" v-if="org_id != 10188">
           <div class="actionBar_list">
-            医师：
-           <span>{{ item.doctor ? item.doctor : "" }}
-             </span>
-
-            <!-- <p class="actionBar_val" style="border-bottom:3px solid red">
-
-            </p> -->
+            <div style="width:120px;">
+                医师：
+            <span>{{ item.doctor ? item.doctor : "" }} </span>
+            </div>
+          
           </div>
           <div class="actionBar_list">
-            审核：{{
+            <div style="width:120px;">
+              审核：{{
               getDoctor(item.advices[0].checker)
                 ? getDoctor(item.advices[0].checker)
                 : ""
             }}
-            <!-- <div class="actionBar_val">
-
-            </div> -->
+            </div>
+            
           </div>
 
           <div class="actionBar_list">
-            金额：
+            <div style="width:120px;">
+                金额：
             {{
               getTotalOne(item.id).toFixed(2)
                 ? getTotalOne(item.id).toFixed(2)
                 : 0
             }}
+            </div>
+          
             <!-- <div class="actionBar_val">
 
             </div> -->
         </div>
         <div class="actionBar">
           <div class="actionBar_list">
-            <div>调配：</div>
+            <div style="width:120px;">调配：</div>
             <!-- <div class="actionBar_val"></div> -->
           </div>
           <div class="actionBar_list">
-            <div>
+            <div style="width:120px;">
               核对：{{
                 getDoctor(item.advices[0].checker)
                   ? getDoctor(item.advices[0].checker)
             </div> -->
           </div>
           <div class="actionBar_list">
-            <div>
+            <div style="width:120px;">
               发药：{{
                 getDoctor(item.advices[0].execution_staff)
                   ? getDoctor(item.advices[0].execution_staff)
                   : ""
               }}
+
+              <!-- <span>占位符</span> -->
             </div>
             <!-- <div class="actionBar_val">
 
     },
     getTime(value, temp) {
       if (value != undefined) {
-
         return uParseTime(value, temp);
       }
       return "";
       return project_name;
     },
 
-    getDiagnosis(id){
-        let ids = id.split(",")
-        var name = ""
-        for(let i = 0; i < ids.length; i++){
-
-          for(let b=0;b<this.diagnoses.length;b++){
-            if(parseInt(ids[i]) == this.diagnoses[b].id){
-              if(name.length == 0){
-                name = this.diagnoses[b].class_name
-              }else{
-                name = name +"," + this.diagnoses[b].class_name
-
-              }
+    getDiagnosis(id) {
+      let ids = id.split(",");
+      var name = "";
+      for (let i = 0; i < ids.length; i++) {
+        for (let b = 0; b < this.diagnoses.length; b++) {
+          if (parseInt(ids[i]) == this.diagnoses[b].id) {
+            if (name.length == 0) {
+              name = this.diagnoses[b].class_name;
+            } else {
+              name = name + "," + this.diagnoses[b].class_name;
             }
           }
         }
-        return name
       }
+      return name;
+    },
   },
   created() {
     this.getAllDoctorList();
   text-align: center;
   font-weight: bold;
   display: flex;
-    position: relative;
-    left: 50%;
-    transform: translateX(-50px);
+  position: relative;
+  left: 50%;
+  transform: translateX(-50px);
 }
 .infoTitle_thin {
   display: flex;
   padding: 0 10px;
 }
 .infoTitle_thin p {
-  width: 200px;
+  width: 250px;
 }
 .infoTitle {
   display: flex;
   padding: 0 10px;
 }
 .infoTitle p {
-  width: 200px;
+  width: 165px;
 }
 .infoMain {
   display: flex;
   width: 150px;
 }
 
-.logo{}
+.logo {
+}
 </style>

src/xt_pages/stock/Dialog/goodInfoDailog.vue

             
             <el-form-item label="是否零用:">
 
-              <el-select v-model="form.is_user" style="width:160px" filterable placeholder="请选择">
+              <el-select v-model="form.is_user" style="width:160px" filterable placeholder="请选择" @change="changeUse">
                   <el-option
                           v-for="(item,index) in userList"
                           :key="index"
                   </el-option>
               </el-select>
              </el-form-item>
-
+           
+            <el-form-item label="是否自动出库:" v-if="form.is_user == 1">
+              <el-select v-model="form.is_warehouse" style="width:160px" filterable placeholder="请选择">
+                  <el-option
+                          v-for="(item,index) in userList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.id">
+                  </el-option>
+              </el-select>
+             </el-form-item>
+ 
+          
             <el-form-item label="批准文号:" >
               <el-input v-model="form.number" style="width:180px"></el-input>
             </el-form-item>
 
+   
+
 
             <el-form-item label="备注 : " prop="name" style="width:100%;">
               <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
           register_number:"",
           is_user:"2",
           number:"",
+          is_warehouse:"1",
         },
 
         rules: {
         form["register_number"] = this.form.register_number
         form["is_user"] = this.form.is_user
         form["number"] = this.form.number
-
+        form["is_warehouse"] = this.form.is_warehouse
         return form
       }, changeSelected: function(val) {
         console.log(val)
         }
       },
      changeDefaultCountUnit(val){
-       console.log("val2222",val)
+      
        this.form.default_count_unit = ''
         this.form.default_count_unit = val
+      },
+      changeUse(val){
+        console.log("val2222",val)
+        if(val == 1){
+         this.form.is_user = val
+        }
       }
     },
     watch: {

src/xt_pages/stock/drugs/drugDamaged.vue

       placeholder="选择日期"
       @change="changeEndTime">
       </el-date-picker>
-    </div> 
+    </div>
     <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" >
         <el-table-column type="selection" width="55" align="center"> </el-table-column>
         <el-table-column  prop="date" label="报损日期" align="center">
           <el-row>
             <el-col :span="8">
               <el-form-item label="入库单号:">
-                 <el-input v-model ="form.warehouseing_order" style="width:200px"></el-input>
+                 <el-input v-model ="form.warehousing_order" style="width:200px"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               </el-table-column>
               <el-table-column prop="address" label="报损金额" align="center">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.XtBaseDrug.min_price!=0">{{scope.row.XtBaseDrug.min_price}} </span> 
+                  <span v-if="scope.row.XtBaseDrug.min_price!=0">{{scope.row.XtBaseDrug.min_price}} </span>
                 </template>
               </el-table-column>
 
               <el-table-column prop="address" label="盘点原因" align="center">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.type == 6">默认</span> 
-                  <span v-if="scope.row.type == 1">到期退货</span> 
-                  <span v-if="scope.row.type == 2">异常退货</span> 
-                  <span v-if="scope.row.type == 3">退货</span> 
-                  <span v-if="scope.row.type == 4">人为损坏</span> 
-                  <span v-if="scope.row.type == 5">不计入报损分析</span> 
+                  <span v-if="scope.row.type == 6">默认</span>
+                  <span v-if="scope.row.type == 1">到期退货</span>
+                  <span v-if="scope.row.type == 2">异常退货</span>
+                  <span v-if="scope.row.type == 3">退货</span>
+                  <span v-if="scope.row.type == 4">人为损坏</span>
+                  <span v-if="scope.row.type == 5">不计入报损分析</span>
                 </template>
               </el-table-column>
             </el-table>
         }
     },
     methods:{
-      
+
         search(){
           this.getlist()
         },
           this.page = val
           this.getlist()
         },
-       
+
         getTime(val) {
          if(val < 0){
             return ""
       getlist(){
         var params = {
           limit:this.limit,
-          page:this.page, 
+          page:this.page,
           start_time:this.start_time,
           end_time:this.end_time,
           keyword:this.searchKey,
         }
-       
+
         getDrugDamageList(params).then(response=>{
            if(response.data.state == 1){
              this.tableList = response.data.data.list
           if(id == this.doctorList[i].admin_user_id){
             user_name = this.doctorList[i].user_name
           }
-        } 
+        }
         return user_name
      },
      changeStartTime(){
        this.getlist()
      },
      getTotalCount(drugid,max_unit,min_unit,min_number){
-        
+
         var total = 0
         var str = ""
         var str_min = ""
         return str+str_min
      },
      getTotalPrice(drugid,minprice){
-        var total = 0 
+        var total = 0
         for(let i=0;i<this.datamageList.length;i++){
           if(drugid == this.datamageList[i].drug_id){
             total+=this.datamageList[i].count
            warehouseing_order:this.form.warehousing_order,
            type:this.form.type,
          }
-        
+
         this.dialogVisible = true
         getDamagedByDrugId(params).then(response=>{
            if(response.data.state ==1){
                list[i].min_number == list[i].XtBaseDrug.min_number
                list[i].total = 0
              }
-            
+
 
              for(let i=0;i<list.length;i++){
                this.drug_name = list[0].drug_name
         })
      },
      getDamagedCount(total){
-     
+
       var str = ""
       var min_str = ""
       if(total< this.min_number){
       return str + min_str
      },
     getDamagedCountOne(total){
-     
+
       var str = ""
       var min_str = ""
       if(total< this.min_number){
         str = ""
-        min_str = total 
+        min_str = total
       }
      if(total >= this.min_number){
         if(parseInt(total/this.min_number)!=0){
        var total_count =  this.getDamagedCountOne(this.total_count)
        var all_count = 0
        all_count =  total_count * this.min_number
-      
+
        return (count / all_count).toFixed(2)*100
      }
     },

src/xt_pages/supply/components/addGoodOrder.vue

       for (let i = 0; i < arr.length; i++) {
         total_count += arr[i].stock_count;
       }
-      return total_count;
+      if(total_count >0){
+        return total_count;
+      }else{
+        return ""
+      }
+     
     },
 
     calculate: function (val) {

src/xt_pages/supply/components/addGoodReturn.vue

             </template>
           </el-table-column>
 
+          <el-table-column label="批号" align="center" width="200px">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.supply_batch_number"
+                style="width: 150px"
+                :disabled="true"
+                placeholder="批号"
+              ></el-input>
+               <div style="visibility: hidden">/</div>
+            </template>
+          </el-table-column>
+
           <el-table-column label="单位" align="center" width="120px">
             <template slot="header" slot-scope="scope">
               <span>单位<span style="color: red">*</span></span>
       var min_str = "";
       if (arr.length > 0) {
         for (let i = 0; i < arr.length; i++) {
-          total += parseInt(arr[i].stock_max_number);
+          total += parseInt(arr[i].stock_max_number+ arr[i].stock_min_number);
         }
       }
       if (total < min_number) {
       for (let i = 0; i < arr.length; i++) {
         total_count += arr[i].stock_count;
       }
-      return total_count;
+      if(total_count > 0){
+       return total_count;
+      }else{
+        return ""
+      }
+      
     },
     calculate: function (val) {
       if (isNaN(val)) {
           var drugList = response.data.data.drugList;
           var goodList = response.data.data.goodList;
           for (let i = 0; i < orderInfo.length; i++) {
+            if(orderInfo[i].is_source == 1){
+              for(let j=0;j<orderInfo[i].drug_warehouse_info.length;j++){
+                 if(orderInfo[i].drug_warehouse_info[j].max_unit == orderInfo[i].drug.max_unit){
+                    orderInfo[i].drug_warehouse_info[j].stock_max_number =  orderInfo[i].drug_warehouse_info[j].stock_max_number * orderInfo[i].drug.min_number
+                 }
+              }
+              orderInfo[i].supply_total = this.getWarehoseInfo(orderInfo[i].drug_warehouse_info,orderInfo[i].drug.max_unit,orderInfo[i].drug.min_unit,orderInfo[i].drug.min_number)
+            }
+            if(orderInfo[i].is_source == 2){
+               orderInfo[i].supply_total = this.getTotalStockCount(orderInfo[i].good_warehouse_info)
+            }
             orderInfo[i].id = orderInfo[i].id;
-            orderInfo[i].supply_count = orderInfo[i].count;
+            orderInfo[i].supply_count = orderInfo[i].supply_count;
             orderInfo[i].count = orderInfo[i].count
             orderInfo[i].supply_price = orderInfo[i].price;
             orderInfo[i].supply_remake = orderInfo[i].remark;
      }
      checkReturnOrder(params).then(response=>{
        if(response.data.state == 1){
-        this.loading = false
-        this.showThree = false
-        this.disabled = true
-        this.is_check = 1
+      
         var msg = response.data.data.msg
-        this.Reviewed = true
-        this.$message.success("审核成功!")
+        if(msg == 1){
+          this.loading = false
+          this.showThree = false
+          this.disabled = true
+          this.is_check = 1
+          this.Reviewed = true
+          this.$message.success("审核成功!")
+        }
+
+         if(msg == 2){
+            var good_name = response.data.data.good_name
+            var specification_name = response.data.data.specification_name
+            var str = good_name +"*" + specification_name +"库存不足,审核失败!"
+            this.$message.error(str)
+
+          }
+          if(msg == 3){
+              var drug_name =  response.data.data.drug_name
+              var dose = response.data.data.dose
+              var dose_unit = response.data.data.dose_unit
+              var min_number = response.data.data.min_number
+              var min_unit =  response.data.data.min_unit
+              var max_unit =  response.data.data.max_unit
+              var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
+              this.$message.error(str + "库存不足,审核失败!")
+          }
+       
        }
      })
     },

src/xt_pages/supply/components/editGoodOrder.vue

       for (let i = 0; i < arr.length; i++) {
         total_count += arr[i].stock_count;
       }
-      return total_count;
+      if(total_count >0){
+         return total_count;
+      }else{
+        return ""
+      }
+      
     },
     calculate: function (val) {
       if (isNaN(val)) {

src/xt_pages/supply/components/editGoodReturn.vue

             v-model="supplier_name"
             style="width: 140px; margin-right: 10px"
             placeholder="请选择"
+            :disabled ="disabled"
           >
             <el-option
               v-for="item in supplyList"
             </template>
           </el-table-column>
 
+         <el-table-column label="批号" align="center" width="200px">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.supply_batch_number"
+                style="width: 150px"
+                :disabled="true"
+                placeholder="批号"
+              ></el-input>
+               <div style="visibility: hidden">/</div>
+            </template>
+          </el-table-column>
+
           <el-table-column label="单位" align="center" width="120px">
             <template slot="header" slot-scope="scope">
               <span>单位<span style="color: red">*</span></span>
       </el-form>
       <div style="margin-top: 10px">
         <el-input
+         :disabled ="disabled"
           type="textarea"
           :rows="2"
           placeholder="备注信息"
             v-model="rate_of_concession"
             @input="addressChange"
             placeholder="请输入优惠率"
+            :disabled ="disabled"
           ></el-input
           >%</span
         >
             v-model="discount_amount"
             @input="count_discount"
             placeholder="请输入优惠金额"
+            :disabled ="disabled"
           ></el-input
         ></span>
 
             v-model="payment"
             @input="count_payment"
             placeholder="请输入本次退款"
+            :disabled ="disabled"
           ></el-input
         ></span>
 
             v-model="arrearage"
             @input="count_arrearage"
             placeholder="请输入本次欠款"
+            :disabled ="disabled"
           ></el-input
         ></span>
       </div>
       var min_str = "";
       if (arr.length > 0) {
         for (let i = 0; i < arr.length; i++) {
-          total += parseInt(arr[i].stock_max_number);
+          total += parseInt(arr[i].stock_max_number+ arr[i].stock_min_number);
         }
       }
       if (total < min_number) {
       for (let i = 0; i < arr.length; i++) {
         total_count += arr[i].stock_count;
       }
-      return total_count;
+      if(total_count >0){
+        return total_count;
+      }else{
+        return ""
+      }
+    
     },
     calculate: function (val) {
       if (isNaN(val)) {
           this.discount_amount = out.discount_amount;
           this.payment = out.payment;
           this.arrearage = out.arrearage;
+          this.return_remark = out.return_remark
           this.start_time = this.getTimes(out.document_date);
           var orderInfo = response.data.data.orderCancelDetail;
           if (out.is_check == 1) {
             this.disabled = true;
+            this.Reviewed = true
           }
           console.log("退库单详情", orderInfo);
           var drugList = response.data.data.drugList;

src/xt_pages/supply/components/editPurchaseOrder.vue

       for (let i = 0; i < arr.length; i++) {
         total_count += arr[i].stock_count;
       }
-      return total_count;
+      if(total_count >0){
+        return total_count;
+      }else{
+        return ""
+      }
+     
     },
     calculate: function (val) {
       if (isNaN(val)) {

src/xt_pages/supply/goodOrderQuery.vue

                 var msg = response.data.data.msg
                 this.tableList.splice(index, 1);
                 this.$message.success("删除成功")
+                this.getlist()
             } else {
                 this.$message.error("删除失败")
             }

src/xt_pages/supply/goodreturn.vue

     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
-    <div class="app-container ">
-      <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
+    <div class="app-container">
+      <div
+        style="
+          justify-content: space-between;
+          margin: 0px 0 12px 0;
+          display: flex;
+          align-items: center;
+        "
+      >
         <div>
-        
           <el-date-picker
             size="small"
             v-model="start_time"
             prefix-icon="el-icon-date"
             :editable="false"
-            style="width: 196px;"
+            style="width: 196px"
             type="date"
             placeholder="选择日期时间"
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             @change="startTimeChange"
-           ></el-date-picker>-
-            <el-date-picker
-              size="small"
-              v-model="end_time"
-              prefix-icon="el-icon-date"
-              :editable="false"
-              style="width: 196px;"
-              type="date"
-              placeholder="选择日期时间"
-              align="right"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd"
-              @change="endTimeChange"
+          ></el-date-picker
+          >-
+          <el-date-picker
+            size="small"
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="endTimeChange"
           ></el-date-picker>
           <span>审核状态:</span>
-           <el-select v-model="check_id" style="width:140px;margin-right:10px;" placeholder="请选择"
-            @change="changeTypeName">
+          <el-select
+            v-model="check_id"
+            style="width: 140px; margin-right: 10px"
+            placeholder="请选择"
+            @change="changeTypeName"
+          >
             <el-option
-                v-for="item in checkList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id">
+              v-for="item in checkList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
             </el-option>
           </el-select>
           <el-input
             size="small"
-            style="width: 200px;margin-left:10px;"
+            style="width: 200px; margin-left: 10px"
             class="filter-item"
             v-model.trim="keywords"
             placeholder="订单编号或供应商名称"
         </div>
       </div>
 
-
-       <el-table
-          :row-style="{ color: '#303133' }"
-          :header-cell-style="{
-              backgroundColor: 'rgb(245, 247, 250)',
-              color: '#606266'
-          }"
-          :data="tableList"
-          :class="signAndWeighBoxPatients"
-          border
-          style="width: 100%"
-          max-height="450"
-         
+      <el-table
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266',
+        }"
+        :data="tableList"
+        :class="signAndWeighBoxPatients"
+        border
+        style="width: 100%"
       >
         <el-table-column label="单据日期" align="center" width="200">
           <template slot-scope="scope">
-            <span>{{getTimes(scope.row.document_date)}}</span>
-         </template>
+            <span>{{ getTimes(scope.row.document_date) }}</span>
+          </template>
         </el-table-column>
         <el-table-column label="单据编号" align="center" width="200">
           <template slot-scope="scope">
-            <span>{{scope.row.number}}</span>
+            <span>{{ scope.row.number }}</span>
           </template>
         </el-table-column>
         <el-table-column label="供应商" align="center" width="200">
-            <template slot-scope="scope">
-              <span>{{getName(scope.row.supplier_id)}}</span>
-            </template>
-         </el-table-column>
+          <template slot-scope="scope">
+            <span>{{ getName(scope.row.supplier_id) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="关联采购订单号" align="center" width="200">
           <template slot-scope="scope">
-            <span v-if="scope.row.cancelOrder!=undefined && scope.row.cancelOrder.length >0">{{scope.row.cancelOrder[0].order_number}}</span>
+            <span
+              v-if="
+                scope.row.cancelOrder != undefined &&
+                scope.row.cancelOrder.length > 0
+              "
+              >{{ scope.row.cancelOrder[0].order_number }}</span
+            >
           </template>
         </el-table-column>
-           <el-table-column label="关联采购单号" align="center" width="200">
+        <el-table-column label="关联采购单号" align="center" width="200">
           <template slot-scope="scope">
-             <span v-if="scope.row.cancelOrder!=undefined && scope.row.cancelOrder.length >0">{{scope.row.cancelOrder[0].good_number}}</span>
+            <span
+              v-if="
+                scope.row.cancelOrder != undefined &&
+                scope.row.cancelOrder.length > 0
+              "
+              >{{ scope.row.cancelOrder[0].good_number }}</span
+            >
           </template>
         </el-table-column>
         <el-table-column label="采购金额" align="center" width="200">
           <template slot-scope="scope">
-             <span v-if="getAllBuyPrice(scope.row.cancelOrder)>0">{{getAllBuyPrice(scope.row.cancelOrder)}}</span> 
+            <span v-if="getAllBuyPrice(scope.row.cancelOrder) > 0">{{
+              getAllBuyPrice(scope.row.cancelOrder)
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column label="优惠后金额" align="center" width="200">
-         <template slot-scope="scope">
-          <span v-if="getAllBuyPrice(scope.row.cancelOrder)>0">{{getAllBuyPriceOne(scope.row.cancelOrder,scope.row.discount_amount)}}</span> 
-         </template>
-       </el-table-column>
-        <!-- <el-table-column label="已退款" align="center" width="200">
-         <template slot-scope="scope">
-         
-         </template>
-       </el-table-column> -->
-       <el-table-column label="数量" align="center" width="200">
-         <template slot-scope="scope">
-           {{getCount(scope.row.cancelOrder)}}
-         </template>
-       </el-table-column>
+          <template slot-scope="scope">
+            <span v-if="getAllBuyPrice(scope.row.cancelOrder) > 0">{{
+              getAllBuyPriceOne(
+                scope.row.cancelOrder,
+                scope.row.discount_amount
+              )
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="已退款" align="center" width="200">
+          <template slot-scope="scope">
+            <span v-if="scope.row.payment > 0">{{ scope.row.payment }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="数量" align="center" width="200">
+          <template slot-scope="scope">
+            {{ getCount(scope.row.cancelOrder) }}
+          </template>
+        </el-table-column>
 
-       <el-table-column label="退款状态" align="center" width="200">
-         <template slot-scope="scope">
-           <!-- <span v-if="scope.row.is_check == 2">未审核</span>
+        <el-table-column label="退款状态" align="center" width="200">
+          <template slot-scope="scope">
+            <!-- <span v-if="scope.row.is_check == 2">未审核</span>
            <span v-if="scope.row.is_check == 1">已审核</span> -->
-         </template>
-       </el-table-column>
-      
-          
-      <el-table-column label="制单人" align="center" width="200">
-         <template slot-scope="scope">
-          {{getDocName(scope.row.creater)}}
-         </template>
-       </el-table-column>
+          </template>
+        </el-table-column>
 
-      <el-table-column label="审核人" align="center" width="200">
-         <template slot-scope="scope">
-          {{getDocName(scope.row.checker)}}
-         </template>
-       </el-table-column>
+        <el-table-column label="制单人" align="center" width="200">
+          <template slot-scope="scope">
+            {{ getDocName(scope.row.creater) }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="审核人" align="center" width="200">
+          <template slot-scope="scope">
+            {{ getDocName(scope.row.checker) }}
+          </template>
+        </el-table-column>
 
-       <el-table-column label="操作" align="center" width="260"  fixed="right">
+        <el-table-column label="操作" align="center" width="260" fixed="right">
           <template slot-scope="scope">
-              <el-button
-                icon="el-icon-edit-outline"
-                size="small"
-                type="primary"
-                @click="editGoodReturn(scope.row.id)"
+            <el-button
+              icon="el-icon-edit-outline"
+              size="small"
+              type="primary"
+              @click="editGoodReturn(scope.row.id)"
               >编辑
-              </el-button>
-              <el-button
-                icon="el-icon-delete"
-                size="small"
-                type="danger"
-                @click="toClickOne(scope.row,scope.$index)"
+            </el-button>
+            <el-button
+              icon="el-icon-delete"
+              size="small"
+              type="danger"
+              @click="toClickOne(scope.row, scope.$index)"
               >删除
-              </el-button>
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100,200,500,1000]"
+        :page-sizes="[10, 50, 100, 200, 500, 1000]"
         :page-size="10"
         background
         align="right"
-        style="margin-top:20px;"
+        style="margin-top: 20px"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >
       </el-pagination>
-
     </div>
   </div>
 </template>
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
-import {getAllSupply,getAllGoodReturnOrderList,deleteReturnOrder} from "@/api/supply"
-import {uParseTime } from '@/utils/tools'
+import {
+  getAllSupply,
+  getAllGoodReturnOrderList,
+  deleteReturnOrder,
+} from "@/api/supply";
+import { uParseTime } from "@/utils/tools";
 export default {
   name: "stockIn",
-   components: {
-     
-   },
+  components: {},
   components: {
-    BreadCrumb
+    BreadCrumb,
   },
   data() {
     return {
       crumbs: [
         { path: false, name: "采购管理" },
-        { path: "/good/return/query", name: "退货单" }
+        { path: "/good/return/query", name: "退货单" },
       ],
       keywords: "",
       total: 0,
       multipleSelection: [],
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
       start_time: "",
-      end_time:"",
+      end_time: "",
       page: 1,
       limit: 10,
       goodType: [],
       goodInfo: [],
-      org_id:0,
-      types:[],
-      tableList:[1],
-      type_name:"",
-      checkList:[
-        {id:0,name:"请选择"},
-        {id:1,name:"已审核"},
-        {id:2,name:"未审核"},
+      org_id: 0,
+      types: [],
+      tableList: [1],
+      type_name: "",
+      checkList: [
+        { id: 0, name: "请选择" },
+        { id: 1, name: "已审核" },
+        { id: 2, name: "未审核" },
       ],
-      supplyList:[],
-      check_id:0,
-      doctorList:[],
+      supplyList: [],
+      check_id: 0,
+      doctorList: [],
     };
   },
-  methods:{
-     toAdd(){
-       this.$router.push({path:"/good/return/add"})
-     },
-     changeTypeName(){
-       this.getlist()
-     },
-     startTimeChange(){
-       this.getlist()
-     },
-     endTimeChange(){
-      this.getlist()
-     },
-     search(){
-      this.getlist()
-     },
-     handleSizeChange(val){
-       this.limit = val
-       this.getlist()
-     },
-     handleCurrentChange(val){
-       this.page = val
-       this.getlist()
-     },
-     getAllSupply(){
-       getAllSupply().then(response=>{
-         if(response.data.state == 1){
-            var supplyList = response.data.data.supplyList
-            this.doctorList = response.data.data.doctorList
-            for(let i=0;i<supplyList.length;i++){
-              this.supplyList.push(supplyList[i])
-            }
-         }
-       })
-     },
-     getTimes(time) {
-      if (time === '') {
-      return ''
+  methods: {
+    toAdd() {
+      this.$router.push({ path: "/good/return/add" });
+    },
+    changeTypeName() {
+      this.getlist();
+    },
+    startTimeChange() {
+      this.getlist();
+    },
+    endTimeChange() {
+      this.getlist();
+    },
+    search() {
+      this.getlist();
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getlist();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getlist();
+    },
+    getAllSupply() {
+      getAllSupply().then((response) => {
+        if (response.data.state == 1) {
+          var supplyList = response.data.data.supplyList;
+          this.doctorList = response.data.data.doctorList;
+          for (let i = 0; i < supplyList.length; i++) {
+            this.supplyList.push(supplyList[i]);
+          }
+        }
+      });
+    },
+    getTimes(time) {
+      if (time === "") {
+        return "";
       }
-      return uParseTime(time, '{y}-{m}-{d}')
-     },
-     getlist(){
-        var params = {
-          check_id:this.check_id,
-          start_time:this.start_time,
-          end_time:this.end_time,
-          keyword:this.keywords,
-          page:this.page,
-          limit:this.limit,
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+    getlist() {
+      var params = {
+        check_id: this.check_id,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        keyword: this.keywords,
+        page: this.page,
+        limit: this.limit,
+      };
+      console.log("param23232323", params);
+      getAllGoodReturnOrderList(params).then((response) => {
+        if (response.data.state == 1) {
+          var list = response.data.data.list;
+          console.log("list2332232323232", list);
+          this.tableList = list;
+          var total = response.data.data.total;
+          this.total = total;
         }
-       console.log("param23232323",params)
-       getAllGoodReturnOrderList(params).then(response=>{
-          if(response.data.state == 1){
-            var list = response.data.data.list 
-            console.log("list2332232323232",list)
-            this.tableList = list
-            var total = response.data.data.total
-            this.total = total
-          }
-       })
-     },
-     getName(id){
-       var name = ""
-       for(let i=0;i<this.supplyList.length;i++){
-         if(id == this.supplyList[i].id){
-           name = this.supplyList[i].supplier_name
-         }
-       }
-       return name
-     },
-     getDocName(id){
-      var user_name = ""
-      for(let i=0;i<this.doctorList.length;i++){
-        if(id == this.doctorList[i].admin_user_id){
-          user_name = this.doctorList[i].user_name
+      });
+    },
+    getName(id) {
+      var name = "";
+      for (let i = 0; i < this.supplyList.length; i++) {
+        if (id == this.supplyList[i].id) {
+          name = this.supplyList[i].supplier_name;
+        }
+      }
+      return name;
+    },
+    getDocName(id) {
+      var user_name = "";
+      for (let i = 0; i < this.doctorList.length; i++) {
+        if (id == this.doctorList[i].admin_user_id) {
+          user_name = this.doctorList[i].user_name;
+        }
+      }
+      return user_name;
+    },
+    getAllBuyPrice(arr) {
+      var buy_price = 0;
+      if (arr != undefined && arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          buy_price += arr[i].supply_count * arr[i].price;
         }
       }
-      return user_name
-     },
-     getAllBuyPrice(arr){
-       var buy_price = 0
-       if(arr!=undefined && arr.length > 0){
-          for(let i=0;i<arr.length;i++){
-            buy_price += (arr[i].count * arr[i].price)
-          }
-       }
 
-       return buy_price.toFixed(2)
-     },
-     getAllBuyPriceOne(arr,discount_amount){
-      
-       var buy_price = 0
-       if(arr!=undefined && arr.length > 0){
-          for(let i=0;i<arr.length;i++){
-            buy_price += (parseInt(arr[i].count) * arr[i].price)
-          }
-       }
-        console.log("discount233232232323",discount_amount)
-       return (buy_price-discount_amount).toFixed(2)
-     },
-     getAllCount(arr){
-       var count = ""
-        if(arr!=undefined && arr.length > 0){
-          for(let i=0;i<arr.length;i++){
-            count += arr[i].count
-          }
-       }
-       return count
-     },
-     editGoodReturn(id){
-       this.$router.push({path:"/good/return/edit?id="+id})
-     },
-     toClickOne(val,index){
-       console.log("val323232323232",val)
-       if(val.is_check == 1){
-         this.$message.error("已审核单据，不能删除!")
-         return false
-       }
+      return buy_price.toFixed(2);
+    },
+    getAllBuyPriceOne(arr, discount_amount) {
+      var buy_price = 0;
+      if (arr != undefined && arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          buy_price += parseInt(arr[i].supply_count) * arr[i].price;
+        }
+      }
+      return (buy_price - discount_amount).toFixed(2);
+    },
+    getAllCount(arr) {
+      var count = "";
+      if (arr != undefined && arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          count += arr[i].supply_count;
+        }
+      }
+      return count;
+    },
+    editGoodReturn(id) {
+      this.$router.push({ path: "/good/return/edit?id=" + id });
+    },
+    toClickOne(val, index) {
+      console.log("val323232323232", val);
+      if (val.is_check == 1) {
+        this.$message.error("已审核单据，不能删除!");
+        return false;
+      }
       //  if(val.cancelOrder.length >0 ){
       //    this.$message.error("已关联单据，不能删除!")
       //    return false
       //  }
-       this.$confirm('确认删除吗?', '删除', {
-          confirmButtonText: '确 定',
-          cancelButtonText: '取 消',
-          type: 'warning'
-        }).then(() => {
-          deleteReturnOrder(val.id).then(response => {
+      this.$confirm("确认删除吗?", "删除", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning",
+      })
+        .then(() => {
+          deleteReturnOrder(val.id).then((response) => {
             if (response.data.state == 1) {
-                var msg = response.data.data.msg
-                this.tableList.splice(index, 1);
-                this.$message.success("删除成功")
+              var msg = response.data.data.msg;
+              this.tableList.splice(index, 1);
+              this.getlist();
+              this.$message.success("删除成功");
             } else {
-                this.$message.error("删除失败")
+              this.$message.error("删除失败");
             }
-          })
-        }).catch(() => {
-       }) 
-     },
-     getCount(val){
-       var total = 0
-       for(let i=0;i<val.length;i++){
-         total += val[i].count
-       }
-       if(total >0){
-         return total
-       }else{
-         return ""
-       }
-      
-     }
+          });
+        })
+        .catch(() => {});
+    },
+    getCount(val) {
+      console.log("val323223322323", val);
+      var total = 0;
+      if (val != undefined) {
+        for (let i = 0; i < val.length; i++) {
+          total += val[i].supply_count;
+        }
+        if (total > 0) {
+          return total;
+        } else {
+          return "";
+        }
+      }
+    },
   },
   created() {
-    var now = new Date(); //当前日期 
-    var nowMonth = now.getMonth(); //当前月 
-    var nowYear = now.getFullYear(); //当前年 
+    var now = new Date(); //当前日期
+    var nowMonth = now.getMonth(); //当前月
+    var nowYear = now.getFullYear(); //当前年
     //本月的开始时间
-    var monthStartDate = new Date(nowYear, nowMonth, 1); 
-    this.start_time = monthStartDate
+    var monthStartDate = new Date(nowYear, nowMonth, 1);
+    this.start_time = this.getTimes(monthStartDate);
     this.end_time = this.getTimes(new Date());
-    this.org_id =  this.$store.getters.xt_user.org_id
-    this.getAllSupply()
-    this.getlist()
+    this.org_id = this.$store.getters.xt_user.org_id;
+    this.getAllSupply();
+    this.getlist();
   },
- 
 };
 </script>
 
 .el-table__fixed-right {
   width: 150px;
   bottom: 20px;
+  height: 100% !important;
+}
+.el-table__fixed-body-wrapper {
   height: 100%;
 }
-
+.el-table__body-wrapper.is-scrolling-left {
+  max-height: 100% !important;
+}
 </style>

src/xt_pages/supply/purchaseOrderQuery.vue

             if (response.data.state == 1) {
               var msg = response.data.data.msg;
               this.tableList.splice(index, 1);
+              this.getlist()
               this.$message.success("删除成功");
             } else {
               this.$message.error("删除失败");