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

package-lock.json

@@ -4751,8 +4751,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4775,15 +4774,13 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4799,22 +4796,19 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4944,8 +4938,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4959,7 +4952,6 @@
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4976,7 +4968,6 @@
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4984,15 +4975,13 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5013,7 +5002,6 @@
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5101,8 +5089,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5116,7 +5103,6 @@
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5211,8 +5197,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5254,7 +5239,6 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5276,7 +5260,6 @@
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5324,15 +5307,13 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -6697,6 +6678,11 @@
         "esprima": "^2.6.0"
       }
     },
+    "jsbarcode": {
+      "version": "3.11.5",
+      "resolved": "https://registry.nlark.com/jsbarcode/download/jsbarcode-3.11.5.tgz",
+      "integrity": "sha1-OQs+/QJx81udaMe4r26XJEWWkBQ="
+    },
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",

package.json

@@ -51,6 +51,7 @@
     "file-saver": "^1.3.8",
     "font-awesome": "4.7.0",
     "js-cookie": "2.2.0",
+    "jsbarcode": "^3.11.5",
     "jsonlint": "1.6.3",
     "jszip": "3.1.5",
     "mockjs": "1.0.1-beta3",

src/xt_pages/outpatientTool/labelPrint.vue

@@ -89,7 +89,40 @@
             >
             </el-pagination>
         </div>
+
+        <el-dialog title="打印" :visible.sync="labelVisible">
+            <div>
+                <el-row style="float:right;">
+                    <el-col :span="24">
+                        <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印
+                        </el-button>
+                    </el-col>
+                </el-row>
+                <div class="app-container" style="background-color: white;">
+                    <div id="sign" class="signPrint">
+                        <div style="display:flex;margin-bottom:10px;">
+                            <div style="margin-left:15px;">
+                                <div>C</div>
+                                <div>{{getTime(current_ctime,'{m}-{d}')}}</div>
+                                <div>{{getTime(current_ctime,'{h}:{i}')}}</div>
+                            </div>
+                            <img id="barcode">
+                        </div>
+                        <div>{{current_number}}</div>
+                        <div style="display:flex;">
+                            <div style="padding-left:20px;">{{current_project_name}}</div>
+                            <div style="font-size:24px;">{{current_name}}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="labelVisible = false">取 消</el-button>
+                <el-button type="primary" @click="labelVisible = false">确 定</el-button>
+            </div>
+        </el-dialog>
     </div>
+
 </template>
 
 
@@ -97,15 +130,25 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { GetLabelList } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
+  import SignPrint from '../dialysis/signPrint'
+  import JsBarcode from 'jsbarcode'
+
   // import NewStatementPrint from './newStatementPrint'
   const moment = require('moment')
   export default {
     components: {
+      SignPrint,
       BreadCrumb
 
     },
     data() {
       return {
+        current_ctime: 0,
+        current_number: '',
+        current_project_name: '',
+        current_name: '',
+
+        labelVisible: false,
         crumbs: [
           { path: false, name: 'HIS工具' },
           { path: false, name: '标签打印' }
@@ -116,6 +159,7 @@
         page: 1,
         limit: 10,
         total: 0,
+        current_id: 0,
         sameRowArr: [],
         keywords: '',
         tableData: [],
@@ -129,6 +173,16 @@
       }
     },
     methods: {
+      printAction: function() {
+        const style = '@media print { .sign{width:960px;margin: 0 auto;text-align: center;border-collapse: collapse;}.order_title_panl {text-align: center;.main_title {font-size: 18px;line-height: 40px;font-weight: 500;}}.dialysisTable tr{padding: 10px 0;}.dialysisTable th {color: #000;padding: 0;margin: 0;height: 30px;}.dialysisTable tr td {padding: 12px 0;}.subadvice_content {text-align: left;padding-left: 25px !important;padding-right: 5px !important;}.advice_content {text-align: left;padding-left: 5px !important;padding-right: 5px !important;padding: 15px 5px !important;} }'
+        printJS({
+          printable: 'sign',
+          type: 'html',
+          documentTitle: '  ',
+          style: style,
+          scanStyles: false
+        })
+      },
       getTime(value, temp) {
         if (value != undefined) {
           return uParseTime(value, temp)
@@ -136,6 +190,23 @@
         return ''
       },
       Print(row, index) {
+        this.labelVisible = true
+        this.current_ctime = row.ctime
+        this.current_number = row.number
+        this.current_project_name = row.project_name
+        this.current_name = row.patient_name
+
+        this.$nextTick(() => {
+          JsBarcode('#barcode', 'DY2020080400088', {
+            format: 'CODE39',
+            lineColor: '#000',
+            background: '#EBEEF5',
+            width: 2,
+            height: 100,
+            displayValue: false
+          })
+
+        });
 
       },
       handleCurrentChange(page) {
@@ -191,6 +262,8 @@
     created() {
       this.getList()
 
+    }, mounted() {
+
     }
   }
 </script>

src/xt_pages/outpatientTool/signPrint.vue

@@ -17,7 +17,7 @@
                         <div>09-15</div>
                     </div>
                     <div style="width:100px;">
-                        <img src="" alt="">
+                        <img id="barcode">
                     </div>
                 </div>
                 <div>6821737912312983</div>
@@ -34,6 +34,7 @@ import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { getSchedualDoctors } from '@/api/advice'
 import { parseTime } from '@/utils'
 import print from 'print-js'
+import JsBarcode from 'jsbarcode'
 const moment = require('moment')
 export default {
     components:{
@@ -59,9 +60,17 @@ export default {
             scanStyles: false
             })
         },
-    
+
     },
     created(){
+      JsBarcode('#barcode', 'DY2020080400088', {
+        format: 'CODE39',
+        lineColor: '#000',
+        background: '#EBEEF5',
+        width: 2,
+        height: 40,
+        displayValue: false
+      })
     }
 }
 </script>