Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunw...

liukangdong

2025-02-07 17d7043f10d55429db919238fe639bff1b51ec0e

Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1

 admin/src/api/client/staff.js

@@ -20,6 +20,14 @@
  })
}

// 导出Excel
export function ywExportExcel (data) {
  return request.post('/visitsAdmin/cloudService/business/member/ywExportExcel', data, {
    trim: true,
    download: true
  })
}

// 创建
export function create (data) {
  return request.post('/visitsAdmin/cloudService/business/member/ywCreate', data)

 admin/src/api/store/index.js

@@ -29,7 +29,8 @@
}
export function ywStockPageEx (data) {
  return request.post('/visitsAdmin/cloudService/business/ywStock/exportExcel', data, {
    trim: true
    trim: true,
    download: true
  })
}


 admin/src/views/client/staffList.vue

@@ -70,6 +70,7 @@
import OperaYwCustomerWindow from './components/staffEdit.vue'
import { fetchList } from '@/api/client/ywCustomer'
import { updateStatusById } from '@/api/business/member'
import { ywExportExcel } from '@/api/client/staff'
import { Message } from 'element-ui'
export default {
  name: 'YwCustomer',
@@ -113,6 +114,28 @@
        this.clientList = res.records || []
      })
    },
    exportExcel () {
      this.$dialog.exportConfirm('确认导出吗？')
        .then(() => {
          this.isWorking.export = true
          ywExportExcel({
            page: this.tableData.pagination.pageIndex,
            capacity: 1000000,
            model: this.searchForm,
            sorts: this.tableData.sorts
          })
            .then(response => {
              this.download(response)
            })
            .catch(e => {
              this.$tip.apiFailed(e)
            })
            .finally(() => {
              this.isWorking.export = false
            })
        })
        .catch(() => {})
    },
  }
}
</script>

 admin/src/views/operation/record.vue

@@ -4,7 +4,7 @@
    <div class="mt20">
      <el-button type="primary" @click="handleEdit()" icon="el-icon-plus"
        v-permissions="['business:ywpatrolline:create']">新建</el-button>
      <el-button type="primary" @click="handleEx" v-permissions="['business:ywpatrolline:create']">导出</el-button>
      <el-button type="primary" @click="exportExcel" :loading="isWorking.export" v-permissions="['business:ywpatrolline:create']">导出</el-button>
    </div>
    <el-table v-loading="loading" :data="list" stripe>
      <el-table-column prop="realName" label="运维人" min-width="100" show-overflow-tooltip />
@@ -38,7 +38,8 @@
import QueryForm from '@/components/common/QueryForm'
import Edit from './components/maintain.vue'
import Detail from './components/maintainDetail.vue'
import { fetchList, deleteById } from '@/api/Inspection/deviceRecord'
import { fetchList, deleteById, exportExcel } from '@/api/Inspection/deviceRecord'
import { ywExportExcel } from '@/api/client/staff'
export default {
  components: {
    Pagination,
@@ -73,6 +74,9 @@
          },
        ],
        online: true
      },
      isWorking: {
        export: false
      }
    }
  },
@@ -100,9 +104,6 @@
        this.loading = false
      })
    },
    handleEx() {

    },
    handleEdit(row) {
      this.showEdit = true
      this.$nextTick(() => {
@@ -111,7 +112,6 @@
          this.$refs.EditRef.getDetail(row.id)
        }
      })

    },
    handleDetail(row) {
      this.$refs.DetailRef.visible = true
@@ -139,7 +139,28 @@
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()
    }
    },
    exportExcel () {
      this.$dialog.exportConfirm('确认导出吗？')
        .then(() => {
          this.isWorking.export = true
          exportExcel({
            page: this.pagination.page,
            capacity: 1000000,
            model: this.filters
          })
            .then(response => {
              this.download(response)
            })
            .catch(e => {
              this.$tip.apiFailed(e)
            })
            .finally(() => {
              this.isWorking.export = false
            })
        })
        .catch(() => {})
    },
  }
}
</script>

 admin/src/views/stock/components/inventoryDetails.vue

@@ -36,7 +36,7 @@
            <div class="list">
                <div class="list_search">
                    <div class="list_search_left">
                        <el-input v-model="form.code" style="width: 200px; margin-right: 10px;" placeholder="请输入物料名称/编码"></el-input>
                        <el-input v-model="form.materialCode" style="width: 200px; margin-right: 10px;" placeholder="请输入物料名称/编码"></el-input>
                        <el-select v-model="form.status" style="width: 150px; margin-right: 10px;" placeholder="盘点状态">
                            <el-option label="已盘" :value="1"></el-option>
                            <el-option label="未盘" :value="0"></el-option>
@@ -110,7 +110,7 @@
        info: {},
        list: [],
        form: {
          code: '',
          materialCode: '',
          status: '',
          type: ''
        },
@@ -145,6 +145,7 @@
        this.form.name = ''
        this.form.status = ''
        this.form.type = ''
        this.form.materialCode = ''
        this.page = 1
        this.getList()
      },
@@ -154,12 +155,13 @@
          page: this.page,
          model: {
            stocktakingId: this.id,
            code: this.form.code,
            materialCode: this.form.materialCode,
            status: this.form.status,
            type: this.form.type
          }
        }).then(res => {
          this.list = res.records
          this.total = res.total
        })
      }
    }