Merge remote-tracking branch 'origin/master'

zss

2024-01-11 17f0e644be8c98b547f6994a7e827d328e7b532e

 src/views/equipment/equipment/index.vue

@@ -147,7 +147,7 @@
            label: '位置',
            sort: true,
            isTrue: true,
            isSearch: false,
            isSearch: true,
            searchInfoType: 'text'
          },
          // 邮箱
@@ -167,7 +167,7 @@
            label: '供应商',
            sort: true,
            isTrue: true,
            isSearch: false,
            isSearch: true,
            searchInfoType: 'text'
          },
          // 制造商
@@ -177,7 +177,7 @@
            label: '制造商',
            sort: true,
            isTrue: true,
            isSearch: false,
            isSearch: true,
            searchInfoType: 'text'
          },
          // 型号规格
@@ -187,7 +187,7 @@
            label: '型号规格',
            sort: true,
            isTrue: true,
            isSearch: false,
            isSearch: true,
            searchInfoType: 'text'
          },
          // 制造日期
@@ -306,7 +306,7 @@
                printable: 'printRaw',//页面
                type: "html",//文档类型
                  maxWidth:450,
                  targetStyles:['*'],                 
                  targetStyles:['*'],
                  style: `@page {
                    margin:0;
                    padding: 0;
@@ -329,7 +329,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)