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

src/xt_pages/stock/drugs/drugStockInOrder.vue

       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
-        :page-size="10"
+        :page-sizes="[5, 10, 50, 100]"
+        :page-size="5"
         background
-        style="margin-top:20px;float: right"
+        style="margin-top:20px;text-align: right"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >
       </el-pagination>
+      <el-table
+        v-show="showOne"
+        :data="WarehouseInfo.warehouseInfoDate"
+        :class="signAndWeighBoxPatients"
+        style="width: 100%;margin-top:10px;"
+        border
+        highlight-current-row
+        v-loading="Warehouse.loading"
+        ref="multipleTable"
+        @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.drug.drug_name}}
+          </template>
+        </el-table-column>
+        <el-table-column label="药品类型" align="center">
+          <template slot-scope="scope">
+              {{getDrugType(scope.row.drug.drug_type)}}
+          </template>
+        </el-table-column>
+        <el-table-column label="规格&单位" align="center">
+          <template slot-scope="scope">
+            {{scope.row.drug.dose}}&nbsp;{{scope.row.drug.dose_unit}}*{{scope.row.drug.min_number}}{{scope.row.drug.min_unit}}/{{scope.row.drug.max_unit}}
+          </template>
+        </el-table-column>
+        <el-table-column label="批号" align="center">
+          <template slot-scope="scope">
+            {{scope.row.number}}
+          </template>
+        </el-table-column>
+        <el-table-column label="入库数量" align="center">
+          <template slot-scope="scope">
+            {{scope.row.warehousing_count}}
+          </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.total_price}}
+          </template>
+        </el-table-column>
+        <el-table-column label="生产厂家" align="center">
+          <template slot-scope="scope">
+            {{getManufacturer(scope.row.drug.manufacturer)}}
+          </template>
+        </el-table-column>
+       <el-table-column label="生产日期" align="center">
+          <template slot-scope="scope">
+             {{getTime(scope.row.product_date)}}
+          </template>
+        </el-table-column>
+        <el-table-column label="有效日期" align="center">
+          <template slot-scope="scope">
+            {{getTime(scope.row.expiry_date)}}
+          </template>
+        </el-table-column>
+        <el-table-column label="批准文号" align="center">
+          <template slot-scope="scope">
+             {{scope.row.number}}
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center">
+          <template slot-scope="scope">
+            {{scope.row.remark}}
+          </template>
+        </el-table-column>
+      </el-table>
     </div>
 
 
     
 
 
-      <el-table
-        v-show="showOne"
-        :data="WarehouseInfo.warehouseInfoDate"
-        :class="signAndWeighBoxPatients"
-        style="width: 100%"
-        border
-        highlight-current-row
-        v-loading="Warehouse.loading"
-        ref="multipleTable"
-        @selection-change="select"
-        :row-style="{ color: '#303133' }"
-        :header-cell-style="{
-          backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
-        }"
-      >
-        <el-table-column align="center" type="selection" width="55">
-        </el-table-column>
-
-        <el-table-column label="药品名称" align="center">
-          <template slot-scope="scope">
-             {{scope.row.drug.drug_name}}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="药品类型" align="center">
-          <template slot-scope="scope">
-              {{getDrugType(scope.row.drug.drug_type)}}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="规格&单位" align="center">
-          <template slot-scope="scope">
-             {{scope.row.drug.dose}}&nbsp;{{scope.row.drug.dose_unit}}*{{scope.row.drug.min_number}}{{scope.row.drug.min_unit}}/{{scope.row.drug.max_unit}}
-          </template>
-        </el-table-column>
-       
-        <el-table-column label="批号" align="center">
-          <template slot-scope="scope">
-           {{scope.row.number}}
-          </template>
-        </el-table-column>
-        
-        <el-table-column label="入库数量" align="center">
-          <template slot-scope="scope">
-             {{scope.row.warehousing_count}}
-          </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.total_price}}
-          </template>
-        </el-table-column>
       
 
-       <el-table-column label="生产厂家" align="center">
-          <template slot-scope="scope">
-             {{getManufacturer(scope.row.drug.manufacturer)}}
-          </template>
-        </el-table-column>
-
-
-       <el-table-column label="生产日期" align="center">
-          <template slot-scope="scope">
-             {{getTime(scope.row.product_date)}}
-          </template>
-        </el-table-column>
-       
-
-       <el-table-column label="有效日期" align="center">
-          <template slot-scope="scope">
-             {{getTime(scope.row.expiry_date)}}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="批准文号" align="center">
-          <template slot-scope="scope">
-             {{scope.row.number}}
-          </template>
-        </el-table-column>
-
-
-        <el-table-column label="备注" align="center">
-          <template slot-scope="scope">
-            {{scope.row.remark}}
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <el-pagination
+      <!-- <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :page-sizes="[10, 50, 100]"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >
-      </el-pagination>
+      </el-pagination> -->
 
   </div>
 </template>
       searchKey: "",
       type: 1,
       page: 1,
-      limit: 10,
+      limit: 5,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/drugs/drugStockOutOrder.vue

       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
-        :page-size="10"
+        :page-sizes="[5, 10, 50, 100]"
+        :page-size="5"
         background
-        style="margin-top:20px;float: right"
+        style="margin-top:20px;text-align: right"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >
       </el-pagination>
-    </div>
-
-
-<!-- 使用详情 -->
-    <div v-show="tableShow" style="margin-bottom:10px">
-      <el-table
-        :data="tableList"
-        :class="signAndWeighBoxPatients"
-        style="width: 100%"
-        border
-        highlight-current-row
-        ref="multipleTable"
-        @selection-change="select"
-        :row-style="{ color: '#303133' }"
-        :header-cell-style="{
-          backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
-        }"
-      >
-        <el-table-column type="selection" width="55" align="center"> </el-table-column>
-
-        <el-table-column label="药品名称" align="center">
-          <template slot-scope="scope">
-             {{scope.row.drug_name}}
-          </template>
-        </el-table-column>
-        <el-table-column label="药品类型" align="center">
-          <template slot-scope="scope">
-              {{getDrugType(scope.row.drug_type)}}
-          </template>
-        </el-table-column>
-         <el-table-column label="规格&单位" align="center">
-          <template slot-scope="scope">
-             {{scope.row.dose}}&nbsp;{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
-          </template>
-        </el-table-column>
-       
-        <el-table-column label="批号" align="center">
-          <template slot-scope="scope">
-           {{scope.row.number}}
-          </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.price}}
-          </template>
-        </el-table-column>
-
-      
-       <el-table-column label="总价" align="center">
-          <template slot-scope="scope">
-             {{scope.row.total_price}}
-          </template>
-        </el-table-column>
-      
-
-       <el-table-column label="生产厂家" align="center">
-          <template slot-scope="scope">
-             {{getManufacturerName(scope.row.manufacturer)}}
-          </template>
-        </el-table-column>
-
-
-       <el-table-column label="生产日期" align="center">
-          <template slot-scope="scope">
-             {{getTime(scope.row.product_date)}}
-          </template>
-        </el-table-column>
-       
-
-       <el-table-column label="有效日期" align="center">
-          <template slot-scope="scope">
-             {{getTime(scope.row.expiry_date)}}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="批准文号" align="center">
-          <template slot-scope="scope">
-             {{scope.row.number}}
-          </template>
-        </el-table-column>
+      <!-- 使用详情 -->
+      <div v-show="tableShow" style="margin-top:10px">
+        <el-table
+          :data="tableList"
+          :class="signAndWeighBoxPatients"
+          style="width: 100%"
+          border
+          highlight-current-row
+          ref="multipleTable"
+          @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.drug_name}}
+            </template>
+          </el-table-column>
+          <el-table-column label="药品类型" align="center">
+            <template slot-scope="scope">
+                {{getDrugType(scope.row.drug_type)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="规格&单位" align="center">
+            <template slot-scope="scope">
+              {{scope.row.dose}}&nbsp;{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+            </template>
+          </el-table-column>
+          <el-table-column label="批号" align="center">
+            <template slot-scope="scope">
+            {{scope.row.number}}
+            </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.price}}
+            </template>
+          </el-table-column>
+          <el-table-column label="总价" align="center">
+            <template slot-scope="scope">
+              {{scope.row.total_price}}
+            </template>
+          </el-table-column>
+          <el-table-column label="生产厂家" align="center">
+            <template slot-scope="scope">
+              {{getManufacturerName(scope.row.manufacturer)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="生产日期" align="center">
+            <template slot-scope="scope">
+              {{getTime(scope.row.product_date)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="有效日期" align="center">
+            <template slot-scope="scope">
+              {{getTime(scope.row.expiry_date)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="批准文号" align="center">
+            <template slot-scope="scope">
+              {{scope.row.number}}
+            </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">
+              <span style="color: #589ff8" v-if="scope.row.is_sys == 1" @click="toDetail(scope.row)">使用明细</span>
+            </template>
+          </el-table-column>
+        </el-table>
 
+      </div>
+    </div>
 
-        <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">
-             <span style="color: #589ff8" v-if="scope.row.is_sys == 1" @click="toDetail(scope.row)">使用明细</span>
-          </template>
-        </el-table-column>
-      </el-table>
 
-    </div>
 
 
     <el-dialog
         { path: false, name: "出库单" }
       ],
       page: 1,
-      limit: 10,
+      limit: 5,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/stockInOrder.vue

       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
-        :page-size="10"
+        :page-sizes="[5, 10, 50, 100]"
+        :page-size="5"
         background
-        style="margin-top:20px;float: right"
+        style="margin-top:20px;text-align: right"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >
       </el-pagination>
-    </div>
-
-
-   <div v-show="tableShow" style="margin-top:80px">
-      <el-table
-        :data="tableList"
-        :class="signAndWeighBoxPatients"
-        style="width: 100%"
-        border
-        highlight-current-row
-        v-loading="Warehouse.loading"
-        ref="multipleTable"
-        @selection-change="select"
-        :row-style="{ color: '#303133' }"
-        :header-cell-style="{
-          backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
-        }"
-      >
-       <!-- <el-table-column align="center" type="selection" width="55">
-       </el-table-column> -->
-
-       <el-table-column label="耗材名称" align="center">
+      <div v-show="tableShow" style="margin-top:10px;">
+        <el-table
+          :data="tableList"
+          :class="signAndWeighBoxPatients"
+          style="width: 100%"
+          border
+          highlight-current-row
+          v-loading="Warehouse.loading"
+          ref="multipleTable"
+          @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.GoodInfo.good_name }}
           </template>
         </el-table-column>
-      
         <el-table-column label="耗材类型" align="center">
           <template slot-scope="scope">
             {{  getTypeName(scope.row.GoodInfo.good_type_id)}}
           </template>
         </el-table-column>
-
-
-       <el-table-column label="规格&单位" align="center">
+        <el-table-column label="规格&单位" align="center">
           <template slot-scope="scope">
             {{ scope.row.GoodInfo.specification_name}} * {{scope.row.GoodInfo.min_number}}{{scope.row.GoodInfo.min_unit}}
           </template>
         </el-table-column>
-
-
-       <el-table-column label="批号" align="center">
+        <el-table-column label="批号" align="center">
           <template slot-scope="scope">
             {{ scope.row.number}}
           </template>
         </el-table-column>
-        
         <el-table-column label="入库数量" align="center">
           <template slot-scope="scope">
             {{ scope.row.warehousing_count}}
           </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">
+        <el-table-column label="总价" align="center">
           <template slot-scope="scope">
             {{ (scope.row.warehousing_count * scope.row.price).toFixed(2)}}
           </template>
         </el-table-column>
-
-
-         <el-table-column label="生产厂家" align="center">
+        <el-table-column label="生产厂家" align="center">
           <template slot-scope="scope">
             {{ getManufactuerName(scope.row.GoodInfo.manufacturer)}}
           </template>
         </el-table-column>
-
         <el-table-column label="生产日期" align="center">
           <template slot-scope="scope">
             {{ getTime(scope.row.product_date)}}
           </template>
         </el-table-column>
-
-
-       <el-table-column label="有效期" align="center">
+        <el-table-column label="有效期" align="center">
           <template slot-scope="scope">
             {{ getTime(scope.row.expiry_date)}}
           </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>
 
 
+   
+
+
     <el-dialog
       title="详情"
       :visible.sync="dialogVisible"
       searchKey: "",
       type: 1,
       page: 1,
-      limit: 10,
+      limit: 5,
       checked: false,
       total: 0,
       pageTotal: 0,
         dealer:0
       }, 
       warehousing_time: '',
-     warehouse:{},
+      warehouse:{},
       propForm: {
         goods: [],
         goodType: [],
       },
         isCreated: 1,
         isVisibility: false,
-       drug_id:1,
+        drug_id:1,
       },
       drug_id:1,
       tableShow:false,

src/xt_pages/stock/stockOutOrder.vue

       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
-        :page-size="10"
+        :page-sizes="[5, 10, 50, 100]"
+        :page-size="5"
         background
-        style="margin-top:20px;float: right"
+        style="margin-top:20px;text-align: right"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >
       </el-pagination>
+      <!--  详情 -->
+      <div v-show="tableShow" style="margin-top:10px;">
+        <el-table
+            :data="tableList"
+            :class="signAndWeighBoxPatients"
+            style="width: 100%"
+            border
+            highlight-current-row
+            ref="multipleTable"
+            @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.good_name }}
+            </template>
+          </el-table-column>
+          <el-table-column label="耗材类型" align="center">
+            <template slot-scope="scope">
+              {{  getTypeName(scope.row.good_type_id)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="规格&单位" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.specification_name}} * {{scope.row.min_number}}{{scope.row.min_unit}}
+            </template>
+          </el-table-column>
+          <el-table-column label="批号" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.number}}
+            </template>
+          </el-table-column>
+          <el-table-column label="出库数量" align="center">
+            <template slot-scope="scope">
+              <span v-if="scope.row.is_sys == 0">{{ scope.row.count}}</span> 
+              <span v-if="scope.row.is_sys == 1">{{getOutStockCount(scope.row.good_id)}}</span> 
+            </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.count * scope.row.price).toFixed(2)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="生产厂家" align="center">
+            <template slot-scope="scope">
+              {{ getManufactuerName(scope.row.manufacturer)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="生产日期" align="center">
+            <template slot-scope="scope">
+              {{ getTime(scope.row.product_date)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="有效期" align="center">
+            <template slot-scope="scope">
+              {{ getTime(scope.row.expiry_date)}}
+            </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">
+              <span v-if="scope.row.is_sys == 1"  style="color: #589ff8" @click="GetOrderDetailById(scope.row)">使用明细</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
     </div>
 
 
 
-   <!--  详情 -->
-  <div v-show="tableShow">
-     <el-table
-        :data="tableList"
-        :class="signAndWeighBoxPatients"
-        style="width: 100%"
-        border
-        highlight-current-row
-        ref="multipleTable"
-        @selection-change="select"
-        :row-style="{ color: '#303133' }"
-        :header-cell-style="{
-          backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
-        }"
-      >
-       <el-table-column align="center" type="selection" width="55">
-       </el-table-column>
-
-       <el-table-column label="耗材名称" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.good_name }}
-          </template>
-        </el-table-column>
-      
-        <el-table-column label="耗材类型" align="center">
-          <template slot-scope="scope">
-            {{  getTypeName(scope.row.good_type_id)}}
-          </template>
-        </el-table-column>
-
-
-       <el-table-column label="规格&单位" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.specification_name}} * {{scope.row.min_number}}{{scope.row.min_unit}}
-          </template>
-        </el-table-column>
-
-
-       <el-table-column label="批号" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.number}}
-          </template>
-        </el-table-column>
-        
-        <el-table-column label="出库数量" align="center">
-          <template slot-scope="scope">
-           <span v-if="scope.row.is_sys == 0">{{ scope.row.count}}</span> 
-           <span v-if="scope.row.is_sys == 1">{{getOutStockCount(scope.row.good_id)}}</span> 
-          </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.count * scope.row.price).toFixed(2)}}
-          </template>
-        </el-table-column>
-
-
-         <el-table-column label="生产厂家" align="center">
-          <template slot-scope="scope">
-            {{ getManufactuerName(scope.row.manufacturer)}}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="生产日期" align="center">
-          <template slot-scope="scope">
-            {{ getTime(scope.row.product_date)}}
-          </template>
-        </el-table-column>
-
-
-       <el-table-column label="有效期" align="center">
-          <template slot-scope="scope">
-            {{ getTime(scope.row.expiry_date)}}
-          </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">
-            <span v-if="scope.row.is_sys == 1"  style="color: #589ff8" @click="GetOrderDetailById(scope.row)">使用明细</span>
-          </template>
-        </el-table-column>
-      </el-table>  
-    
-  </div>
+  
 
 
     <!-- 新增弹窗 -->
         { path: false, name: "出库单" }
       ],
       page: 1,
-      limit: 10,
+      limit: 5,
       checked: false,
       total: 0,
       pageTotal: 0,