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

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -978,11 +978,11 @@
             v-if="org_template_info.template_id == 44"
           >
           </DialysisPrintOrderFortyFour>
-          <DialysisPrintOrderFortySeven
+          <DialysisPrintOrderFortyFive
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 45"
           >
-          </DialysisPrintOrderFortySeven>
+          </DialysisPrintOrderFortyFive>
 
           <DialysisPrintOrderFortySix
             v-bind:childResponse="childResponse"

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -111,13 +111,13 @@
           <table class="proj_table">
             <tbody>
               <tr>
-                <td colspan="2" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
+                <td colspan="2" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 24px;">
                   透析前情况
                 </td>
               </tr>
               <tr>
                 <td colspan="2">
-                  <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
+                  <div class="row" style="padding: 2px 0;line-height:20px;display:flex;">
                     <div class="inline_block" style="flex:1;">
                       本次透析日期：
                       <div class="under_line" style="width: 100px;text-align: center">
@@ -155,7 +155,7 @@
 
                   </div>
 
-                  <div class="row" style="padding: 2px 0;line-height:23px;">
+                  <div class="row" style="padding: 2px 0;line-height:20px;">
                     <div class="inline_block">
                       T：
                       <div class="under_line" style="width: 50px;text-align: center">
@@ -223,7 +223,7 @@
                     </div>
                   </div>
 
-                  <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
+                  <div class="row" style="padding: 2px 0;line-height:20px;display:flex;">
                     <div class="inline_block">
                       血管通路：
                       <div class="under_line" style="width: 220px;text-align: center;">
@@ -254,7 +254,7 @@
                       </div>
                     </div>
                   </div>
-                  <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
+                  <div class="row" style="padding: 2px 0;line-height:20px;display:flex;">
                     <div class="inline_block" style="flex:1;">
                       透析方式：
                       <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="!prescription.mode_id">
@@ -363,7 +363,7 @@
                       min
                     </div>
                   </div>
-                  <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
+                  <div class="row" style="padding: 2px 0;line-height:20px;display:flex;">
                     <div class="inline_block" style="flex:1;">
                       透析(滤)器：
                       <div class="under_line" style="width: 100px;text-align: center">
@@ -379,7 +379,7 @@
                     </div>
                   </div>
 
-                  <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
+                  <div class="row" style="padding: 2px 0;line-height:20px;display:flex;">
                     <div class="inline_block" style="flex:1;">
                       上次透后体重：
                       <div class="under_line" style="width: 100px;text-align: center">
@@ -412,7 +412,7 @@
                     </div>
                   </div>
 
-                  <div class="row" style="padding: 2px 0;line-height:23px;">
+                  <div class="row" style="padding: 2px 0;line-height:20px;">
                     <div class="inline_block">
                       透析液成分钾：
                       <div class="under_line" style="width: 50px;text-align: center">
@@ -449,7 +449,7 @@
                       ml/min
                     </div>
                   </div>
-                  <div class="row" style="padding: 2px 0;line-height:23px;">
+                  <div class="row" style="padding: 2px 0;line-height:20px;">
                     <div class="inline_block">
                       抗凝剂：
                       <div class="under_line" style="width: 150px;text-align: center">
@@ -510,10 +510,10 @@
                       </div>
                     </div>
                   </div>
-                  <div class="row" style="padding: 2px 0;line-height:23px;display:flex;" v-if="org_id != 10223">
+                  <div class="row" style="padding: 2px 0;line-height:20px;display:flex;" v-if="org_id != 10223">
                     <div class="inline_block" style="flex:1; display:inline-block;">
                       备注：
-                      <div class="under_line" style="width: 860px;line-height: 25px;text-align: left;margin-left: 2px;display: inline-block;white-space: normal;">
+                      <div class="under_line" style="width: 860px;line-height: 20px;text-align: left;margin-left: 2px;display: inline-block;white-space: normal;">
                         {{ predialysis.remark ? predialysis.remark : "/" }}
                       </div>
                     </div>
@@ -893,11 +893,11 @@
                     <div class="inline_block" style="margin-left:10px;flex:1.5;">
                       BP：
                       <div class="under_line" style="width: 50px;text-align: center;">
-                        {{ afterBP.systolic_blood_pressure ? afterBP.systolic_blood_pressure : "/" }}
+                       <span v-if="afterBP!=undefined"> {{ afterBP.systolic_blood_pressure ? afterBP.systolic_blood_pressure : "/" }}</span>
                       </div>
                       /
                       <div class="under_line" style="width: 50px;text-align: center;">
-                        {{ afterBP.diastolic_blood_pressure ? afterBP.diastolic_blood_pressure : "/" }}
+                      <span v-if="afterBP!=undefined"> {{ afterBP.diastolic_blood_pressure ? afterBP.diastolic_blood_pressure : "/" }}</span> 
                       </div>
                       mmHg
                     </div>

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -288,7 +288,7 @@
                     <el-table-column label="库存" width="60">
                       <template slot-scope="scope">
                                           <span
-                                              v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10188 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278">
+                                              v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10188 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278 || org_id == 10217">
                                               <span
                                                   v-if="scope.row.count/scope.row.min_number>0">{{ Math.floor(scope.row.count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
                                               <span
@@ -387,7 +387,7 @@
                     <el-table-column label="库存" width="40">
                       <template slot-scope="scope">
                                                 <span
-                                                    v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278">
+                                                    v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278 || org_id == 10217">
                                                     {{ scope.row.stock_count }}
                                                 </span>
                         <span v-else> {{ scope.row.total }}</span>
@@ -2667,7 +2667,7 @@ export default {
       this.$refs.additionalCharges.show()
     },
     selectDrugs(selection, row) {
-      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278) {
+      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217) {
         if (row.count <= 0) {
           if (selection) {
             selection.forEach(row => {
@@ -2954,7 +2954,7 @@ export default {
     },
     selectChange(selection, row) {
       console.log('row', row)
-      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10188  || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278) {
+      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10188  || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217) {
         if (row.stock_count <= 0) {
           if (row.type == 3) {
             if (selection) {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -286,7 +286,7 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 || org_id == 10278">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 || org_id == 10278 || org_id == 10217">
                                                <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
                                               </span>
@@ -383,7 +383,7 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="40">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10188 || org_id == 10191 || org_id == 10278">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10188 || org_id == 10191 || org_id == 10278 || org_id == 10217">
                                                    {{scope.row.stock_count}}
                                               </span>
                                               <span v-else> {{ scope.row.total }}</span>
@@ -2663,7 +2663,7 @@
       selectDrugs(selection, row) {
         console.log('selection', selection)
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217){
             if (row.count <= 0) {
               if (selection) {
                 selection.forEach(row => {
@@ -2941,7 +2941,7 @@
       },
       selectChange(selection, row) {
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217){
            if (row.stock_count <= 0) {
             if (row.type == 3) {
               if (selection) {

src/xt_pages/stock/detail/print.vue

@@ -51,7 +51,8 @@
               <td style="line-height: 50px">
                 <span v-if="type == 1"> {{ item.warehousing_count }}</span>
                 <span v-if="type == 2"> 
-                  <span  v-if= "org_id == 3907 || org_id == 9919 || org_id == 9583">{{getStockCount(item.good_id) }}</span>  
+                  <span  v-if="org_id == 3907 || org_id == 9919 || org_id == 9583">{{getStockCount(item.good_id) }}</span> 
+                   <span  v-if="org_id == 10265">{{getMySelfCount(item.good_id) }}</span>   
                   <span v-else>{{getStockCount(item.good_id) }}</span>
                 </span>
                
@@ -63,7 +64,7 @@
               <td style="line-height:50px">
                 <span v-if="type == 1"> {{ item.price }}</span>
                 <span v-if="type == 2"> 
-                  <span v-if="org_id == 9919 || org_id == 9671">{{ item.buy_price }}</span>  
+                  <span v-if="org_id == 9919">{{ item.buy_price }}</span>  
                   <span v-else>
                     {{ item.packing_price }} 
                   </span>  
@@ -73,9 +74,10 @@
               <td style="line-height:50px">
                 <span v-if="type == 1">{{(item.warehousing_count * item.price).toFixed(2)}}</span>
                 <span v-if="type == 2">
-                  <span v-if="org_id == 3907 || org_id ==9919 || org_id == 9671">
-                     {{(getStockCount(item.good_id) * item.buy_price).toFixed(2) }}
+                  <span v-if="org_id == 3907 || org_id ==9919">
+                     {{(getStockCount(item.good_id) * item.buy_price).toFixed(2)}}
                   </span>
+                  <span v-if="org_id == 10265">{{(getMySelfCount(item.good_id)*item.packing_price).toFixed(2)}}</span>
                   <span v-else>{{(getStockCount(item.good_id) * item.packing_price).toFixed(2)}}</span>
                 </span>
                 <span v-if="type == 4">{{(item.count * item.price).toFixed(2)}}</span>
@@ -97,7 +99,8 @@
               <td style="line-height: 50px"  width="80">
                 <span v-if="type == 1">{{getWareInfoTotal().toFixed(2)}}</span> 
                 <span v-if="type == 2">
-                  <span v-if="org_id == 3907 || org_id == 9919 || org_id == 9671">{{getWareOutTotalOne().toFixed(2)}}</span>
+                  <span v-if="org_id == 3907 || org_id == 9919">{{getWareOutTotalOne().toFixed(2)}}</span>
+                  <span v-if="org_id == 10265">{{getWareOutTotalSix().toFixed(2)}}</span>
                   <span v-else> {{getWareOutTotal().toFixed(2)}}</span>
                  </span> 
                 <span v-if="type == 4">{{getWareOutTotal().toFixed(2)}}</span> 
@@ -406,13 +409,28 @@
        return total
      },
      getWareOutTotalOne(){
-       console.log("数据23332323",this.stockDatas)
        var total = 0
        for(let i=0;i<this.stockDatas.length;i++){
          total+= this.getStockCount(this.stockDatas[i].good_id) * this.stockDatas[i].buy_price
        }
        return total
-     }
+     },
+     getMySelfCount(good_id){
+       var total = 0
+       for(let i=0;i<this.stockDatas.length;i++){
+         if(good_id == this.stockDatas[i].good_id){
+            total+= this.stockDatas[i].count
+         }
+       }
+       return total
+     },
+     getWareOutTotalSix(){
+       var total = 0
+       for(let i=0;i<this.stockDatas.length;i++){
+         total+= this.getMySelfCount(this.stockDatas[i].good_id) * this.stockDatas[i].packing_price
+       }
+       return total
+     },
     },
     created() {
       var xtuser = this.$store.getters.xt_user

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -754,10 +754,18 @@ export default {
         if(this.orgId == 9919){
           this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].buy_price).toFixed(2)
           this.tableOut[i].packing_price = this.tableOut[i].buy_price
+        }else if(this.orgId == 10265){
+          this.tableOut[i].total_price = (this.getMySelfCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else{
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }
-        this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
+       
+        if(this.orgId  == 10265){
+        
+         this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
+        }else{
+          this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
+        }
        }
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
@@ -845,7 +853,7 @@ export default {
       getGoodDetailPrintList(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
-        
+          console.log("lisrt23323223233232232323232323",list)
           this.tableOut = list
           var stockTotal = response.data.data.stockTotal
           console.log("list88888888888888888888",stockTotal)
@@ -863,6 +871,22 @@ export default {
         }
         return count
     }, 
+    getMySelfCount(good_id){
+       var total = 0
+       for(let i=0;i<this.tableOut.length;i++){
+         if(good_id == this.tableOut[i].good_id){
+            total+= this.tableOut[i].count
+         }
+       }
+       return total
+     },
+     getWareOutTotalSix(){
+       var total = 0
+       for(let i=0;i<this.tableOut.length;i++){
+         total+= this.getMySelfCount(this.tableOut[i].good_id) * this.tableOut[i].packing_price
+       }
+       return total
+     },
   }
 };
 </script>

src/xt_pages/supply/components/addGoodReturn.vue

@@ -717,12 +717,15 @@ export default {
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
-      if (this.recordInfo.tableList.length <= 1) {
-        this.$message.error("只有一条记录的时候无法删除");
-        return;
-      }else{
-        this.recordInfo.tableList.splice(index, 1);
+      if(row.id == 0){
+       if (this.recordInfo.tableList.length <= 1) {
+          this.$message.error("只有一条记录的时候无法删除");
+          return;
+        }else{
+          this.recordInfo.tableList.splice(index, 1);
+        }
       }
+     
       if (row.id > 0) {
         const params = {
             id: row.id