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

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1190,8 +1190,8 @@
                               : "/"
                           }}
                         </div>
-                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id==10460 || org_id ==10624 || org_id ==10644">ml</span>
-                         <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471 && org_id!=10460 && org_id!=10624  && org_id!=10644">L</span>
+                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469|| org_id==10460 || org_id ==10624 || org_id ==10644">ml</span>
+                         <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10460 && org_id!=10624  && org_id!=10644">L</span>
                       </div>
 
                       <div class="inline_block" style="flex: 1" v-if="org_id == 10469 || org_id ==10598">
@@ -2196,7 +2196,7 @@
                             执行人签名
                           </td>
                           <td style="font-size: 16px" width="10%">时间</td>
-                           <td style="font-size: 16px" width="10%" v-if="org_id == 10375 || org_id == 0 || org_id ==10206 || org_id == 10571 || org_id ==10600 || org_id == 10489">核对护士</td>
+                           <td style="font-size: 16px" width="10%" v-if="org_id == 10375 || org_id == 0 || org_id ==10206 || org_id == 10571 || org_id ==10600 || org_id == 10489 || org_id ==10402">核对护士</td>
                         </tr>
                         <!-- <template v-for="group in doctor_advices" > -->
 
@@ -2304,7 +2304,7 @@
                                 getTime(advice[0].execution_time, " {h}:{i}")
                               }}</span>
                             </td>
-                            <td height="35px" v-if="org_id == 10375 || org_id ==0||org_id ==10206|| org_id == 10571 || org_id ==10600 || org_id ==10489">
+                            <td height="35px" v-if="org_id == 10375 || org_id ==0||org_id ==10206|| org_id == 10571 || org_id ==10600 || org_id ==10489 || org_id == 10402">
                               <span
                                 v-if="
                                   setAdminUserES(

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -2380,7 +2380,19 @@ export default {
             this.manufacturerList = manufacturerList
             var adviceMonthList = response.data.data.adviceList
             var hisAdviceMonthList = response.data.data.hisAdviceList
+        
+            for(let i=0;i<hisAdviceMonthList.length;i++){
+                hisAdviceMonthList[i].count_one = 0
+               if(hisAdviceMonthList[i].prescribing_number_unit == hisAdviceMonthList[i].drug.max_unit){
+                hisAdviceMonthList[i].prescribing_number = parseInt(hisAdviceMonthList[i].prescribing_number) * hisAdviceMonthList[i].drug.min_number
+                hisAdviceMonthList[i].count_one =  parseInt(hisAdviceMonthList[i].prescribing_number) * hisAdviceMonthList[i].drug.min_number
+               }
+            }
+
+  
             if(config.is_open == 1){
+
+
                
               if(hisAdviceMonthList!=null && hisAdviceMonthList.length>0){
                 let dataInfo = {}
@@ -2574,8 +2586,8 @@ export default {
           total+=parseInt(val[i].prescribing_number)
         }
         if (total < min_number) {
-        min_str = total + min_unit;
-      }
+          min_str = total + min_unit;
+        }
       if (total == 0) {
         min_str = "";
         max_str = "";

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1293,8 +1293,8 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460 || org_id==10644">ml</span>
-                      <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460 && org_id!=10644">L</span>
+                      <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10460 || org_id==10644">ml</span>
+                      <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10460 && org_id!=10644">L</span>
                     </div>
 
 
@@ -2148,13 +2148,13 @@
                         <td style="font-size: 16px" width="10%">医生签名</td>
                         <!-- <td style="font-size: 16px" width="10%">核对人签名</td> -->
                         <td style="font-size: 16px" width="10%">执行人签名</td>
-                        <td style="font-size: 16px" width="10%" v-if="org_id == 10598 || org_id == 10489 ">核对护士</td>
+                        <td style="font-size: 16px" width="10%" v-if="org_id == 10598 || org_id == 10489 || org_id == 0 || org_id == 10402">核对护士</td>
                         <td style="font-size: 16px" width="10%">时间</td>
                         <td
                           style="font-size: 16px"
                           width="10%"
                           v-if="org_id == 10223 || org_id == 9538  ||
-                                org_id ==10375 || org_id ==10571 || org_id ==10600 "
+                                org_id ==10375 || org_id ==10571 || org_id ==10600"
                         >
                           核对护士
                         </td>
@@ -2237,7 +2237,7 @@
                             />
                         </span>
                         </td>
-                        <td v-if="org_id == 10598 || org_id==10489 ">
+                        <td v-if="org_id == 10598 || org_id==10489 || org_id == 0 || org_id == 10402 ">
                           <span v-if="org_id!=10489">
                             <span v-if="advice!=null && advice.checker>0">
                               <span v-if="setAdminUserES(advice.checker) == ''">{{ getAdminUser(advice.checker)}}</span>

src/xt_pages/outpatientCharges/summary.vue

@@ -16,7 +16,7 @@
               搜索
             </el-button>
           </div>
-          
+
           <div>
             <el-select  v-model="sort_type"
               placeholder="请选择"
@@ -32,7 +32,7 @@
               </el-option>
             </el-select>
           </div>
-          
+
           <div>
             <el-select v-model="sch_type" placeholder="请选择班次" @change="handleSchType" style="width: 100%;">
               <el-option label="全部" value="0"></el-option>
@@ -54,6 +54,9 @@
           </div>
         </div>
         <div class="content_button"  style="">
+          <el-button
+            size="small" type="primary" @click="query">查询
+          </el-button>
           <el-button
             v-if="$store.getters.xt_user.org_id == 10138 || $store.getters.xt_user.org_id == 10278 ||
                 $store.getters.xt_user.org_id == 10610 || $store.getters.xt_user.org_id == 0"
@@ -79,8 +82,8 @@
       <div style=" display: flex; justify-content: space-between;  margin-bottom: 10px;">
         <div class="content_top" style="margin-right: 10px;">
           <div style="">
-            <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date" 
-              @change="handleStartTimeChange":editable="false" :clearable="false" 
+            <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date"
+              @change="handleStartTimeChange":editable="false" :clearable="false"
               style="width: 45%;"
               type="date"
               placeholder="选择开始日期"
@@ -128,7 +131,7 @@
             </el-select>
           </div>
 
-          
+
         </div>
         <div class="content_button">
           <el-button size="small" type="primary" @click="export_detail_three" v-if="$store.getters.xt_user.org_id == 10265 || $store.getters.xt_user.org_id == 0">报表下载12</el-button>
@@ -855,13 +858,13 @@ export default {
     },
     handleSchType(val) {
       this.sch_type = val
-      this.getHisOrderList()
+      // this.getHisOrderList()
     }, handleMedChange() {
-      this.getHisOrderList()
+      // this.getHisOrderList()
     },
     handleZoneChange(val) {
       this.zoneVal = val
-      this.getHisOrderList()
+      // this.getHisOrderList()
 
     },
     getInitData: function() {
@@ -3591,12 +3594,12 @@ export default {
     changeSortType() {
       this.page = 1
       this.keywords = ''
-      this.getHisOrderList()
+      // this.getHisOrderList()
     },
     changeDoctor() {
       this.page = 1
       this.keywords = ''
-      this.getHisOrderList()
+      // this.getHisOrderList()
     },
     handleSizeChange(limit) {
       this.limit = limit
@@ -4063,12 +4066,12 @@ export default {
     }
   }
   .content_top{
-    flex: 1; 
+    flex: 1;
     display: flex;
     justify-content: space-between;
   }
   .content_button{
-    flex: 1; 
+    flex: 1;
     display: flex;
     text-align: right;
     justify-content: flex-end;

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -200,6 +200,7 @@
                         <div>{{'天'}}</div>
                     </div>
                 </template>
+
             </el-table-column>
             <el-table-column align="center" prop="total" width="70" label="总量">
                 <template slot-scope="scope">
@@ -547,7 +548,7 @@
               scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose ) //  / scope.row.drug.dose
             } else {
               console.log(1234)
-              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)// 
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)//
             }
           }
           if (scope.row.prescribing_number == 0) {

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

@@ -95,6 +95,11 @@
                   {{scope.row.dose}}{{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" v-if="org_id ==10697 || org_id == 0">
+              <template slot-scope="scope">
+                 {{scope.row.retail_price}}
+              </template>
+            </el-table-column>
             <el-table-column label="生产厂商" align="center">
               <template slot-scope="scope">
                 {{getManufacturName(scope.row.manufacturer)}}

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

@@ -59,6 +59,11 @@
                    {{scope.row.XtBaseDrug.dose}}{{scope.row.XtBaseDrug.dose_unit}}*{{scope.row.XtBaseDrug.min_number}}{{scope.row.XtBaseDrug.min_unit}}/{{scope.row.XtBaseDrug.max_unit}}
                 </template>
             </el-table-column>
+            <el-table-column label="国家编码" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.XtBaseDrug.medical_insurance_number}}
+              </template>
+            </el-table-column>
             <el-table-column label="生产厂商" align="center">
               <template slot-scope="scope">
                  {{getManufacturName(scope.row.manufacturer)}}

src/xt_pages/stock/drugs/drugInventoryModePrint.vue

@@ -13,47 +13,105 @@
 
                 <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>
+                        <tr>
+                        <td colspan="17" style="font-size: 20px;font-weight: bold;">{{ org_name }}药品盘点</td>
+                        </tr>
+                        <tr>
+
+                        <td colspan="17" style="text-align: right;">
+                            {{ getNowTime() }}
+                            <!-- <div style="float: right;margin-left: 600px;width: 200px;">{{ getNowTime() }}</div> -->
+                        </td>
+                        </tr>
+
+                     </thead>
                     <tbody class="print_body">
                     <tr>
-                        <td align="center" style="width: 50px;">序号</td>
+                        <!-- <td align="center" style="width: 50px;">序号</td>
                         <td align="center" style="width: 200px;">药品名称</td>
                         <td align="center" style="width: 200px;">规格</td>
-                        <td align="center" style="width: 200px;">上期结余数量</td>
-                        <td align="center" style="width: 200px;">本月入库数量</td>
-                        <td align="center" style="width: 200px;">进货金额</td>
-                        <td align="center" style="width: 200px;">本月入库总金额</td>
-                        <td align="center" style="width: 200px;">本月出库数量</td>
-                        <td align="center" style="width: 200px;">销售价</td>
-                        <td align="center" style="width: 200px;">本月销售总金额</td>
-                        <td align="center" style="width: 200px;">本月剩余库存</td>
-                        <td align="center" style="width: 200px;">进货价</td>
-                        <td align="center" style="width: 200px;">本月剩余总金额</td>
+                        <td align="center" style="width: 50px;">上期结余数量</td>
+                        <td align="center" style="width: 100px;">本月入库数量</td>
+                        <td align="center" style="width: 50px;">进货金额</td>
+                        <td align="center" style="width: 100px;">本月入库总金额</td>
+                        <td align="center" style="width: 50px;">本月出库数量</td>
+                        <td align="center" style="width: 50px;">销售价</td>
+                        <td align="center" style="width: 100px;">本月销售总金额</td>
+                        <td align="center" style="width: 50px;">本月剩余库存</td>
+                        <td align="center" style="width: 50px;">进货价</td>
+                        <td align="center" style="width: 100px;">本月剩余总金额</td>
                         <td align="center" style="width: 200px;">批号</td>
                         <td align="center" style="width: 200px;">生产日期</td> 
                         <td align="center" style="width: 200px;">有效日期</td>
                         <td align="center" style="width: 200px;">生产厂商</td>
-                        <td align="center" style="width: 200px;">盘点数量</td>
+                        <td align="center" style="width: 200px;">盘点数量</td> -->
+
+                        <td align="center" style="width: 50px;">序号</td>
+                        <td align="center" style="width: 200px;">药品名称</td>
+                        <td align="center" style="">规格</td>
+                        <td align="center" style="">上期结余数量</td>
+                        <td align="center" style="width:150px">本月入库数量</td>
+                        <td align="center" style="">进货金额</td>
+                        <td align="center" style="width:150px">本月入库总金额</td>
+                        <td align="center" style="width:150px">本月出库数量</td>
+                        <td align="center" style=" ">销售价</td>
+                        <td align="center" style="width:150px">本月销售总金额</td>
+                        <td align="center" style="width:150px">本月剩余库存数量</td>
+                        <td align="center" style=" ">进货价</td>
+                        <td align="center" style="width:150px;">本月剩余总金额</td>
+                        <td align="center" style=" ">批号</td>
+                        <td align="center" style=" ">有效日期</td>
+                        <td align="center" style=" ">生产厂商</td>
+                        <td align="center" width="100" style=" ">盘点<br/>数量</td>
                        
                     </tr>
 
                     <tr v-for="(item,index) in tableList" :key="index">
-                        <td align="center" style="width: 50px;">序号</td>
-                        <td align="center">{{ item.drug_name }}</td>
-                        <td align="center">{{ item.specification_name }}</td>
-                        <td align="center" style="width: 200px;">上期结余数量</td>
-                        <td align="center">{{ getInCount(item.drug_id,item.min_number,item.min_unit,item.max_unit) }}</td>
-                        <td align="center" style="width: 200px;">进货金额</td>
-                        <td align="center" style="width: 200px;">本月入库总金额</td>
+                        <td align="center" style="width: 50px;">
+                          <span v-if="item.is_total == 0">  {{index+1 }}</span>
+                          <span v-if="item.is_total == 1">  {{ item.index }}</span>
+                        </td>
+                        <td align="center">
+                           <span v-if="item.is_total == 0">{{ item.drug_name }}</span>
+                        </td>
+                        <td align="center">
+                           <span v-if="item.is_total == 0">
+                             {{ item.specification_name }}
+                           </span>
+                        </td>
+                        <td align="center" style="width: 200px;">
+                           <span v-if="item.is_total == 0">
+                             {{ item.last_over }}
+                           </span>
+                        </td>
+                        <td align="center">
+                           <span v-if="item.is_total == 0">
+                            {{ getInCount(item.drug_id,item.min_number,item.min_unit,item.max_unit) }}
+                           </span> 
+                        </td>
+                        <td align="center" style="width: 200px;">
+                          <span v-if="item.is_total == 0">
+                            {{ getBuyPrice(item.drug_id) }}
+                          </span>  
+                        </td>
+                        <td align="center" style="width: 200px;">
+
+                           {{item.month_in_total_price }}
+                        </td>
                         <td align="center">{{ getOutCount(item.drug_id,item.min_number,item.min_unit,item.max_unit) }}</td> 
-                        <td align="center" style="width: 200px;">销售价</td>
-                        <td align="center" style="width: 200px;">本月销售总金额</td>
+                        <td align="center" style="width: 200px;">{{ getRetailPrice(item.drug_id) }}</td>
+                        <td align="center" style="width: 200px;">
+                            {{ item.month_out_total_price}}
+                        </td>
                         <td align="center">{{ getSumCount(item.sum_count,item.min_number,item.min_unit,item.max_unit) }}</td>
-                        <td align="center" style="width: 200px;">进货价</td>
-                        <td align="center" style="width: 200px;">本月剩余总金额</td>
+                        <td align="center" style="width: 200px;">
+                            {{ getBuyPrice(item.drug_id) }}
+                        </td>
+                        <td align="center" style="width: 200px;">
+                            {{ item.month_over_total_price}}
+                        </td>
                         <td align="center">
+                           <span v-if="item.is_total == 0">
                             <table
                                 class="ware_table"
                                 style="width: 100%; border-collapse: collapse"
@@ -89,84 +147,89 @@
                                     </td>
                               </tr>
                             </table>
+                            </span>
                         </td>
                        
-                        <td align="center">
-                             <table
-                                class="ware_table"
-                                style="width: 100%; border-collapse: collapse"
-                                >
-                                <tr
-                                    v-for="(it, i) in item.child"
-                                    :key="i"
-                                    style="width: 100%"
-                                >
-                                    <td
-                                    :style="[
-                                        {
-                                        border:
-                                            i === item.child.length - 1
-                                            ? 'none'
-                                            : '',
-                                        },
-                                        {
-                                        borderStyle:
-                                            i === item.child.length - 1
-                                            ? 'initial'
-                                            : 'hidden',
-                                        },
-                                        {
-                                        borderBottom:
-                                            i === item.child.length - 1
-                                            ? 'none'
-                                            : '1px solid',
-                                        },
-                                    ]"
+                        <!-- <td align="center">
+                            <span v-if="item.is_total == 0">
+                                <table
+                                    class="ware_table"
+                                    style="width: 100%; border-collapse: collapse"
                                     >
-                                    {{ getTime(it.product_date) }}
-                                    </td>
-                              </tr>
-                            </table>
-                        </td>
+                                    <tr
+                                        v-for="(it, i) in item.child"
+                                        :key="i"
+                                        style="width: 100%"
+                                    >
+                                        <td
+                                        :style="[
+                                            {
+                                            border:
+                                                i === item.child.length - 1
+                                                ? 'none'
+                                                : '',
+                                            },
+                                            {
+                                            borderStyle:
+                                                i === item.child.length - 1
+                                                ? 'initial'
+                                                : 'hidden',
+                                            },
+                                            {
+                                            borderBottom:
+                                                i === item.child.length - 1
+                                                ? 'none'
+                                                : '1px solid',
+                                            },
+                                        ]"
+                                        >
+                                        {{ getTime(it.product_date) }}
+                                        </td>
+                                </tr>
+                                </table>
+                            </span>
+                        </td> -->
                         <td align="center">
-                          <table
-                                class="ware_table"
-                                style="width: 100%; border-collapse: collapse"
-                                >
-                                <tr
-                                    v-for="(it, i) in item.child"
-                                    :key="i"
-                                    style="width: 100%"
-                                >
-                                    <td
-                                    :style="[
-                                        {
-                                        border:
-                                            i === item.child.length - 1
-                                            ? 'none'
-                                            : '',
-                                        },
-                                        {
-                                        borderStyle:
-                                            i === item.child.length - 1
-                                            ? 'initial'
-                                            : 'hidden',
-                                        },
-                                        {
-                                        borderBottom:
-                                            i === item.child.length - 1
-                                            ? 'none'
-                                            : '1px solid',
-                                        },
-                                    ]"
+                            <span v-if="item.is_total == 0">
+                                <table
+                                    class="ware_table"
+                                    style="width: 100%; border-collapse: collapse"
                                     >
-                                    {{ getTime(it.expiry_date) }}
-                                    </td>
-                              </tr>
-                            </table> 
+                                    <tr
+                                        v-for="(it, i) in item.child"
+                                        :key="i"
+                                        style="width: 100%"
+                                    >
+                                        <td
+                                        :style="[
+                                            {
+                                            border:
+                                                i === item.child.length - 1
+                                                ? 'none'
+                                                : '',
+                                            },
+                                            {
+                                            borderStyle:
+                                                i === item.child.length - 1
+                                                ? 'initial'
+                                                : 'hidden',
+                                            },
+                                            {
+                                            borderBottom:
+                                                i === item.child.length - 1
+                                                ? 'none'
+                                                : '1px solid',
+                                            },
+                                        ]"
+                                        >
+                                        {{ getTime(it.expiry_date) }}
+                                        </td>
+                                </tr>
+                                </table> 
+                           </span>
                         </td>
                         <td align="center">
-
+                          <span v-if="item.is_total == 0">
                             <table
                                 class="ware_table"
                                 style="width: 100%; border-collapse: collapse"
@@ -202,7 +265,7 @@
                                     </td>
                               </tr>
                             </table>
-
+                          </span>
                         </td>
                         <td align="center">
 
@@ -213,6 +276,10 @@
                    
                     </tbody>
                 </table>
+                <div style="width: 100%;display: flex;margin-top: 10px;">
+                    <div style="flex: 1;">盘点人签字:</div>
+                    <div style="flex: 1;">监盘人签字:</div>
+                </div>
             </div>
         </div>
     </div>
@@ -250,6 +317,15 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
        }
      },
      methods:{
+        getNowTime: function () {
+            let dateTime;
+            let yy = new Date().getFullYear();
+            let mm = new Date().getMonth() + 1;
+            let dd = new Date().getDate();
+
+            dateTime = yy + '年' + mm + '月' + dd + '日'
+            return dateTime
+       },
         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({ 
@@ -287,6 +363,19 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
               if(response.data.state == 1){
                  loading.close()
                  var list  =  response.data.data.list
+                 var manufacturerList = response.data.data.manufacturerList
+                 this.manufacturerList = manufacturerList
+
+                 this.infoList = response.data.data.infoList
+
+                 this.outList = response.data.data.outList
+
+              
+                 this.drugList = response.data.data.drugList
+
+                 this.warehouseInfoFlow = response.data.data.warehouseInfoFlow
+                 this.warehouseOutFlow = response.data.data.warehouseOutFlow
+                 this.cancelFlow = response.data.data.cancelFlow
                 if(list!=null && list.length > 0){
                   let dataInfo = {}
                   list.forEach((item, index) => {
@@ -304,10 +393,10 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
                       sum_count:item.sum_count,
                       last_over:0, //上期结余数量
                       month_in_total:0,//本月入库数量
-                      buy_price:0,//进货金额
+                      last_price:0,//进货金额
                       month_in_total_price:0,//本月入库总金额
                       month_out_total:0,//本月出库数量,
-                      packing_price:0,//销售价,
+                      retail_price:0,//销售价,
                       month_out_total_price:0,//本月销售总金额,
                       month_over_total:0,//本月剩余库存
                       month_over_total_price:0,
@@ -324,26 +413,271 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
                        }
                    }
                 }
-                
-                this.tableList = arr
-                console.log("arr--------------",arr)
+                for(let i=0;i<arr.length;i++){
+                  arr[i].is_total = 0
+                  arr[i].last_over = this.getLastover(arr[i].drug_id,arr[i].min_number,arr[i].min_unit,arr[i].max_unit)
+                  arr[i].month_in_total = this.getInCount(arr[i].drug_id,arr[i].min_number,arr[i].min_unit,arr[i].max_unit)
+                  arr[i].last_price = this.getBuyPrice(arr[i].drug_id)
+                  arr[i].month_in_total_price = (this.getBuyPrice(arr[i].drug_id)*this.getInCountOne(arr[i].drug_id,arr[i].min_number,arr[i].min_unit,arr[i].max_unit)).toFixed(2)
+                  arr[i].retail_price = this.getRetailPrice(arr[i].retail_price)
+                  arr[i].month_out_total_price = (this.getOutCountOne(arr[i].drug_id,arr[i].min_number,arr[i].min_unit,arr[i].max_unit) * this.getRetailPrice(arr[i].drug_id)).toFixed(2)
+                  arr[i].month_over_total_price = (this.getSumCountOne(arr[i].sum_count,arr[i].min_number,arr[i].min_unit,arr[i].max_unit) * this.getBuyPrice(arr[i].drug_id)).toFixed(2)
                 }
-                 var manufacturerList = response.data.data.manufacturerList
-                 this.manufacturerList = manufacturerList
-
-                 this.infoList = response.data.data.infoList
 
-                 this.outList = response.data.data.outList
+                this.tableList = arr
+                console.log("arr------------------------",arr)
+                var obj = {is_total:1,index:"合计",last_over:0,month_in_total:0,last_price:0,month_in_total_price:0,retail_price:0,month_out_total_price:0,month_over_total_price:0}
 
               
-                 this.drugList = response.data.data.drugList
+                for(let i=0;i<this.tableList.length;i++){
+                  obj.month_in_total_price += parseFloat(this.tableList[i].month_in_total_price) 
+                  obj.month_out_total_price +=parseFloat(this.tableList[i].month_out_total_price)
+                  obj.month_over_total_price +=parseFloat(this.tableList[i].month_over_total_price) 
+                }
+                obj.mon
+                console.log("obj=====================",obj)
+                this.tableList.push(obj)
+                // console.log("arr--------------",arr)
 
-                 this.warehouseInfoFlow = response.data.data.warehouseInfoFlow
-                 this.warehouseOutFlow = response.data.data.warehouseOutFlow
-                 this.cancelFlow = response.data.data.cancelFlow
+               }
+                
               }
           })
         },
+        getLastover(drug_id,min_number,min_unit,max_unit){
+
+            var arr_in_count = []
+            var arr_out_count = []
+            var cancel_count = []
+            var min_str  =""
+            var max_str = ""
+
+            var total_in_count = 0
+            var total_out_count = 0
+            var total_cancel_count =0
+
+            var total = 0
+
+            for(let i=0;i<this.warehouseInfoFlow.length;i++){
+                if(drug_id == this.warehouseInfoFlow[i].drug_id){
+                   arr_in_count.push(this.warehouseInfoFlow[i])
+                }
+            }
+
+            for(let i=0;i<this.warehouseOutFlow.length;i++){
+                if(drug_id == this.warehouseOutFlow[i].drug_id){
+                   arr_out_count.push(this.warehouseOutFlow[i])
+                }
+            }
+
+            for(let i=0;i<this.cancelFlow.length;i++){
+                if(drug_id == this.cancelFlow[i].drug_id){
+                  cancel_count.push(this.cancelFlow[i])
+                }
+            }
+
+
+            if(arr_in_count!=null){
+                for(let i=0;i<arr_in_count.length;i++){
+                if(arr_in_count[i].max_unit == max_unit && max_unit!=min_unit){
+                    arr_in_count[i].last_stock_max_number = arr_in_count[i].count * min_number
+                } 
+                if(arr_in_count[i].max_unit == min_unit && max_unit!=min_unit){
+                    arr_in_count[i].last_stock_max_number = arr_in_count[i].count 
+                } 
+                if(arr_in_count[i].max_unit == max_unit && max_unit==min_unit){
+                    arr_in_count[i].last_stock_max_number = arr_in_count[i].count 
+                } 
+                }
+
+                if(arr_in_count!=null){
+                    for(let i=0;i<arr_in_count.length;i++){
+                        total_in_count += parseInt(arr_in_count[i].last_stock_max_number)
+                    }
+                }
+             }
+
+
+             if(arr_out_count!=null){
+                for(let i=0;i<arr_out_count.length;i++){
+                if(arr_out_count[i].max_unit == max_unit && max_unit!=min_unit){
+                    arr_out_count[i].last_stock_max_number_one = arr_out_count[i].count * min_number
+                } 
+                if(arr_out_count[i].max_unit == min_unit && max_unit!=min_unit){
+                    arr_out_count[i].last_stock_max_number_one = arr_out_count[i].count 
+                } 
+                if(arr_out_count[i].max_unit == max_unit && max_unit==min_unit){
+                    arr_out_count[i].last_stock_max_number_one = arr_out_count[i].count 
+                } 
+                }
+
+                if(arr_out_count!=null){
+                    for(let i=0;i<arr_out_count.length;i++){
+                        total_out_count += parseInt(arr_out_count[i].last_stock_max_number_one)
+                    }
+                }
+             }
+
+
+             
+             if(cancel_count!=null){
+                for(let i=0;i<cancel_count.length;i++){
+                if(cancel_count[i].max_unit == max_unit && max_unit!=min_unit){
+                    cancel_count[i].last_stock_max_number_two = cancel_count[i].count * min_number
+                } 
+                if(cancel_count[i].max_unit == min_unit && max_unit!=min_unit){
+                    cancel_count[i].last_stock_max_number_two = cancel_count[i].count 
+                } 
+                if(cancel_count[i].max_unit == max_unit && max_unit==min_unit){
+                    cancel_count[i].last_stock_max_number_two = cancel_count[i].count 
+                } 
+                }
+
+                if(cancel_count!=null){
+                    for(let i=0;i<cancel_count.length;i++){
+                     total_cancel_count += parseInt(cancel_count[i].last_stock_max_number_two)
+                    }
+                }
+             }
+
+             console.log("drug_id=================",drug_id)
+             console.log("total_in_count",total_in_count)
+             console.log("total_cancel_count",total_cancel_count)
+             console.log("total_out_count",total_out_count)
+             total = total_in_count + total_cancel_count - total_out_count
+
+
+             if (total < min_number) {
+               min_str = total + min_unit;
+           }
+            if (total == 0) {
+                min_str = "";
+                max_str = "";
+            }
+            if (total >= min_number) {
+                if (parseInt(total / min_number) != 0) {
+                max_str = parseInt(total / min_number) + max_unit;
+                }
+                if (total % min_number != 0) {
+                min_str = (total % min_number) + min_unit;
+                }
+            }
+            console.log("max_str",max_str)
+            console.log("min_str",min_str)
+            if(max_str == "" && min_str == ""){
+                return "0"
+            }else{
+            return max_str + min_str
+            }
+
+
+
+        },
+
+        getLastoverOne(drug_id,min_number,min_unit,max_unit){
+
+            var arr_in_count = []
+            var arr_out_count = []
+            var cancel_count = []
+            var min_str  =""
+            var max_str = ""
+
+            var total_in_count = 0
+            var total_out_count = 0
+            var total_cancel_count =0
+
+            var total = 0
+
+            for(let i=0;i<this.warehouseInfoFlow.length;i++){
+                if(drug_id == this.warehouseInfoFlow[i].drug_id){
+                arr_in_count.push(this.warehouseInfoFlow[i])
+                }
+            }
+
+            for(let i=0;i<this.warehouseOutFlow.length;i++){
+                if(drug_id == this.warehouseOutFlow[i].drug_id){
+                arr_out_count.push(this.warehouseOutFlow[i])
+                }
+            }
+
+            for(let i=0;i<this.warehouseOutFlow.length;i++){
+                if(drug_id == this.warehouseOutFlow[i].drug_id){
+                cancel_count.push(this.warehouseOutFlow[i])
+                }
+            }
+
+
+            if(arr_in_count!=null){
+                for(let i=0;i<arr_in_count.length;i++){
+                if(arr_in_count[i].max_unit == max_unit && max_unit!=min_unit){
+                    arr_in_count[i].last_stock_max_number = arr_in_count[i].count * min_number
+                } 
+                if(arr_in_count[i].max_unit == min_unit && max_unit!=min_unit){
+                    arr_in_count[i].last_stock_max_number = arr_in_count[i].count 
+                } 
+                if(arr_in_count[i].max_unit == max_unit && max_unit==min_unit){
+                    arr_in_count[i].last_stock_max_number = arr_in_count[i].count 
+                } 
+                }
+
+                if(arr_in_count!=null){
+                    for(let i=0;i<arr_in_count.length;i++){
+                        total_in_count += parseInt(arr_in_count[i].last_stock_max_number)
+                    }
+                }
+            }
+
+
+            if(arr_out_count!=null){
+                for(let i=0;i<arr_out_count.length;i++){
+                if(arr_out_count[i].max_unit == max_unit && max_unit!=min_unit){
+                    arr_out_count[i].last_stock_max_number = arr_out_count[i].count * min_number
+                } 
+                if(arr_out_count[i].max_unit == min_unit && max_unit!=min_unit){
+                    arr_out_count[i].last_stock_max_number = arr_out_count[i].count 
+                } 
+                if(arr_out_count[i].max_unit == max_unit && max_unit==min_unit){
+                    arr_out_count[i].last_stock_max_number = arr_out_count[i].count 
+                } 
+                }
+
+                if(arr_out_count!=null){
+                    for(let i=0;i<arr_out_count.length;i++){
+                        total_out_count += parseInt(arr_out_count[i].last_stock_max_number)
+                    }
+                }
+            }
+
+
+            
+            if(cancel_count!=null){
+                for(let i=0;i<cancel_count.length;i++){
+                if(cancel_count[i].max_unit == max_unit && max_unit!=min_unit){
+                    cancel_count[i].last_stock_max_number = cancel_count[i].count * min_number
+                } 
+                if(cancel_count[i].max_unit == min_unit && max_unit!=min_unit){
+                    cancel_count[i].last_stock_max_number = cancel_count[i].count 
+                } 
+                if(cancel_count[i].max_unit == max_unit && max_unit==min_unit){
+                    cancel_count[i].last_stock_max_number = cancel_count[i].count 
+                } 
+                }
+
+                if(cancel_count!=null){
+                    for(let i=0;i<cancel_count.length;i++){
+                    total_cancel_count += parseInt(cancel_count[i].last_stock_max_number)
+                    }
+                }
+            }
+
+
+            total = total_in_count+total_cancel_count - total_out_count
+
+            if(total > 0){
+            return total
+            }
+
+        },
         getManufacturerName(id){
            var manufacturer_name = ""
            for(let i=0;i<this.manufacturerList.length;i++){
@@ -380,9 +714,6 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
             }
          }
 
-
-
-        console.log("newARR========",newArr)
           if(newArr!=null){
             for(let i=0;i<newArr.length;i++){
                 total += parseInt(newArr[i].last_stock_max_number)
@@ -413,6 +744,56 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
             return max_str + min_str
             }
         },
+        getInCountOne(drug_id,min_number,min_unit,max_unit){
+          
+          var newArr =[]
+          var total =0
+          for(let i=0;i<this.infoList.length;i++){
+            if(drug_id == this.infoList[i].drug_id){
+               newArr.push(this.infoList[i])
+            }
+          }
+        
+         if(newArr!=null){
+            for(let i=0;i<newArr.length;i++){
+               if(newArr[i].max_unit == max_unit && max_unit!=min_unit){
+                 newArr[i].last_stock_max_number = newArr[i].count * min_number
+               } 
+               if(newArr[i].max_unit == min_unit && max_unit!=min_unit){
+                 newArr[i].last_stock_max_number = newArr[i].count 
+               } 
+               if(newArr[i].max_unit == max_unit && max_unit==min_unit){
+                 newArr[i].last_stock_max_number = newArr[i].count 
+               } 
+            }
+         }
+
+          if(newArr!=null){
+            for(let i=0;i<newArr.length;i++){
+                total += parseInt(newArr[i].last_stock_max_number)
+            }
+          }
+
+          return total
+        },
+        getBuyPrice(drug_id){
+          var last_price = "" 
+          for(let i=0;i<this.drugList.length;i++){
+            if(drug_id == this.drugList[i].id){
+               last_price = this.drugList[i].last_price
+            }
+          } 
+          return last_price
+        },
+        getRetailPrice(drug_id){
+          var min_price = ""
+          for(let i=0;i<this.drugList.length;i++){
+            if(drug_id == this.drugList[i].id){
+                min_price = this.drugList[i].min_price
+            }
+          } 
+          return min_price     
+        },
         getOutCount(drug_id,min_number,min_unit,max_unit){
           
           var newArr =[]
@@ -472,6 +853,38 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
             return max_str + min_str
             }
         },
+        getOutCountOne(drug_id,min_number,min_unit,max_unit){
+          
+          var newArr =[]
+          var total =0
+
+          for(let i=0;i<this.outList.length;i++){
+            if(drug_id == this.outList[i].drug_id){
+               newArr.push(this.outList[i])
+            }
+          }
+        
+         if(newArr!=null){
+            for(let i=0;i<newArr.length;i++){
+               if(newArr[i].max_unit == max_unit && max_unit!=min_unit){
+                 newArr[i].last_stock_max_number = newArr[i].count * min_number
+               } 
+               if(newArr[i].max_unit == min_unit && max_unit!=min_unit){
+                 newArr[i].last_stock_max_number = newArr[i].count 
+               } 
+               if(newArr[i].max_unit == max_unit && max_unit==min_unit){
+                 newArr[i].last_stock_max_number = newArr[i].count 
+               } 
+            }
+         }
+          if(newArr!=null){
+            for(let i=0;i<newArr.length;i++){
+                total += parseInt(newArr[i].last_stock_max_number)
+            }
+          }
+
+         return total
+        },
         getSumCount(total,min_number,min_unit,max_unit){
            var min_str  =""
            var max_str = ""
@@ -497,6 +910,9 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
             }else{
             return max_str + min_str
             }
+        },
+        getSumCountOne(total,min_number,min_unit,max_unit){
+          return total
         }
 
         
@@ -509,16 +925,59 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
   } 
 </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>
+.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 tr{
+  page-break-inside:avoid;
+}
+
+.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>

src/xt_pages/stock/query/expiryDateQuery.vue

@@ -56,6 +56,11 @@
                  {{scope.row.GoodInfo.good_name}}
               </template>
             </el-table-column>
+            <el-table-column label="国家编码" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.GoodInfo.social_security_directory_code}}
+              </template>
+            </el-table-column>
             <el-table-column label="规格&单位" align="center">
                 <template slot-scope="scope">
                    {{scope.row.GoodInfo.specification_name}}/{{scope.row.GoodInfo.packing_unit}}

src/xt_pages/stock/query/goodNewQuery.vue

@@ -73,6 +73,12 @@
                   {{scope.row.specification_name}}/{{scope.row.packing_unit}}
                 </template>
             </el-table-column>
+           
+            <el-table-column label="零售价" align="center" v-if="org_id == 0 || org_id ==10697">
+              <template slot-scope="scope">
+                 {{scope.row.packing_price}}
+              </template>
+            </el-table-column>
             <el-table-column label="生产厂商" align="center" v-if="org_id!=10679">
               <template slot-scope="scope">
                   {{getManufacturName(scope.row.manufacturer)}}