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

src/api/config.js

     params: params
   })
 }
+
+export function changeDrugOpenConfig(params) {
+  return request({
+    url: '/api/changedrugopenconfig',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/data/basicConfig.vue

             <p style="margin-top:20px;">耗材先出库再执行：
                 <el-switch v-model="is_open_is_type" @change="changeFuncType"></el-switch>
             </p>
+            <!-- <p style="margin-top:20px;">药品在保存处方时出库：
+                <el-switch v-model="drug_out_open" @change="changeDrugOpen"></el-switch>
+            </p> -->
         </div>
 
 
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig,changePrescriptionConfig} from '@/api/config'
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig,changePrescriptionConfig,changeDrugOpenConfig} from '@/api/config'
 
 export default {
   name: "printTemplate",
       is_open_is_type:false,
       is_open_advice_xt_his:false,
       is_open_prescription_xt_his:false,
+      drug_out_open:false,
     };
   },
   methods: {
               this.is_open_prescription_xt_his = false
             }
 
+            if(response.data.data.is_open == 1){
+              this.drug_out_open = true
+            }else{
+              this.drug_out_open = false
+            }
+
           } else {
             this.$message.error(response.data.msg)
           }
             this.$message.success("保存成功!")
           }
       })
+    },
+    changeDrugOpen(){
+      var drug_out_open = 0
+      if(this.drug_out_open == false){
+        drug_out_open = 2
+      }
+      if(this.drug_out_open == false){
+        drug_out_open = 2
+      }
+      var params = {
+        drug_out_open:drug_out_open,
+      }
+      changeDrugOpenConfig(params).then(response=>{
+        if(response.data.state == 1){
+           var msg =  response.data.data.msg
+           this.$message.success("保存成功!")
+        }
+      })
+
     }
 
   },

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

         </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
-           <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">
-             <!-- <span v-if="scope.row.price >0">
-                <span v-if="scope.row.count_unit == scope.row.min_unit">
-                  {{(scope.row.price * scope.row.count).toFixed(2)}}
-                </span>  
-                <span v-if="scope.row.count_unit == scope.row.max_unit">{{(scope.row.price * scope.row.count * scope.row.min_number).toFixed(2)}}</span>
-              </span>
-             <span v-if="scope.row.price  == 0">
-               <span v-if="scope.row.count_unit  == scope.row.min_unit">
-                 {{((getPrice(scope.row.drug_id)* scope.row.count)).toFixed(2)}}
-               </span> 
-               <span v-if="scope.row.count_unit == scope.row.max_unit">
-                 {{(getPrice(scope.row.drug_id)* scope.row.count * scope.row.min_number).toFixed(2)}}
-              </span>
-             </span> -->
-             {{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}}
+            </span>
           </template>
         </el-table-column>
       </el-table>
                order[i].total_price = order[i].count * order[i].last_price
                total_price += order[i].count * order[i].last_price
              }else{
+               console.log("555555555555",order[i])
                if(order[i].price > 0){
+                console.log("近来33232323322323")
                  if(order[i].count_unit == order[i].min_unit && order[i].max_unit!=order[i].min_unit){
                    order[i].total_price = order[i].count * order[i].price
-                  total_price += order[i].total_price
                  }
                  if(order[i].count_unit == order[i].max_unit){
                    if(order[i].is_sys == 0){
                      order[i].total_price += order[i].count * order[i].price * order[i].min_number
                    }
                  }
+
+                total_price += order[i].total_price
                 
                }
+
                if(order[i].price ==0 ){
                  if(order[i].count_unit == order[i].min_unit && order[i].max_unit!=order[i].min_unit){
                     order[i].total_price = order[i].count * this.getPrice(order[i].drug_id)
-                   total_price +=order[i].total_price
+                  
                     order[i].price = this.getPrice(order[i].drug_id)
                  }
                 
                    }
                    order[i].price = this.getPrice(order[i].drug_id)
                 }
-                 
+                total_price +=order[i].total_price
                } 
                
              }
             
           }
-         
+           console.log("toal_p3232332332233232",total_price)
            order.push({
             warehouse_out_order_number: "合计",
             is_total: 1,
        
           console.log("233223322323322332232323",order)
           this.tableData = order
+
            let objInfo = {}
           order.forEach((item,index)=>{
              let { drug_id } = item
           this.tablePrint[i].index = i+1
         }
         for(let i=0;i<this.tablePrint.length;i++){
-           if(this.org_id == 9919 ){
+           if(this.org_id == 9919){
            
              this.tablePrint[i].count = this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child)
              this.tablePrint[i].total_price = this.getCountSenven(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

     </div>
     <div class="app-container ">
       <div id="dialysis-print-box">
+        <div v-if="org_id!=9671">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
              </tr>
             </tbody>
           </table>
+          <div v-if="orgId != 10024" style="display:flex;margin-top:1px;float:right;">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+          </div>
+          <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
+            <div style="width:50px;">科室：</div><div style="width:60px;"></div>
+            <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
+            <div style="width:80px;">审批：</div><div style="width:100px;">肖庆娥</div>
+            <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
+            <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;">徐立琼</div>
+          </div>
+        </div>
+      </div> 
+
 
+      <div v-if="org_id == 9671">
+       <div class="dialysis-print-order" v-for="(it,index) in tableData" :key="index" >
+         <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
+          <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
 
+          <div style="float: left;margin-bottom: 1px;">单据编号：{{it.warehouse_out_order_number}}</div>
+          <div style="float: right;margin-bottom: 1px;">{{getDateTwo()}}</div>
+
+          <table class="print-table" border="1">
+            <tbody>
+            <tr>
+              <td style="line-height: 50px" width="230">药品名称</td>
+              <td style="line-height: 50px" width="230">规格型号</td>
+              <td style="line-height: 50px" width="80">出货数量</td>
+              <td style="line-height: 50px" width="50">单位</td>
+              <td style="line-height:50px" width="80">出库价格</td>
+              <td style="line-height: 50px" width="80">总价</td>
+              <td style="line-height: 50px" width="80">批号</td>
+              <td style="line-height: 50px" width="80">生产日期</td>
+              <td style="line-height: 50px" width="80">有效日期</td>
+            </tr>
+
+            <tr v-for="(item,i) in it.xt_drug_warehouse_out_info" :key="i">
+              <td style="line-height: 50px">
+                <span>{{item.drug.drug_name}}</span>
+              </td>
+              <td style="line-height: 50px">
+                  <span>{{item.drug.dose}}{{item.dose_unit}}*{{item.drug.min_number}}{{item.drug.min_unit}}/{{item.drug.max_unit}}</span>
+              </td>
+              <td style="line-height: 50px">
+                  {{item.count}}
+              </td>
+              <td style="line-height: 50px">
+                <span>{{item.count_unit}}</span>
+              </td>
+              <td style="line-height:50px">
+                  {{item.price}}
+              </td>
+             <td  style="line-height:50px">
+                {{(item.count * item.price).toFixed(2)}}
+             </td>
+             <td>{{item.batch_number}}</td>
+             <td>{{(getTime(item.product_date))}}</td>
+             <td>{{(getTime(item.expire_date))}}</td>
+            </tr>
+             <tr>
+               <td style="line-height:50px">合计</td>
+               <td colspan="7"></td>
+               <td>{{getTotalPrince(it.xt_drug_warehouse_out_info).toFixed(2)}}</td>
+             </tr>
+            </tbody>
+          </table>
           <div v-if="orgId != 10024" style="display:flex;margin-top:1px;float:right;">
             <div style="width:50px;">审批：</div><div style="width:100px;"></div>
             <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
           </div>
         </div>
 
+       </div>
       </div>
 
     </div>
         manufactureList:[],
         tableList:[],
         loading:false,
-        warehouseList:[]
+        warehouseList:[],
+        tableData:[],
       }
     },
     methods: {
             const params = {
             'id': order_id
             };
-            getDrugWarehouseOutInfo(params).then(response => {
-            if (response.data.state == 0) {
+     getDrugWarehouseOutInfo(params).then(response => {
+        if (response.data.state == 0) {
 
-                this.$message.error(response.data.msg);
-                return false
-            } else {
-              for (let i = 0; i < response.data.data.list.length; i++) {
-                this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
-               }
-               var total_price = 0;
-               for(let i=0;i<this.warehousingOutInfo.warehousingOutData.length;i++){
-                 total_price += this.warehousingOutInfo.warehousingOutData[i].count * this.warehousingOutInfo.warehousingOutData[i].price
-               }
-               this.allPrice = total_price;
-               this.warehousingOutInfo.info = response.data.data.info;
-               this.handleSpanTempArr()
+            this.$message.error(response.data.msg);
+            return false
+        } else {
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
             }
-            })
-        },
+            var total_price = 0;
+            for(let i=0;i<this.warehousingOutInfo.warehousingOutData.length;i++){
+              total_price += this.warehousingOutInfo.warehousingOutData[i].count * this.warehousingOutInfo.warehousingOutData[i].price
+            }
+            this.allPrice = total_price;
+            this.warehousingOutInfo.info = response.data.data.info;
+            this.handleSpanTempArr()
+        }
+      })
+     },
         getList() {
         let params = {
           page: this.page,
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.list.push(response.data.data.list[i])
             }
-            console.log("list222222",this.list)
+           
           }
         })
       },
         getDrugWarehouseOrderInfo().then(response=>{
            if(response.data.state == 1){
              var list =  response.data.data.list
-             console.log("入库单详情",list)
              this.drugOrderList = list
            }
         })
         getDrugOutOrderDetailPrint(params).then(response=>{
           if(response.data.state ==1){
              var info = response.data.data.info
-             console.log("info",info)
             var warehousing = response.data.data.warehousing
-            console.log("ware2232",warehousing)
             this.warehouseList = warehousing
           
             for(let i=0;i<info.length;i++){
             }
             
             var manufacturerList = response.data.data.manufacturerList
-            console.log("manufacturelist",manufacturerList)
+           
             this.manufactureList = manufacturerList
-            console.log("列表",info)
+
             this.tableList = info
+            this.tableData = response.data.data.drug_warhouse_out
             this.loading = false
           }
         })
           }
         }
         return count
-      }
+      },
+      getTotalPrice(val){
+        var count = 0
+        for(let i=0;i<val.length;i++){
+           count +=val[i].count * val[i].price
+          }
+         return count.toFixed(2)
+        }
     },
     created() {
       this.orgName = this.$store.getters.xt_user.org.org_name;