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

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

@@ -2036,7 +2036,7 @@
           if (minites < 10) {
             minites = '0' + minites
           }
-          if (this.$store.getters.xt_user.org.id == 10016 || this.$store.getters.xt_user.org.id == 10121 || this.$store.getters.xt_user.org.id == 4  ) {
+          if (this.$store.getters.xt_user.org.id == 10016 || this.$store.getters.xt_user.org.id == 10121 || this.$store.getters.xt_user.org.id == 4 || this.$store.getters.xt_user.org.id == 10013 || this.$store.getters.xt_user.org.id == 10014 ) {
             this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
           } else {
             if (schedual.schedule_type == 1) {

src/xt_pages/dialysis/template/DialysisPrintOrderFortyThree.vue

@@ -175,6 +175,33 @@
                     <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 19">
                     IUF+HD
                     </div>
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 20">
+                    UF
+                    </div>
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 21">
+                    HD+
+                    </div>
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 22">
+                    血浆胆红素吸附+HDF
+                    </div>
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 23">
+                    血浆胆红素吸附
+                    </div>
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 24">
+                    I-HDF
+                    </div>
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 25">
+                    HD高通
+                    </div>
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 26">
+                    CVVH
+                    </div>
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 27">
+                    CVVHD
+                    </div>
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 28">
+                    CVVHDF
+                    </div>
                 </div>
             </div>
             <div class="row">
@@ -185,7 +212,7 @@
                         Ca：{{ prescription.calcium ? prescription.calcium : "/" }}&nbsp;&nbsp;
                         Na：{{ prescription.sodium ? prescription.sodium : "/" }}&nbsp;&nbsp;
                         HCO3：{{ prescription.bicarbonate ? prescription.bicarbonate : "/" }}&nbsp;&nbsp;
-                        <!-- 糖：{{ prescription.amylaceum ? prescription.amylaceum : "/" }}&nbsp;&nbsp; -->
+                        糖：{{ prescription.amylaceum ? prescription.amylaceum : "/" }}&nbsp;&nbsp;
                     </div>
                 </div>
                 <div class="inline_block">
@@ -273,8 +300,10 @@
                 <td width="60" style="height:20px;line-height:20px">动脉压</td>
                 <td width="60" style="height:20px;line-height:20px">跨膜压</td>
                 <td width="60" style="height:20px;line-height:20px">温度</td>
-                <td width="60" style="height:20px;line-height:20px">超滤率</td>
-                <td width="60" style="height:20px;line-height:20px">超滤量</td>
+                <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id != 2">超滤率</td>
+                <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id != 2">超滤量</td>
+                <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换率</td>
+                <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换量</td>
                 <td width="60" style="height:20px;line-height:20px">血容量</td>
                 <td width="">病情变化及处理</td>
             </tr>
@@ -287,17 +316,19 @@
                         {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
                     </span>
                 </td>
-                <td>&nbsp;{{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}</td>
-                <td>&nbsp;{{ monitor.ktv ? monitor.ktv : "" }}</td>
-                <td>&nbsp;{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}</td>
-                <td>&nbsp;{{ monitor.venous_pressure ? monitor.venous_pressure : "" }}</td>
-                <td>&nbsp;{{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}</td>
+                <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.pulse_frequency ? monitor.pulse_frequency : "/" }}</span></td>
+                <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ktv ? monitor.ktv : "/" }}</span></td>
+                <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "/" }}</span></td>
+                <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.venous_pressure ? monitor.venous_pressure : "/" }}</span></td>
+                <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.arterial_pressure ? monitor.arterial_pressure : "/" }}</span></td>
                 
-                <td>&nbsp;{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}</td>
-                <td>&nbsp;{{monitor.dialysate_temperature ? monitor.dialysate_temperature : ''}}</td>
-                <td>&nbsp;{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : ''}}</td>
-                <td>&nbsp;{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}</td>
-                <td>&nbsp;{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "" }}</td>
+                <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "/" }}</span></td>
+                <td>&nbsp;<span v-if="monitor.operate_time">{{monitor.dialysate_temperature ? monitor.dialysate_temperature : '/'}}</span></td>
+                <td v-if="prescription.mode_id != 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/'}}</span></td>
+                <td v-if="prescription.mode_id != 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/" }}</span></td>
+                <td v-if="prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span></td>
+                <td v-if="prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.displacement_quantity ? monitor.displacement_quantity : "/" }}</span></td>
+                <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "/" }}</span></td>
                 <td style="text-align:left;padding-left:10px;">
                     <div style="line-height:20px;text-align: left;display: inline-block;">
                         &nbsp;{{ monitor.symptom }}{{ monitor.dispose }}{{ monitor.result }}
@@ -376,14 +407,16 @@
             </td> -->
                 <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
                 <td height="32px">
-                <span>{{ getAdminUser(advice.advice_doctor) }}</span>
+                    <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{ getAdminUser(advice.advice_doctor) }}</span>
+                    <img style="height:30px" :src="setAdminUserES(advice.advice_doctor)" alt="" srcset="" v-else />
                 </td>
                 <!-- <td height="35px">
             <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
             <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
             </td> -->
                 <td height="32px">
-                <span>{{ getAdminUser(advice.execution_staff) }}</span>
+                    <span v-if="setAdminUserES(advice.execution_staff) == ''">{{ getAdminUser(advice.execution_staff) }}</span>
+                    <img style="height:30px" :src="setAdminUserES(advice.execution_staff)" alt="" srcset="" v-else />
                 </td>
                 <td height="32px">
                 <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>

src/xt_pages/hospitalStation/components/inquiriesDetail.vue

@@ -110,8 +110,8 @@
       :visible.sync="innerVisible"
       append-to-body>
 
-      <print v-if="activeName == 'first'" :paramsObj='paramsObj'></print>
-      <recordPrint v-if="activeName == 'second'" :patientid="patientid"></recordPrint>
+      <print v-if="activeName == 'first'" :paramsObj='paramsObj' :showBtn='true'></print>
+      <recordPrint v-if="activeName == 'second'" :patientid="patientid" :showBtn='true'></recordPrint>
     </el-dialog>
   </el-dialog>
 </div>

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -59,7 +59,7 @@
                               ref="tab"
                     >
                         <el-table-column prop="name" label="姓名" width='89'>
-                            <template slot-scope="scope">{{scope.row.name}}</template>
+                            <template slot-scope="scope">{{ scope.$index + 1 }}. {{scope.row.name}}</template>
                         </el-table-column>
                         <el-table-column prop="name" label="就诊号" width="110">
                             <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}</template>

src/xt_pages/hospitalStation/print.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <!-- <template>
+        <template v-if="showBtn">
           <el-button
             style="float:right;"
             :loading="loading"
@@ -10,7 +10,7 @@
             type="primary"
             >打印</el-button
           >
-        </template> -->
+        </template>
 
         <div class='dialysisPage' style="padding-top:40px;">
             <div v-if="org_id != 10138">
@@ -47,7 +47,8 @@
       printFour
     },
     props:{
-      paramsObj:Object
+      paramsObj:Object,
+      showBtn:Boolean
     },
     data() {
       return {

src/xt_pages/hospitalStation/recordPrint.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <template>
+    <template v-if="showBtn">
       <el-button
         style="position:fixed;right:25px;z-index:999"
         size="small"
@@ -35,6 +35,7 @@ export default {
   },
   props:{
     patientid:Number,
+    showBtn:Boolean
   },
   data() {
     return {

src/xt_pages/hospitalStation/template/printOne.vue

@@ -23,7 +23,7 @@
               <div class="Rp">Rp:</div>
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
                   <!-- <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;{{it.drug.drug_spec}}&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 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}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
                   <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">

src/xt_pages/management/components/UserForm.vue

@@ -1670,6 +1670,8 @@ export default {
 
       this.$refs[formName].validate(valid => {
         if (valid) {
+          console.log("hhhh23233323",this.userform)
+       
           UpdateForm(this.userform).then(response => {
             if (response.data.state === 1) {
               var information = response.data.data.information;

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -163,7 +163,6 @@
                 <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
                              :hisPatientInfo="hisPatientInfo" v-if="titleType == '电子病历'" :detalid="detalid"
                              ref="child"></desk-record>
-c
                 <medicalRecord ref='medicalRecord' @func="getMsgFormSon"></medicalRecord>
                 <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
                 <!--<dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid'></dialysis-index>-->

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -23,7 +23,7 @@
               <div class="Rp">Rp:</div>
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
                   <!-- <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;{{it.drug.drug_spec}}&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 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}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
                   <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">

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

@@ -224,20 +224,19 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-     var start = window.sessionStorage.getItem('start_in_time')
-     console.log("start23323232322323",start)
-      var end =  window.sessionStorage.getItem('end_in_time')
-     if(start!= "null"){
-        console.log("hh232h23h32h3232322323")
-        this.start_time = start
-     }
      
+    var start_time =  window.sessionStorage.getItem('drug_start_in_time')
     
-     if(end != "null"){
-       
-        this.end_time = end
-     }
-   
+    var end_time =  window.sessionStorage.getItem('drug_end_in_time')
+    if(start_time !=null){
+      console.log("hh232323232红红火火")
+      this.start_time = start_time
+    }
+    if(end_time!=null){
+      this.end_time = end_time
+    }
+    window.sessionStorage.removeItem('drug_start_in_time')
+    window.sessionStorage.removeItem('drug_end_in_time')  
     this.GetConfigInfo()
     this.fetchAllAdminUsers()
     //获取入库单数据
@@ -333,6 +332,7 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.start_time = "";
       } else {
+        window.sessionStorage.setItem('drug_start_in_time',this.start_time)
         this.getlist()
         this.getDrugWarehouseInfoPrint()
       }
@@ -343,6 +343,7 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
+        window.sessionStorage.setItem('drug_end_in_time',this.end_time)
         this.getlist()
         this.getDrugWarehouseInfoPrint()
       }
@@ -460,8 +461,8 @@ export default {
       })
     },
     PrintAction(){
-      window.sessionStorage.setItem('start_in_time',this.start_time)
-      window.sessionStorage.setItem('end_in_time',this.end_time)
+      window.sessionStorage.setItem('drug_start_in_time',this.start_time)
+      window.sessionStorage.setItem('drug_end_in_time',this.end_time)
       this.$router.push("/stock/drugprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+this.order_type+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
     },
     select(){

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

@@ -179,7 +179,7 @@
             {{scope.row.count}}
           </template>
         </el-table-column>
-        <el-table-column label="总价" align="center">
+        <el-table-column label="总价5555" align="center">
           <template slot-scope="scope">
             <!-- {{scope.row.price * scope.row.count}} -->
             {{scope.row.total_price}}
@@ -232,15 +232,15 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-    var start = window.sessionStorage.getItem('start_out_time')
+    var start_time = window.sessionStorage.getItem('start_out_time')
     console.log("start",start)
-     var end =  window.sessionStorage.getItem('end_out_time')
-    if(start!="null"){
-       this.start_time = start   
+     var end_time =  window.sessionStorage.getItem('end_out_time')
+    if(start_time!=null){
+       this.start_time = start_time   
     }
-    if(end!="null"){
+    if(end_time!=null){
      
-      this.end_time = end
+      this.end_time = end_time
     }
     
     this.getDrugOutOrderPrint()
@@ -401,8 +401,8 @@ export default {
       }
     },
     PrintAction: function() {
-       window.sessionStorage.setItem('start_out_time',this.start_time)
-       window.sessionStorage.setItem('end_out_time',this.end_time)
+      //  window.sessionStorage.setItem('start_out_time',this.start_time)
+      //  window.sessionStorage.setItem('end_out_time',this.end_time)
        this.$router.push("/stock/drugoutorderprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+2+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
     },
     getlist(){

src/xt_pages/stock/drugs/drugInventory.vue

@@ -1,10 +1,10 @@
 <template>
-  <div class="main-contain">
+  <div class="main-contain" style="height:100%;">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
-    <div class="app-container">
-        <el-tabs v-model="activeName">
+    <div class="app-container" style="height: calc(100vh - 118px);overflow: hidden;">
+        <el-tabs v-model="activeName" style="height: 100%;display: flex;flex-direction: column;">
             <el-tab-pane label="药品盘点" name="first">
                 <drug-inventory></drug-inventory>
             </el-tab-pane>
@@ -77,4 +77,7 @@ export default {
 ::-webkit-scrollbar{
     height: 20px !important;
 }
+.el-tabs__content{
+  overflow-y: auto;
+}
 </style>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -630,7 +630,6 @@ export default {
       } else {
         this.GetWarehouseOut();
       }
-      this.GetWarehouseOut();
     },
     endTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);

src/xt_pages/stock/drugs/inventory.vue

@@ -1,572 +1,91 @@
 <template>
-    <div>
-        <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
-            <div>
-                <el-input
-                size="small"
-                style="width: 200px;margin-left:10px;"
-                class="filter-item"
-                v-model.trim="searchKey"
-                placeholder="请输入单据编号或操作人姓名"
-                />
-                <el-button
-                size="small"
-                class="filter-item"
-                type="primary"
-                icon="el-icon-search"
-                @click="search"
-                >搜索</el-button
-                >
-                <el-date-picker
-                size="small"
-                v-model="start_time"
-                type="date"
-                style="margin-left:5px;width:140px;"
-                placeholder="选择日期"
-                @change="changeStartTime">
-                </el-date-picker>
-                <el-date-picker
-                size="small"
-                v-model="end_time"
-                type="date"
-                style="margin-left:5px;width:140px;"
-                placeholder="选择日期"
-                @change="changeEndTime">
-                </el-date-picker>
-            </div>
-            <div>
-                <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
-                <el-button size="small" type="primary" @click="toCheck">核对</el-button>
-                <!-- <el-button size="small" type="primary" @click="print">打印</el-button>
-                <el-button size="small" type="primary" @click="exportList">导出</el-button> -->
-            </div>
-        </div>
-        <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"  @selection-change="changePrice">
-           <el-table-column type="selection" width="55" align="center"> </el-table-column>
-            <el-table-column prop="date" label="盘点编号" align="center">
-                <template slot-scope="scope">
-                  {{scope.row.warehousing_order}}
-                </template>
-            </el-table-column>
-            <el-table-column prop="date" label="盘点日期" align="center">
-                <template slot-scope="scope">
-                  {{getTime(scope.row.start_time)}}
-                </template>
-            </el-table-column>
-            <el-table-column prop="date" label="药品名称" align="center">
+  <div>
+    <div>日期：2021-10-13    盘点人：赵强</div>
+    <el-collapse v-model="activeNames">
+      <el-collapse-item :name="index" v-for="(item,index) in 10" :key="index">
+        <template slot="title">
+          一致性 Consistency <el-button type="warning" icon="el-icon-remove" style="margin-left:20px;">移除</el-button>
+        </template>
+        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" style="width:100%">
+              <el-table-column prop="date" label="药品名称" width="200" align="center">
                 <template slot-scope="scope">
                   {{scope.row.drug_name}}
                 </template>
-            </el-table-column>
-            <el-table-column prop="date" label="药品规格" align="center">
+              </el-table-column>
+              <el-table-column  prop="name" label="规格" width="100"  align="center">
                 <template slot-scope="scope">
                   {{scope.row.specification_name}}
                 </template>
-            </el-table-column>
-            <el-table-column prop="name" label="盘点数量" align="center">
-                <template slot-scope="scope">
-                  {{scope.row.count}}{{scope.row.warehousing_unit}}<span v-if="scope.row.min_count>0">{{scope.row.min_count}}{{scope.row.min_unit}}</span>
-                </template>
-            </el-table-column>
-            <el-table-column prop="name" label="盘点人" align="center">
-                <template slot-scope="scope">
-                  {{getDoctorName(scope.row.creater)}}
-                </template>
-            </el-table-column>
-            <el-table-column prop="name" label="审核日期" align="center">
-                <template slot-scope="scope">
-                  {{getTime(scope.row.checker_time)}}
-                </template>
-            </el-table-column>
-            <el-table-column prop="name" label="审核人" align="center">
-                <template slot-scope="scope">
-                   {{getDoctorName(scope.row.checker)}}
-                </template>
-            </el-table-column>
-            <el-table-column prop="name" label="状态" align="center">
-              <template slot-scope="scope">
-                 <span v-if="scope.row.checker_status == 1">盘点完成</span>
-                 <span v-if="scope.row.checker_status == 2">正在盘点</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="260">
-                <template slot-scope="scope">
-                  <el-button type="primary" size="small" @click="editInventory(scope.row.id,scope.row.checker_status,scope.$index)">编辑</el-button>
-                  <el-button type="danger" size="small" @click="deleteDrugInventory(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
-                 
+              </el-table-column>
+              <el-table-column prop="name" label="单位" width="100"  align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.warehousing_unit}}
                 </template>
-            </el-table-column>
-        </el-table>
-        <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :page-sizes="[10, 20, 40, 100]"
-            :page-size="10"
-            background
-            style="margin-top:20px;text-align: right"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total"
-        >
-        </el-pagination>
-        <el-dialog
-        title="药品盘点"
-        :visible.sync="dialogVisible"
-        width="1200px"
-        class="addDrugsDialog">
-            <el-form :model="form" class="modifyDialog" label-width="120px">
-                <el-form-item label="药品ID">
-                    <el-input v-model="form.drug_id" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="药品名称">
-                  <el-autocomplete
-                    class="checkSearch"
-                    popper-class="my-autocomplete"
-                    v-model="form.drug_name"
-                    :fetch-suggestions="querySearchAsync"
-                    :trigger-on-focus="true"
-                    placeholder="请输入药品名称"
-                    @select="handleSelect"
-                    style="width:160px;"
-                  >
-                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
-                  <template slot-scope="{ item }">
-                    <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + "  "+item.manufacturer}}</div>
-                  </template>
-                 </el-autocomplete>  
-                </el-form-item>
-                <el-form-item label="批次">
-                  <el-select v-model="form.batch_number" filterable placeholder="请选择" @change="changeNumber">
-                      <el-option
-                        v-for="(item,index) in numberList"
-                        :key="index"
-                        :label="item.batch_number"
-                        :value="item.id">
-                      </el-option>
-                  </el-select>
-                </el-form-item>
-         
-                <el-form-item label="规格">
-                    <el-input v-model="form.specification_name" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="进货价">
-                    <el-input v-model="form.last_price" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="零售价">
-                    <el-input v-model="form.retail_price" :disabled="true"></el-input>
-                </el-form-item>
-
-                <div style="width:100%;display:flex;">
-                    <el-form-item prop="dose" label="盘点数量" style="width:100%;">
-                      <el-input v-model="form.count" type="number" style="width:160px;" placeholder="盘点数量"></el-input>
-                      <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="最大单位" :disabled="true">
-                      <el-option
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
-                        :key="index"
-                        :label="item.name"
-                        :value="item.name">
-                      </el-option>
-                    </el-select>
-                    <el-input v-model="form.min_count"  style="width:160px;margin-left:10px" placeholder="盘点数量" ></el-input>
-                    <el-select v-model="form.min_unit"  style="width:160px;" placeholder="最小单位" :disabled="true">
-                      <el-option
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
-                        :key="index"
-                        :label="item.name"
-                        :value="item.name">
-                      </el-option>
-                    </el-select>
-                    </el-form-item>
-                      
-                </div>
-
-                <el-form-item label="库存">
-                    <el-input v-model="form.total" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="产地">
-                    <el-input v-model="form.drug_origin_place" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="批准文号">
-                    <el-input v-model="form.number" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="生产厂商">
-                    <el-input v-model="form.manufacturer" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="备注">
-                    <div style="display:flex;">
-                        <el-input v-model="form.name"></el-input>
-                        <el-button style="margin-left:5px;" type="primary" @click="addInventory">添加</el-button>
-                    </div>
-                </el-form-item>
-            </el-form>
-            <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-                <el-table-column prop="date" label="耗材ID" width="100" align="center">
-                    <template slot-scope="scope">
-                       {{scope.row.drug_id}}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="date" label="耗材名称" width="100" align="center">
-                   <template slot-scope="scope">
-                       {{scope.row.drug_name}}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="name" label="规格" width="100" align="center">
-                   <template slot-scope="scope">
-                       {{scope.row.specification_name}}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="name" label="单位" width="100" align="center">
-                     <template slot-scope="scope">
-                       {{scope.row.warehousing_unit}}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="name"  label="盘点数量" width="100" align="center">
-                     <template slot-scope="scope">
-                       {{scope.row.count}}{{scope.row.warehousing_unit}}{{scope.row.min_count}}{{scope.row.min_unit}}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="name" label="原进货价" width="100" align="center">
-                   <template slot-scope="scope">
-                       {{scope.row.last_price}}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="name" label="原零售价" width="100" align="center">
-                    <template slot-scope="scope">
-                       {{scope.row.retail_price}}
-                    </template>
-                </el-table-column>
-             
-                <el-table-column  prop="name" label="生产厂商" width="100" align="center">
-                    <template slot-scope="scope">
-                       {{scope.row.manufacturer}}
-                    </template> 
-                </el-table-column>
-                <el-table-column prop="name" label="产地"  width="100" align="center">
+              </el-table-column>
+              <el-table-column prop="name" label="库存数量" width="100"  align="center">
                   <template slot-scope="scope">
-                       {{scope.row.drug_origin_place}}
+                    {{scope.row.total}}
                   </template> 
-                </el-table-column>
-                <el-table-column prop="name" label="批准文号" width="100" align="center">
-                 <template slot-scope="scope">
-                       {{scope.row.number}}
+              </el-table-column>
+              <el-table-column prop="name" label="进价" width="100"  align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.last_price}}
                   </template> 
-                </el-table-column>
-                <el-table-column prop="name" label="备注" width="100" align="center">
-                    <template slot-scope="scope">
-                       {{scope.row.remark}}
-                    </template> 
-                </el-table-column>
-                <el-table-column
-                fixed="right"
-                width="100"
-                label="操作">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small" @click="toEdit(scope.row,scope.$index)">编辑</el-button>
-                        <el-button type="text" size="small" @click="toDelete(scope.$index)">删除</el-button>
-                       
-                    </template>
-                </el-table-column>
-            </el-table>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="saveDrugInventory">确 定</el-button>
-            </span>
-        </el-dialog>
-
-
-          <el-dialog
-            title="库房调价"
-            :visible.sync="editdialogVisible"
-            width="1200px">
-            <el-form :model="form" class="modifyDialog" label-width="120px">
-
-                <el-form-item label="耗材ID">
-                    <el-input v-model="form.drug_id" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="药品名称">
-                  <el-autocomplete
-                    class="checkSearch"
-                    popper-class="my-autocomplete"
-                    v-model="form.drug_name"
-                    :fetch-suggestions="querySearchAsync"
-                    :trigger-on-focus="true"
-                    placeholder="请输入药品名称"
-                    @select="handleSelect"
-                    style="width:160px;"
-                  >
-                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
-                  <template slot-scope="{ item }">
-                    <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + "  "+item.manufacturer}}</div>
-                  </template>
-                 </el-autocomplete>  
-                </el-form-item>
-                <el-form-item label="规格">
-                    <el-input v-model="form.specification_name" :disabled="true"></el-input>
-                </el-form-item>
-               <el-form-item label="批次">
-                  <el-select v-model="form.batch_number" filterable placeholder="请选择" @change="changeNumber">
-                      <el-option
-                        v-for="(item,index) in numberList"
-                        :key="index"
-                        :label="item.batch_number"
-                        :value="item.id">
-                      </el-option>
-                  </el-select>
-                </el-form-item>
-              
-                <el-form-item label="进货价">
-                    <el-input v-model="form.last_price" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="零售价">
-                    <el-input v-model="form.retail_price" :disabled="true"></el-input>
-                </el-form-item>
-
-                <div style="width:100%;display:flex;">
-                    <el-form-item prop="dose" label="盘点数量" style="width:100%;">
-                      <el-input v-model="form.count" type="number" style="width:160px;" placeholder="盘点数量"></el-input>
-                      <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="最大单位" :disabled="true">
-                      <el-option
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
-                        :key="index"
-                        :label="item.name"
-                        :value="item.name">
-                      </el-option>
-                    </el-select>
-                    <el-input v-model="form.min_count"  style="width:160px;margin-left:10px" placeholder="盘点数量" ></el-input>
-                    <el-select v-model="form.min_unit"  style="width:160px;" placeholder="最小单位" :disabled="true">
-                      <el-option
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
-                        :key="index"
-                        :label="item.name"
-                        :value="item.name">
-                      </el-option>
-                    </el-select>
-                 </el-form-item>
-                </div>
-                <el-form-item label="库存">
-                    <el-input v-model="form.total" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="产地">
-                    <el-input v-model="form.drug_origin_place"></el-input>
-                </el-form-item>
-                <el-form-item label="批准文号">
-                    <el-input v-model="form.number"></el-input>
-                </el-form-item>
-                <el-form-item label="生产厂商">
-                    <el-input v-model="form.manufacturer"></el-input>
-                </el-form-item>
-                <el-form-item label="备注">
-                    <div style="display:flex;">
-                        <el-input v-model="form.remark"></el-input>
-                    </div>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="editdialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="saveInventory">确 定</el-button>
-            </span>
-        </el-dialog>
-
-      <el-dialog
-        title="药品盘点核对"
-        :visible.sync="checkDialogVisible"
-        width="30%"
-        >
-        <span>
-          <el-form :model="form">
-            <el-row>
-              <el-col>
-                <el-form-item label="核对时间">
-                 <el-date-picker
-                    size="small"
-                    v-model="check_time"
-                    type="date"
-                    style="margin-left:5px;width:140px;"
-                    placeholder="选择日期">
-                  </el-date-picker>
-                </el-form-item>  
-              </el-col>
-            </el-row>  
-             <el-row>
-              <el-col>
-                <el-form-item label="核对人">
-                  <el-select v-model="checker" placeholder="请选择">
-                    <el-option
-                    v-for="item in doctorList"
-                    :key="item.admin_user_id"
-                    :label="item.user_name"
-                    :value="item.admin_user_id">
-                    </el-option>
-                 </el-select>
-                </el-form-item>  
-              </el-col>
-            </el-row>  
-          </el-form>  
-        </span>
-        <span slot="footer" class="dialog-footer">
-            <el-button @click="checkDialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="SaveDrugCheckedInventory">保 存</el-button>
-        </span>
-    </el-dialog>
-
-
-       <el-dialog
-            title="库房调价"
-            :visible.sync="modifydialogVisible"
-            width="1200px">
-            <el-form :model="form" class="modifyDialog" label-width="120px">
-
-                <el-form-item label="耗材ID">
-                    <el-input v-model="form.drug_id"></el-input>
-                </el-form-item>
-                <el-form-item label="药品名称">
-                  <el-autocomplete
-                    class="checkSearch"
-                    popper-class="my-autocomplete"
-                    v-model="form.drug_name"
-                    :fetch-suggestions="querySearchAsync"
-                    :trigger-on-focus="true"
-                    placeholder="请输入药品名称"
-                    @select="handleSelect"
-                    style="width:160px;"
-                  >
-                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
-                  <template slot-scope="{ item }">
-                    <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + "  "+item.manufacturer}}</div>
-                  </template>
-                 </el-autocomplete>  
-                </el-form-item>
-                <el-form-item label="规格">
-                    <el-input v-model="form.specification_name" :disabled="true"></el-input>
-                </el-form-item>
-                <!-- <el-form-item label="单位">
-                    <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
-                </el-form-item> -->
-                <!-- <el-form-item prop="warehousing_unit" label="单位">
-                    <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="单位" @change="changeMaxUnit">
-                      <el-option
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
-                        :key="index"
-                        :label="item.name"
-                        :value="item.name">
-                      </el-option>
-                    </el-select>
-                </el-form-item> -->
-                <el-form-item label="进货价">
-                    <el-input v-model="form.last_price" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="零售价">
-                    <el-input v-model="form.retail_price" :disabled="true"></el-input>
-                </el-form-item>
-                <!-- <el-form-item label="盘点数量">
-                    <el-input v-model="form.count"></el-input>
-                </el-form-item> -->
-              
-                <div style="width:100%;display:flex;">
-                    <el-form-item prop="dose" label="盘点数量" style="width:100%;">
-                      <el-input v-model="form.count" type="number" style="width:160px;" placeholder="盘点数量"></el-input>
-                      <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="最大单位" :disabled="true">
-                      <el-option
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
-                        :key="index"
-                        :label="item.name"
-                        :value="item.name">
-                      </el-option>
-                    </el-select>
-                    <el-input v-model="form.min_count"  style="width:160px;margin-left:10px" placeholder="盘点数量" ></el-input>
-                    <el-select v-model="form.min_unit"  style="width:160px;" placeholder="最小单位" :disabled="true">
-                      <el-option
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
-                        :key="index"
-                        :label="item.name"
-                        :value="item.name">
-                      </el-option>
-                    </el-select>
-                 </el-form-item>
-                </div>
-                <el-form-item label="库存">
-                    <el-input v-model="form.total" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="产地">
-                    <el-input v-model="form.drug_origin_place" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="批准文号">
-                    <el-input v-model="form.number" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="生产厂商">
-                    <el-input v-model="form.manufacturer" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="备注">
-                    <div style="display:flex;">
-                        <el-input v-model="form.remark"></el-input>
-                    </div>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="modifydialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="modifyInventory">确 定</el-button>
-            </span>
-        </el-dialog>
-
-
-         <el-dialog
-            title="校正"
-            :visible.sync="profdialogVisible"
-            width="1200px">
-            <el-form :model="form" class="modifyDialog" label-width="120px">
-
-                <el-form-item label="药品名称">
-                  <el-autocomplete
-                    class="checkSearch"
-                    popper-class="my-autocomplete"
-                    v-model="form.drug_name"
-                    :fetch-suggestions="querySearchAsync"
-                    :trigger-on-focus="true"
-                    placeholder="请输入药品名称"
-                    @select="handleSelect"
-                    style="width:160px;"
-                  >
-                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
-                  <template slot-scope="{ item }">
-                    <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + "  "+item.manufacturer}}</div>
-                  </template>
-                 </el-autocomplete>  
-                </el-form-item>
-                <!-- <el-form-item label="单位">
-                    <el-input v-model="form.warehousing_unit"></el-input>
-                </el-form-item> -->
-                <el-form-item prop="warehousing_unit" label="单位">
-                    <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="单位" @change="changeMaxUnit">
-                      <el-option
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
-                        :key="index"
-                        :label="item.name"
-                        :value="item.name">
-                      </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="盘点数量">
-                    <el-input v-model="form.count"></el-input>
-                </el-form-item>
-                <el-form-item label="校正数量">
-                    <el-input v-model="form.proof_count" type="number"></el-input>
-                </el-form-item>
-              
-                <el-form-item label="库存">
-                    <el-input v-model="form.total" :disabled="true"></el-input>
-                </el-form-item>
+              </el-table-column>
+              <el-table-column prop="name" label="零售价" width="100"  align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.retail_price}}
+                  </template> 
+              </el-table-column>
+              <el-table-column prop="name"  label="零售总价" width="100"  align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.count * scope.row.retail_price}}
+                  </template> 
+              </el-table-column>
+              <el-table-column prop="name" label="产地" width="100"  align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.drug_origin_place}}
+                  </template> 
+              </el-table-column>
+              <el-table-column prop="name" label="生产厂商" width="100"  align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.manufacturer}}
+                  </template> 
+              </el-table-column>
+              <el-table-column prop="name" label="实盘点" width="100"  align="center">
+                <template slot-scope="scope">
+                    {{scope.row.count}}{{scope.row.warehousing_unit}} <span v-if="scope.row.min_count">{{scope.row.min_count}}{{scope.row.min_unit}}</span>
+                  </template> 
+              </el-table-column>
+              <!-- <el-table-column  prop="name" label="亏损价格" width="100"  align="center">
+                <template slot-scope="scope">
                 
-                <el-form-item label="备注">
-                    <div style="display:flex;">
-                        <el-input v-model="form.remark"></el-input>
-                    </div>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="profdialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="proofInventory">确 定</el-button>
-            </span>
-        </el-dialog>
-    </div>
+                  </template>  
+              </el-table-column> -->
+              <el-table-column prop="name" label="生产日期" width="100"  align="center">
+                  <template slot-scope="scope">
+                    {{getTime(scope.row.product_date)}}
+                  </template>  
+              </el-table-column>
+              <el-table-column prop="name" label="有效日期" width="100"  align="center">
+                  <template slot-scope="scope">
+                    {{getTime(scope.row.expiry_date)}}
+                  </template>  
+              </el-table-column>
+              <!-- <el-table-column
+              fixed="right"
+              width="100"
+              label="操作">
+                  <template slot-scope="scope">
+                      <el-button type="text" size="small">删除</el-button>
+                      <el-button type="text" size="small">编辑</el-button>
+                  </template>
+              </el-table-column> -->
+          </el-table>
+      </el-collapse-item>
+    </el-collapse>
+    <el-input v-model="input" placeholder="请输入内容"></el-input>
+  </div>
 </template>
 
 <script>
@@ -583,7 +102,7 @@ export default {
             value2:'',
             tableData: [],
             dialogVisible:false,
-           form: {
+            form: {
                 id:"",
                 drug_name: '',
                 retail_price :'',
@@ -634,6 +153,15 @@ export default {
             profdialogVisible:false,
             index:"",
             unitList:[],
+            reasonList:[
+              {id:0,name:"默认"},
+              {id:1,name:"到期退货"},
+              {id:2,name:"异常退货"},
+              {id:3,name:"退货"},
+              {id:4,name:"人为损坏"},
+              {id:5,name:"不计入报损分析"},
+            ],
+            activeNames: [0]
         }
     },
     methods:{

src/xt_pages/stock/stockInOrderAdd.vue

@@ -86,10 +86,9 @@
               <span>批号</span>
             </template>
             <template slot-scope="scope">
-              <el-form-item style="padding-top: 20px">
+              <el-form-item style="padding-top: 20px" >
                 <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
               </el-form-item>
-
             </template>
           </el-table-column>
 
@@ -285,6 +284,9 @@
 
           good_id: [
             { validator: checkGoodId, trigger: 'blur' }
+          ],
+          number:[
+            { required: true, message: '批号不能为空', trigge: 'blur' }
           ]
 
         },

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -120,18 +120,20 @@
           
           <el-table-column  width="150" align="center">
              <template slot="header" slot-scope="scope">
-              <span>批号<span style="color: red"></span></span>
+              <span>批号<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-               <!-- <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input> -->
-                <el-select v-model="scope.row.number" filterable placeholder="请选择">
+              <el-form-item  
+                :rules="tableRules.number">
+                <el-select v-model="scope.row.number" filterable placeholder="请选择" @change="changeNumberList(scope.row)">
                   <el-option
                     v-for="(item,index) in numberList"
                     :key="index"
                     :label="item.number"
-                    :value="item.number">
+                    :value="item.id">
                   </el-option>
                 </el-select>
+              </el-form-item>
             </template>
           </el-table-column>
 
@@ -324,7 +326,8 @@ export default {
       },
       tableRules: {
         price: [{ required: true, message: "单价不能为空", trigger: "blur" }],
-        count: [{ required: true, message: "数量不能为空", trigge: "blur" }]
+        count: [{ required: true, message: "数量不能为空", trigge: "blur" }],
+        number:[{ required: true, message: "批号不能为空",trigge:"blur"}],
       },
       ruleForm: {
         manufacturer: [
@@ -456,10 +459,10 @@ export default {
       tempObj["good_unit"] = "";
       tempObj["number"] = ""
       tempObj["specification_name"] = ""
-      tempObj["number"] = ""
       tempObj["expiry_date"] = ""
       tempObj["product_date"] = ""
       tempObj["license_number"] = ""
+      tempObj["warehouse_info_id"] = 0
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -587,6 +590,7 @@ export default {
            
              this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
           }
+          console.log("批次好",this.numberList)
           for(let i=0;i<this.recordInfo.recordData.length;i++){
             for(let j=0;j<this.manufacturerList.length;j++){
               if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
@@ -598,12 +602,18 @@ export default {
                   this.recordInfo.recordData[i].dealer = this.dealerList[z].id
               }
             }
+          
+            for(let y=0;y<this.numberList.length;y++){
+               if(this.recordInfo.recordData[i].number == this.numberList[y].id){
+                   this.recordInfo.recordData[i].number = this.numberList[y].number
+               }
+            }
           }
           const params = {
             stockOut: this.recordInfo.recordData
           };
           console.log("2323223223",this.recordInfo.recordData);
-          
+     
           postWarehouseOut(
             params,
             this.warehouse_out_time,
@@ -619,7 +629,7 @@ export default {
                var msg = response.data.data.msg
                var good_name = response.data.data.good_name
                var specification_name = response.data.data.specification_name
-               var str = good_name +"*" + specification_name +"无库存,请入库"
+               var str = good_name +"*" + specification_name +"该批次无库存,请入库"
                console.log("msg222222222",msg)
                if(msg == 1){
                   this.$message.error(str)
@@ -711,9 +721,7 @@ export default {
          }
 
        
-      }
-
-       
+      }    
     },
 
     getStockBatchNumber(id){
@@ -731,6 +739,15 @@ export default {
     getDataConfig(module, filed_name) {
       return getDataConfig(module, filed_name)
     },
+    changeNumberList(val){
+       console.log("val232332323223232332",val)
+       for(let i=0;i<this.recordInfo.recordData.length;i++){
+         if(val.good_id == this.recordInfo.recordData[i].good_id){
+            this.recordInfo.recordData[i].warehouse_info_id = val.number
+         }
+       }  
+      console.log("表格",this.recordInfo.recordData)
+    }
   },
   created() {
     var nowDate = new Date();
@@ -752,9 +769,9 @@ export default {
     tempObj["good_unit"] = ""
     tempObj["number"] = ""
     tempObj["specification_name"] = ""
-    tempObj["number"] = ""
     tempObj["dealer"] = ""
     tempObj["license_number"] = ""
+    tempObj["warehouse_info_id"] = 0
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/workforce/remind_print_setting.vue

@@ -20,18 +20,18 @@
           <div class="table_panel">
             <div v-for="(main_collection,index) in scheduleData" :key="index" style="page-break-after: always;">
               <div class="signPrint">
-                <div>分区/床位号:{{main_collection.zone.name}}/{{main_collection.number.number}}</div> 
+                <div>分区/床位号:{{main_collection.zone.name}}/{{main_collection.number.number}}</div>
                 <div>姓名:
-                  <span v-if="type ==1">{{main_collection.patient.name}} </span> 
-                  <span v-if="type ==2">{{main_collection.patient}} </span> 
-                </div> 
-                <div>抗凝剂: 
+                  <span v-if="type ==1">{{main_collection.patient.name}} </span>
+                  <span v-if="type ==2">{{main_collection.patient}} </span>
+                </div>
+                <div>抗凝剂:
                   <span v-if="org_id == 10138">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
                   <span v-else >{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name: ''}}</span>
-                </div> 
+                </div>
                <div v-if="org_id == 10188">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
                 <div v-if="org_id == 10188">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
-                <div>用量:  
+                <div>用量:
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 3">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
@@ -43,11 +43,11 @@
                   <span v-if="main_collection.dialysissolution.anticoagulant == 9">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 10">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
-                </div> 
+                </div>
                 <div v-if="org_id == 10188">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
                 <div v-if="org_id == 10188">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
                 <div v-if="org_id == 10188">体重增加:{{(main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight).toFixed(2)}}</div>
-                <div>用法:静脉注射</div> 
+                <div>用法:静脉注射</div>
                 <div>打印时间:{{currentDate}}</div>
               </div>
            </div>
@@ -64,7 +64,7 @@
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
-  const moment = require('moment') 
+  const moment = require('moment')
   export default {
     name: 'SchedulePrint',
     data() {
@@ -97,20 +97,20 @@
       BreadCrumb
     },
     created() {
-      console.log("type2323233223232",this.$route.query.type)  
+      // console.log("type2323233223232",this.$route.query.type)
      this.type = this.$route.query.type
      this.getPrintList()
      this.org_id = this.$store.getters.xt_user.org.id
      console.log("机构ID",this.org_id)
      this.currentDate = this.getCurrentDate()
-   
+
      this.modeOptions = this.$store.getters.treatment_mode
      this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
     this.week_type = this.$route.query.week_type
     this.week_time  = this.$route.query.week_time
     this.zone = this.$route.query.zone
     this.pre_status = this.$route.query.prestatus
-    
+
     if(parseInt(this.$route.query.type) == 1){
       const params = {
           week_type:this.week_type,
@@ -128,7 +128,7 @@
            var arr = list.sort(this.compare('sort'))
             console.log("Arr222222",arr)
            this.scheduleData = arr
-            
+
              let a = response.data.data.day
               console.log("a",a)
               var myDate = new Date(a);
@@ -171,7 +171,7 @@
     if(parseInt(this.$route.query.type) == 2){
        this.getNextScheduleWeekDay()
     }
-    
+
     },
     methods: {
       getAdvice:function(doctor_advice) {
@@ -299,8 +299,8 @@
           var str = year + "年" + month + "月" + day + "日  " + days;
           return str;
         }
-        
-        
+
+
       },
 
        compare(property) {
@@ -337,7 +337,7 @@
         // var arr = newArr.join(",")
         // var str = ""
         // if(this.zone == 0){
-        //    str = arr  
+        //    str = arr
         // }
         // if(zone != 0){
         //   str = zone.join(",")
@@ -360,23 +360,23 @@
         this.scheduleData = [];
         if (response.data.state == 1) {
           var scheduleData = response.data.data.schedule;
-      
+
           for(let i=0;i<scheduleData.length;i++){
               scheduleData[i].sort = scheduleData[i].number.sort
           }
             var arr =   scheduleData.sort(this.compare('sort'))
             console.log("元旦快乐",arr)
             this.scheduleData = arr
-          
+
             // var newList = []
             // for(let i=0;i<scheduleData.length;i++){
             //   if(scheduleData.prescription.id > 0){
             //      newList.push(scheduleData[i])
-            //   } 
+            //   }
             // }
             // var arr =   newList.sort(this.compare('sort'))
             // console.log("元旦快乐",arr)
-            // this.scheduleData = arr 
+            // this.scheduleData = arr
         } else {
           this.$message.error("网络错误");
           return false;