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

src/xt_pages/outpatientTool/labelPrint.vue

                               <div>{{getTime(current_ctime,'{m}-{d}')}}</div>
                               <div>{{getTime(current_ctime,'{h}:{i}')}}</div>
                           </div>
-                          <img style="width:300px;height:80px;margin-left:10px;" id="barcode">
+                          <img style="width:300px;height:200px;margin-left:10px;" id="barcode">
                       </div>
                       <div style="margin-bottom:5px;">{{current_number}}</div>
                       <div style="display:flex;">
         this.current_number = row.number
         this.current_project_name = row.project_name
         this.current_name = row.patient_name
-
         this.$nextTick(() => {
-          JsBarcode('#barcode', 'DY2020080400088', {
+          JsBarcode('#barcode',row.feedetl_sn, {
             format: 'CODE39',
             lineColor: '#000',
             background: '#EBEEF5',
-            width: 2,
-            height: 100,
-            displayValue: false
+            width: 3,
+            height: 200,
+            displayValue: false,
+            fontOptions:"bold italic",//使文字加粗体或变斜体
+            font:"fantasy",//设置文本的字体
+            textAlign:"left",//设置文本的水平对齐方式
+            textPosition:"top",//设置文本的垂直位置
+            textMargin:5,//设置条形码和文本之间的间距
+            fontSize:15,//设置文本的大小
+            margin:15//设置条形码周围的空白边距
           })
 
         });