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/template/DialysisPrintOrderTen.vue

@@ -487,6 +487,7 @@
                     </tr>
                     <tr>
                       <td width="60">时间</td>
+                      <td width="50">体温<br />°C</td>
                       <td width="60">血压<br />(mmHg)</td>
                       <td width="50">脉搏<br />(次/分)</td>
                       <td width="50">呼吸<br />(次/分)</td>
@@ -517,6 +518,7 @@
 
                     <tr v-for="(monitor, monindex) in monitors" :key="monindex">
                       <td>{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
+                      <td>{{ monitor.temperature ? monitor.temperature : "" }}</td>
                       <td>
                         {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}
                         {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFive.vue

@@ -72,14 +72,15 @@
                 L
               </span>
               ）
-              <label-box :isChecked="prescription.mode_id > 2 ? true : false" showValue="其他："></label-box>
+              <label-box :isChecked="prescription.mode_id == 9 ? true : false" showValue="HFHD+HP"></label-box>&nbsp;
+              <label-box :isChecked="prescription.mode_id > 2 && prescription.mode_id != 9 ? true : false" showValue="其他："></label-box>
               <span v-if="prescription.mode_id == 3">{{ prescription.mode_id == 3 ? "HD+HP" : "" }}</span>
               <span v-if="prescription.mode_id == 4">{{ prescription.mode_id == 4 ? "HP" : "" }}</span>
               <span v-if="prescription.mode_id == 5">{{ prescription.mode_id == 5 ? "HF" : "" }}</span>
               <span v-if="prescription.mode_id == 6">{{ prescription.mode_id == 6 ? "SCUF" : "" }}</span>
               <span v-if="prescription.mode_id == 7">{{ prescription.mode_id == 7 ? "IUF" : "" }}</span>
               <span v-if="prescription.mode_id == 8">{{ prescription.mode_id == 8 ? "HFHD" : "" }}</span>
-              <span v-if="prescription.mode_id == 9">{{ prescription.mode_id == 9 ? "HFHD+HP" : "" }}</span>
+              <!-- <span v-if="prescription.mode_id == 9">{{ prescription.mode_id == 9 ? "HFHD+HP" : "" }}</span> -->
               <span v-if="prescription.mode_id == 10">{{ prescription.mode_id == 10 ? "PHF" : "" }}</span>
               <span v-if="prescription.mode_id == 11">{{ prescription.mode_id == 11 ? "HFR" : "" }}</span>
               <span v-if="prescription.mode_id == 12">{{ prescription.mode_id == 12 ? "HDF+HP" : "" }}</span>
@@ -681,6 +682,7 @@
             <td colspan="2" style="width:110px;height:40px">医生签名</td>
 
             <td colspan="2" style="width:108px;height:40px">执行</td>
+            <td colspan="2" style="width:108px;height:40px">核对</td>
             <td colspan="3" style="width:130px;height:40px">执行时间</td>
             <!-- <td style="width:60px;height:60px">
               <p style="height:20px;line-height:20px">核对</p>
@@ -726,6 +728,12 @@
               </span>
               <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt srcset v-else />
             </td>
+            <td colspan="2" style="height:40px">
+              <span v-if="setAdminUserES(advice.checker) == ''">
+                {{ getAdminUser(advice.checker) }}
+              </span>
+              <img style="height:30px;" :src="setAdminUserES(advice.checker)" alt srcset v-else />
+            </td>
             <td colspan="3" style="width:130px;">
               {{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}
             </td>
@@ -830,7 +838,7 @@
             <td width="100" style="border:none;padding-left:5px;">
               透析器凝血:
             </td>
-            <td width="100" style="text-align:left;border:none;">
+            <td style="text-align:left;border:none;">
               <div>
                 <span style="width:100px;display:inline-block;border:none;">
                   {{ afterdialysis.cruor ? afterdialysis.cruor : "" }}
@@ -839,7 +847,7 @@
             </td>
             <!-- <td width="10" style="border:none;"></td> -->
 
-            <td width="70" style="border:none;padding-left:5px;">内瘘:</td>
+            <!-- <td width="70" style="border:none;padding-left:5px;">内瘘:</td>
             <td width="200" style="text-align:left;border:none;line-height: 30px;">
               <div>
                 <span style="width:200px;display:inline-block">
@@ -854,7 +862,7 @@
                   {{ afterdialysis.catheter ? afterdialysis.catheter : "" }}
                 </span>
               </div>
-            </td>
+            </td> -->
           </tr>
         </tbody>
       </table>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -3807,6 +3807,9 @@
             if (this.radio == 1) {
               this.all_table_data = this.unique_four(this.all_table_data)
             }
+            console.log("~~~~~~~~~~")
+
+            console.log(this.all_table_data)
 
             switch (this.radio) {
               case 1:

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -387,6 +387,9 @@
                                         <el-table-column label="规格" width="60">
                                             <template slot-scope="scope">{{ scope.row.single_dose }}</template>
                                         </el-table-column>
+                                        <el-table-column label="库存" width="40">
+                                            <template slot-scope="scope">{{ scope.row.total }}</template>
+                                        </el-table-column>
                                         <el-table-column label="单价" width="40">
                                             <template slot-scope="scope">{{ scope.row.price }}</template>
                                         </el-table-column>
@@ -2750,7 +2753,8 @@
                 price: project[i].price,
                 medical_code: project[i].medical_code,
                 unit: project[i].unit,
-                type: 2
+                type: 2,
+                total:project[i].total
               }
 
               this.tabProject.push(obj)
@@ -2763,14 +2767,15 @@
                 id: good_info[i].id,
                 project_name: good_info[i].good_name,
                 statistical_classification: 0,
-                single_dose: 1,
+                single_dose: good_info[i].specification_name,
                 delivery_way: '',
                 execution_frequency: '',
                 number_days: 1,
-                price: good_info[i].retail_price,
+                price: good_info[i].packing_price,
                 medical_code: good_info[i].medical_insurance_number,
                 unit: this.getGoodUnit(good_info[i].good_unit),
-                type: 3
+                type: 3,
+                total:good_info[i].total
               }
               this.tabProject.push(obj)
             }

src/xt_pages/outpatientRegistration/index.vue

@@ -1063,6 +1063,10 @@
                     this.form.id_card_type = 1
                     this.form.settlementValue = 1
 
+                    this.form.register = 4
+                    this.form.registrationFee = 0
+                    this.form.medicalExpenses = 0
+
                   } else {
                     this.$message.error('今日患者已挂号!')
                   }
@@ -1435,6 +1439,10 @@
                       that.form.phone = ''
                       that.form.social_type = ''
 
+                      that.form.register = 4
+                      that.form.registrationFee = 0
+                      that.form.medicalExpenses = 0
+
                       that.form.p_type = 14
                       that.form.sick_type = that.sick[0].id
                       that.form.diagnosis = that.diagnoses[0].id

src/xt_pages/stock/cancelStockOrder.vue

@@ -30,38 +30,39 @@
           @click="search"
           >搜索</el-button
         >
+        <div style="margin-left:10px;">
+          <label class="title"><span class="name">退库时间</span> : </label>
+          <el-date-picker
+            size="small"
+            v-model="start_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="startTimeChange"
+          ></el-date-picker>
+          <span class="cellLine"> - </span>
+          <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>
+        </div>
       </div>
 
-      <div class="cell clearfix">
-        <label class="title"><span class="name">退库时间</span> : </label>
-        <el-date-picker
-          size="small"
-          v-model="start_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="startTimeChange"
-        ></el-date-picker>
-        <span class="cellLine"> - </span>
-        <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>
-      </div>
+      
 
       <div class="filter-container" style="margin-top: 10px">
         <el-checkbox

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -62,7 +62,7 @@
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
        
-          <el-table-column align="center" width="230">
+          <el-table-column align="center" width="230" fixed="left">
              <template slot="header" slot-scope="scope">
               <span>耗材名称</span>
             </template>

src/xt_pages/stock/cancelStockOrderPrint.vue

@@ -17,48 +17,48 @@
           <table class="print-table" border="1">
             <tbody>
             <tr>
-              <td style="line-height: 50px" width="230">耗材名称</td>
-              <td style="line-height: 50px" width="260">品名/注册证号(备案凭证号)</td>
-              <td style="line-height: 50px" width="230">规格型号</td>
-              <td style="line-height: 50px" width="200">生产厂商</td>
-              <td style="line-height: 50px" width="180">批号(序列号)</td>
-              <td style="line-height:50px" width="200">生产日期</td>
-              <td style="line-height: 50px" width="200">有效期</td>
-              <td style="line-height: 50px" width="200">退库数量</td>
-              <td style="line-height: 50px" width="80">单价</td>
-              <td style="line-height: 50px" width="80">总金额</td>
+              <td width="230">耗材名称</td>
+              <td width="260">品名/注册证号(备案凭证号)</td>
+              <td width="230">规格型号</td>
+              <td width="200">生产厂商</td>
+              <td width="180">批号(序列号)</td>
+              <td width="200">生产日期</td>
+              <td width="200">有效期</td>
+              <td width="200">退库数量</td>
+              <td width="80">单价</td>
+              <td width="80">总金额</td>
             </tr>
 
             <tr v-for="(item,i) in it.XtCancelStockInfo" :key="i">
-              <td style="line-height: 50px">
+              <td>
                 <span>{{item.GoodInfo.good_name}}</span>
               </td>
-             <td style="line-height: 50px">
+             <td>
                 <span>{{item.register_account}}</span>
               </td>
-              <td style="line-height: 50px">
+              <td>
                   <span>{{item.GoodInfo.specification_name}}/{{item.GoodInfo.packing_unit}}</span>
               </td>
-              <td style="line-height: 50px">
+              <td>
                   {{item.manufacturer}}
               </td>
-              <td style="line-height: 50px">
+              <td>
                 <span>{{item.number}}</span>
               </td>
-              <td style="line-height:50px">
+              <td>
                   {{(getTime(item.product_date))}}
               </td>
              <td>{{(getTime(item.expiry_date))}}</td>
-             <td  style="line-height:50px">
+             <td>
                {{item.count}}
              </td>
-              <td  style="line-height:50px">
+              <td>
                {{item.price}}
              </td>
              <td> {{(item.count * item.price).toFixed(2)}}</td>
             </tr>
              <tr>
-               <td style="line-height:50px">合计</td>
+               <td>合计</td>
                <td colspan="8"></td>
                <td>{{getAllPrince(it.id).toFixed(2)}}</td>
              </tr>
@@ -74,12 +74,10 @@
             <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
           </div>
           <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
-            <div style="width:50px;">科室：</div><div style="width:60px;"></div>
-            <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
             <div style="width:80px;">审批：</div><div style="width:100px;">肖庆娥</div>
             <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
             <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
-            <div style="width:70px;">制单人：</div><div style="width:100px;">徐立琼</div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;">肖庆娥</div>
           </div>
         </div>
 
@@ -384,7 +382,7 @@
     width: 100%;
     text-align: center;
     border-collapse: collapse;
-    line-height: 40px;
+    line-height: 20px;
     font-size: 14px;
   }
 

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -31,38 +31,39 @@
         @click="search"
         >搜索</el-button
       >
+      <div style="margin-left:10px;">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker
+          size="small"
+          v-model="start_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="startTimeChange"
+        ></el-date-picker>
+        <span class="cellLine"> - </span>
+        <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>
+      </div>
     </div>
 
-    <div class="cell clearfix">
-      <label class="title"><span class="name">日期查询</span> : </label>
-      <el-date-picker
-        size="small"
-        v-model="start_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="startTimeChange"
-      ></el-date-picker>
-      <span class="cellLine"> - </span>
-      <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>
-    </div>
+    
 
     <!-- <div class="cell clearfix">
       <label class="title"><span class="name">单据类型</span> : </label>

src/xt_pages/stock/detail/stockInDetail.vue

@@ -33,38 +33,39 @@
         @click="search"
         >搜索</el-button
       >
+      <div style="margin-left:10px;">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker
+          size="small"
+          v-model="start_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="startTimeChange"
+        ></el-date-picker>
+        <span class="cellLine"> - </span>
+        <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>
+      </div>
     </div>
 
-    <div class="cell clearfix">
-      <label class="title"><span class="name">日期查询</span> : </label>
-      <el-date-picker
-        size="small"
-        v-model="start_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="startTimeChange"
-      ></el-date-picker>
-      <span class="cellLine"> - </span>
-      <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>
-    </div>
+    
 
     <!-- <div class="cell clearfix">
       <label class="title"><span class="name">单据类型</span> : </label>

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -31,38 +31,39 @@
         @click="search"
         >搜索</el-button
       >
+      <div style="margin-left:10px;">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker
+          size="small"
+          v-model="start_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="startTimeChange"
+        ></el-date-picker>
+        <span class="cellLine"> - </span>
+        <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>
+      </div>
     </div>
 
-    <div class="cell clearfix">
-      <label class="title"><span class="name">日期查询</span> : </label>
-      <el-date-picker
-        size="small"
-        v-model="start_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="startTimeChange"
-      ></el-date-picker>
-      <span class="cellLine"> - </span>
-      <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>
-    </div>
+    
 
     <!-- <div class="cell clearfix">
       <label class="title"><span class="name">单据类型</span> : </label>

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -30,38 +30,39 @@
           @click="search"
           >搜索</el-button
         >
+        <div style="margin-left:10px;">
+          <label class="title"><span class="name">退库时间</span> : </label>
+          <el-date-picker
+            size="small"
+            v-model="start_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="startTimeChange"
+          ></el-date-picker>
+          <span class="cellLine"> - </span>
+          <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>
+        </div>
       </div>
 
-      <div class="cell clearfix">
-        <label class="title"><span class="name">退库时间</span> : </label>
-        <el-date-picker
-          size="small"
-          v-model="start_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="startTimeChange"
-        ></el-date-picker>
-        <span class="cellLine"> - </span>
-        <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>
-      </div>
+      
 
       <div class="filter-container" style="margin-top: 10px">
         <el-checkbox
@@ -75,180 +76,179 @@
         <el-button size="small"  type="primary" @click="toExport">导出</el-button>
       </div>
 
-      <el-row :gutter="12" style="margin-top: 10px">
-        <el-table
-          :data="cancelStockDate"
-          :class="signAndWeighBoxPatients"
-          border
-          highlight-current-row
-          ref="multipleTable"
-          @current-change="handleCurrentChangeOne"
-          @selection-change="select"
-          :row-style="{ color: '#303133' }"
-          :header-cell-style="{
-            backgroundColor: 'rgb(245, 247, 250)',
-            color: '#606266'
-          }"
-        >
-          <el-table-column type="selection" width="55"> </el-table-column>
+      <el-table
+        :data="cancelStockDate"
+        :class="signAndWeighBoxPatients"
+        border
+        highlight-current-row
+        ref="multipleTable"
+        @current-change="handleCurrentChangeOne"
+        @selection-change="select"
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+      >
+        <el-table-column type="selection" width="55"> </el-table-column>
 
-          <el-table-column label="单据日期" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.return_time | parseTime("{y}-{m}-{d}") }}
-            </template>
-          </el-table-column>
+        <el-table-column label="单据日期" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.return_time | parseTime("{y}-{m}-{d}") }}
+          </template>
+        </el-table-column>
 
-          <el-table-column label="单据编号" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.order_number }}
-            </template>
-          </el-table-column>
+        <el-table-column label="单据编号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.order_number }}
+          </template>
+        </el-table-column>
 
-          <el-table-column label="制单人" align="center">
-            <template slot-scope="scope">
-              {{ getXuserName(scope.row.creater) }}
-            </template>
-          </el-table-column>
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+            {{ getXuserName(scope.row.creater) }}
+          </template>
+        </el-table-column>
 
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-tooltip
-                class="item"
-                effect="dark"
-                content="编辑"
-                placement="top"
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="编辑"
+              placement="top"
+            >
+              <el-button
+                size="mini"
+                type="primary"
+                icon="el-icon-edit-outline"
+                @click="handleEdit(scope.$index, scope.row)"
               >
-                <el-button
-                  size="mini"
-                  type="primary"
-                  icon="el-icon-edit-outline"
-                  @click="handleEdit(scope.$index, scope.row)"
-                >
-                </el-button>
-              </el-tooltip>
-              <el-tooltip
-                class="item"
-                effect="dark"
-                content="删除"
-                placement="top"
+              </el-button>
+            </el-tooltip>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="删除"
+              placement="top"
+            >
+              <el-button
+                size="mini"
+                type="danger"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.$index, scope.row)"
               >
-                <el-button
-                  size="mini"
-                  type="danger"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.$index, scope.row)"
-                >
-                </el-button>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :page-sizes="[10, 50, 100]"
-          :page-size="10"
-          background
-          style="margin-top:20px;float: right"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total"
-        >
-        </el-pagination>
-      </el-row>
-    </div>
+              </el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <div v-show ="showTable" style="margin-top:10px">
-       <el-table
-          :data="tableList"
-          :class="signAndWeighBoxPatients"
-          border
-          highlight-current-row
-          ref="multipleTableOne"
-          @current-change="handleCurrentChangeOne"
-          @selection-change="select"
-          :row-style="{ color: '#303133' }"
-          :header-cell-style="{
-            backgroundColor: 'rgb(245, 247, 250)',
-            color: '#606266'
-          }"
-        >
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;float: right;margin-bottom:10px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+      <div v-show ="showTable">
+        <el-table
+            :data="tableList"
+            :class="signAndWeighBoxPatients"
+            border
+            highlight-current-row
+            ref="multipleTableOne"
+            @current-change="handleCurrentChangeOne"
+            @selection-change="select"
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+          >
 
-          <el-table-column label="药品名称" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.BaseDrugLib.drug_name}}
-            </template>
-          </el-table-column>
+            <el-table-column label="药品名称" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.BaseDrugLib.drug_name}}
+              </template>
+            </el-table-column>
+            
+          <el-table-column label="规格&单位" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.BaseDrugLib.dose}}{{scope.row.BaseDrugLib.dose_unit}} * {{scope.row.BaseDrugLib.min_number}}{{scope.row.BaseDrugLib.min_unit}} /{{scope.row.BaseDrugLib.max_unit}}
+              </template>
+            </el-table-column>
           
-         <el-table-column label="规格&单位" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.BaseDrugLib.dose}}{{scope.row.BaseDrugLib.dose_unit}} * {{scope.row.BaseDrugLib.min_number}}{{scope.row.BaseDrugLib.min_unit}} /{{scope.row.BaseDrugLib.max_unit}}
-            </template>
-          </el-table-column>
-         
-          <el-table-column label="退库数量" align="center">
-            <template slot-scope="scope">
-               {{ scope.row.count}}
-            </template>
-          </el-table-column>
+            <el-table-column label="退库数量" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.count}}
+              </template>
+            </el-table-column>
 
-          <el-table-column label="退库单位" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.max_unit}}
-            </template>
-          </el-table-column>
+            <el-table-column label="退库单位" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.max_unit}}
+              </template>
+            </el-table-column>
 
-          <el-table-column label="退库单价" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.price}}
-            </template> 
-          </el-table-column>
+            <el-table-column label="退库单价" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.price}}
+              </template> 
+            </el-table-column>
 
-           <el-table-column label="批次" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.batch_number}}
-            </template>
-          </el-table-column>
+            <el-table-column label="批次" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.batch_number}}
+              </template>
+            </el-table-column>
 
-          <el-table-column label="品名/注册证号(备案凭证号)" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.register_account}}
-            </template>
-          </el-table-column>
+            <el-table-column label="品名/注册证号(备案凭证号)" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.register_account}}
+              </template>
+            </el-table-column>
 
-          <el-table-column label="生产厂家" align="center">
-            <template slot-scope="scope">
-              {{scope.row.manufacturer}}
-            </template>
-          </el-table-column>
+            <el-table-column label="生产厂家" align="center">
+              <template slot-scope="scope">
+                {{scope.row.manufacturer}}
+              </template>
+            </el-table-column>
 
-          <el-table-column label="生产日期" align="center">
-            <template slot-scope="scope">
-               {{scope.row.product_date}}
-            </template>
-          </el-table-column>
+            <el-table-column label="生产日期" align="center">
+              <template slot-scope="scope">
+                {{scope.row.product_date}}
+              </template>
+            </el-table-column>
 
-         <el-table-column label="有效日期" align="center">
-            <template slot-scope="scope">
-              {{scope.row.expiry_date}}
-            </template>
-          </el-table-column>
-         
-          <el-table-column label="经销商" align="center">
-            <template slot-scope="scope">
-              {{scope.row.dealer}}
-            </template>
-          </el-table-column>
-         
-          <el-table-column label="退库原因" align="center">
-            <template slot-scope="scope">
-              {{scope.row.remark}}
-            </template>
-          </el-table-column>
+          <el-table-column label="有效日期" align="center">
+              <template slot-scope="scope">
+                {{scope.row.expiry_date}}
+              </template>
+            </el-table-column>
+          
+            <el-table-column label="经销商" align="center">
+              <template slot-scope="scope">
+                {{scope.row.dealer}}
+              </template>
+            </el-table-column>
+          
+            <el-table-column label="退库原因" align="center">
+              <template slot-scope="scope">
+                {{scope.row.remark}}
+              </template>
+            </el-table-column>
 
-        
-        </el-table>
+          
+          </el-table>
+      </div>
     </div>
+
+    
   </div>
 </template>
 

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -102,7 +102,7 @@
           max-height="450"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
-          <el-table-column align="center" width="200">
+          <el-table-column align="center" width="200" fixed="left">
             <template slot="header" slot-scope="scope">
               <span>药品名称<span style="color: red">*</span></span>
             </template>

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

@@ -33,38 +33,39 @@
         @click="search"
         >搜索</el-button
       >
+      <div style="margin-left:10px;">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker
+          size="small"
+          v-model="start_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="startTimeChange"
+        ></el-date-picker>
+        <span class="cellLine"> - </span>
+        <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>
+      </div>
     </div>
 
-    <div class="cell clearfix">
-      <label class="title"><span class="name">日期查询</span> : </label>
-      <el-date-picker
-        size="small"
-        v-model="start_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="startTimeChange"
-      ></el-date-picker>
-      <span class="cellLine"> - </span>
-      <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>
-    </div>
+    
 
     <!-- <div class="cell clearfix">
       <label class="title"><span class="name">单据类型</span> : </label>

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

@@ -33,38 +33,39 @@
         @click="search"
         >搜索</el-button
       >
+      <div style="margin-left:10px;">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker
+          size="small"
+          v-model="start_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="startTimeChange"
+        ></el-date-picker>
+        <span class="cellLine"> - </span>
+        <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>
+      </div>
     </div>
 
-    <div class="cell clearfix">
-      <label class="title"><span class="name">日期查询</span> : </label>
-      <el-date-picker
-        size="small"
-        v-model="start_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="startTimeChange"
-      ></el-date-picker>
-      <span class="cellLine"> - </span>
-      <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>
-    </div>
+    
 
     <!-- <div class="cell clearfix">
       <label class="title"><span class="name">单据类型</span> : </label>

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

@@ -31,38 +31,39 @@
         @click="search"
         >搜索</el-button
       >
+      <div style="margin-left:10px;">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker
+          size="small"
+          v-model="start_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="startTimeChange"
+        ></el-date-picker>
+        <span class="cellLine"> - </span>
+        <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>
+      </div>
     </div>
 
-    <div class="cell clearfix">
-      <label class="title"><span class="name">日期查询</span> : </label>
-      <el-date-picker
-        size="small"
-        v-model="start_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="startTimeChange"
-      ></el-date-picker>
-      <span class="cellLine"> - </span>
-      <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>
-    </div>
+    
 
     <!-- <div class="cell clearfix">
       <label class="title"><span class="name">单据类型</span> : </label>

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -30,38 +30,39 @@
           @click="search"
           >搜索</el-button
         >
+        <div style="margin-left:10px;">
+          <label class="title"><span class="name">入库时间</span> : </label>
+          <el-date-picker
+            size="small"
+            v-model="start_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="startTimeChange"
+          ></el-date-picker>
+          <span class="cellLine"> - </span>
+          <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>
+        </div>
       </div>
 
-      <div class="cell clearfix">
-        <label class="title"><span class="name">入库时间</span> : </label>
-        <el-date-picker
-          size="small"
-          v-model="start_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="startTimeChange"
-        ></el-date-picker>
-        <span class="cellLine"> - </span>
-        <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>
-      </div>
+      
 
       <div class="cell clearfix">
         <el-checkbox

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -43,7 +43,7 @@
           max-height="450"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
-          <el-table-column align="center" width="200">
+          <el-table-column align="center" width="200" fixed="left">
             <template slot="header" slot-scope="scope">
               <span>药品名称<span style="color: red">*</span></span>
             </template>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -28,38 +28,39 @@
           @click="search"
           >搜索</el-button
         >
+        <div style="margin-left:10px;">
+          <label class="title"><span class="name">出库时间</span> : </label>
+          <el-date-picker
+            size="small"
+            v-model="start_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="startTimeChange"
+          ></el-date-picker>
+          <span class="cellLine"> - </span>
+          <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>
+        </div>
       </div>
 
-      <div class="cell clearfix">
-        <label class="title"><span class="name">出库时间</span> : </label>
-        <el-date-picker
-          size="small"
-          v-model="start_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="startTimeChange"
-        ></el-date-picker>
-        <span class="cellLine"> - </span>
-        <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>
-      </div>
+      
 
       <div class="cell clearfix">
         <el-checkbox

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -61,7 +61,7 @@
           max-height="450"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
-          <el-table-column align="center" width="200">
+          <el-table-column align="center" width="200" fixed="left">
             <template slot="header" slot-scope="scope">
               <span>药品名称<span style="color: red">*</span></span>
             </template>

src/xt_pages/stock/stockInOrder.vue

@@ -31,38 +31,39 @@
           @click="search"
           >搜索</el-button
         >
+        <div style="margin-left:10px;">
+          <label class="title"><span class="name">入库时间</span> : </label>
+          <el-date-picker
+            size="small"
+            v-model="start_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="startTimeChange"
+          ></el-date-picker>
+          <span class="cellLine"> - </span>
+          <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>
+        </div>
       </div>
 
-      <div class="cell clearfix">
-        <label class="title"><span class="name">入库时间</span> : </label>
-        <el-date-picker
-          size="small"
-          v-model="start_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="startTimeChange"
-        ></el-date-picker>
-        <span class="cellLine"> - </span>
-        <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>
-      </div>
+      
 
       <div class="cell clearfix">
         <el-checkbox

src/xt_pages/stock/stockInOrderAdd.vue

@@ -32,7 +32,7 @@
                   style="width: 100%"
                   max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
         >
-          <el-table-column align="center" width="200">
+          <el-table-column align="center" width="200" fixed="left">
              <template slot="header" slot-scope="scope">
               <span>耗材名称</span>
             </template>

src/xt_pages/stock/stockOutOrder.vue

@@ -29,38 +29,39 @@
           @click="search"
           >搜索</el-button
         >
+        <div style="margin-left:10px;">
+          <label class="title"><span class="name">出库时间</span> : </label>
+          <el-date-picker
+            size="small"
+            v-model="start_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="startTimeChange"
+          ></el-date-picker>
+          <span class="cellLine"> - </span>
+          <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>
+        </div>
       </div>
 
-      <div class="cell clearfix">
-        <label class="title"><span class="name">出库时间</span> : </label>
-        <el-date-picker
-          size="small"
-          v-model="start_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="startTimeChange"
-        ></el-date-picker>
-        <span class="cellLine"> - </span>
-        <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>
-      </div>
+      
 
       <div class="cell clearfix">
         <el-checkbox

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -62,7 +62,7 @@
           max-height="450"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
-         <el-table-column width="200" align="center">
+         <el-table-column width="200" align="center" fixed="left">
             <template slot="header" slot-scope="scope">
               <span>耗材名称</span>
             </template>
@@ -793,4 +793,7 @@ export default {
 .el-autocomplete-suggestion{
   width: 400px !important;
 }
+::-webkit-scrollbar{
+  height: 20px;
+}
 </style>