hah阿凡达

src/api/drug/drug_stock.js

@@ -681,3 +681,12 @@ export function ModityDrugCodeWarehouseInfo(data){
   })
 }
 
+
+export function getDrugWarehouseInfoPrintList(params){
+ 
+  return request({
+    url:"/api/drug/getdrugwarehouseinfoprintlist",
+    method:"get",
+    params:params
+  })
+}

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1472,14 +1472,14 @@
                             }}
                           </td>
                           <td v-if="org_id != 10683">
-                            <span v-if="org_id == 9671 || org_id == 10440 || org_id == 10471 || org_id == 10744 || org_id == 10726|| org_id == 9478">
+                            <span v-if="org_id == 9671 || org_id == 10440 || org_id == 10471 || org_id == 10744 || org_id == 10726|| org_id == 9478|| org_id == 10644">
                               {{
                                 monitor_record.ultrafiltration_volume
                                   ? monitor_record.ultrafiltration_volume
                                   : "0"
                               }}
                             </span>
-                            <span v-if="org_id != 9671 && org_id != 10440 && org_id != 10471 && org_id!=10744 && org_id!=10726&& org_id!=9478">
+                            <span v-if="org_id != 9671 && org_id != 10440 && org_id != 10471 && org_id!=10744 && org_id!=10726&& org_id!=9478&& org_id!=10644">
                               {{
                                 monitor_record.ultrafiltration_volume
                                   ? monitor_record.ultrafiltration_volume

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1378,6 +1378,7 @@
             v-if="org_template_info.template_id == 40"
           >
           </DialysisPrintOrderForty>
+          
           <DialysisPrintOrderFortyOne
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 41"

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1590,12 +1590,13 @@
                             <span v-if="org_id != 10644 && org_id != 0">{{ monitor.ultrafiltration_rate ?
                               monitor.ultrafiltration_rate : "" }}</span>
                             <span v-if="org_id == 10644">
-                              <span v-if="monindex == 0">{{ monitor.ultrafiltration_volume ?
+                              <!-- <span v-if="monindex == 0">{{ monitor.ultrafiltration_volume ?
                                 monitor.ultrafiltration_volume : "0" }}</span>
                               <span v-if="monindex == monitors.length - 1">{{ monitor.ultrafiltration_volume ?
                                 monitor.ultrafiltration_volume : "" }}</span>
                               <span v-if="(monindex != monitors.length - 1 && monindex != 0)">{{
-                                monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}</span>
+                                monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}</span> -->
+                                {{ monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:"0" }}
                             </span>
                           </td>
                           <td v-if="
@@ -2858,7 +2859,12 @@
                             <img style="height: 40px" :src="setAdminUserES(doctor_advices[0].advice_doctor)" alt=""
                               srcset="" v-else />
                           </span>
-
+                          <span v-if="doctor_advices[0]==null">
+                          <span style="height: 30px; display: inline-block" v-if="setAdminUserES(prescription.creater) == ''">
+                            {{ getAdminUser(prescription.creater) }}
+                          </span>
+                          <img style="height: 40px" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else />
+                         </span>
                         </div>
                       </div>
                     </div>
@@ -3372,6 +3378,7 @@
                     <img style="height: 40px" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else />
                   </div>
                   <div v-if="org_id != 10191" class="under_line" style="width: 80px; text-align: center">
+                   
                     <span v-if="doctor_advices[0] != null && doctor_advices[0].advice_doctor > 0">
                       <span style="height: 30px; display: inline-block"
                         v-if="setAdminUserES(doctor_advices[0].advice_doctor) == ''">
@@ -3380,6 +3387,12 @@
                       <img style="height: 40px" :src="setAdminUserES(doctor_advices[0].advice_doctor)" alt="" srcset=""
                         v-else />
                     </span>
+                    <span v-if="doctor_advices[0]==null">
+                      <span style="height: 30px; display: inline-block" v-if="setAdminUserES(prescription.creater) == ''">
+                        {{ getAdminUser(prescription.creater) }}
+                      </span>
+                      <img style="height: 40px" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else />
+                    </span>
 
                   </div>
                 </div>

src/xt_pages/stock/detail/stockInDetail.vue

@@ -116,14 +116,14 @@
       </template>
     </el-autocomplete>
 
-    <!-- <el-button
+    <el-button
       style="float: right"
       size="small"
       icon="el-icon-printer"
       @click="BatchPrintAction"
       type="primary"
       >批量打印
-    </el-button> -->
+    </el-button>
     </div>
 
     <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
@@ -252,7 +252,7 @@
               size="small"
               v-model="listQuery.start_time"
               prefix-icon="el-icon-date"
-              @change="changeTime"
+              @change="changeStartTime"
               :editable="false"
               style="width: 196px;"
               type="date"
@@ -267,7 +267,7 @@
               size="small"
               v-model="listQuery.end_time"
               prefix-icon="el-icon-date"
-              @change="changeTime"
+              @change="changeEndTime"
               :editable="false"
               style="width: 196px;"
               type="date"
@@ -286,7 +286,7 @@
                 :fetch-suggestions="querySearchAsync"
                 :trigger-on-focus="true"
                 placeholder="请输入耗材名称"
-                @select="handleSelect"
+                @select="handleSelectOne"
                 style="width:500px;"
                 :popper-append-to-body="true"
               >
@@ -304,7 +304,7 @@
       </div>
       
       <!-- 操作按钮区域 -->
-      <div class="operation-buttons">
+      <div class="operation-buttons" style="margin-bottom: 10px;">
         <el-button type="primary" @click="toGoodPrint">打印</el-button>
         <!-- <el-button type="primary" @click="toPrint">导出</el-button> -->
       </div>
@@ -384,6 +384,30 @@
              {{ scope.row.packing_price }}
           </template>
         </el-table-column>
+
+        <el-table-column prop="purchasePrice" label="生产厂家" width="100" align="center">
+          <template slot-scope="scope">
+             {{getManufactuerName(scope.row.manufacturer) }}
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="purchasePrice" label="经销商" width="100" align="center">
+          <template slot-scope="scope">
+             {{getDealerName(scope.row.dealer_name) }}
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="purchasePrice" label="入库时间" width="100" align="center">
+          <template slot-scope="scope">
+             {{getTime(scope.row.ctime) }}
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="purchasePrice" label="备注" width="100" align="center">
+          <template slot-scope="scope">
+             {{scope.row.remark }}
+          </template>
+        </el-table-column>
       </el-table>
       
       <div slot="footer" class="dialog-footer">
@@ -536,27 +560,29 @@ export default {
     };
   },
   methods: {
-    changeTime(){
+    changeStartTime(){
+
+    },
+    changeEndTime(){
 
     },
     pickerOptions(){
 
     },
     toGoodPrint() {
-      // if (this.state == 1 && this.multipleSelection.length == 0) {
-      //   this.$message.error("未选择任何数据");
-      //   return;
-      // }
-      // if (this.state == 2 && this.tableData == null) {
-      //   this.$message.error("未选择任何数据");
-      //   return;
-      // }
       this.$refs.goodPrint.show(
         this.printData,
+        this.goodList,
+        this.manufacturerList,
+        this.dealerList,
+        this.goodKindList
       );
     },
     batchSelect(selection){
-
+      if(selection.length == 0){
+        this.$message.error("请选中需要打印的内容")
+        return
+      }
       this.printData = []
       for(let i=0;i<selection.length;i++){
         for(let j=0;j<this.tablePrintData.length;j++){
@@ -570,6 +596,11 @@ export default {
     BatchPrintAction(){
       this.dialogVisible = true
     },
+    handleSelectOne(val){
+    this.good_name = val.good_name
+    this.good_id = val.id
+     this.handleQuery()
+    },
     getSocialSecurityDirectoryCode(good_id){
        var social_security_directory_code = ""
        for(let i=0;i<this.goodList.length;i++){
@@ -616,6 +647,7 @@ export default {
       getGoodWarehosueInPrintList(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
+
           this.tablePrintData = list
           var manufacturerList = response.data.data.manufacturerList
           this.manufacturerList = []

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

@@ -82,8 +82,9 @@
         type="primary"
         icon="el-icon-search"
         @click="getAllQuery"
-        >查询</el-button
-      >
+        >查询</el-button>
+
+     
     </div>
 
     <div  style="margin-bottom: 20px;">
@@ -116,6 +117,15 @@
           </div>
         </template>
       </el-autocomplete>
+
+      <el-button
+        style="float: right"
+        size="small"
+        icon="el-icon-printer"
+        @click="BatchPrintAction"
+        type="primary"
+        >批量打印
+      </el-button>
     
     </div>
    
@@ -251,18 +261,222 @@
         <el-button type="primary" @click="saveTextArea()">确 定</el-button>
       </span>
     </el-dialog>
+
+    <el-dialog
+      title="入库记录"
+      :visible.sync="dialogVisibleOne"
+      width="80%"
+      top="5vh"
+      :close-on-click-modal="false"
+    >
+      <!-- 查询条件区域 -->
+      <div class="filter-container">
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <span class="demonstration">日期查询:</span>
+            <el-date-picker
+              size="small"
+              v-model="listQuery.start_time"
+              prefix-icon="el-icon-date"
+              @change="changeStartTime"
+              :editable="false"
+              style="width: 196px;"
+              type="date"
+              placeholder="选择日期时间"
+              align="right"
+              :picker-options="pickerOptions"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+           ></el-date-picker>
+            -
+            <el-date-picker
+              size="small"
+              v-model="listQuery.end_time"
+              prefix-icon="el-icon-date"
+              @change="changeEndTime"
+              :editable="false"
+              style="width: 196px;"
+              type="date"
+              placeholder="选择日期时间"
+              align="right"
+              :picker-options="pickerOptions"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+            ></el-date-picker>
+          </el-col>
+          <el-col  :span="8">
+            <el-autocomplete
+              class="checkSearch"
+              popper-class="my-autocomplete"
+              v-model="drug_name"
+              :fetch-suggestions="querySearchAsync"
+              :trigger-on-focus="true"
+              placeholder="请输入药品名称"
+              @select="handleSelectOne"
+              style="width: 500px"
+           >
+            <i class="el-icon-search el-input__icon" slot="suffix"></i>
+            <template slot-scope="{ item }">
+              <div class="name">
+                {{
+                  item.drug_name +
+                  item.dose +
+                  item.dose_unit +
+                  "*" +
+                  item.min_number +
+                  item.min_unit +
+                  "/" +
+                  item.max_unit +
+                  "  " +
+                  item.manufacturer
+                }}
+              </div>
+            </template>
+          </el-autocomplete>
+
+          </el-col>
+          <el-col :span="2">
+            <el-button type="primary" @click="handleQuery" style="width: 100%">查询</el-button>
+          </el-col>
+        </el-row>
+      </div>
+      
+      <!-- 操作按钮区域 -->
+      <div class="operation-buttons" style="margin-bottom: 10px;">
+        <el-button type="primary" @click="toGoodPrint">打印</el-button>
+        <!-- <el-button type="primary" @click="toPrint">导出</el-button> -->
+      </div>
+      
+      <!-- 表格区域 -->
+      <el-table
+        :data="tablePrintData"
+        border
+        style="width: 100%"
+        height="60vh"
+        v-loading="loading"
+        @selection-change="batchSelect"
+        element-loading-text="数据加载中"
+      >
+      <el-table-column align="center" type="selection" width="55">
+      </el-table-column>
+        <el-table-column prop="index" label="序号" width="60" align="center">
+          <template slot-scope="scope">
+            {{ scope.$index+1 }}  
+          </template>
+        </el-table-column>
+          
+        <el-table-column prop="medicalCode" label="医保编码" width="200" align="center">
+          <template slot-scope="scope">
+              {{ scope.row.social_security_directory_code }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="name" label="药品名称" width="180" align="center">
+          <template slot-scope="scope">
+              {{ scope.row.drug_name }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="specification" label="药品规格" width="200" align="center">
+          <template slot-scope="scope">
+             {{ scope.row.specification_name }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="stockQuantity" label="入库数量" width="100" align="center">
+           <template slot-scope="scope">
+              {{ scope.row.warehousing_count }}
+           </template>
+        </el-table-column>
+        <el-table-column prop="unit" label="单位" width="80" align="center">
+          <template slot-scope="scope">
+              {{ scope.row.max_unit }}
+           </template>
+        </el-table-column>
+        <el-table-column prop="purchasePrice" label="进货单价" width="100" align="center">
+          <template slot-scope="scope">
+             {{ scope.row.price }}
+          </template>
+        </el-table-column>
+
+      
+        <el-table-column prop="stockAmount" label="入库金额" width="120" align="center">
+          <template slot-scope="scope">
+              {{ scope.row.price * scope.row.warehousing_count }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="purchasePrice" label="零售价" width="100" align="center">
+          <template slot-scope="scope">
+              {{ scope.row.retail_price }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="batchNumber" label="批号" width="120" align="center">
+          <template slot-scope="scope">
+              {{ scope.row.batch_number }}
+           </template>
+        </el-table-column>
+        <el-table-column prop="productionDate" label="生产日期" width="120" align="center">
+          <template slot-scope="scope">
+            {{ getTime(scope.row.product_date) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="expiryDate" label="有效日期" width="120" align="center">
+          <template slot-scope="scope">
+            {{ getTime(scope.row.expiry_date) }}
+          </template>
+        </el-table-column>
+       
+        <el-table-column prop="purchasePrice" label="生产厂家" width="100" align="center">
+          <template slot-scope="scope">
+              {{ scope.row.manufacturer_name }}
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="purchasePrice" label="进销商" width="100" align="center">
+          <template slot-scope="scope">
+              {{ scope.row.dealer_name }}
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="purchasePrice" label="入库时间" width="100" align="center">
+          <template slot-scope="scope">
+            {{ getTime(scope.row.ctime) }}
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="purchasePrice" label="入库单备注" width="100" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.remark}}
+          </template>
+        </el-table-column>
+      </el-table>
+      
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisibleOne = false">关闭</el-button>
+      </div>
+    </el-dialog>
+
+    <drug-new-print
+      ref="drugPrint"
+      :visibility="isVisibility"
+      :propsTable="propsTable"
+    >
+    </drug-new-print>
   </div>
+
+  
 </template>
 
 <script>
 import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers } from "@/api/doctor";
 import { GetAllConfig } from "@/api/stock";
-import { getDrugIndetail,getDrugWarehouseInfoPrint,ModityDrugCodeWarehouseInfo} from "@/api/drug/drug_stock"
+import { getDrugIndetail,getDrugWarehouseInfoPrint,ModityDrugCodeWarehouseInfo,getDrugWarehouseInfoPrintList} from "@/api/drug/drug_stock"
 import {  postSearchDrugList } from "@/api/data";
+import drugNewPrint from "../drugNewPrint.vue";
+const moment = require('moment')
 export default {
   name: "stockInDetail",
-
+  components: {
+    drugNewPrint,
+  },
   created() {
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
@@ -345,9 +559,110 @@ export default {
       id:0,
       drug_name:"",
       drug_id:0,
+      dialogVisibleOne:false,
+      listQuery:{
+       start_time: moment().startOf('month').format('YYYY-MM-DD'),
+       end_time:moment().endOf('month').format('YYYY-MM-DD')
+      },
+      tableData: [],
+      pagination: {
+        currentPage: 1,
+        pageSize: 20,
+        total: 0
+      },
+      tablePrintData:[],
+      goodList:[],
+      goodsType:[],
+      idsList:[],
+      printData:[],
+      isVisibility: "",
+      propsTable: "",
+      drugInfoList:[],
+      manufacturerList:[],
+      dealerList:[],
+      drugList:[],
     };
   },
   methods: {
+    batchSelect(selection){
+      if(selection.length == 0){
+        this.$message.error("请选中需要打印的内容")
+        return
+      }
+      this.printData = []
+      for(let i=0;i<selection.length;i++){
+        for(let j=0;j<this.tablePrintData.length;j++){
+          if(selection[i].id == this.tablePrintData[j].id){
+              this.printData.push(this.tablePrintData[j])
+          }
+        } 
+      }
+      console.log("打印数据=====",this.printData)
+    },
+    toGoodPrint() {
+      this.$refs.drugPrint.show(
+        this.printData,
+      );
+    },
+    handleSelectOne(){
+     this.handleQuery()
+    },
+    handleQuery(){
+      var params = {
+        start_time:this.listQuery.start_time,
+        end_time:this.listQuery.end_time,
+        drug_id:this.drug_id,
+      }
+      getDrugWarehouseInfoPrintList(params).then(response=>{
+         if(response.data.state == 1){
+           var drugInfo = response.data.data.drugInfo
+           var manufacturerList = response.data.data.manufacturerList
+           var dealerList = response.data.data.dealerList
+            var drugList = response.data.data.drugList
+           console.log("drug_info=====",drugInfo)
+
+           if(drugInfo!=null && drugInfo.length>0){
+              for(let i=0;i<drugInfo.length;i++){
+                drugInfo[i].social_security_directory_code = ""
+                drugInfo[i].drug_name = ""
+                for(let j=0;j<drugList.length;j++){
+                    if(drugInfo[i].drug_id == drugList[j].id){
+                       drugInfo[i].specification_name = drugList[j].dose + drugList[j].dose_unit +"*" +drugList[j].min_number + drugList[j].min_unit + "/"+drugList[j].max_unit
+                       drugInfo[i].social_security_directory_code = drugList[j].social_security_directory_code
+                       drugInfo[i].drug_name = drugList[j].drug_name
+                    }
+                }
+
+                for(let x=0;x<manufacturerList.length;x++){
+                   
+                  if(drugInfo[i].manufacturer == manufacturerList[x].id) {
+                    drugInfo[i].manufacturer_name = manufacturerList[x].manufacturer_name
+                  }
+                }
+
+                for(let y=0;y<dealerList.length;y++){
+                 
+                  if(drugInfo[i].dealer == dealerList[y].id) {
+                    drugInfo[i].dealer_name = dealerList[y].dealer_name
+                  }
+                }
+              }
+
+            
+           } 
+
+           this.tablePrintData = []
+           console.log("drugInfo==========",drugInfo)
+           this.tablePrintData = drugInfo
+
+          
+         }
+      })
+    
+    },
+    BatchPrintAction(){
+      this.dialogVisibleOne = true
+    },
     querySearchAsync(keyword, cb) {
       let key = "";
       if (keyword != undefined) {

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

@@ -626,14 +626,14 @@ export default {
            
               list[i].over_count_one = this.GetInitStartFlowOne(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit) 
              
-              if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
+              if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752 || this.org_id == 9478){
                 list[i].drugInMoney = ""
               }else{
                 list[i].drugInMoney = list[i].last_price
               }
               if(this.org_id == 10697){
                 list[i].drugSaleMoney =  (list[i].over_count_one * list[i].last_price).toFixed(2)
-              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
+              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752 || this.org_id == 9478){
               
                 list[i].drugSaleMoney =  this.GetInitStartFlowPice(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)
               } else{
@@ -647,7 +647,7 @@ export default {
               if( this.org_id == 10697){
                  list[i].drugAddPrice = list[i].last_price
                  list[i].drugAddSalePrice = (list[i].last_price *list[i].drugAddOne).toFixed(2)
-              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
+              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752 || this.org_id ==9478){
                 list[i].drugAddPrice = "/"
                 list[i].drugAddSalePrice = this.drugAddInfoOnePirce(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
                 console.log("本期增加加淀粉",list[i].drugAddSalePrice)
@@ -663,7 +663,7 @@ export default {
               if( this.org_id == 10697){
                 list[i].drugOutPrice = list[i].retail_price
                 list[i].drugOutSalePrice = (list[i].drugOutOne * list[i].retail_price).toFixed(2)
-              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
+              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752 || this.org_id == 9478){
                 list[i].drugOutPrice = "/"
                 list[i].drugOutSalePrice= this.getDrugOutPriceOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
               } else{
@@ -683,7 +683,7 @@ export default {
             if(this.org_id == 10697){
                 list[i].overDrugPrice = list[i].retail_price
                 list[i].oveDrugSaleMoney = (list[i].overDrugOne * list[i].retail_price).toFixed(2)
-            }else if(this.org_id == 0 || this.org_id ==10644 || this.org_id == 10752){
+            }else if(this.org_id == 0 || this.org_id ==10644 || this.org_id == 10752 || this.org_id == 9478){
               console.log("加个2323323",list[i].drugAddSalePrice)
                 list[i].overDrugPrice = ""
                 list[i].oveDrugSaleMoney = this.GetDrugOverOnePrice(list[i].drugSaleMoney,list[i].drugAddSalePrice,list[i].drugOutSalePrice,list[i].min_number,list[i].min_unit,list[i].max_unit)

src/xt_pages/stock/goodPrint.vue

@@ -16,38 +16,73 @@
         </div>
         <div style="display: flex;">
           <div style="margin-right: 20px;">日期：{{times}}</div>
-          <div>单据号:00013756</div>
         </div>
         <div>
           <table class="table" border="1" 
             style="border-collapse: collapse;width: 100%;text-align: center;">
             <tr>
-              <td>药品名称</td>
+              <td>序号</td>
+              <td>医保编码</td>
+              <td>耗材名称</td>
               <td>规格</td>
-              <td>用量</td>
-              <td>用法</td>
-              <td>天数</td>
-              <td>总量</td>
-              <td>单价</td>
-              <td>金额</td>
-              <td>执行时间</td>
+              <td>单位</td>
+              <td>批号</td>
+              <td>生产日期</td>
+              <td>有效日期</td>
+              <td>进货单价</td>
+              <td>入库数量</td>
+              <td>入库金额</td>
+              <td>零售价</td>
+              <td>生产厂家</td>
+              <td>经销商</td>
+              <td>入库时间</td>
+              <td>备注</td>
             </tr>
-            <tr v-for="item in tableData" >
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
+            <tr v-for="(item,i) in tableData" >
+              <td>{{ i+1 }}</td>
+              <td>{{ getSocialSecurityDirectoryCode(item.good_id) }}</td>
+              <td>{{ getGoodName(item.good_id)}}</td>
+              <td>{{ getSpecificationName(item.good_id) }}</td>
+              <td>{{ getPackingUnit(item.good_id)}}</td>
+              <td>{{ item.number }}</td>
+              <td>
+                {{ getTime(item.product_date) }}
+              </td>
+              <td>
+              {{ getTime(item.expiry_date) }}
+              </td>
+              <td>
+                {{ item.price }}
+              </td>
+              <td>{{ item.warehousing_count }}</td>
+              <td>
+               {{ (item.warehousing_count * item.price).toFixed(2) }}
+              </td>
+              <td>
+                {{ item.packing_price }}
+              </td>
+              <td>
+                {{getManufactuerName(item.manufacturer) }}
+              </td>
+              <td>
+                {{getDealerName(item.dealer_name) }}
+              </td>
+              <td>
+                {{ getTime(item.ctime) }}
+              </td>
+              <td>
+                {{ item.remark }}
+              </td>
             </tr>
           </table>
         </div>
         <div style="display: flex;margin: 10px 0;">
-          <div style="flex: 1;">数量合计:</div>
-          <div style="flex: 1;">金额合计:</div>
+          <div style="flex: 1;">数量合计:
+             {{ getSumCount() }}
+          </div>
+          <div style="flex: 1;">金额合计:
+             {{ getSumPrice() }}
+          </div>
           <div style="flex: 1;">操作人:</div>
           <div style="flex: 1;">核对人:</div>
         </div>
@@ -72,7 +107,7 @@
         name:"",
         DialysisNo:'',
         state:null,
-        times:"",
+        times: moment().format('YYYY-MM-DD HH:mm:ss'),
         start_time:moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
         org_name: this.$store.getters.xt_user.org.org_name,
         baseList:[],
@@ -82,6 +117,10 @@
         Price_zong:0,
         diagnosearr:[],
         diagnosis:'',
+        goodList:[],
+        manufacturerList:[],
+        dealerList:[],
+        goodKindList:[],
       };
     },
     props: {
@@ -93,7 +132,90 @@
       this.init();
     },
     methods: {
-     
+      getManufactuerName: function(manufacturer_id) {
+      for (let i = 0; i < this.manufacturerList.length; i++) {
+        if (this.manufacturerList[i].id == manufacturer_id) {
+          return this.manufacturerList[i].manufacturer_name;
+        }
+      }
+    },
+    getDealerName: function(dealer_id) {
+      for (let i = 0; i < this.dealerList.length; i++) {
+        if (this.dealerList[i].id == dealer_id) {
+          return this.dealerList[i].dealer_name;
+        }
+      }
+    },
+      getSumCount(){
+        var sum_count = 0
+        for(let i=0;i<this.tableData.length;i++){
+          sum_count+=this.tableData[i].warehousing_count
+        }
+        return sum_count
+      },
+      getSumPrice(){
+        var all_price = 0
+        for(let i=0;i<this.tableData.length;i++){
+          all_price+= (this.tableData[i].warehousing_count * this.tableData[i].price)
+        }
+        if(all_price>0){
+           all_price.toFixed(2)
+        }else{
+          return ""
+        }
+      },
+      getTime: function(val) {
+      if (val == 0) {
+        return "";
+      } else {
+        return uParseTime(val, "{y}-{m}-{d}");
+      }
+     },
+      getSocialSecurityDirectoryCode(good_id){
+       var social_security_directory_code = ""
+       for(let i=0;i<this.goodList.length;i++){
+         if(good_id == this.goodList[i].id){
+           social_security_directory_code = this.goodList[i].social_security_directory_code
+         }
+       }
+       return social_security_directory_code
+    },
+      getGoodKandName(id){
+        var name = ""
+        for(let i=0;i<this.goodKindList.length;i++){
+        if(id == this.goodKindList[i].value){
+            name = this.goodKindList[i].name
+        }
+        }
+        return name
+      },
+      getGoodName(good_id){
+        var good_name = ""
+        for(let i=0;i<this.goodList.length;i++){
+          if(good_id == this.goodList[i].id){
+            good_name = this.goodList[i].good_name
+          }
+        }
+        return good_name
+      },
+      getSpecificationName(good_id){
+        var specification_name = ""
+        for(let i=0;i<this.goodList.length;i++){
+          if(good_id == this.goodList[i].id){
+            specification_name = this.goodList[i].specification_name
+          }
+        }
+        return specification_name
+      },
+      getPackingUnit(good_id){
+        var packing_unit = ""
+        for(let i=0;i<this.goodList.length;i++){
+          if(good_id == this.goodList[i].id){
+            packing_unit = this.goodList[i].packing_unit
+          }
+        }
+        return packing_unit
+      },
       init(){
       
       },
@@ -108,9 +230,18 @@
           }
         }
       },
-      show: function (val) {
+      show: function (tableData,goodList,manufacturerList,dealerList,goodKindList) {
+      
+        this.goodList = []
+        this.goodList = goodList
+        this.manufacturerList =[] 
+        this.manufacturerList = manufacturerList
+        this.dealerList =[]
+        this.dealerList = dealerList 
+        this.goodKindList = []
+        this.goodKindList = goodKindList
         this.tableData = []
-        this.tableData = val
+        this.tableData = tableData
         this.visibility = true;
       },
    
@@ -127,14 +258,15 @@
       print() {
         console.log(this.org_name,'this.org_name')
         Vue.prototype.printJson = printutils.printJson;
-          const style =
-            '@media print {.list_title{width:940px;border-bottom:1px solid;display:flex;margin:20px auto} .table tr td{border:1px solid black;padding: 5px 0;border-left: none;border-right: none;}}';
+          const style ='@media print {.list_title{width:940px;border-bottom:1px solid;display:flex;margin:20px auto} .table tr td{border:1px solid black;padding: 5px 0;border-left: none;border-right: none;}.dialysis-print-box-1 .table{ border-collapse: collapse;width:100%;text_align:center} .dialysis-print-box-1 .table tr td{ border: 1px solid #000 !important; padding: 5px 0;} }';
           printJS({
             printable: "dialysis-print-box-1",
             type: "html",
             style: style,
             scanStyles: false,
           });
+
+          
       },
       getSpecaiName(drug_id){
          var spc =""
@@ -216,5 +348,17 @@
   .el-table::before {
     background-color: #d0d3da;
   }
+
+  /* 仅影响当前组件的表格 */
+.dialysis-print-box-1 .table {
+  border-collapse: collapse;
+  width: 100%;
+  text-align: center;
+}
+
+.dialysis-print-box-1 .table tr td {
+  border: 1px solid #000 !important; /* 确保所有边框都显示 */
+  padding: 5px 0;
+}
   </style>
   

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -223,6 +223,7 @@ export default {
   
   },
   methods:{
+    
     changeStorehouseName(){
 
     },
@@ -324,7 +325,7 @@ export default {
               }else if(this.org_id == 0){
                 list[i].addStockMoney = list[i].buy_price 
                 list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
-              } else if(this.org_id == 10644 || this.org_id == 10752){
+              } else if(this.org_id == 10644 || this.org_id == 10752 || this.org_id ==9478 ){
                 list[i].addStockMoney = "/"
                 list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
               } else{
@@ -340,7 +341,7 @@ export default {
               }else if(this.org_id == 0){
                 list[i].stockOutprice = list[i].packing_price
                 list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
-              }else if(this.org_id == 10644 || this.org_id == 10752){
+              }else if(this.org_id == 10644 || this.org_id == 10752 || this.org_id == 9478){
                 list[i].stockOutprice = "/"
                 list[i].saleOutMoney = this.getWarehosueOutInfoPrice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
                 if(list[i].saleOutMoney == "NaN"){
@@ -371,7 +372,7 @@ export default {
               }else if(this.org_id == 0){
                 list[i].overPrice = list[i].GoodEndFlowInfo.buy_price
                 list[i].overMoney = (list[i].GoodEndFlowInfo.buy_price*list[i].overStock).toFixed(2)
-              } else if(this.org_id ==10644 || this.org_id == 10752){
+              } else if(this.org_id ==10644 || this.org_id == 10752 || this.org_id == 9478){
                 list[i].overPrice = "/"
                 list[i].overMoney = (parseFloat(list[i].stockMoney)  + parseFloat(list[i].saleStockMoney) - parseFloat(list[i].saleOutMoney)).toFixed(2)
               }else{