完成首页等问题修改

licp

2024-03-29 41cad2434411b2eac1b9814d47d06e34c291f285

 src/views/equipment/equipment/index.vue

@@ -18,12 +18,14 @@
        ref="addOrUpdate"
        @refreshDataList="getData"
      ></table-form>
      <el-dialog title="标签列表" :visible.sync="diaPrintTab" width="500px">
        <div class="dia_body">
          <el-card class="box-card" id="printRaw" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 30px;">
    </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="8" :offset="1">序号：</el-col>
              <el-col :span="7" style="font-weight: bold;">{{ i + 1 }}</el-col>
              <el-col :span="7" style="font-weight: bold;">{{ tem.id }}</el-col>
            </el-row>
            <el-row>
              <el-col :span="8" :offset="1">编号：</el-col>
@@ -41,12 +43,12 @@
            </el-row>
          </el-card>
        </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>
    </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>

@@ -66,7 +68,7 @@
      multipleSelection: [],
      uploadInfo: {
        // 是否展示上传EXCEL以及对应的url
        isShow: true,
        isShow: false,
        url: '/mes/equipment/upload'
      },
      diaPrintTab: false,
@@ -95,6 +97,7 @@
          // 设备编号
          {
            minWidth: '30',
            width: '200',
            prop: 'number',
            label: '设备编号',
            sort: true,
@@ -108,8 +111,19 @@
          // 设备名称
          {
            minWidth: '30',
            width: '100',
            prop: 'name',
            label: '设备名称',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // 状态
          {
            minWidth: '30',
            prop: 'state',
            label: '状态',
            sort: true,
            isTrue: true,
            isSearch: true,
@@ -145,19 +159,19 @@
            label: '位置',
            sort: true,
            isTrue: true,
            isSearch: false,
            isSearch: true,
            searchInfoType: 'text'
          },
          // 邮箱
          {
            minWidth: '30',
            prop: 'email',
            label: '邮箱',
            sort: true,
            isTrue: true,
            isSearch: false,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '30',
          //   prop: 'email',
          //   label: '邮箱',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: false,
          //   searchInfoType: 'text'
          // },
          // 供应商
          {
            minWidth: '30',
@@ -165,7 +179,7 @@
            label: '供应商',
            sort: true,
            isTrue: true,
            isSearch: false,
            isSearch: true,
            searchInfoType: 'text'
          },
          // 制造商
@@ -175,7 +189,7 @@
            label: '制造商',
            sort: true,
            isTrue: true,
            isSearch: false,
            isSearch: true,
            searchInfoType: 'text'
          },
          // 型号规格
@@ -185,13 +199,13 @@
            label: '型号规格',
            sort: true,
            isTrue: true,
            isSearch: false,
            isSearch: true,
            searchInfoType: 'text'
          },
          // 制造日期
          {
            minWidth: '150',
            width: '250',
            width: '100',
            prop: 'manufactureDate',
            label: '制造日期',
            sort: true,
@@ -203,7 +217,7 @@
          // 安装日期
          {
            minWidth: '150',
            width: '250',
            width: '100',
            prop: 'installDate',
            label: '安装日期',
            sort: true,
@@ -211,52 +225,10 @@
            isSearch: true,
            formatter: this.formatReceiveTime,
            searchInfoType: 'datetimerange'
          },
          // 状态
          {
            minWidth: '30',
            prop: 'state',
            label: '状态',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          }
        ],
        toolbar: [
          {
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle
          },
          {
              text: '标签打印',
              type: 'primary',
              fun: this.labelPrint
            },
          // {
          //   text: '同步',
          //   type: 'primary',
          //   loading: false,
          //   fun: this.pullEquipFun
          // }
        ],
        operator: [
          {
            text: '修改',
            icon: 'el-icon-edit',
            type: 'text',
            size: 'small',
            fun: this.addOrUpdateHandle
          },
          {
            text: '删除',
            icon: 'el-icon-delete',
            type: 'text',
            size: 'small',
            fun: this.deleteHandle
          }
        ],
        toolbar: [],
        operator: null,
        operatorConfig: {
          fixed: 'right',
          label: '操作',
@@ -277,6 +249,48 @@
    ...mapGetters(['permissions'])
  },
  created() {
    if(this.permissions.equipment_equipment_add){
      this.table.toolbar.push({
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle
          })
    }
    if(this.permissions.equipment_equipment_labelprint){
      this.table.toolbar.push({
              text: '标签打印',
              type: 'primary',
              fun: this.labelPrint
            })
    }
    if(this.permissions.equipment_equipment_sync){
      this.table.toolbar.push({
            text: '同步',
            type: 'primary',
            loading: false,
            fun: this.pullEquipFun
          })
    }
    let arr = []
    if(this.permissions.equipment_equipment_edit){
      arr.push({
            text: '修改',
            icon: 'el-icon-edit',
            type: 'text',
            size: 'small',
            fun: this.addOrUpdateHandle
          })
    }
    if(this.permissions.equipment_equipment_del){
      arr.push({
            text: '删除',
            icon: 'el-icon-delete',
            type: 'text',
            size: 'small',
            fun: this.deleteHandle
          })
    }
    this.table.operator = arr.length>0 ? arr : null
    remote('work_shop').then((response) => {
      if (response.data.code === 0) {
        this.workshopList = response.data.data
@@ -289,13 +303,25 @@
    printFun() {
            // this.printDialogVisible = false;
            this.diaPrintTab = false;
            console.log(printRaw);
            PrintJS({
                printable: "printRaw",//页面
                printable: 'printRaw',//页面
                type: "html",//文档类型
                  maxWidth:450,
                  targetStyles:['*'],                 
                  style:"@page {margin:0  ;resolution: 300dpi;portrait}",
                  targetStyles:['*'],
                  style: `@page {
                    margin:0;
                    padding: 0;
                    size: 360px 170px landscape;
                  }
                  html{
                    zoom:100%;
                  }
                  @media print{
                    width: 360px;
                    height: 170px;
                    margin:0;
                    padding: 0;
                  }`,
                  onPrintDialogClose: this.erexcel=false,
                  targetStyles: ["*"], // 使用dom的所有样式，很重要
                  font_size: '',
@@ -304,7 +330,7 @@
    pullEquipFun(){
      this.table.toolbar.find((e) => e.text === '同步').loading = true
      pullEquip().then(res=>{
        this.$message.success(res.data.data.msg)
        this.$message.success(res.data.msg)
        this.table.toolbar.find((e) => e.text === '同步').loading = false
      }).catch(error=>{
        this.$message.error("同步失败",error)
@@ -329,7 +355,6 @@
    },
    handleSelectionChange(val) {
      this.multipleSelection = val
      console.log(this.multipleSelection);
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {