Merge branch 'master' of http://119.23.210.103:3000/wy/lh_firm_former

src/views/system/jbdScan/goods/manualConfirmation.vue

@@ -470,14 +470,14 @@ import IbpsLinkData from '@/business/platform/data/templaterender/link-data'
 import weizhiData from "./weizhiData.vue"
 import liuyangData from "./liuyangData.vue"
 
-import IbpsUserSelector from '@/business/platform/org/selector'
+// import IbpsUserSelector from '@/business/platform/org/selector'
  export default {
    components:{
      IbpsLinkData,
      weizhiData,
      liuyangData,
 
-    IbpsUserSelector
+    // IbpsUserSelector
 
    },
    mixins:[manualConfirmationJS],

src/views/system/jbdScan/goods/orderOpen.vue

@@ -0,0 +1,133 @@
+<template>
+  <div class="bg">
+    <el-dialog width="1000" height="500" :modal-append-to-body='false' title="订单开立流程" :visible.sync="scanVisible" >
+      <!-- 表单是否显示 -->
+      <div style="width: 100%;height: 100%;">
+        <div ref="qrcode" id="box">
+          <vue-easy-print tableShow ref="easyPrint" :onePageRow="onePageRow">
+
+                <div class="tagBox">
+                 <!-- <p class="title"> -->
+                    <img src="../../../../assets/images/login/orderOpen.png" class="logoImg" />
+
+               <!--   </p> -->
+                </div>
+
+
+          </vue-easy-print>
+        </div>
+      </div>
+
+    </el-dialog>
+
+
+  </div>
+</template>
+
+<script>
+import VueBarcode from 'vue-barcode';
+import vueEasyPrint from "vue-easy-print";
+import repostCurd from '@/business/platform/form/utils/custom/joinCURD.js';
+
+export default {
+  components: {
+    VueBarcode,
+    vueEasyPrint,
+  },
+  props: {
+    obj: {
+      default: [],
+      type: Array
+    },
+    onePageRow: {
+      type: Number,
+      default: 3
+    },
+    blankLines: {
+      type: Boolean,
+      default: true
+    },
+    scanVisible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      visible: true
+    }
+  },
+  // watch: {
+  //   obj() {
+  //     this.getInit()
+  //   }
+  // },
+  created() {
+    this.getInit()
+  },
+  methods: {
+
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.bg {
+  // height: auto;
+}
+
+// .title {
+//   font-size: 16px;
+//   color: #01a39e;
+//   margin: 0;
+//   margin-bottom: 10px;
+// }
+
+/deep/ .logoImg {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  // top: 6px;
+      border: 1px solid #000000;
+      border-radius: 5px;
+}
+
+.tagBox {
+  width: 90%; // 300  240
+  height:90%; // 180  150
+  position: relative;
+  // border: 1px solid #000000;
+  padding: 2px;
+  display: inline-block;
+  margin: 0px 37px 30px 37px;
+  border-radius: 4px;
+  background-color: #fff;
+}
+
+.ewm {
+  display: flex;
+  justify-content: center;
+}
+
+.la {
+  display: flex;
+  align-items: center;
+}
+
+.lh {
+  font-size: 4px; //16
+  display: flex;
+  align-items: center;
+}
+
+/deep/ .tagBox {
+  width: 90%; // 300  240
+  height:90%; // 180  150
+  padding: 0px 10px 1px 10px;
+}
+/deep/ .el-dialog__header {
+    padding: 20px 20px 10px !important;
+
+}
+
+</style>

src/views/system/jbdScan/goods/sampleConfirmation.vue

@@ -468,13 +468,13 @@ import sampleConfirmationJS from '../js/sampleConfirmationJS.js'
 import IbpsLinkData from '@/business/platform/data/templaterender/link-data'
 import weizhiData from "./weizhiData.vue"
 import liuyangData from "./liuyangData.vue"
-import IbpsUserSelector from '@/business/platform/org/selector'
+// import IbpsUserSelector from '@/business/platform/org/selector'
  export default {
    components:{
      IbpsLinkData,
      weizhiData,
      liuyangData,
-     IbpsUserSelector
+    //  IbpsUserSelector
    },
    mixins:[sampleConfirmationJS],
    props:{scanVisible:Boolean},

src/views/system/jbdScan/js/sampleConfirmationJS.js

@@ -28,7 +28,6 @@ export default {
 
       // 扫码扫到新数据,查询 回填展示
       if(flag){
-        // console.log(id)
          repostCurd('select','{"tableName": "t_lhypb","paramWhere":{"yang_pin_bian_hao":"' + id + '","jie_yang_zhuang_t":"待接收","shi_fou_guo_shen_":"1"}}').then(res => {
           if (res.variables.data && res.variables.data.length > 0) {
             for (let i in res.variables.data) {

src/views/system/jbdScan/scan.vue

@@ -20,12 +20,13 @@ import neishenzhuangtai from './goods/neishenzhuangtai'
 import bwTag from './goods/bwTag.vue'
 import fzrkTag from './goods/fzrkTag.vue'
 import kucuntag from './goods/kucuntag.vue'
+import orderOpen from './goods/orderOpen.vue'
 
 export default {
   components: {
     facility, material, sample, sampleConfirmation, manualConfirmation, tag,
     deviceTag, deviceVerificationTag, deviceFailureTag,
-    neishenzhuangtai, bwTag, fzrkTag, kucuntag
+    neishenzhuangtai, bwTag, fzrkTag, kucuntag,orderOpen
   },
   props: {
     currentScan: String,