Преглед изворни кода

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

陈少旭 пре 9 месеци
родитељ
комит
1d1f7e0c2c

+ 5 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue Прегледај датотеку

@@ -1899,7 +1899,9 @@
1899 1899
                         <td
1900 1900
                           style="font-size: 16px"
1901 1901
                           width="10%"
1902
-                          v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375 || org_id ==10571 || org_id ==10600"
1902
+                          v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || 
1903
+                                org_id ==10375 || org_id ==10571 || org_id ==10600 || 
1904
+                                org_id == 10598" 
1903 1905
                         >
1904 1906
                           核对护士
1905 1907
                         </td>
@@ -1995,7 +1997,8 @@
1995 1997
                             getTime(advice.execution_time, "{h}:{i}")
1996 1998
                           }}</span>
1997 1999
                         </td>
1998
-                        <td height="32px" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375 || org_id ==10571 || org_id ==10600">
2000
+                        <td height="32px" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || 
2001
+                            org_id ==10375 || org_id ==10571 || org_id ==10600 || org_id == 10598">
1999 2002
                           <span v-if="advice!=null && advice.checker>0">
2000 2003
                             <span v-if="setAdminUserES(advice.checker) == ''">{{ getAdminUser(advice.checker)}}</span>
2001 2004
                             <img

+ 21 - 16
src/xt_pages/outpatientCharges/invoiceTemplate/printtwelve.vue Прегледај датотеку

@@ -42,13 +42,14 @@
42 42
         <div :style="{position: 'absolute',top:'210px',left:'310px'}"></div>
43 43
       </div>
44 44
       <div style="display: flex;">
45
-        <div :style="{position: 'absolute',top:'230px',left:'75px'}">{{list.checkCostTotal?list.checkCostTotal:""}}</div>
45
+        <!-- {{list.checkCostTotal?list.checkCostTotal:""}} 检查费-->
46
+        <div :style="{position: 'absolute',top:'230px',left:'75px'}"></div>
46 47
         <div :style="{position: 'absolute',top:'230px',left:'121px'}"></div>
47 48
         <div :style="{position: 'absolute',top:'230px',left:'270px'}"></div>
48 49
         <div :style="{position: 'absolute',top:'230px',left:'310px'}"></div>
49 50
       </div>
50 51
       <div style="display: flex;">
51
-        <div :style="{position: 'absolute',top:'250px',left:'75px'}">{{list.treatCostTotal?list.treatCostTotal:""}}</div>
52
+        <div :style="{position: 'absolute',top:'250px',left:'75px'}"><span v-if="treatCostTotal!=0">{{treatCostTotal?treatCostTotal:""}}</span></div>
52 53
         <div :style="{position: 'absolute',top:'250px',left:'121px'}"></div>
53 54
         <div :style="{position: 'absolute',top:'250px',left:'270px'}">{{list.materialCostTotal?list.materialCostTotal:""}}</div>
54 55
         <div :style="{position: 'absolute',top:'250px',left:'310px'}"></div>
@@ -103,6 +104,7 @@ export default {
103 104
       org_name:'',
104 105
       pageArr:[],
105 106
       Arr:[],
107
+      treatCostTotal:0,
106 108
       // pageArrs:['西药费','化验费','治疗费','处置费',,'输氧费','其他']
107 109
       // pageArrs:['西药费','化验费','治疗费','处置费','中成药','诊疗费','材料费',
108 110
       //         '护理费','注射费','检查费','输氧费','其他'],
@@ -134,10 +136,13 @@ export default {
134 136
         newArray.push(array.slice(index, index += subGroupLength));
135 137
       }
136 138
       return newArray;
137
-    }, getInvoice(params){
139
+    }, 
140
+    getInvoice(params){
138 141
       getInvoice(params).then((res) => {
139 142
         console.log('res',res)
140 143
         this.list = res.data.data
144
+        this.treatCostTotal = (this.list.treatCostTotal+this.list.checkCostTotal).toFixed(2)
145
+        // console.log('ttttttttt',this.treatCostTotal);
141 146
         this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
142 147
           this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
143 148
         this.smalltoBIG(this.totalPrice)
@@ -196,22 +201,22 @@ export default {
196 201
           this.pageArr.push(obj)
197 202
         }
198 203
 
199
-        if(this.list.checkCostTotal > 0){
200
-          let obj = {
201
-            name: this.paramsObj.name,
202
-            total: this.list.checkCostTotal,
203
-            item: "检查费",
204
-            doctor_name:"医生 " + this.list.doctor_info.user_name,
205
-            operator:this.list.admin_user_name,
206
-            printDate:this.printDate,
207
-          }
208
-          this.pageArr.push(obj)
209
-        }
204
+        // if(this.list.checkCostTotal > 0){
205
+        //   let obj = {
206
+        //     name: this.paramsObj.name,
207
+        //     total: this.list.checkCostTotal,
208
+        //     item: "检查费",
209
+        //     doctor_name:"医生 " + this.list.doctor_info.user_name,
210
+        //     operator:this.list.admin_user_name,
211
+        //     printDate:this.printDate,
212
+        //   }
213
+        //   this.pageArr.push(obj)
214
+        // }
210 215
 
211
-        if(this.list.treatCostTotal > 0){
216
+        if(this.list.treatCostTotal > 0 || this.list.checkCostTotal > 0){
212 217
           let obj = {
213 218
             name:this.paramsObj.name,
214
-            total: this.list.treatCostTotal,
219
+            total: this.list.treatCostTotal + this.list.checkCostTotal,
215 220
             item: "治疗费",
216 221
             doctor_name:"医生 " + this.list.doctor_info.user_name,
217 222
             operator:this.list.admin_user_name,

+ 1 - 0
src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue Прегледај датотеку

@@ -13,6 +13,7 @@
13 13
         src="https://kuyi.shengws.com/beierlog.png"
14 14
         alt=""
15 15
       />
16
+      <div class="printTitle" v-if="org_id ==10598">孝感源生堂血液透析中心</div>
16 17
       <div class="printTitle">检验申请单</div>
17 18
 
18 19
       <div style="border: 1px solid #000;margin-bottom: 10px;">

+ 1 - 1
src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue Прегледај датотеку

@@ -11,7 +11,6 @@
11 11
                 </template>
12 12
             </el-table-column>
13 13
 
14
-
15 14
             <el-table-column align="center" prop="drug_name" label="名称" fixed>
16 15
                 <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span>
17 16
                 </template>
@@ -520,6 +519,7 @@
520 519
           return
521 520
         }
522 521
         if(this.$store.getters.xt_user.org_id != 10206) {
522
+          console.log('yyyyyyyy',scope);
523 523
           if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
524 524
             if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
525 525
               console.log(1)

+ 58 - 6
src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateTable.vue Прегледај датотеку

@@ -584,7 +584,9 @@
584 584
         //     this.$message.error(scope.row.drug_name + '库存不足')
585 585
         //   }
586 586
         // }
587
-      },      getAllChange(scope) {
587
+      },      
588
+      getAllChange(scope) {
589
+        console.log('kkkkkkkk',scope);
588 590
         if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
589 591
           if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
590 592
             console.log(1)
@@ -607,17 +609,31 @@
607 609
         }
608 610
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
609 611
           // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
610
-          if (scope.row.prescribing_number > scope.row.drug.total) {
611
-            if(this.$store.getters.xt_user.org_id != 10206) {
612
+
613
+          // if (scope.row.prescribing_number > scope.row.drug.total) {
614
+          //   if(this.$store.getters.xt_user.org_id != 10206) {
615
+          //     this.$message.error(scope.row.drug_name + '库存不足')
616
+          //   }
617
+          // }
618
+
619
+          if (scope.row.drug.is_user != 1) {
620
+            if (scope.row.prescribing_number > scope.row.drug.sum_count && this.$store.getters.xt_user.org_id != 10206 && this.$store.getters.xt_user.org_id != 0) {
612 621
               this.$message.error(scope.row.drug_name + '库存不足')
613 622
             }
614 623
           }
615 624
         } else {
616
-          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
617
-            if(this.$store.getters.xt_user.org_id != 10206) {
625
+          // if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
626
+          //   if(this.$store.getters.xt_user.org_id != 10206) {
627
+          //     this.$message.error(scope.row.drug_name + '库存不足')
628
+          //   }
629
+          // }
630
+
631
+          if (scope.row.drug.is_user != 1) {
632
+            if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count && this.$store.getters.xt_user.org_id != 10206 && this.$store.getters.xt_user.org_id != 0) {
618 633
               this.$message.error(scope.row.drug_name + '库存不足')
619 634
             }
620 635
           }
636
+
621 637
           // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
622 638
         }
623 639
 
@@ -640,7 +656,43 @@
640 656
         if (this.prescription.project[scope.$index].total == 0) {
641 657
           this.prescription.project[scope.$index].total = 1
642 658
         }
643
-      }
659
+      },
660
+      getNum(execution_frequency) {
661
+        let arr = [
662
+          { name: '立即执行', count: 1 },
663
+          { name: '透析时', count: 1 },
664
+          { name: '透析1h一次', count: 1 },
665
+          { name: '透析2h一次', count: 1 },
666
+          { name: '透析3h一次', count: 1 },
667
+          { name: '每日一次', count: 1 },
668
+          { name: '每日两次', count: 2 },
669
+          { name: '每日三次', count: 3 },
670
+          { name: '每晚一次', count: 1 },
671
+          { name: '每晚', count: 1 },
672
+          { name: '上机前', count: 1 },
673
+          { name: '下机前', count: 1 },
674
+          { name: '透析后立即', count: 1 },
675
+          { name: '持续使用', count: 1 },
676
+          { name: '临时开药', count: 1 },
677
+          { name: '临睡前', count: 1 },
678
+          { name: '隔日一次', count: 1 },
679
+          { name: '隔三日一次', count: 1 },
680
+          { name: '每二小时一次', count: 12 },
681
+          { name: '每四小时一次', count: 6 },
682
+          { name: '每六小时一次', count: 4 },
683
+          { name: '每八小时一次', count: 3 }
684
+        ]
685
+        let num = ''
686
+        arr.map(item => {
687
+          if (item.name == execution_frequency) {
688
+            num = item.count
689
+          }
690
+        })
691
+        if (num == '') {
692
+          num = 1
693
+        }
694
+        return num
695
+      },
644 696
     }, mounted() {
645 697
       this.getInitData()
646 698
 

+ 97 - 46
src/xt_pages/outpatientDoctorStation/template/prinSeven.vue Прегледај датотеку

@@ -99,43 +99,89 @@
99 99
                 </div>
100 100
               </template>
101 101
               <div style="position: relative;">
102
-                <!-- :style="{'border-right':item.arr.length>0 && (item.arr[0][0].groupno==it.groupno) ? '1px solid black': 'none','width':'80%'}" -->
103
-                <!-- <div class="drugsOne" >
104
-                  <span style="font-weight: bold" >
105
-                    {{ index + 1 + "."}}
106
-                  </span>
107
-                  {{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;
108
-                  <span v-if="it.drug.min_unit != it.drug.dose_unit">
109
-                    {{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* {{ it.drug.min_number }}{{ it.drug.min_unit }}/
110
-                    {{it.drug.max_unit}}
111
-                  </span>&nbsp;
102
+                <div v-if="item.arr.length>0">
112 103
                   <div v-for="(ite,indexs) in item.arr" :key="indexs">
113
-                    <template v-if="item.arr.length>0 && ite[0].groupno==it.groupno">
114
-                      <div >
115
-                        <span style="margin-left: 38px;">{{ite[0].advice_name ? ite[0].advice_name : ""}}</span>&nbsp;&nbsp;
116
-                        <span v-if="ite[0].drug.min_unit != ite[0].drug.dose_unit">
117
-                          {{ ite[0].drug.dose }}{{ ite[0].drug.dose_unit }}&nbsp;* {{ ite[0].drug.min_number }}{{ ite[0].drug.min_unit }}/
118
-                          {{ite[0].drug.max_unit}}
104
+                    <template>
105
+                      <div class="drugsOne" :style="{'border-right':item.arr.length>0 && (ite[0].groupno==it.groupno) ? '1px solid black': 'none','width':'80%'}">
106
+                        <span style="font-weight: bold" >
107
+                          {{ index + 1 + "."}}
108
+                        </span>
109
+                        {{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;
110
+                        <span v-if="it.drug.min_unit != it.drug.dose_unit">
111
+                          {{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* {{ it.drug.min_number }}{{ it.drug.min_unit }}/
112
+                          {{it.drug.max_unit}}
119 113
                         </span>&nbsp;
120
-                      </div>
121
-                      <div style="display: inline-block;position: absolute;left:85%;top:20px;margin-left: 5px;" >
122
-                        &nbsp;共{{ ite[0].single_dose }}{{ ite[0].single_dose_unit }}
114
+                        <div >
115
+                          <!-- v-for="(ite,indexs) in item.arr" :key="indexs" -->
116
+                          <template v-if="item.arr.length>0 && ite[0].groupno==it.groupno">
117
+                            <div>
118
+                              <span style="margin-left: 38px;">{{ite[0].advice_name ? ite[0].advice_name : ""}}</span>&nbsp;&nbsp;
119
+                              <span v-if="ite[0].drug.min_unit != ite[0].drug.dose_unit">
120
+                                {{ ite[0].drug.dose }}{{ ite[0].drug.dose_unit }}&nbsp;* {{ ite[0].drug.min_number }}{{ ite[0].drug.min_unit }}/
121
+                                {{ite[0].drug.max_unit}}
122
+                              </span>&nbsp;
123
+                            </div>
124
+                            <div style="display: inline-block;position: absolute;left:85%;top:20px;margin-left: 5px;" >
125
+                              &nbsp;共{{ ite[0].single_dose }}{{ ite[0].single_dose_unit }}
126
+                            </div>
127
+                          </template>
128
+                        </div>
129
+
130
+                        <div style="margin-left: 70px" >
131
+                          <template>
132
+                              用法:
133
+                              <div style="display: inline-block;" >
134
+                                <template>
135
+                                  <span style="margin-right: 0;" v-if="(item.arr.length>0 && ite[0].groupno!=it.groupno)||item.arr.length==0">{{ it.single_dose }}{{ it.single_dose_unit }}</span>
136
+                                </template>
137
+                              </div>
138
+                            &nbsp;&nbsp;<span>
139
+                              {{ it.execution_frequency }}&nbsp;{{
140
+                                it.delivery_way
141
+                              }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc}}</span>
142
+                          </template>
143
+                        </div>
144
+                        <div style="margin-left: 70px" v-if="it.remark !=''">
145
+                          备注:<span > {{ it.remark }}</span>
146
+                        </div>
123 147
                       </div>
124 148
                     </template>
125 149
                   </div>
150
+                </div>
126 151
 
127
-                  <div style="margin-left: 70px">
128
-                    用法:
129
-                    <span v-if="(item.arr.length>0 && item.arr[0][0].groupno!=it.groupno)||item.arr.length==0">{{ it.single_dose }}{{ it.single_dose_unit }}</span>
130
-                    &nbsp;&nbsp;<span>
131
-                      {{ it.execution_frequency }}&nbsp;{{
132
-                        it.delivery_way
133
-                      }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc}}</span>
134
-                  </div>
135
-                  <div style="margin-left: 70px" v-if="it.remark !=''">
136
-                    备注:<span > {{ it.remark }}</span>
137
-                  </div>
152
+                <div v-if="item.arr.length==0">
153
+                  <!--   
154
+                      :style="{'border-right':item.arr.length>0 && (item.arr[0][0].groupno==it.groupno) ? '1px solid black': 'none','width':'80%'}"-->
155
+                      <div class="drugsOne" >
156
+                        <span style="font-weight: bold" >
157
+                          {{ index + 1 + "."}}
158
+                        </span>
159
+                        {{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;
160
+                        <span v-if="it.drug.min_unit != it.drug.dose_unit">
161
+                          {{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* {{ it.drug.min_number }}{{ it.drug.min_unit }}/
162
+                          {{it.drug.max_unit}}
163
+                        </span>&nbsp;
164
+
165
+                        <div style="margin-left: 70px" >
166
+                          <template>
167
+                              用法:
168
+                              <div style="display: inline-block;" >
169
+                                <template>
170
+                                  <span style="margin-right: 0;">{{ it.single_dose }}{{ it.single_dose_unit }}</span>
171
+                                </template>
172
+                              </div>
173
+                            &nbsp;&nbsp;<span>
174
+                              {{ it.execution_frequency }}&nbsp;{{
175
+                                it.delivery_way
176
+                              }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc}}</span>
177
+                          </template>
178
+                        </div>
179
+                        <div style="margin-left: 70px" v-if="it.remark !=''">
180
+                          备注:<span > {{ it.remark }}</span>
181
+                        </div>
182
+                      </div>
138 183
                 </div>
184
+               
139 185
                 <div style="display: inline-block;position: absolute;left:80%;bottom:30px;margin-left: 5px;" >
140 186
                   ×&nbsp;{{ it.prescribing_number}}
141 187
                 </div>
@@ -146,18 +192,26 @@
146 192
                     </div>
147 193
                   </template>
148 194
                 </div>
149
-                <template>
150
-
151
-                    <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" v-if="(item.arr.length>0&&item.arr[0][0].groupno!=it.groupno) || item.arr.length==0">
152
-                      &nbsp;共{{ it.prescribing_number}}{{ it.prescribing_number_unit }}
153
-                    </div>
195
+                <div v-if="item.arr.length>0">
196
+                  <div v-for="(ite,indexs) in item.arr" :key="indexs">
197
+                    <template>
198
+                        <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" v-if="(item.arr.length>0&&ite[0].groupno!=it.groupno) || item.arr.length==0">
199
+                          &nbsp;共{{ it.prescribing_number}}{{ it.prescribing_number_unit }}
200
+                        </div>
154 201
 
155
-                    <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" v-if="item.arr.length>0&&item.arr[0][0].groupno==it.groupno">
156
-                      &nbsp;共{{ it.single_dose }}{{ it.single_dose_unit }}
157
-                    </div>
158
-                </template> -->
159
-                <!-- --------------------------------------------------------------------- -->
160
-                <template>
202
+                        <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" v-if="item.arr.length>0&&ite[0].groupno==it.groupno">
203
+                          &nbsp;共{{ it.single_dose }}{{ it.single_dose_unit }}
204
+                        </div>
205
+                    </template>
206
+                  </div>
207
+                </div>
208
+                <div v-if="item.arr.length==0">
209
+                  <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" >
210
+                    &nbsp;共{{ it.prescribing_number}}{{ it.prescribing_number_unit }}
211
+                  </div>
212
+                </div>
213
+                <!-------------------------------------------------------------------------->
214
+                <!-- <template>
161 215
                   <div v-for="(ite,indexs) in item.arr" :key="indexs">
162 216
                     <div class="drugsOne" :style="{'border-right':item.arr.length>0 && (ite[0].groupno==it.groupno) ? '1px solid black': 'none','width':'80%'}">
163 217
                     <span style="font-weight: bold" >
@@ -179,7 +233,6 @@
179 233
                         </div>
180 234
                         <div style="display: inline-block;position: absolute;left:85%;top:20px;margin-left: 5px;" >
181 235
                           &nbsp;共{{ ite[0].single_dose }}{{ ite[0].single_dose_unit }}
182
-                          <!-- 共{{ it.prescribing_number}}{{ it.prescribing_number_unit }} -->
183 236
                         </div>
184 237
                       </template>
185 238
                     </div>
@@ -194,7 +247,6 @@
194 247
                     <div style="margin-left: 70px" v-if="it.remark !=''">
195 248
                       备注:<span > {{ it.remark }}</span>
196 249
                     </div>
197
-                      <!-- v-if="arr.length>0 && arr[0][0].groupno==it.groupno" 'border-right':arr.length>0 && arr[0][0].groupno==it.groupno ? '1px solid black' :'none',-->
198 250
                     </div>
199 251
                     <div style="display: inline-block;position: absolute;left:80%;bottom:30px;margin-left: 5px;" >
200 252
                       ×&nbsp;{{ it.prescribing_number}}
@@ -207,7 +259,6 @@
207 259
                       </template>
208 260
                     </div>
209 261
                     <template>
210
-                      <!-- <div v-for="(ite,indexs) in item.arr" :key="indexs"> -->
211 262
                         <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" v-if="(item.arr.length>0&&item.arr[0][0].groupno!=it.groupno) || item.arr.length==0">
212 263
                           &nbsp;共{{ it.prescribing_number}}{{ it.prescribing_number_unit }}
213 264
                         </div>
@@ -215,11 +266,11 @@
215 266
                         <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" v-if="item.arr.length>0&&item.arr[0][0].groupno==it.groupno">
216 267
                           &nbsp;共{{ it.single_dose }}{{ it.single_dose_unit }}
217 268
                         </div>
218
-                      <!-- </div> -->
269
+                  
219 270
                     </template>
220 271
                   </div>
221 272
 
222
-                </template>
273
+                </template> -->
223 274
 
224 275
               </div>
225 276
               <template v-if="index==yi&&item.advices.length>5">

+ 4 - 4
src/xt_pages/role/admin.vue Прегледај датотеку

@@ -24,15 +24,15 @@
24 24
         @click="BatchDelete"
25 25
         >医药师登记</el-button>
26 26
 
27
-
28
-       <!-- <el-button
27
+<!-- 
28
+        <el-button
29 29
           type="primary"
30 30
           size="small"
31 31
           icon="el-icon-circle-plus-outline"
32 32
           style="float:left"
33
-          @click="toJiaBan">首拼</el-button> 
33
+          @click="toJiaBan">首拼</el-button>  -->
34 34
 
35
-           -->
35
+          
36 36
 
37 37
 
38 38
           <!-- <el-button

+ 8 - 3
src/xt_pages/stock/stockOutOrder.vue Прегледај датотеку

@@ -296,7 +296,7 @@
296 296
             <template slot-scope="scope">
297 297
                <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
298 298
                   <td style="border-right: none; border-inline-end: none;text-align: center">
299
-                     {{getAllStockCount(scope.row.child,item.warehousing_id) - getCancelInfo(item.warehousing_id,item.good_id)}}
299
+                     {{getAllStockCount(scope.row.child,item.warehousing_id,item.good_id) - getCancelInfo(item.warehousing_id,item.good_id)}}
300 300
                   </td>
301 301
                </tr>
302 302
              
@@ -349,7 +349,7 @@
349 349
                <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
350 350
                   <td style="border-right: none; border-inline-end: none;text-align: center">
351 351
                       <!-- {{(getAllStockCount(scope.row.child,item.warehousing_id) * getAllStockCountPrice(scope.row.child,item.warehousing_id)).toFixed(2)}} -->
352
-                       {{((getAllStockCount(scope.row.child,item.warehousing_id) - getCancelInfo(item.warehousing_id,item.good_id)) *  getAllStockCountPrice(scope.row.child,item.warehousing_id)).toFixed(2)}}
352
+                       {{((getAllStockCount(scope.row.child,item.warehousing_id,item.good_id) - getCancelInfo(item.warehousing_id,item.good_id)) *  getAllStockCountPrice(scope.row.child,item.warehousing_id)).toFixed(2)}}
353 353
                   </td>
354 354
                </tr>
355 355
             </template>
@@ -2257,7 +2257,7 @@ export default {
2257 2257
     changeCheckType(){
2258 2258
       this.GetWarehouseOut()
2259 2259
     },
2260
-    getAllStockCount(val,warehousing_id){
2260
+    getAllStockCount(val,warehousing_id,good_id){
2261 2261
       var arr=[]
2262 2262
       var total_count = 0
2263 2263
      if(val!=null&&val.length > 0){
@@ -2273,10 +2273,13 @@ export default {
2273 2273
        }
2274 2274
      }
2275 2275
      if(total_count > 0){
2276
+    
2276 2277
         return total_count
2277 2278
      }else{
2279
+     
2278 2280
       return total_count
2279 2281
      }
2282
+     
2280 2283
     },
2281 2284
     getAllStockCountPrice(val,warehousing_id){
2282 2285
      var price = 0
@@ -2422,6 +2425,8 @@ export default {
2422 2425
       }
2423 2426
      }
2424 2427
      if(count > 0){
2428
+      console.log("good_id",good_id)
2429
+      console.log("数量我哦哦我",count)
2425 2430
       return count
2426 2431
      }else{
2427 2432
       return 0 

+ 10 - 10
src/xt_pages/workforce/remind_print_setting_one.vue Прегледај датотеку

@@ -42,13 +42,13 @@
42 42
                     <span>{{getModeId(main_collection.mode_id)}}</span>
43 43
                   
44 44
                 </div>
45
-                <div class="printCell" v-if="org_id!=10375">
45
+                <div class="printCell" v-if="org_id!=9671">
46 46
                   <span>抗凝剂:{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}</span>
47 47
                 </div>
48
-                <div class="printCell" v-if="org_id==10375">
48
+                <div class="printCell" v-if="org_id==9671">
49 49
                   <span>抗凝剂:{{ main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name : ''}}</span>
50 50
                 </div>
51
-                <div class="printCell" v-if="org_id!=10375">
51
+                <div class="printCell" v-if="org_id!=9671">
52 52
                  首剂:<span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji}} mg</span>
53 53
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">
54 54
                     {{main_collection.dialysissolution.anticoagulant_shouji}}mg
@@ -82,7 +82,7 @@
82 82
                    </span>
83 83
                  
84 84
                 </div>
85
-                <div class="printCell" v-if="org_id ==10375">
85
+                <div class="printCell" v-if="org_id ==9671">
86 86
                  首剂:<span v-if="main_collection.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_shouji}} mg</span>
87 87
                   <span v-if="main_collection.prescription.anticoagulant == 2">
88 88
                     {{main_collection.prescription.anticoagulant_shouji}}mg
@@ -116,7 +116,7 @@
116 116
                    </span>
117 117
                  
118 118
                 </div>
119
-                <div class="printCell" v-if="org_id!=10375">
119
+                <div class="printCell" v-if="org_id!=9671">
120 120
                   维持:{{main_collection.dialysissolution.anticoagulant_weichi}}
121 121
                    <span v-if="main_collection.dialysissolution.anticoagulant == 1">
122 122
                     mg/h
@@ -154,7 +154,7 @@
154 154
               
155 155
                 </div>
156 156
 
157
-                <div class="printCell" v-if="org_id!=10375">
157
+                <div class="printCell" v-if="org_id!=9671">
158 158
                   维持:{{main_collection.prescription.anticoagulant_weichi}}
159 159
                    <span v-if="main_collection.prescription.anticoagulant == 1">
160 160
                     mg/h
@@ -192,7 +192,7 @@
192 192
               
193 193
                 </div>
194 194
                
195
-                <div class="printCell" v-if="org_id!=10375">
195
+                <div class="printCell" v-if="org_id!=9671">
196 196
                   总量:{{main_collection.dialysissolution.anticoagulant_zongliang}}
197 197
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
198 198
                     mg
@@ -230,7 +230,7 @@
230 230
           
231 231
                 </div>
232 232
 
233
-                <div class="printCell" v-if="org_id==10375">
233
+                <div class="printCell" v-if="org_id==9671">
234 234
                   总量:{{main_collection.prescription.anticoagulant_zongliang}}
235 235
                   <span v-if="main_collection.prescription.anticoagulant == 1">
236 236
                     mg
@@ -332,7 +332,7 @@
332 332
                 </div>
333 333
 
334 334
                 <div class="printCell">
335
-                  <span v-if="org_id!=0&&org_id!=10375">
335
+                  <span v-if="org_id!=0&&org_id!=9671">
336 336
                     排班备注:
337 337
                     <span  style="width:auto;">
338 338
                      <span>
@@ -341,7 +341,7 @@
341 341
                     </span>
342 342
                   
343 343
                   </span>
344
-                  <span v-if="org_id == 0 || org_id ==10375">
344
+                  <span v-if="org_id == 0 || org_id ==9671">
345 345
                     排班备注:
346 346
                     <sapn v-if="main_collection.schedule_type ==1">上午</sapn>
347 347
                     <sapn v-if="main_collection.schedule_type ==2">下午</sapn>