Browse Source

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

XMLWAN 3 years ago
parent
commit
c326897da0

+ 1 - 1
src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue View File

@@ -91,7 +91,7 @@
91 91
                   <div>费别:<span style="display:inline-block;width:80px;">自费</span>
92 92
                   </div>
93 93
                   <div>电脑号:<span style="display:inline-block;width:80px;"></span></div>
94
-                  <div>收费日期:<span style="display:inline-block;width:100px;">{{getTime(balanceAccounts.order.settle_accounts_date,"{y}-{m}-{d}")?getTime(new Date(),"{y}-{m}-{d}"):""}}</span></div>
94
+                  <div>收费日期:<span style="display:inline-block;width:100px;">{{getTime(balanceAccounts.order.settle_accounts_date,"{y}-{m}-{d}")?getTime(balanceAccounts.order.settle_accounts_date,"{y}-{m}-{d}"):""}}</span></div>
95 95
                 </div>
96 96
                 <div style="float:right">金额单位:元</div>
97 97
             </div>

+ 4 - 2
src/xt_pages/outpatientDoctorStation/doctorDesk.vue View File

@@ -1186,9 +1186,11 @@
1186 1186
             for(let i=0;i<drugs.length;i++){
1187 1187
                 drugs[i].count = 0
1188 1188
               if(drugs[i].stock_in.length > 0){
1189
-                 for(let j=0;j<drugs[i].stock_in.length;j++){
1189
+                if(drugs[i].stock_in != null) {
1190
+                  for (let j = 0; j < drugs[i].stock_in.length; j++) {
1190 1191
                     drugs[i].count += (drugs[i].stock_in[j].stock_max_number * drugs[i].min_number + drugs[i].stock_in[j].stock_min_number)
1191
-                 }
1192
+                  }
1193
+                }
1192 1194
               }
1193 1195
             }
1194 1196
             this.drugs = drugs

+ 1 - 1
src/xt_pages/outpatientTool/labelPrint.vue View File

@@ -194,7 +194,7 @@
194 194
         this.current_project_name = row.project_name
195 195
         this.current_name = row.patient_name
196 196
         this.$nextTick(() => {
197
-          JsBarcode('#barcode',row.feedetl_sn, {
197
+          JsBarcode('#barcode',row.p_project_id, {
198 198
             format: 'CODE39',
199 199
             lineColor: '#000',
200 200
             background: '#EBEEF5',