Skip to content

T
template_vue
Commit 8d230751 authored by 高宇's avatar 高宇
Browse files
Options

Merge remote-tracking branch 'origin/project1' into project1

parents cdbf3c21 ede1af43
Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 444 deletions
src/api/equipment/basicInfo.js
View file @ 8d230751
...@@ -54,3 +54,13 @@ export function getDictData(params) { ...@@ -54,3 +54,13 @@ export function getDictData(params) {
}) })
} }
// TODO: 导出
export function exportBasicInfo(params) {
return request({
url: '/wbbaseinfo/export',
method: 'get',
params,
responseType: 'blob'
})
}
src/api/magnagement.js
View file @ 8d230751
...@@ -53,10 +53,11 @@ export function deletedevice(id) { ...@@ -53,10 +53,11 @@ export function deletedevice(id) {
}) })
} }
// 导出 // 导出
export function exportdevice() { export function exportdevice(query) {
return request({ return request({
url: '/wbwarehouse/export', url: '/wbwarehouse/export',
method: 'get', method: 'get',
params: query,
responseType: 'blob' responseType: 'blob'
}) })
} }
src/api/sample/basicInformation.js
View file @ 8d230751
...@@ -47,11 +47,10 @@ export function deleteLogical(id) { ...@@ -47,11 +47,10 @@ export function deleteLogical(id) {
}) })
} }
// 导出信息接口 // 导出信息接口
export function exporTable(param) { export function exporTable() {
return request({ return request({
url: '/wbchemistrybaseinfo/export', url: '/wbchemistrybaseinfo/export',
method: 'get', method: 'get',
param,
responseType: 'blob' responseType: 'blob'
}) })
} }
src/views/equipment/basicInfo.vue
View file @ 8d230751
...@@ -49,6 +49,13 @@ ...@@ -49,6 +49,13 @@
icon="el-icon-plus" icon="el-icon-plus"
@click="handleAdd" @click="handleAdd"
>新增</el-button> >新增</el-button>
<el-button
style="padding: 8px 7px;"
type="success"
size="small"
icon="el-icon-download"
@click="handleExport"
>导出</el-button>
</div> </div>
</el-form> </el-form>
<div class="placeholder" /> <div class="placeholder" />
...@@ -201,7 +208,7 @@ ...@@ -201,7 +208,7 @@
</template> </template>
<script> <script>
import { add, listBasicInfo, updataInfo, getDetailById, deleteLogical } from '@/api/equipment/basicInfo' import {add, listBasicInfo, updataInfo, getDetailById, deleteLogical, exportBasicInfo} from '@/api/equipment/basicInfo'
import { parseTime } from '@/utils' import { parseTime } from '@/utils'
import { getDictData } from '@/api/equipment/application' import { getDictData } from '@/api/equipment/application'
export default { export default {
...@@ -501,6 +508,32 @@ export default { ...@@ -501,6 +508,32 @@ export default {
this.pgxList = res.data this.pgxList = res.data
} }
}) })
},
/** 导出按钮操作 */
handleExport() {
this.$confirm('是否确认导出工序库信息?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(function() {
return exportBasicInfo({ ptype: '2' }).then(response => {
const blob = new Blob([response])
const downloadElement = document.createElement('a')
// TODO: 创建下载的链接
const href = window.URL.createObjectURL(blob)
downloadElement.href = href
// TODO: 下载后文件名
downloadElement.download = '设备库基本信息' + '.xls'
document.body.appendChild(downloadElement)
// TODO: 点击下载
downloadElement.click()
// TODO: 下载完成移除元素
document.body.removeChild(downloadElement)
// TODO: 释放掉blob对象
window.URL.revokeObjectURL(href)
// this.download(response.msg);
})
})
} }
} }
} }
......
src/views/equipment/management.vue
View file @ 8d230751
...@@ -646,7 +646,7 @@ export default { ...@@ -646,7 +646,7 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(function() { }).then(function() {
return exportdevice().then(response => { return exportdevice({ ptype: 1 }).then(response => {
const blob = new Blob([response]) const blob = new Blob([response])
const downloadElement = document.createElement('a') const downloadElement = document.createElement('a')
// TODO: 创建下载的链接 // TODO: 创建下载的链接
......
src/views/processManagement/basicProcessManagement/index.vue
View file @ 8d230751
...@@ -704,7 +704,7 @@ export default { ...@@ -704,7 +704,7 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(function() { }).then(function() {
return exportdevice().then(response => { return exportdevice({ ptype: '2' }).then(response => {
const blob = new Blob([response]) const blob = new Blob([response])
const downloadElement = document.createElement('a') const downloadElement = document.createElement('a')
// TODO: 创建下载的链接 // TODO: 创建下载的链接
......
src/views/processManagement/basicProcessManagement/simulateDataList/simulateProcessList.json deleted 100644 → 0
View file @ cdbf3c21
[
{
"processName": "打磨",
"workshop": "车间1",
"flag": 1,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "张三"
},
{
"processName": "焊接",
"workshop": "车间2",
"flag": 2,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "李四"
},
{
"processName": "组装",
"workshop": "车间3",
"flag": 3,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "王五"
},
{
"processName": "涂装",
"workshop": "车间1",
"flag": 1,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "赵六"
},
{
"processName": "包装",
"workshop": "车间4",
"flag": 2,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "钱七"
},
{
"processName": "质检",
"workshop": "车间2",
"flag": 3,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "孙八"
},
{
"processName": "喷漆",
"workshop": "车间3",
"flag": 1,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "刘九"
},
{
"processName": "检修",
"workshop": "车间4",
"flag": 2,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "周十"
},
{
"processName": "组装",
"workshop": "车间1",
"flag": 3,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "张三"
},
{
"processName": "打磨",
"workshop": "车间2",
"flag": 1,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "李四"
},
{
"processName": "焊接",
"workshop": "车间3",
"flag": 2,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "王五"
},
{
"processName": "涂装",
"workshop": "车间4",
"flag": 3,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "赵六"
},
{
"processName": "包装",
"workshop": "车间1",
"flag": 1,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "钱七"
},
{
"processName": "质检",
"workshop": "车间2",
"flag": 2,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "孙八"
},
{
"processName": "喷漆",
"workshop": "车间3",
"flag": 3,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "刘九"
},
{
"processName": "检修",
"workshop": "车间4",
"flag": 1,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "周十"
},
{
"processName": "喷漆",
"workshop": "车间3",
"flag": 3,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "刘九"
},
{
"processName": "检修",
"workshop": "车间4",
"flag": 1,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "周十"
},
{
"processName": "组装",
"workshop": "车间1",
"flag": 2,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "李四"
},
{
"processName": "包装",
"workshop": "车间2",
"flag": 1,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "王五"
},
{
"processName": "焊接",
"workshop": "车间3",
"flag": 2,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "张三"
},
{
"processName": "装配",
"workshop": "车间1",
"flag": 3,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "陈二"
},
{
"processName": "打磨",
"workshop": "车间4",
"flag": 2,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "杨六"
},
{
"processName": "检验",
"workshop": "车间2",
"flag": 3,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "赵七"
},
{
"processName": "涂层",
"workshop": "车间3",
"flag": 1,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "吴八"
},
{
"processName": "质量控制",
"workshop": "车间1",
"flag": 2,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "孙九"
},
{
"processName": "喷涂",
"workshop": "车间4",
"flag": 3,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "刘十"
},
{
"processName": "装箱",
"workshop": "车间2",
"flag": 1,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "周一"
},
{
"processName": "组织调度",
"workshop": "车间3",
"flag": 2,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "李二"
},
{
"processName": "精确测量",
"workshop": "车间1",
"flag": 3,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "王三"
},
{
"processName": "抛光",
"workshop": "车间4",
"flag": 2,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "张四"
},
{
"processName": "品质检查",
"workshop": "车间2",
"flag": 3,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "赵五"
},
{
"processName": "喷塑",
"workshop": "车间3",
"flag": 1,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "吴六"
},
{
"processName": "装配调试",
"workshop": "车间1",
"flag": 2,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "孙七"
},
{
"processName": "清洗",
"workshop": "车间4",
"flag": 3,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "刘八"
},
{
"processName": "包装检验",
"workshop": "车间2",
"flag": 1,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "周九"
},
{
"processName": "组装检查",
"workshop": "车间3",
"flag": 2,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "李十"
},
{
"processName": "涂装调整",
"workshop": "车间1",
"flag": 3,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "王一"
},
{
"processName": "打磨抛光",
"workshop": "车间4",
"flag": 2,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "张二"
},
{
"processName": "品质审查",
"workshop": "车间2",
"flag": 3,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "赵三"
},
{
"processName": "打包",
"workshop": "车间3",
"flag": 1,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "吴四"
},
{
"processName": "总装",
"workshop": "车间1",
"flag": 2,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "孙五"
},
{
"processName": "喷漆调试",
"workshop": "车间4",
"flag": 3,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "刘六"
},
{
"processName": "组织物料",
"workshop": "车间2",
"flag": 1,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "周七"
},
{
"processName": "质量测试",
"workshop": "车间3",
"flag": 2,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "李八"
},
{
"processName": "喷漆检验",
"workshop": "车间1",
"flag": 3,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "王九"
},
{
"processName": "焊接调整",
"workshop": "车间4",
"flag": 2,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "张十"
},
{
"processName": "产品检查",
"workshop": "车间2",
"flag": 3,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "赵一"
},
{
"processName": "喷涂调试",
"workshop": "车间3",
"flag": 1,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "吴二"
},
{
"processName": "装配测试",
"workshop": "车间1",
"flag": 2,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "孙三"
},
{
"processName": "研磨",
"workshop": "车间4",
"flag": 3,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "刘四"
},
{
"processName": "装配调整",
"workshop": "车间2",
"flag": 1,
"createTime": "2023-07-25T12:00:00.000Z",
"updataTime": "2023-07-25T12:00:00.000Z",
"createBy": "周五"
}
]
src/views/processManagement/equipmentRequisition/index.vue
View file @ 8d230751
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
import BaseTable from '@/components/Table/BaseTable/index.vue' import BaseTable from '@/components/Table/BaseTable/index.vue'
// TODO: 通过json的形式，优化导入模拟数据，并增加模拟数据的数量 // TODO: 通过json的形式，优化导入模拟数据，并增加模拟数据的数量
const simulateDataList = require('../basicProcessManagement/simulateDataList/simulateProcessList.json') const simulateDataList = require('../equipmentRequisition/simulateDataList/simulateProcessList.json')
export default { export default {
name: 'Role', name: 'Role',
components: { BaseTable }, components: { BaseTable },
......
src/views/sample/basicInformation/index.vue
View file @ 8d230751
...@@ -320,7 +320,7 @@ export default { ...@@ -320,7 +320,7 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(function() { }).then(function() {
return exporTable(this.queryParams).then(response => { return exporTable().then(response => {
const blob = new Blob([response]) const blob = new Blob([response])
const downloadElement = document.createElement('a') const downloadElement = document.createElement('a')
// TODO: 创建下载的链接 // TODO: 创建下载的链接
......
src/views/sample/inventoryRecord/index.vue
View file @ 8d230751
...@@ -63,7 +63,8 @@ ...@@ -63,7 +63,8 @@
</el-form-item> </el-form-item>
<!--TODO: 导出和盘点按钮所在 --> <!--TODO: 导出和盘点按钮所在 -->
<el-row :gutter="10" class="mb8" justify="start"> <div style="float: right; padding:3px 15px;">
<el-row :gutter="10">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
...@@ -74,6 +75,7 @@ ...@@ -74,6 +75,7 @@
</el-button> </el-button>
</el-col> </el-col>
</el-row> </el-row>
</div>
</el-form> </el-form>
</div> </div>
...@@ -115,13 +117,13 @@ ...@@ -115,13 +117,13 @@
<el-row :gutter="10" justify="start" align="middle"> <el-row :gutter="10" justify="start" align="middle">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="pn：" prop="pn"> <el-form-item label="pn：" prop="pn">
<el-input v-model.trim="singleDetails.pn" :readonly="isReadOnly" ref="input1" @keyup.enter.native="handelTab(1,$event)" /> <el-input ref="input1" v-model.trim="singleDetails.pn" :readonly="isReadOnly" @keyup.enter.native="handelTab(1,$event)" />
</el-form-item> </el-form-item>
<el-form-item label="lot：" prop="lot"> <el-form-item label="lot：" prop="lot">
<el-input v-model.trim="singleDetails.lot" :readonly="isReadOnly" ref="input2" @keyup.enter.native="handelTab(2,$event)" /> <el-input ref="input2" v-model.trim="singleDetails.lot" :readonly="isReadOnly" @keyup.enter.native="handelTab(2,$event)" />
</el-form-item> </el-form-item>
<el-form-item label="unit：" prop="unit"> <el-form-item label="unit：" prop="unit">
<el-input v-model.trim="singleDetails.unit" :readonly="isReadOnly" ref="input3" @keyup.enter.native="handelTab(3,$event)" /> <el-input ref="input3" v-model.trim="singleDetails.unit" :readonly="isReadOnly" @keyup.enter.native="handelTab(3,$event)" />
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -133,7 +135,7 @@ ...@@ -133,7 +135,7 @@
{{ singleDetails.qty }} {{ singleDetails.qty }}
</el-form-item> </el-form-item>
<el-form-item label="memo：" prop="memo"> <el-form-item label="memo：" prop="memo">
<el-input v-model.trim="singleDetails.memo" :readonly="isReadOnly" ref="input4" @keyup.enter.native="handelTab(4,$event)" /> <el-input ref="input4" v-model.trim="singleDetails.memo" :readonly="isReadOnly" @keyup.enter.native="handelTab(4,$event)" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -141,13 +143,13 @@ ...@@ -141,13 +143,13 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="操作员：" prop="userName"> <el-form-item label="操作员：" prop="userName">
<el-input v-model.trim="singleDetails.userName" :readonly="isReadOnly" ref="input5" @keyup.enter.native="handelTab(5,$event)" /> <el-input ref="input5" v-model.trim="singleDetails.userName" :readonly="isReadOnly" @keyup.enter.native="handelTab(5,$event)" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="操作时间：" prop="createDate"> <el-form-item label="操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="isReadOnly" ref="input6" @keyup.enter.native="handelTab(6,$event)" /> <el-input ref="input6" v-model.trim="singleDetails.createDate" :readonly="isReadOnly" @keyup.enter.native="handelTab(6,$event)" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment