Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

package.json

@@ -58,6 +58,7 @@
     "three": "0.121.0",
     "vanta": "^0.5.24",
     "vue": "2.6.12",
+    "vue-barcode": "^1.3.0",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
     "vue-ls": "4.0.0",

src/views/mes/md/product/components/productOrderDetail.vue

@@ -2,6 +2,26 @@
   <div class="productOrderBox">
     <div class="pageTop">
       <div class="titles">生产单</div>
+      <div v-if="pageHeader.arrangeCode" class="barcode">
+          <vue-barcode
+          :value="pageHeader.arrangeCode"
+          margin-right="5"
+          display-value="432141243"
+          font="bold"
+          margin-left="5"
+          text-margin="10"
+          text-position="bottom"
+          style="width:200px;"
+          width="1"
+          ean128="ean128"
+          :text="'规格书编号：'+ pageHeader.arrangeCode"
+          height="30"
+          margin-top="10"
+          margin="10"
+          margin-bottom="20"
+          text-align="center"
+          font-size="12">不支持vue-barcode</vue-barcode>
+      </div>
       <div>
         产品类别：{{ pageHeader.itemTypeName }}
       </div>
@@ -24,7 +44,7 @@
         <div>完工日期：{{ pageHeader.finishTime }}</div>
       </div>
     </div>
-    <table border class="form-header font-size-16" style="table-layout: fixed;width: 100%;border:1px solid #000000;">
+    <table border class="form-header font-size-16" style="table-layout: fixed;width: 100%;border:1px solid #000000;font-size:14px;">
       <!--  -->
       <tr height="20" class="color000">
         <td colspan="4" align="center">产品编码</td>
@@ -186,7 +206,9 @@
 </template>
 
 <script>
+import VueBarcode from 'vue-barcode'
 export default {
+  components: { VueBarcode },
   data() {
     return {
       workOrderInfo: {
@@ -327,10 +349,20 @@ export default {
 .pageTop{
   color: #000;
   padding: 0px 10px;
+  position: relative;
   .titles{
     text-align: center;
     font-size:22px;
   }
+  .barcode{
+    position: absolute;
+    top:-10px;
+    right:0px;
+    width: 200px;
+    height:80px;
+    overflow: hidden;
+  }
+
   .titleType{
     display: flex;
     div{

yarn.lock

@@ -5910,7 +5910,7 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-jsbarcode@^3.11.5:
+jsbarcode@^3.11.5, jsbarcode@^3.5.8:
   version "3.11.6"
   resolved "https://registry.npmmirror.com/jsbarcode/-/jsbarcode-3.11.6.tgz#96e8fbc3395476e162982a6064b98a09b5ea02c0"
   integrity sha512-G5TKGyKY1zJo0ZQKFM1IIMfy0nF2rs92BLlCz+cU4/TazIc4ZH+X1GYeDRt7TKjrYqmPfTjwTBkU/QnQlsYiuA==
@@ -9853,6 +9853,13 @@ vm-browserify@^1.0.1:
   resolved "https://registry.npmmirror.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
+vue-barcode@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.npmmirror.com/vue-barcode/-/vue-barcode-1.3.0.tgz#c1a4fede73b2d45cdd154a176d6fd0e20fb32df0"
+  integrity sha512-DxQ0hxes/dP6GajsJumpW6jV14VwlnTwStZbtE6G0wkewuJVDoDOdxUr5seGuxsMT9fJ0aty4X47Z5TG0M/gxg==
+  dependencies:
+    jsbarcode "^3.5.8"
+
 vue-count-to@1.0.13:
   version "1.0.13"
   resolved "https://registry.npmmirror.com/vue-count-to/-/vue-count-to-1.0.13.tgz#3e7573ea6e64c2b2972f64e0a2ab2e23c7590ff3"