Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/stock.js

     method:"get",
     params:params
   })
+}
+
+
+export function getStockInventoryPrintList(params){
+
+  return request({
+    url:"/api/good/getstockinventoryprintlist",
+    method:"get",
+    params:params
+  })
+}
+
+export function getStockInventroyModePrintList(params){
+  
+  return request({
+    url:"/api/good/getstockinventoymodeprintlist",
+    method:"get",
+    params:params
+  })
 }

src/router/modules/stock.js

       meta: { title: 'stockInventoryPrint', noCache: true }
     },
 
+    {
+      path: '/stock/stockInventoryModePrint',
+      component: () => import('@/xt_pages/stock/stockInventoryModePrint'),
+      name: 'stockInventoryModePrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockInventoryModePrint', noCache: true }
+    },
+
     // {
     //   path: "/stock/",
     //   component: Layout,

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                           </span>
 
                         </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 v-if="advice!=null && advice.execution_staff>0">
                             <span
                         </span>
                         </td>
                         <td v-if="org_id == 10598 || org_id==10489 ">
-                          <span v-if="advice!=null && advice.checker>0">
+                          <span v-if="org_id!=10489">
+                            <span v-if="advice!=null && advice.checker>0">
                               <span v-if="setAdminUserES(advice.checker) == ''">{{ getAdminUser(advice.checker)}}</span>
                               <img
                                 style="height: 30px"
                                 srcset=""
                                 v-else
                               />
+                            </span>
                           </span>
+
+                          <span v-if="org_id == 10489">
+                            <span v-if="advice.execution_time">{{
+                              getTime(advice.execution_time, "{h}:{i}")
+                             }}</span>
+                          </span>
+                         
                         </td>
                         <td height="32px">
-                          <span v-if="advice.execution_time">{{
-                            getTime(advice.execution_time, "{h}:{i}")
-                          }}</span>
+                          <span v-if="org_id!=10489">
+                             <span v-if="advice.execution_time">{{
+                              getTime(advice.execution_time, "{h}:{i}")
+                             }}</span>
+                          </span>
+                          <span v-if="org_id == 10489">
+                            <span v-if="advice!=null && advice.checker>0">
+                              <span v-if="setAdminUserES(advice.checker) == ''">{{ getAdminUser(advice.checker)}}</span>
+                              <img
+                                style="height: 30px"
+                                :src="setAdminUserES(advice.checker)"
+                                alt=""
+                                srcset=""
+                                v-else
+                              />
+                            </span>
+                          </span>
+                         
                         </td>
                         <td height="32px" v-if="org_id == 10223 || org_id == 9538  ||
                             org_id ==10375 || org_id ==10571 || org_id ==10600">
 
 
                       <tr
-                      v-if="org_id ==10206 || org_id == 10644 || org_id == 0"
+                      v-if="org_id ==10206 || org_id == 10644 || org_id == 0 || org_id ==10489"
                       v-for="(advice, advice_index) in projectsOne"
                       :key="advice_index"
                     >
                         />
                       </td>
                         <td height="32px">
+                          
                           <span v-if="advice.execution_time">{{
                             getTime(advice.execution_time, "{h}:{i}")
                           }}</span>
                   </table>
                 </td>
               </tr>
+
+
               <tr v-if="org_id ==10206">
                 <td style="padding: 0; position: relative" colspan="2">
                   <table class="inside_table">
         }
 
         //HIS客户显示临时医嘱的地方
-        if(this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489){
+        if(this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489 || this.org_id == 0 || this.org_id == 10644){
           if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
 
             for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){

src/xt_pages/stock/inventoryRecord.vue

         </div>
         <el-table :data="tableData" 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="name" label="盘点时间"  width="100" align="center">
+                <template slot-scope="scope">
+                   {{ getTime(scope.row.record_date) }}
+                </template>
+            </el-table-column>
             <el-table-column prop="date" label="耗材名称" align="center">
                 <template slot-scope="scope">
                   {{scope.row.good_name}}
                 </template>
             </el-table-column>
 
-            <el-table-column prop="name" label="盘点时间"  width="100" align="center">
-                <template slot-scope="scope">
-                   {{ getTime(scope.row.record_date) }}
-                </template>
-            </el-table-column>
           
         </el-table>
         <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :page-sizes="[10, 20, 40, 100]"
+            :page-sizes="[100, 200, 400, 600,800,1000,2000]"
             :page-size="10"
             background
             style="margin-top:20px;text-align: right"
 <script>
 import { uParseTime } from '@/utils/tools'
 import { getGoodStockInventoryList } from "@/api/stock"
+const moment = require('moment');
 import user from '../../store/modules/user';
 
 export default {
                 name: '',
             },
             total: 0,
-            limit:10,
+            limit:100,
             page:1,
             ids:"",
             damageList:[],
              this.$message.error("请勾选需要打印的内容")
              return false
           }              
-          this.$router.push({path:'/stock/stockInventoryPrint?storehouse_id='+this.storehouse_id+"&good_name="+this.searchKey+"&limit="+this.limit+"&page="+this.page+"&ids="+this.ids})
+          this.$router.push({path:'/stock/stockInventoryPrint?storehouse_id='+this.storehouse_id+"&keyword="+this.searchKey+"&limit="+this.limit+"&page="+this.page+"&ids="+this.ids})
         },
 
         search(){
          }
        },
       inventoryExportList(){
-        this.$router.push({path:'/stock/inventoryPrint'})
+       
+        var start_time_one = ""
+        var end_time_one = ""
+        if(this.start_time!="" && this.end_time !=""){
+           start_time_one = this.start_time
+           end_time_one = this.end_time
+        }
+        if(this.start_time=="" && this.end_time ==""){
+
+          start_time_one = moment().startOf('month').format("YYYY-MM-DD")
+          end_time_one= moment().endOf('month').format("YYYY-MM-DD")
+
+        }
+        this.$router.push({path:'/stock/stockInventoryModePrint?start_time='+start_time_one+"&end_time="+end_time_one})
       },
       getStorehouseName(id){
         var storehouse_name = ""

src/xt_pages/stock/stockInventoryPrint.vue

+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;">
+            <div id="print_content">
+
+                <table class="printTable" border="0" cellspacing="0" align="center">
+                    <thead class="print_head">
+                        <tr><td colspan="11">{{org_name}}</td></tr>
+                        <tr><td colspan="11">耗材盘点</td></tr>
+                    </thead>
+                    <tbody class="print_body">
+                    <tr>
+                        <td text-align="center">耗材名称</td>
+                        <td text-align="center">规格</td>
+                        <td text-align="center">批号</td>
+                        <td text-align="center">生产厂商</td>
+                        <td text-align="center">仓库名称</td>
+                        <td text-align="center">盘点前数量</td> 
+                        <td text-align="center">盘点后数量</td>
+                        <td text-align="center">盈亏类型</td>
+                        <td text-align="center">盘点人</td>
+                       
+                    </tr>
+                    <tr v-for="(item,index) in tableList" :key="index">
+                        <td>{{item.good_name}}</td>
+                        <td>{{item.specification_name}}</td>
+                        <td>{{item.batch_number}}</td>
+                        <td>{{item.manufacturer_name}}</td>
+                        <td>{{getHouseName(item.storehouse_id)}}</td>
+                        <td>{{item.befor_count}}</td>
+                        <td>{{item.after_count}}</td>
+                        <td>
+                          <span v-if="item.befor_count > item.after_count">盘亏</span>
+                          <span v-if="item.befor_count < item.after_count">盘盈</span></td>
+                        <td><span> {{getName(item.creater)}}</span></td>
+                      
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+const moment = require('moment');
+import { uParseTime } from '@/utils/tools'
+import { getStockInventoryPrintList } from "@/api/stock"
+import print from "print-js";
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '耗材管理' },
+            { path: false, name: '耗材盘点打印' },
+          ],
+          org_name: this.$store.getters.xt_user.org.org_name,
+          ids:"",
+          tableList:[],
+          manufacturerList:[],
+          houseList:[],
+          doclist:[]
+        }
+    },
+    methods:{
+        getName(admin_user_id){
+         var user_name = ""
+         for(let i=0;i<this.docList.length;i++){
+           if(admin_user_id == this.docList[i].admin_user_id){
+               user_name = this.docList[i].user_name
+           }
+         }
+         return user_name
+        },
+        printAction: function() {
+            const style = '@page{size:landscape;margin: 10mm;} @media print { print_content{width:960px;margin:0} .flex{display: flex;justify-content: space-between;} .printTable{width:100%;border-collapse: collapse;border:0px;margin:10px 0;} .printTable thead{text-align:center}.printTable td{padding:5px;} .print_body tr td{border: 1px solid;font-size:12px;border-collapse:collapse;} }';
+            printJS({ 
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+        getTime(val) {
+         if(val < 0){
+            return ""
+          }
+         if(val == ""){
+            return ""
+          }else {
+            return uParseTime(val, '{y}-{m}-{d}')
+         }
+        },
+        getlist(){
+          var params = {
+            storehouse_id:this.$route.query.storehouse_id,
+            keyword:this.$route.query.keyword,
+            limit:this.$route.query.limit,
+            page:this.$route.query.page,
+            ids:this.$route.query.ids,
+          }
+         getStockInventoryPrintList(params).then(response=>{
+           if(response.data.state == 1){
+             var list = response.data.data.list
+             console.log("list232332232323",response.data.data.list)
+             this.tableList = list
+             console.log("list233233232323",this.tableList)
+             this.houseList = response.data.data.storeHouseList
+
+             this.docList = response.data.data.doclist
+           }
+         })
+        },
+        getManufacturerName(id){
+           var name = ""
+           for(let i=0;i<this.manufacturerList.length;i++){
+              if(id == this.manufacturerList[i].id){
+                  name = this.manufacturerList[i].manufacturer_name
+              }
+           }
+           return name
+        },
+        getHouseName(id){
+         var storehouse_name = ""
+         for(let i=0;i<this.houseList.length;i++){
+           if(id == this.houseList[i].id){
+              storehouse_name = this.houseList[i].storehouse_name
+           }
+         }
+         if(storehouse_name == "全部"){
+           return ""
+         }else{
+           return storehouse_name
+         }
+       }
+    },
+    created(){
+
+      this.getlist()
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.printTitle{font-size: 22px;text-align: center;}
+.flex{display: flex;justify-content: space-between;}
+.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}
+.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}
+.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;}
+.printTable{width:100%;border-collapse: collapse;}
+.printTable td{padding:5px;}
+.print_head{border: none;display: table-header-group;}
+.print_head tr td{text-align: center;border: none;}
+.print_body tr td{border:1px solid}
+</style>