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

src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue

@@ -91,7 +91,7 @@
                   <div>费别：<span style="display:inline-block;width:80px;">自费</span>
                   </div>
                   <div>电脑号：<span style="display:inline-block;width:80px;"></span></div>
-                  <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>
+                  <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>
                 </div>
                 <div style="float:right">金额单位：元</div>
             </div>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1186,9 +1186,11 @@
             for(let i=0;i<drugs.length;i++){
                 drugs[i].count = 0
               if(drugs[i].stock_in.length > 0){
-                 for(let j=0;j<drugs[i].stock_in.length;j++){
+                if(drugs[i].stock_in != null) {
+                  for (let j = 0; j < drugs[i].stock_in.length; j++) {
                     drugs[i].count += (drugs[i].stock_in[j].stock_max_number * drugs[i].min_number + drugs[i].stock_in[j].stock_min_number)
-                 }
+                  }
+                }
               }
             }
             this.drugs = drugs

src/xt_pages/outpatientTool/labelPrint.vue

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