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

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

@@ -0,0 +1,245 @@
+<template>
+  <div class="bg">
+    <el-dialog 
+      width="21cm"
+      height="10cm" 
+       :modal-append-to-body='true' :append-to-body="true" title="设备标签" :visible.sync="scanVisible">
+      <!-- 表单是否显示 -->
+      <div style="height:500px">
+          <div ref="qrcode" id="box">
+          <vue-easy-print tableShow ref="easyPrint"
+            :onePageRow="onePageRow"
+          >
+            <div v-for="(item1, index1) in list" :key="index1"  style="display: inline-block" >
+              <div v-for="(item2, index2) in parseInt(item1.num)" :key="index2" 
+              style="display: inline-block"
+              ><!-- style="page-break-after:always" -->
+               <div class="All">
+                <div class="tagBox">
+                  <div class="lh">
+                    <div>设备名称：</div>
+                    <div>{{ item1.name }}</div>
+                  </div>
+                  <div class="la">
+                    <div class="lh">
+                      <div>设备编号：</div>
+                      <div>{{ item1.serial }}</div>
+                    </div>
+                  </div>
+                  <div class="lh">
+                    <div>存放地点：</div>
+                    <div>{{ item1.local }}</div>
+                  </div>
+                  <div class="lh">
+                    <div>启用日期：</div>
+                    <div>{{ item1.time }}</div>
+                  </div>
+
+                  <div class="lh">
+                    <div>资产原值：</div>
+                    <div>{{ item1.money }}</div>
+                  </div>
+                  <div class="lh">
+                    <div>使用科室：</div>
+                    <div>{{ item1.condition }}</div>
+                  </div>
+                  <div class="lh">
+                    <div>固定资产编号：</div>
+                    <div>{{ item1.assets }}</div>
+                  </div>
+
+                 
+                  <!-- <div class="lh">
+                    <div>流转状态：</div>
+                    <div>▢待检，▢已检，▢留样</div>
+                  </div> -->
+                 
+                  <div class="ewm">
+                    <vue-barcode :value="item1.serial" :width=1.5 :height=25 :fontSize=15 :margin=8 ></vue-barcode>
+                  </div>
+
+                  <!-- <div
+                    style="page-break-after: always; display: block !important;height: 40px"
+                  ></div> -->
+
+
+                </div>
+               </div>
+              </div>
+            </div>
+          </vue-easy-print>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <!-- <el-button @click="dialogVisible = false">取 消</el-button> -->
+        <el-button type="primary" @click="printDemo">打印标签</el-button>
+      </span>
+    </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 {
+      value: '',
+      id: '',
+      list: [{
+        name: 1,
+        serial: 1,
+        assets: 1,
+        num: 1,
+        local:1,
+        condition: 1,
+        money:1,
+        time:1,
+      }],
+      visible: true,
+    }
+  },
+  watch: {
+    obj() {
+      this.getInit()
+      // console.log(this.obj)
+    }
+  },
+  created() {
+    this.getInit()
+  },
+  methods: {
+    printDemo() {
+      this.$refs.easyPrint.print()
+    },
+    getInit() {
+      var idStr = '';
+      this.obj.forEach(item=>{
+        idStr += item.split(" ")[0] + ','
+      })
+      idStr = idStr.substring(0,idStr.length-1);
+      this.getLook(idStr)
+    },
+    getLook(id) {
+      let sql = `select * from t_sbdj where find_in_set(id_,'${id}')`
+      console.log(sql)
+      repostCurd("sql", sql).then(res => {
+          const data = res.variables.data
+          console.log(data)
+          let list = []
+          data.forEach(item => {
+            let num = 1
+            let o = {
+              name: item.she_bei_ming_cheng_,
+              serial: item.she_bei_shi_bie_h,
+              assets: item.zi_chan_bian_hao_,
+              num: num,
+              local:item.cun_fang_di_dian_,
+              condition: item.shi_yong_ke_shi_,
+              money:item.zi_chan_yuan_zhi_,
+              time:item.qi_yong_ri_qi_!=null?this.getTime(item.qi_yong_ri_qi_):'',
+            }
+            list.push(o)
+          })
+          
+          this.list = list
+      })
+    },
+    getTime(second) {
+      let date =new Date(second);
+      let year = date.getFullYear();
+      let month = ''
+      let day = ''
+      if((date.getMonth()+1)<=9){
+        month = "0"+ (date.getMonth()+1)
+      }else{
+        month = date.getMonth()+1
+      }
+      if(date.getDate()<=9){
+        day =  "0"+date.getDate();
+      }else {
+        day =  date.getDate();
+      }
+        return year + "-"+month+"-"+day;
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.bg {
+  // height: auto;
+}
+
+.tagBox {
+  width: 283px;   // 300  240
+  height: 283px;  // 180  150  94
+  position: relative;
+  border: 2px solid #000000;
+  padding: 5px;
+  display: inline-block;
+  // justify-content: space-around;
+  // flex-direction: column;
+  margin: 10px 5px;
+  border-radius: 4px;
+  background-color: #fff;
+}
+.ewm{
+
+}
+/*
+.tagBox {
+  width: 177.5px;   // 300  240
+  height: 106.5px;  // 180  150
+  position: relative;
+  border: 1px solid #000000;
+  padding: 20px;
+  display: flex;
+  justify-content: space-around;
+  flex-direction: column;
+  margin: 20px auto;
+  border-radius: 15px;
+  background-color: #fff;
+}
+*/
+
+.la {
+  display: flex;
+  align-items: center;
+}
+
+.lh {
+  // line-height: auto;
+  font-size: 18px;  //16
+  display: flex;
+  align-items: center;
+  // padding: 4px;
+
+}
+</style>

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

@@ -0,0 +1,261 @@
+<template>
+  <div class="bg">
+    <el-dialog 
+      width="21cm"
+      height="10cm" 
+       :modal-append-to-body='true' :append-to-body="true" title="设备检定校准标签" :visible.sync="scanVisible">
+      <!-- 表单是否显示 -->
+      <div style="height:500px">
+          <div ref="qrcode" id="box">
+          <vue-easy-print tableShow ref="easyPrint"
+            :onePageRow="onePageRow"
+          >
+            <div v-for="(item1, index1) in list" :key="index1"  style="display: inline-block" >
+              <div v-for="(item2, index2) in parseInt(item1.num)" :key="index2" 
+              style="display: inline-block"
+              ><!-- style="page-break-after:always" -->
+               <div class="All">
+                <div class="tagBox">
+                  <div class="lh">
+                    <div>设备名称：</div>
+                    <div>{{ item1.name }}</div>
+                  </div>
+                  <div class="la">
+                    <div class="lh">
+                      <div>设备编号：</div>
+                      <div>{{ item1.serial }}</div>
+                    </div>
+                  </div>
+                  <div class="lh">
+                    <div>存放地点：</div>
+                    <div>{{ item1.local }}</div>
+                  </div>
+                  <div class="lh">
+                    <div>启用日期：</div>
+                    <div>{{ item1.time }}</div>
+                  </div>
+
+                  <div class="lh">
+                    <div>资产原值：</div>
+                    <div>{{ item1.money }}</div>
+                  </div>
+                  <div class="lh">
+                    <div>使用科室：</div>
+                    <div>{{ item1.condition }}</div>
+                  </div>
+                  <div class="lh">
+                    <div>校准机构：</div>
+                    <div>{{ item1.jiGou }}</div>
+                  </div>
+                  <div class="lh">
+                    <div>校准时间：</div>
+                    <div>{{ item1.jiaoZhunTime }}</div>
+                  </div>
+                  <div class="lh">
+                    <div>修正值/修正因子：</div>
+                    <div>{{ item1.yinZi }}</div>
+                  </div>
+
+                  <div class="lh">
+                    <div>固定资产编号：</div>
+                    <div>{{ item1.assets }}</div>
+                  </div>
+                 
+                  <div class="ewm">
+                    <vue-barcode :value="item1.serial" :width=1.5 :height=25 :fontSize=15 :margin=8 ></vue-barcode>
+                  </div>
+
+                  <!-- <div
+                    style="page-break-after: always; display: block !important;height: 40px"
+                  ></div> -->
+
+
+                </div>
+               </div>
+              </div>
+            </div>
+          </vue-easy-print>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <!-- <el-button @click="dialogVisible = false">取 消</el-button> -->
+        <el-button type="primary" @click="printDemo">打印标签</el-button>
+      </span>
+    </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 {
+      value: '',
+      id: '',
+      list: [{
+        name: 1,
+        serial: 1,
+        assets: 1,
+        num: 1,
+        local:1,
+        condition: 1,
+        money:1,
+        time:1,
+        yinZi:1,
+        jiGou:1,
+        jiaoZhunTime:1
+      }],
+      visible: true,
+    }
+  },
+  watch: {
+    obj() {
+      this.getInit()
+      // console.log(this.obj)
+    }
+  },
+  created() {
+    this.getInit()
+  },
+  methods: {
+    printDemo() {
+      this.$refs.easyPrint.print()
+    },
+    getInit() {
+      var idStr = '';
+      this.obj.forEach(item=>{
+        idStr += item.split(" ")[0] + ','
+      })
+      idStr = idStr.substring(0,idStr.length-1);
+      this.getLook(idStr)
+    },
+    getLook(id) {
+      let sql = `select dj.she_bei_ming_cheng_,dj.she_bei_shi_bie_h,dj.zi_chan_bian_hao_,
+        dj.cun_fang_di_dian_,dj.shi_yong_ke_shi_,dj.zi_chan_yuan_zhi_,  dj.qi_yong_ri_qi_,
+        zx.xiu_zheng_zhi_,zx.xiao_zhun_ri_qi_,zx.jian_ding_xiao_zh
+        from t_sbdj dj right JOIN t_sbjdxzzx zx on zx.yi_qi_bian_hao_ = dj.id_ where find_in_set(zx.parent_id_,'${id}')`
+      // console.log(sql)
+      repostCurd("sql", sql).then(res => {
+          const data = res.variables.data
+          // console.log(data)
+          let list = []
+          data.forEach(item => {
+            let num = 1
+            let o = {
+              name: item.she_bei_ming_cheng_,
+              serial: item.she_bei_shi_bie_h,
+              assets: item.zi_chan_bian_hao_,
+              num: num,
+              local:item.cun_fang_di_dian_,
+              condition: item.shi_yong_ke_shi_,
+              money:item.zi_chan_yuan_zhi_,
+              time:item.qi_yong_ri_qi_!=null?this.getTime(item.qi_yong_ri_qi_):'',
+              yinZi:item.xiu_zheng_zhi_,
+              jiGou:item.jian_ding_xiao_zh,
+              jiaoZhunTime:item.xiao_zhun_ri_qi_
+            }
+            list.push(o)
+          })
+          
+          this.list = list
+      })
+    },
+    getTime(second) {
+      let date =new Date(second);
+      let year = date.getFullYear();
+      let month = ''
+      let day = ''
+      if((date.getMonth()+1)<=9){
+        month = "0"+ (date.getMonth()+1)
+      }else{
+        month = date.getMonth()+1
+      }
+      if(date.getDate()<=9){
+        day =  "0"+date.getDate();
+      }else {
+        day =  date.getDate();
+      }
+        return year + "-"+month+"-"+day;
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.bg {
+  // height: auto;
+}
+
+.tagBox {
+  width: 283px;   // 300  240
+  height: 283px;  // 180  150  94
+  position: relative;
+  border: 2px solid #000000;
+  padding: 5px;
+  display: inline-block;
+  // justify-content: space-around;
+  // flex-direction: column;
+  margin: 10px 5px;
+  border-radius: 4px;
+  background-color: #fff;
+}
+.ewm{
+
+}
+/*
+.tagBox {
+  width: 177.5px;   // 300  240
+  height: 106.5px;  // 180  150
+  position: relative;
+  border: 1px solid #000000;
+  padding: 20px;
+  display: flex;
+  justify-content: space-around;
+  flex-direction: column;
+  margin: 20px auto;
+  border-radius: 15px;
+  background-color: #fff;
+}
+*/
+
+.la {
+  display: flex;
+  align-items: center;
+}
+
+.lh {
+  // line-height: auto;
+  font-size: 18px;  //16
+  display: flex;
+  align-items: center;
+  // padding: 4px;
+
+}
+</style>

src/views/system/jbdScan/scan.vue

@@ -17,9 +17,11 @@ import sample from './goods/sample'
 import sampleConfirmation from './goods/sampleConfirmation'
 import manualConfirmation from './goods/manualConfirmation'
 import tag from './goods/tag'
+import deviceTag from './goods/deviceTag.vue'
+import deviceVerificationTag from './goods/deviceVerificationTag.vue'
 
 export default {
-  components: { facility,material,sample,sampleConfirmation,manualConfirmation,tag},
+  components: { facility,material,sample,sampleConfirmation,manualConfirmation,tag,deviceTag,deviceVerificationTag},
   props:{
     currentScan:String,
     scanVisible:Boolean,