Merge remote-tracking branch 'origin/master'

zss

2023-12-07 95cafbee8f05dc6fbc6256c5cd84bcfe3621107f

 src/views/equipment/equipment/index.vue

@@ -18,35 +18,37 @@
        ref="addOrUpdate"
        @refreshDataList="getData"
      ></table-form>
      <el-dialog title="标签列表" :visible.sync="diaPrintTab" width="500px">
        <div class="dia_body" style="height: 400px;overflow-y: auto;padding: 0 10px;">
          <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 15px;">
    </basic-container>
    <el-dialog title="标签列表" :visible.sync="diaPrintTab" width="500px" top="5vh">
      <div style="width:100%;height:400px;overflow-y: auto;">
        <div class="dia_body" id="printRaw">
          <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 10px; font-size: 16px !important;">
            <el-row>
              <el-col :span="10" :offset="3">序号：</el-col>
              <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
              <el-col :span="8" :offset="1">序号：</el-col>
              <el-col :span="7" style="font-weight: bold;">{{ tem.id }}</el-col>
            </el-row>
            <el-row>
              <el-col :span="10" :offset="3">编号：</el-col>
              <el-col :span="8" :offset="1">编号：</el-col>
              <el-col :span="10" style="font-weight: bold;">{{ tem.number }}</el-col>
            </el-row>
            <el-row>
              <el-col :span="10" :offset="3">设备名称：</el-col>
              <el-col :span="10" style="font-weight: bold;">{{ tem.name }}</el-col>
              <el-col :span="8" :offset="1">设备名称：</el-col>
              <el-col :span="7" style="font-weight: bold;">{{ tem.name }}</el-col>
            </el-row>
            <el-row>
              <el-col :span="10" :offset="3">设备二维码：</el-col>
              <el-col :span="10">
              <el-col :span="8" :offset="1">设备二维码：</el-col>
              <el-col :span="7">
                <vueQr :text="tem.number" :size="80" :margin="2"></vueQr>
              </el-col>
            </el-row>
          </el-card>
        </div>
        <span slot="footer" class="dialog-footer">
          <el-button @click="diaPrintTab = false">取 消</el-button>
          <el-button type="primary" @click="diaPrintTab = false">打 印</el-button>
        </span>
      </el-dialog>
    </basic-container>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="diaPrintTab = false">取 消</el-button>
        <el-button type="primary" @click="printFun">打 印</el-button>
      </span>
    </el-dialog>
  </div>
</template>

@@ -58,6 +60,7 @@
import * as fecha from 'element-ui/lib/utils/date'
import { remote } from '../../../api/admin/dict'
import vueQr from 'vue-qr'
import PrintJS from 'print-js'
export default {
  data() {
    return {
@@ -285,6 +288,33 @@
    })
  },
  methods: {
    printFun() {
            // this.printDialogVisible = false;
            this.diaPrintTab = false;
            PrintJS({
                printable: 'printRaw',//页面
                type: "html",//文档类型
                  maxWidth:450,
                  targetStyles:['*'],                 
                  style: `@page {
                    margin:0;
                    padding: 0;
                    size: 360px 170px;
                  }
                  html{
                    zoom:100%;
                  }
                  @media print{
                    width: 360px;
                    height: 170px;
                    margin:0;
                    padding: 0;
                  }`,
                  onPrintDialogClose: this.erexcel=false,
                  targetStyles: ["*"], // 使用dom的所有样式，很重要
                  font_size: '',
            });
        },
    pullEquipFun(){
      this.table.toolbar.find((e) => e.text === '同步').loading = true
      pullEquip().then(res=>{
@@ -313,7 +343,6 @@
    },
    handleSelectionChange(val) {
      this.multipleSelection = val
      console.log(this.multipleSelection);
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {