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

src/xt_pages/data/components/drugs.vue

@@ -118,6 +118,11 @@
           <div>{{scope.row.medical_insurance_number}}</div>
         </template>
       </el-table-column>
+      <el-table-column prop="date" label="批准文号" width="100" align="center">
+        <template slot-scope="scope">
+          <div></div>
+        </template>
+      </el-table-column>
       <el-table-column prop="date" label="药品本位码" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.code}}</div>

src/xt_pages/stock/detail/print.vue

@@ -445,6 +445,27 @@
     //       }
     //   })
     // },
+    getWarehouseOut(good_id){
+      var total = 0
+      for(let i=0;i<this.wareOutList.length;i++){
+         if(this.wareOutList[i].good_id == good_id){
+            total += this.wareOutList[i].count
+         }
+      }
+      return total
+    },
+    
+     getPrintStockGood(){
+
+      getPrintStockGood(this.queryParams).then(response=>{
+          if(response.data.state == 1){
+            var list =  response.data.data.list
+            console.log("list23323232323232",list)
+            this.wareOutList = list
+
+          }
+      })
+    },
     getWarehouseOut(good_id){
       var total = 0
       for(let i=0;i<this.wareOutList.length;i++){

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

@@ -8,15 +8,15 @@
       type="primary"
       >打印
     </el-button>
-     <el-button
-      style="float: right;margin-right:10px"
+    <el-button
+      style="float: right; margin-right: 10px"
       size="small"
       @click="exportListDetai"
       type="primary"
       >明细导出
     </el-button>
-     <el-button
-      style="float: right;margin-right:10px"
+    <el-button
+      style="float: right; margin-right: 10px"
       size="small"
       @click="exportList"
       type="primary"
@@ -24,18 +24,26 @@
     </el-button>
 
     <div class="cell clearfix">
-       <label class="title"><span class="name">仓库</span> :</label>
-      <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeHouseList">
-          <el-option
-            v-for="(option, index) in houseList"
-            :key="index"
-            :label="option.storehouse_name"
-            :value="option.id">
-          </el-option>
+      <label class="title"><span class="name">仓库</span> :</label>
+      <el-select
+        size="small"
+        v-model="storehouse_id"
+        filterable
+        placeholder="请选择仓库"
+        style="width: 200px"
+        @change="changeHouseList"
+      >
+        <el-option
+          v-for="(option, index) in houseList"
+          :key="index"
+          :label="option.storehouse_name"
+          :value="option.id"
+        >
+        </el-option>
       </el-select>
       <el-input
         size="small"
-        style="width: 200px;"
+        style="width: 200px"
         class="filter-item"
         v-model.trim="searchKey"
         placeholder="单据编码/制单人/药品名称"
@@ -48,38 +56,36 @@
         @click="search"
         >搜索</el-button
       >
-        <label class="title"><span class="name">日期查询</span> : </label>
-        <el-date-picker
-          size="small"
-          v-model="start_time"
-          prefix-icon="el-icon-date"
-          :editable="false"
-          style="width: 150px;"
-          type="date"
-          placeholder="选择日期时间"
-          align="right"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          @change="startTimeChange"
-        ></el-date-picker>
-        <span class="cellLine"> - </span>
-        <el-date-picker
-          size="small"
-          v-model="end_time"
-          prefix-icon="el-icon-date"
-          :editable="false"
-          style="width: 150px;"
-          type="date"
-          placeholder="选择日期时间"
-          align="right"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          @change="endTimeChange"
-        ></el-date-picker>
-
+      <label class="title"><span class="name">日期查询</span> : </label>
+      <el-date-picker
+        size="small"
+        v-model="start_time"
+        prefix-icon="el-icon-date"
+        :editable="false"
+        style="width: 150px"
+        type="date"
+        placeholder="选择日期时间"
+        align="right"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        @change="startTimeChange"
+      ></el-date-picker>
+      <span class="cellLine"> - </span>
+      <el-date-picker
+        size="small"
+        v-model="end_time"
+        prefix-icon="el-icon-date"
+        :editable="false"
+        style="width: 150px"
+        type="date"
+        placeholder="选择日期时间"
+        align="right"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        @change="endTimeChange"
+      ></el-date-picker>
     </div>
 
-
     <el-row :gutter="12" style="margin-top: 10px">
       <el-table
         :data="tableData"
@@ -91,7 +97,7 @@
         :row-style="{ color: '#303133' }"
         :header-cell-style="{
           backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
+          color: '#606266',
         }"
       >
         <el-table-column label="单据编号" align="center" width="200">
@@ -109,66 +115,73 @@
           </template>
         </el-table-column>
 
-         <el-table-column label="药品名称" align="center">
+        <el-table-column label="药品名称" align="center">
           <template slot-scope="scope">
-            {{scope.row.drug_name}}
+            {{ scope.row.drug_name }}
           </template>
         </el-table-column>
 
         <el-table-column label="规格型号" align="center">
           <template slot-scope="scope">
-           <!-- {{scope.row.drug_spec}} -->
-           {{scope.row.specification_name}}
+            <!-- {{scope.row.drug_spec}} -->
+            {{ scope.row.specification_name }}
           </template>
         </el-table-column>
 
-
         <el-table-column label="操作时间" align="center">
           <template slot-scope="scope">
-           <span>{{getTime(scope.row.ctime)}}</span>
+            <span>{{ getTime(scope.row.ctime) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="制单人" align="center">
           <template slot-scope="scope">
-           {{getAdminUser(scope.row.creater)}}
+            {{ getAdminUser(scope.row.creater) }}
           </template>
         </el-table-column>
         <el-table-column label="仓库名称" align="center">
           <template slot-scope="scope">
-           {{getStorehouseName(scope.row.storehouse_id)}}
+            {{ getStorehouseName(scope.row.storehouse_id) }}
           </template>
         </el-table-column>
         <el-table-column label="出货价" align="center">
           <template slot-scope="scope">
-           <span v-if="org_id == 9919">{{scope.row.last_price}} </span>
-           <span v-else>
-             <span v-if="scope.row.price >0"> {{scope.row.price}}</span>
-            <span v-if="scope.row.price  == 0"> {{getPrice(scope.row.drug_id)}}</span>
-           </span>
+            <span v-if="org_id == 9919">{{ scope.row.last_price }} </span>
+            <span v-else>
+              <span v-if="scope.row.price > 0"> {{ scope.row.price }}</span>
+              <span v-if="scope.row.price == 0">
+                {{ getPrice(scope.row.drug_id) }}</span
+              >
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="数量" align="center">
           <template slot-scope="scope">
-            {{scope.row.count}}
+            {{ scope.row.count }}
           </template>
         </el-table-column>
-         <el-table-column label="单位" align="center">
+        <el-table-column label="单位" align="center">
           <template slot-scope="scope">
-            {{scope.row.count_unit}}
+            {{ scope.row.count_unit }}
           </template>
         </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.is_total !=1">
-              <span v-if="org_id == 9919">{{(scope.row.last_price * scope.row.count).toFixed(2)}} </span>
-              <span v-if="org_id == 10210 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span>
-              <span v-if="org_id == 9671 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span>
-              <span v-if ="org_id!=9919 && org_id!=10210 && org_id!=9671">
-                 {{scope.row.total_price}}
-               </span>
+            <span v-if="scope.row.is_total != 1">
+              <span v-if="org_id == 9919"
+                >{{ (scope.row.last_price * scope.row.count).toFixed(2) }}
+              </span>
+              <span v-if="org_id == 10210"
+                >{{ (scope.row.price * scope.row.count).toFixed(2) }}
+              </span>
+              <span v-if="org_id == 9671"
+                >{{ (scope.row.price * scope.row.count).toFixed(2) }}
+              </span>
+              <span v-if="org_id != 9919 && org_id != 10210 && org_id != 9671">
+                {{ scope.row.total_price }}
+              </span>
             </span>
             <span v-if="scope.row.is_total == 1">
-              {{scope.row.total_price}}
+              {{ scope.row.total_price }}
             </span>
           </template>
         </el-table-column>
@@ -177,10 +190,10 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100,1000]"
+        :page-sizes="[10, 50, 100, 1000]"
         :page-size="10"
         background
-        style="margin-top:20px;float: right"
+        style="margin-top: 20px; float: right"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >
@@ -463,11 +476,8 @@ export default {
                 }
                 total_price +=order[i].total_price
                }
-
              }
-
           }
-           console.log("toal_p3232332332233232",total_price)
            order.push({
             warehouse_out_order_number: "合计",
             is_total: 1,
@@ -479,8 +489,6 @@ export default {
           for(let i=0;i<order.length;i++){
             order[i].total_price = order[i].total_price.toFixed(2)
           }
-
-          console.log("233223322323322332232323",order)
           this.tableData = order
 
            let objInfo = {}
@@ -534,8 +542,6 @@ export default {
               }
             })
           }
-
-
           for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].child.length;j++){
               if(list[i].child[j].count!=null || list[i].child[j].count != "" || list[i].child[j].count!=0){
@@ -551,8 +557,8 @@ export default {
           this.tableList = list
           var total = response.data.data.total
           this.total = total
-        }
-      })
+          }}
+  )}
     },
 
    select(){
@@ -876,7 +882,7 @@ export default {
        this.houseList = []
        this.getlist()
      }
-  }
+  
 };
 </script>
 

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -112,20 +112,27 @@
         <el-button size="small" type="primary" @click="toExport()"
           >导出</el-button
         >
+        <div>
+          <span>&nbsp;&nbsp;</span>
+          <label class="title"><span class="name">审核状态</span> :</label>
+          <el-select
+            size="small"
+            v-model="check_type"
+            filterable
+            placeholder="请选择仓库"
+            style="width: 200px"
+            @change="changeCheckType"
+          >
+            <el-option
+              v-for="(option, index) in checkList"
+              :key="index"
+              :label="option.name"
+              :value="option.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
       </div>
-      
-      <span>&nbsp;&nbsp;</span>
-      <label class="title"><span class="name">审核状态</span> :</label>
-      <el-select size="small" v-model="check_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeCheckType">
-          <el-option
-            v-for="(option, index) in checkList"
-            :key="index"
-            :label="option.name"
-            :value="option.id">
-          </el-option>
-      </el-select>  
-     
-     
 
       <el-table
         :data="Warehouse.warehouseDate"
@@ -518,12 +525,12 @@ export default {
       exportList: [],
       houseList: [],
       storehouse_id: 0,
-      check_type:0,
-      checkList:[
-       {id:0,name:"全部"},
-       {id:1,name:"已审核"},
-       {id:2,name:"未审核"},
-      ]
+      check_type: 0,
+      checkList: [
+        { id: 0, name: "全部" },
+        { id: 1, name: "已审核" },
+        { id: 2, name: "未审核" },
+      ],
     };
   },
 
@@ -560,7 +567,7 @@ export default {
         type: this.type,
         keywords: this.searchKey,
         storehouse_id: this.storehouse_id,
-        check_type:this.check_type,
+        check_type: this.check_type,
       };
       this.Warehouse.warehouseDate = [];
       getDrugWarehouseList(Params).then((response) => {
@@ -586,7 +593,7 @@ export default {
         type: this.type,
         keywords: this.searchKey,
         storehouse_id: this.storehouse_id,
-        check_type:this.check_type,
+        check_type: this.check_type,
       };
       this.Warehouse.warehouseDate = [];
       getDrugWarehouseList(Params).then((response) => {
@@ -748,7 +755,7 @@ export default {
           type: this.type,
           supply_warehouse_id: row.supply_warehouse_id,
           is_sys: row.is_sys,
-          is_check:row.is_check,
+          is_check: row.is_check,
         },
       });
     },
@@ -788,9 +795,9 @@ export default {
         this.$message.error("自动入库数据不能删除!");
         return false;
       }
-      if(row.is_check == 1){
-        this.$message.error("已审核的单据不能删除")
-        return false
+      if (row.is_check == 1) {
+        this.$message.error("已审核的单据不能删除");
+        return false;
       }
       const ids = [];
       ids.push(row.id);
@@ -853,19 +860,18 @@ export default {
       const ids = [];
       const idOne = [];
       for (let i = 0; i < this.selectedTableData.length; i++) {
-        if(this.selectedTableData[i].is_check == 1){
-          this.$message.error("已审核单据不能删除!")
-          return false
+        if (this.selectedTableData[i].is_check == 1) {
+          this.$message.error("已审核单据不能删除!");
+          return false;
         }
         if (this.selectedTableData[i].is_sys == 13) {
           this.$message.error("调拨入库数据不能删除!");
           return false;
         }
         ids.push(this.selectedTableData[i].id);
-        if(this.selectedTableData[i].supply_warehouse_id >0){
+        if (this.selectedTableData[i].supply_warehouse_id > 0) {
           idOne.push(this.selectedTableData[i].supply_warehouse_id);
         }
-      
       }
 
       for (let i = 0; i < idOne.length; i++) {
@@ -1095,9 +1101,9 @@ export default {
     changeStoreHouse() {
       this.GetWarehouse();
     },
-    changeCheckType(){
+    changeCheckType() {
       this.GetWarehouse();
-    }
+    },
   },
 };
 </script>

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -157,6 +157,7 @@
 
     </div>
   </div>
+  </div>
 
 </template>
 

src/xt_pages/stock/drugs/print.vue

@@ -68,7 +68,7 @@ export default {
             { path: false, name: '耗材管理' },
             { path: false, name: '耗材盘点打印' },
           ],
-          org_name:"",
+          org_name: this.$store.getters.xt_user.org.org_name,
           ids:"",
           tableData:[],
           manufacturerList:[],
@@ -117,6 +117,7 @@ export default {
         }
     },
     created(){
+
       this.getlist()
     }
 }

src/xt_pages/stock/print_all.vue

@@ -68,7 +68,7 @@ export default {
             { path: false, name: '耗材管理' },
             { path: false, name: '耗材盘点打印' },
           ],
-          org_name:"",
+          org_name: this.$store.getters.xt_user.org.org_name,
           ids:"",
           tableData:[],
           manufacturerList:[],

src/xt_pages/stock/stockOutOrder.vue

@@ -110,6 +110,8 @@
           >导出</el-button
         >
         <span>&nbsp;&nbsp;</span>
+        <!-- <el-button size="small" type="primary" @click="toExport">导出</el-button> -->
+        <!-- <span>&nbsp;&nbsp;</span> -->
         <label class="title"><span class="name">出库方式</span> :</label>
         <el-select size="small" v-model="way_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeWay">
             <el-option
@@ -870,6 +872,7 @@
     >
     </stock-in-dialog>
   </div>
+  </div>
 </template>
 
 <script>
@@ -1366,8 +1369,8 @@ export default {
               }
             }
           });
-        })
-        .catch(() => {});
+      })
+        .catch(() => {})}
     },
 
     handleSearch(val) {
@@ -2039,7 +2042,7 @@ export default {
     changeCheckList(){
       this.GetWarehouseOut();
     }
-  },
+  
 };
 </script>
 

src/xt_pages/stock/stockPrint.vue

@@ -46,6 +46,13 @@
                                    <td>
                                       <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info)}}{{item.packing_unit}}</span>
                                    </td>
+<<<<<<< Updated upstream
+=======
+                                   <td v-if="end_time == ''"  style="text-align:center">
+                                      <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>
+                                   </td>
+>>>>>>> Stashed changes
                                    <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 || org_id == 10265 || org_id == 10210">
                                         <span>