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

src/views/layout/components/Navbar.vue

@@ -123,35 +123,35 @@
         ></modify-org-info-dialog>
       </div>
       <div>
-        <i class="el-icon-question"></i>
-        <a href="https://sso.kuyicloud.com/help" target="_blank">帮助中心</a> 
-        <div class="fixedBox">
-        <div class="fixed-item" @mouseover="mouseOver" @mouseleave="leave">
+        <!-- <i class="el-icon-question"></i>
+        <a href="https://sso.kuyicloud.com/help" target="_blank">帮助中心</a> -->
+       <div class="fixedBox">
+         <div class="fixed-item" @mouseover="mouseOver" @mouseleave="leave">
           <i class="el-icon-chat-line-round"></i>
-         <div class="fixed-text">联系客户经理</div>
-          <div class="fixed-wrap" v-show="wrap1">
-          <div class="fixed-inner">
-               <div class="fixed-inner-item">您的专属客户经理:{{ information.name }}</div>
-                <div class="fixed-inner-item">电话:{{ information.phone }}</div>
+           <div class="fixed-text">联系客户经理</div>
+            <div class="fixed-wrap" v-show="wrap1">
+              <div class="fixed-inner">
+                <div class="fixed-inner-item">您的专属客户经理:{{ information.name }}</div>
+                  <div class="fixed-inner-item">电话:{{ information.phone }}</div>
                <div class="fixed-inner-item">微信:{{ information.wechat }}</div>
-               <div class="fixed-inner-item">QQ:{{ information.qqchat }}</div>
-               <div class="fixed-inner-item">邮箱:{{ information.email }}</div>
-               <div class="fixed-inner-triangle"></div>
+                <div class="fixed-inner-item">QQ:{{ information.qqchat }}</div>
+                <div class="fixed-inner-item">邮箱:{{ information.email }}</div>
+                <div class="fixed-inner-triangle"></div>
              </div>
-           </div>
-         </div>
-        <div class="fixed-item" @mouseover="mouseOver1" @mouseleave="leave1">
-          <i class="el-icon-full-screen"></i>
+            </div>
+          </div>
+          <div class="fixed-item" @mouseover="mouseOver1" @mouseleave="leave1">
+           <i class="el-icon-full-screen"></i>
             <div class="fixed-text">微信联系</div>
-           <div class="fixed-wrap" v-show="wrap2">
-            <div class="fixed-inner">
+            <div class="fixed-wrap" v-show="wrap2">
+              <div class="fixed-inner">
                 <img :src="information.wechat_link" alt="">
                 <div>扫码加微信</div>
-               <div class="fixed-inner-triangle"></div>
-             </div>
+                <div class="fixed-inner-triangle"></div>
+              </div>
+            </div>
           </div>
-         </div>
-       </div>
+        </div>
       </div>
     </div>
   </div>

src/xt_pages/data/components/drugs.vue

@@ -103,17 +103,17 @@
           <div>{{scope.row.last_price}}</div>
         </template>
       </el-table-column>
-      <el-table-column label="零售价" width="100" align="center">
+      <!-- <el-table-column label="零售价" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.retail_price}}</div>
         </template>
-      </el-table-column>
-      <el-table-column label="拆零价" width="100" align="center">
+      </el-table-column> -->
+      <el-table-column label="拆零零售价" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.min_price}}</div>
         </template>
       </el-table-column>
-      <el-table-column label="包装价" width="100" align="center">
+      <el-table-column label="包装零售价" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.retail_price}}</div>
         </template>

src/xt_pages/data/components/project.vue

@@ -137,7 +137,7 @@
          <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :page-sizes="[10, 50, 100]"
+            :page-sizes="[10, 50, 100,500,1000]"
             :page-size="10"
             background
             align="right"

src/xt_pages/stock/drugs/query.vue

@@ -107,7 +107,7 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="入库数量" align="center">
            <template slot-scope="scope">
-            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)>0">{{getWarehoseInfo(scope.row.drug_warehouse_info)}}{{scope.row.max_unit}}</span>
+            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)>0">{{getWarehoseInfo(scope.row.drug_warehouse_info)}}{{scope.row.min_unit}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出库数量" align="center" v-if="showOne">
@@ -281,7 +281,11 @@ import { min } from 'moment'
              console.log("list99999",list)
              for(let i=0;i<list.length;i++){
                for(let j=0;j<list[i].drug_warehouse_info.length;j++){
-                 list[i].drug_warehouse_info[j].stock_max_number = list[i].min_number * list[i].drug_warehouse_info[j].stock_max_number
+                 if(list[i].max_unit == list[i].drug_warehouse_info[j].max_unit){
+                    list[i].drug_warehouse_info[j].stock_max_number = list[i].min_number * list[i].drug_warehouse_info[j].stock_max_number
+                    list[i].drug_warehouse_info[j].warehousing_count = list[i].min_number * list[i].drug_warehouse_info[j].warehousing_count
+                 }
+                
                }
                for(let y=0;y<list[i].drug_warehouse_out.length;y++){
                   if(list[i].drug_warehouse_out[y].count_unit == list[i].max_unit){
@@ -832,7 +836,7 @@ import { min } from 'moment'
         var over_count = 0
         var cancel_count = 0
         for(let i=0;i<info.length;i++){
-           total += (info[i].warehousing_count * min_number)
+           total += info[i].warehousing_count
         }
         
         for(let j=0;j<info.length;j++){

src/xt_pages/stock/stockPrint.vue

@@ -45,7 +45,7 @@
                                       <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info)}}{{item.packing_unit}}</span>
                                    </td>
                                    <td v-if="end_time == ''">
-                                      <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10290">
+                                      <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265">
                                         <span>
                                           {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info) + getCancelSotckInfo(item.cancel_stock_info)}}
                                         </span>
@@ -58,7 +58,7 @@
                                    </td>
                                   
                                    <td v-if="end_time == ''">
-                                     <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10290">
+                                     <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265">
                                         {{getOverFlushInfo(item.xt_warehouse_info)}}
                                      </span>
                                      <span v-else>