Merge branch '2022-10-17_vue_schedule_branch' of http://git.shengws.com/csx/Vue_New into 20220812

src/api/stock.js

@@ -1072,3 +1072,11 @@ export function getwarehouseinfolist(params) {
     params: params
   })
 }
+
+export function getNewGoodWarehouseInfo(params) {
+  return request({
+    url: '/api/stock/getnewgoodwarehouseinfo',
+    method: 'get',
+    params: params
+  })
+}

src/router/modules/stock.js

@@ -259,6 +259,17 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/stock/print/one',
+      component: () => import('@/xt_pages/stock/detail/printOne'),
+      hidden: true,
+      is_menu: false,
+      name: 'stock_print_one',
+      meta: {
+        title: '库存打印',
+        noCache: true
+      }
+    },
     {
       path: '/stock/user/detail',
       component: () => import('@/xt_pages/stock/stockUserDetail'),

src/xt_pages/stock/detail/printOne.vue

@@ -0,0 +1,329 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button :loading="loading" size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印
+      </el-button>
+    </div>
+    <div class="app-container ">
+      <div id="dialysis-print-box">
+        <div class="dialysis-print-order">
+          <div class="order-yy-name">{{orgname}}</div>
+          <div class="order-title" v-if="type == 1">入库单</div>
+          <div style="float: left;margin-bottom: 10px;">{{getDateOne()}}</div>
+          <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+
+
+
+          <table class="print-table" border="1">
+            <tbody>
+            <tr>
+              <td style="line-height: 50px" width="50">序号</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="50">单位</td>
+
+              <td style="line-height:50px" width="80">
+                进货价
+              </td>
+              <td style="line-height: 50px" width="80">总价</td>
+              <td style="line-height: 50px" width="80">备 注</td>
+            </tr>
+
+            <tr v-for="(item,index) in stockDatas" :key="item.id">
+              <td style="line-height: 50px">&nbsp;
+                {{index+1}}
+              </td>
+              <td style="line-height: 50px">
+              
+              </td>
+              <td style="line-height: 50px">
+               
+              </td>
+
+              <td style="line-height: 50px">
+               
+              </td>
+              <td style="line-height: 50px">
+               
+              </td>
+              <td style="line-height:50px">
+               
+              </td>
+              <td style="line-height:50px">
+               
+              </td>
+              <td style="line-height: 50px">
+                
+              </td>
+            </tr>
+            </tbody>
+          </table>
+          <table class="print-table" border="1">
+            <tr>
+              <td style="line-height: 50px"  width="50">合计</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="50"></td>
+              <td style="line-height: 50px"   width="80"></td>
+              <td style="line-height: 50px"  width="80">
+              
+              </td>
+              <td style="line-height: 50px" width="80">
+
+              </td>
+            </tr>
+          </table>
+
+          <div style="display:flex;margin-top:20px;float:right;">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></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>
+
+        </div>
+
+      </div>
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { getNewGoodWarehouseInfo } from '@/api/stock'
+  import { getDataConfig } from '@/utils/data'
+  import { jsGetAge, uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import print from 'print-js'
+
+  export default {
+    name: 'dialysisPrintOrder',
+    components: {
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '出入库明细' },
+          { path: false, name: '打印单' }
+        ],
+        loading: false,
+        orgname: '',
+        queryParams: {
+          start_time: this.$route.query.start_time,
+          end_time: this.$route.query.end_time,
+          type: this.$route.query.type,
+          limit:this.$route.query.limit,
+          page:this.$route.query.page,
+          storehouse_id:this.$route.query.storehouse_id,
+          keywords:this.$route.query.keywords
+        },
+        totalPrice: 0,
+        stockDatas: [],
+        goodUnit: [],
+        type: this.$route.query.type,
+        start_time: this.$route.query.start_time,
+        end_time: this.$route.query.end_time,
+        stockTotal:[],
+        wareOutInfo:[],
+        org_id:this.$store.getters.xt_user.org.id,
+        informationList:[],
+        wareOutList:[],
+      }
+    },
+    methods:{
+      getDateOne(){
+
+        return "入库日期: "+this.start_time +"~"+this.end_time
+        
+
+      },
+      getDateTwo(){
+        var ptime = Math.round(new Date().getTime() / 1000)
+        return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')
+      },
+      getTime(value, temp) {
+        if (value == 0) {
+          return ''
+        }
+        if (value != undefined) {
+          return uParseTime(value, temp)
+        }
+        return ''
+      },
+      getlist(){
+        console.log("query23323223wo",this.queryParams)
+        getNewGoodWarehouseInfo(this.queryParams).then(response=>{
+
+        })
+      }
+    },
+    created() {
+      var xtuser = this.$store.getters.xt_user
+      this.orgname = xtuser.org.org_name
+      this.goodUnit = this.$store.getters.good_unit
+      this.getlist()
+    }
+
+  }
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px 20px 20px 20px;
+  }
+
+  .dialysis-print-order .table-box {
+
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+
+
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color .25s cubic-bezier(.71, -.46, .29, 1.46), background-color .25s cubic-bezier(.71, -.46, .29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 25px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+
+  .print-template-two tr {
+    line-height: 30px;
+  }
+</style>

src/xt_pages/stock/detail/stockInDetail.vue

@@ -636,9 +636,13 @@ export default {
       return (r1 * r2) / Math.pow(10, m);
     },
     PrintAction: function() {
+
+      
       window.sessionStorage.setItem('start_time',this.start_time)
       window.sessionStorage.setItem('end_time',this.end_time)
-      this.$router.push({
+
+      if(this.org_id!=9671){
+        this.$router.push({
         path: "/stock/print",
         query: {
           type: 1,
@@ -649,6 +653,24 @@ export default {
           keywords:this.$router.keywords,
         }
       });
+      }
+      if(this.org_id == 9671){
+        console.log("进来")
+        this.$router.push({
+        path: "/stock/print/one",
+        query: {
+          type: 1,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          limit:this.limit,
+          page:this.page,
+          keywords:searchKey,
+          storehouse_id:this.storehouse_id,
+          
+        }
+       });
+      }
+     
     },
    getPrintStockGood(){
      const params = {