整体导出功能修改

This commit is contained in:
lSun 2026-01-26 11:17:46 +08:00
parent bcbf107d7a
commit a9eeb8b855
51 changed files with 297 additions and 275 deletions

View File

@ -1 +1,13 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1569915748289" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3062" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M768.35456 416a256 256 0 1 0-512 0 192 192 0 1 0 0 384v64a256 256 0 0 1-58.88-505.216 320.128 320.128 0 0 1 629.76 0A256.128 256.128 0 0 1 768.35456 864v-64a192 192 0 0 0 0-384z m-512 384h64v64H256.35456v-64z m448 0h64v64h-64v-64z" fill="#333333" p-id="3063"></path><path d="M539.04256 845.248V512.192a32.448 32.448 0 0 0-32-32.192c-17.664 0-32 14.912-32 32.192v333.056l-36.096-36.096a32.192 32.192 0 0 0-45.056 0.192 31.616 31.616 0 0 0-0.192 45.056l90.88 90.944a31.36 31.36 0 0 0 22.528 9.088 30.08 30.08 0 0 0 22.4-9.088l90.88-90.88a32.192 32.192 0 0 0-0.192-45.12 31.616 31.616 0 0 0-45.056-0.192l-36.096 36.096z" fill="#333333" p-id="3064"></path></svg>
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_700_3247)">
<path d="M14.5 7.85599C14.5 6.20639 14.5 6.40966 14.5 5.07682C14.5 4.81072 14.3939 4.55453 14.2053 4.36685L10.9014 1.07973C10.714 0.893293 10.4604 0.788635 10.1961 0.788635H2C1.44772 0.788635 1 1.23635 1 1.78864V16.2114C1 16.7636 1.44772 17.2114 2 17.2114H9.22295" stroke="#595959" stroke-width="1.5" stroke-linecap="round"/>
<path d="M9.40625 1C9.40625 2.56165 9.40625 3.5655 9.40625 4.91855C9.40625 5.47084 9.85397 5.91858 10.4062 5.91858H15" stroke="#595959" stroke-width="1.5"/>
<path d="M9 13.2581L16.6232 13.2581" stroke="#595959" stroke-width="1.5" stroke-linecap="round"/>
<path d="M14.873 10.8291L16.6659 12.622C17.0565 13.0125 17.0565 13.6457 16.6659 14.0362L14.873 15.8291" stroke="#595959" stroke-width="1.5" stroke-linecap="round"/>
</g>
<defs>
<clipPath id="clip0_700_3247">
<rect width="18" height="18" fill="white"/>
</clipPath>
</defs>
</svg>

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 993 B

View File

@ -1,13 +0,0 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_700_3247)">
<path d="M14.5 7.85599C14.5 6.20639 14.5 6.40966 14.5 5.07682C14.5 4.81072 14.3939 4.55453 14.2053 4.36685L10.9014 1.07973C10.714 0.893293 10.4604 0.788635 10.1961 0.788635H2C1.44772 0.788635 1 1.23635 1 1.78864V16.2114C1 16.7636 1.44772 17.2114 2 17.2114H9.22295" stroke="#595959" stroke-width="1.5" stroke-linecap="round"/>
<path d="M9.40625 1C9.40625 2.56165 9.40625 3.5655 9.40625 4.91855C9.40625 5.47084 9.85397 5.91858 10.4062 5.91858H15" stroke="#595959" stroke-width="1.5"/>
<path d="M9 13.2581L16.6232 13.2581" stroke="#595959" stroke-width="1.5" stroke-linecap="round"/>
<path d="M14.873 10.8291L16.6659 12.622C17.0565 13.0125 17.0565 13.6457 16.6659 14.0362L14.873 15.8291" stroke="#595959" stroke-width="1.5" stroke-linecap="round"/>
</g>
<defs>
<clipPath id="clip0_700_3247">
<rect width="18" height="18" fill="white"/>
</clipPath>
</defs>
</svg>

Before

Width:  |  Height:  |  Size: 993 B

View File

@ -74,10 +74,12 @@
>重置</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="exportList"
>导出</el-button
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
>
<svg-icon icon-class="download"/> 导出
</el-button
>
<!-- <el-button size="mini" type="primary" @click="onHandlePrint">打印</el-button>-->
</el-form-item>

View File

@ -349,7 +349,7 @@
<div>
<span class="table-title">装备列表 </span>
<span class="table-count" style="margin-left: 35px;"> {{ total }} 条记录</span>
</div>
</div>
</div>
</el-col>
<el-col :span="16">
@ -360,17 +360,16 @@
></right-toolbar>
<span>
<el-button
icon="el-icon-download"
style="float: right;"
style="float: right;background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
type="primary"
size="mini"
@click="exportData"
>
导出数据
<svg-icon icon-class="download"/> 导出
</el-button>
</span>
</el-col>
</el-row>
<el-table
@ -2291,4 +2290,13 @@ export default {
display: none;
}
}
.btn-icon {
width: 11px;
height: 11px;
margin-right: 6px;
vertical-align: top;
color: rgba(0,0,0,.65);
}
</style>

View File

@ -44,7 +44,8 @@
</el-form-item>
<el-form-item class="button-group">
<el-button icon="el-icon-refresh" size="mini" @click="onHandleExport">导出数据</el-button>
<el-button size="mini" @click="onHandleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)">
<svg-icon icon-class="download"/> 导出</el-button>
</el-form-item>
</el-form>
</div>

View File

@ -43,7 +43,8 @@
<span style="font-size: 20px; font-weight: 800">维修记录列表</span>
</el-col>
<el-col :span="22" style="text-align: right;">
<el-button type="primary" icon="el-icon-download" size="mini" @click="onHandleExport">导出数据</el-button>
<el-button type="primary" size="mini" @click="onHandleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)">
<svg-icon icon-class="download"/> 导出</el-button>
</el-col>
</el-row>
@ -100,7 +101,7 @@
</div>
</el-card>
<!-- 出库记录单 -->
<el-dialog title="维修记录单" :visible.sync="outRecordVisible" width="80%" append-to-body>
<el-dialog title="维修记录单" :visible.sync="outRecordVisible" width="80%" append-to-body>
<vue-easy-print ref="recordPrintRef" id="print-content" tableShow style="width: 100%">
<h2 style="text-align: center;font-size: 28px;">维修记录单</h2>
@ -147,10 +148,10 @@
</table>
</div>
</vue-easy-print>
<div slot="footer">
<el-row style="display: flex; justify-content: flex-end; gap: 8px;">
<el-button size="mini" type="primary" @click="handleDownloadPDF">下载</el-button>
<el-row style="display: flex; justify-content: flex-end; gap: 8px;">
<el-button size="mini" type="primary" @click="handleDownloadPDF">下载</el-button>
<el-button size="mini" type="primary" @click="onHandlePrint">打印</el-button>
<el-button size="mini" type="primary" @click="onHandleClose">关闭</el-button>
</el-row>

View File

@ -39,7 +39,8 @@
<span style="font-size: 20px; font-weight: 800">出库记录列表</span>
</el-col>
<el-col :span="22" style="text-align: right;">
<el-button type="primary" icon="el-icon-download" size="mini" @click="onHandleExport">导出数据</el-button>
<el-button type="primary" size="mini" @click="onHandleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)">
<svg-icon icon-class="download"/> 导出</el-button>
</el-col>
</el-row>

View File

@ -42,7 +42,8 @@
<span style="font-size: 20px; font-weight: 800">退役记录列表</span>
</el-col>
<el-col :span="22" style="text-align: right;">
<el-button type="primary" icon="el-icon-download" size="mini" @click="onHandleExport">导出数据</el-button>
<el-button type="primary" size="mini" @click="onHandleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)">
<svg-icon icon-class="download"/> 导出</el-button>
</el-col>
</el-row>
@ -108,7 +109,7 @@
</div>
</el-card>
<!-- 出库记录单 -->
<el-dialog title="退役记录单" :visible.sync="outRecordVisible" width="80%" append-to-body>
<el-dialog title="退役记录单" :visible.sync="outRecordVisible" width="80%" append-to-body>
<vue-easy-print ref="recordPrintRef" id="print-content" tableShow style="width: 100%">
<h2 style="text-align: center;font-size: 28px;">退役记录单</h2>
@ -158,12 +159,12 @@
</div>
</vue-easy-print>
<div slot="footer">
<el-row style="display: flex; justify-content: flex-end; gap: 8px;">
<el-button size="mini" type="primary" @click="handleDownloadPDF">下载</el-button>
<el-row style="display: flex; justify-content: flex-end; gap: 8px;">
<el-button size="mini" type="primary" @click="handleDownloadPDF">下载</el-button>
<el-button size="mini" type="primary" @click="onHandlePrint">打印</el-button>
<el-button size="mini" type="primary" @click="onHandleClose">关闭</el-button>
</el-row>
</div>
</div>
<!-- <el-row class="record-row" style="margin-top: 10px">
<el-col :span="24" style="text-align: right">
<div>

View File

@ -31,7 +31,8 @@
<span style="font-size: 20px; font-weight: 800">退库记录列表</span>
</el-col>
<el-col :span="22" style="text-align: right;">
<el-button type="primary" icon="el-icon-download" size="mini" @click="onHandleExport">导出数据</el-button>
<el-button type="primary" size="mini" @click="onHandleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)">
<svg-icon icon-class="download"/> 导出</el-button>
</el-col>
</el-row>

View File

@ -112,8 +112,9 @@
<el-row style="margin-bottom: 10px">
<el-col :span="24" style="text-align: right">
<el-button type="primary" size="mini" @click="handleAdd">新增</el-button>
<el-button type="primary" size="mini" @click="handleExport"
>导出
<el-button type="primary" size="mini" @click="handleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
>
<svg-icon icon-class="download"/> 导出
</el-button>
</el-col>
</el-row>

View File

@ -7,7 +7,7 @@
:inline="true"
v-show="showSearch"
label-width="100px"
>
>
<el-form-item label="退料申请时间" prop="time">
<el-date-picker
v-model="queryParams.time"
@ -35,7 +35,7 @@
filterable
style="width: 240px"
placeholder="请选择"
>
>
<el-option
v-for="dict in dict.type.back_task_status"
:key="dict.value"
@ -57,11 +57,11 @@
:options="unitList"
:props="selectTreeProps"
filterable
clearable
collapse-tags
@change="unitChange"
clearable
collapse-tags
@change="unitChange"
placeholder="请选择退料单位"
></el-cascader>
></el-cascader>
<!-- <el-select
v-model="queryParams.unitId"
clearable
@ -84,10 +84,10 @@
:options="proList"
:props="selectTreeProps"
filterable clearable
collapse-tags
collapse-tags
@change="proChange"
placeholder="请选择退料工程"
></el-cascader>
placeholder="请选择退料工程"
></el-cascader>
<!-- <el-select
v-model="queryParams.proId"
clearable
@ -128,15 +128,15 @@
<el-button
type="success"
plain icon="el-icon-refresh"
size="mini"
size="mini"
>提交</el-button>
</el-col> -->
<el-col :span="1.5">
<el-button
icon="el-icon-download"
<el-button
size="mini"
@click="handleExport"
>导出</el-button
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出</el-button
>
</el-col>
@ -170,7 +170,7 @@
label="序号"
type="index"
/>
<el-table-column
label="退料单位"
align="center"
@ -275,19 +275,19 @@
plain
icon="el-icon-edit"
v-if="scope.row.taskStatus!=2"
@click="handleUpdate(scope.row)"
@click="handleUpdate(scope.row)"
>编辑</el-button
>
<el-button
size="mini"
type="success"
plain
plain
icon="el-icon-refresh"
v-if="scope.row.taskStatus!=2"
@click="handleSubmit(scope.row)"
@click="handleSubmit(scope.row)"
>提交</el-button
>
<el-button
size="mini"
type="danger"
@ -307,13 +307,13 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 退料单 -->
<dialogFormByCq
:dialogTitle="title"
@ -371,7 +371,7 @@
</template>
<script>
import {
getBackApplyList,
getProjectList,
@ -387,7 +387,7 @@ import {
// // getUseNumByTypeId
// } from '@/api/claimAndRefund/receive.js'
import dialogFormByCq from '@/views/material/back/component/dialogFormByCq.vue'
export default {
name: '',
dicts: ['back_task_status'],
@ -440,8 +440,8 @@ export default {
value: 'id',
// multiple: true,
},
unitId: null,
projectId: null,
unitId: null,
projectId: null,
dialogQueryParams: {
pageNum: 1,
pageSize: 10,
@ -512,32 +512,32 @@ export default {
projectId: this.queryParams.proId /* */,
}
const res = await getUnitList(params)
this.unitList = res.data
this.unitList = res.data
},
unitChange(val){
if(val&&val.length>0){
unitChange(val){
if(val&&val.length>0){
this.queryParams.unitId=this.unitId[this.unitId.length - 1]
}else if(val&&val.length==0){
this.queryParams.unitId=""
}
this.GetProData()
this.GetProData()
},
//
async GetProData() {
const params = {
unitId: this.queryParams.unitId,
}
const res = await getProjectList(params)
this.proList = res.data
this.proList = res.data
},
proChange(val){
proChange(val){
if(val&&val.length>0){
this.queryParams.proId=this.projectId[this.projectId.length - 1]
}else if(val&&val.length==0){
this.queryParams.proId=""
}
this.GetUnitData()
this.GetUnitData()
},
/** 查询列表 startTime,结束日期endTime */
@ -592,7 +592,7 @@ export default {
/** 查看按钮操作 */
handleSee(row) {
this.$emit("queryReturn",row.id);
},
},
// 退
handleUpdateOrder() {
this.title = '查看'
@ -609,7 +609,7 @@ export default {
// this.openTextThree = ''
// this.openTwo = true
// },
handleSubmit(row){
this.$modal.confirm('是否确认提交所选择的退料任务?') .then(() => {
let param = {
@ -617,10 +617,10 @@ export default {
taskId:row.taskId
}
submitBackApply(param).then((res) => {
this.getList()
this.getList()
this.$message.success('操作成功!')
})
}).catch(() => {
})
}).catch(() => {
})
},
/** 删除按钮操作 */
@ -634,10 +634,10 @@ export default {
return backApplyRemove(row.id)
})
.then(() => {
this.getList()
this.getList()
this.$message.success('操作成功!')
})
.catch(() => {
.catch(() => {
})
},
handlePrint(row) {

View File

@ -51,10 +51,10 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出</el-button
>
</el-col>
<!-- <el-col :span="1.5">
@ -140,7 +140,7 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"

View File

@ -61,10 +61,10 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出数据</el-button
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出</el-button
>
</el-col>
@ -169,7 +169,7 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"

View File

@ -61,10 +61,10 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出数据</el-button
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出</el-button
>
</el-col>
@ -155,7 +155,7 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@ -346,7 +346,7 @@ export default {
});
})
},
//
getTypeDept() {
getDeptList().then((response) => {
@ -372,7 +372,7 @@ export default {
// });
})
},
select(row) {
// console.log(row.label)
this.form.deptName = row.label
@ -502,16 +502,16 @@ export default {
.confirm('是否确认删除所选择的数据项?')
.then(function () {
return delUnit(unitId)
})
.then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
this.$modal.msgSuccess('删除成功')
})
.catch(() => {})
}
})
},
/** 导出按钮操作 */
handleExport() {

View File

@ -43,11 +43,11 @@
<el-col :span="1.5">
<el-button
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:role:export']"
>导出数据</el-button
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出</el-button
>
</el-col>
<right-toolbar
@ -133,7 +133,7 @@
</el-table>
<!-- <pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"

View File

@ -88,10 +88,10 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
> <svg-icon icon-class="download"/> 导出
</el-button>
</el-col>
<right-toolbar
@ -262,7 +262,7 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"

View File

@ -86,11 +86,11 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['picking:outbound:export']"
>导出</el-button
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出</el-button
>
</el-col>
<right-toolbar
@ -178,7 +178,7 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@ -318,7 +318,7 @@
</el-table>
<pagination
:total="dialogTotal"
:page.sync="dialogQuery.pageNum"
:limit.sync="dialogQuery.pageSize"
@ -364,7 +364,8 @@
size="small"
type="primary"
@click="onHandleExport"
>导出</el-button
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出</el-button
>
</el-form-item>
</el-form>

View File

@ -86,11 +86,11 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['picking:outbound:export']"
>导出</el-button
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出</el-button
>
</el-col>
<right-toolbar
@ -178,7 +178,7 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@ -318,7 +318,7 @@
</el-table>
<pagination
:total="dialogTotal"
:page.sync="dialogQuery.pageNum"
:limit.sync="dialogQuery.pageSize"
@ -364,7 +364,8 @@
size="small"
type="primary"
@click="onHandleExport"
>导出</el-button
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出</el-button
>
</el-form-item>
</el-form>

View File

@ -66,10 +66,10 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出</el-button
>
</el-col>
</el-row>

View File

@ -71,10 +71,10 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出</el-button
>
</el-col>
</el-row>

View File

@ -46,10 +46,10 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出
</el-button>
</el-col>
<right-toolbar
@ -126,7 +126,7 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"

View File

@ -118,10 +118,10 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出
</el-button>
</el-col>
<right-toolbar
@ -217,7 +217,7 @@
</el-table-column>
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@ -356,8 +356,8 @@
</el-form>
</el-dialog>
</div>
</template>
</template>
<script>
import {
getListByPartType,
@ -796,4 +796,4 @@ export default {
> .el-tree-node__content {
background-color: #8decf1;
}
</style>
</style>

View File

@ -80,10 +80,10 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出
</el-button>
</el-col>
<right-toolbar

View File

@ -101,8 +101,8 @@
<el-card class="content-box" style="margin-top: 20px">
<el-row :gutter="10" class="mb8" style="text-align: right">
<el-col :span="24">
<el-button type="warning" plain size="mini" @click="handleExport"
>导出
<el-button type="warning" plain size="mini" @click="handleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出
</el-button>
</el-col>
</el-row>

View File

@ -124,10 +124,10 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出
</el-button>
</el-col>
<right-toolbar
@ -224,7 +224,7 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"

View File

@ -124,10 +124,10 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出
</el-button>
</el-col>
<right-toolbar
@ -224,7 +224,7 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"

View File

@ -47,10 +47,10 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出
</el-button>
</el-col>
<right-toolbar
@ -134,7 +134,7 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"

View File

@ -70,10 +70,10 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出</el-button
>
</el-col>
@ -215,7 +215,7 @@
</el-table>
<!-- <pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@ -323,8 +323,8 @@
</div>
</el-dialog>
</div>
</template>
</template>
<script>
import { getDeviceType } from "@/api/ma/device";
import { getManufacturerSelect } from "@/api/ma/supplier";
@ -553,7 +553,7 @@ export default {
let param = {
purchaseCheckDetailsList:this.checkList,
verifyPass:this.verifyPass
}
}
console.log(param);
acceptInnerVerifyer(param).then((response) => {
if (response.code == 200) {
@ -670,4 +670,4 @@ export default {
display: none;
}
}
</style>
</style>

View File

@ -4,9 +4,9 @@
<el-form-item prop="dateRange">
<el-date-picker
v-model="dateRange"
type="datetimerange"
type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="至"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
@ -18,7 +18,7 @@
clearable
@keyup.enter.native="handleQuery"
maxlength="20"
/>
/>
</el-form-item>
<el-form-item prop="taskStatus">
<el-select v-model="queryParams.taskStatus" placeholder="请选择任务状态" clearable>
@ -43,7 +43,7 @@
size="mini"
:disabled="multiple"
@click="acceptancePurchase"
>
>
验收合格
</el-button>
</el-col>
@ -51,14 +51,14 @@
<el-col :span="1.5">
<el-button
type="warning" plain
icon="el-icon-download"
size="mini"
size="mini"
@click="handleExport"
>导出</el-button>
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="taskId" height="546" @selection-change="handleSelectionChange" border>
<el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
<el-table-column label="序号" align="center" width="80" type="index">
@ -86,14 +86,14 @@
<template slot-scope="scope">
<el-button
size="mini"
@click="handleView(scope.row)"
@click="handleView(scope.row)"
>
查看
</el-button>
<el-button
size="mini"
type="primary"
@click="handleUpdate(scope.row)"
@click="handleUpdate(scope.row)"
>
验收
</el-button>
@ -104,13 +104,13 @@
>
验收单
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@ -284,9 +284,9 @@
</div>
</template>
<script>
</template>
<script>
import { getPurchaseList,acceptOuterVerify,getPurchaseCheckFormByTaskId } from "@/api/purchase/goodsAccept";
import { downloadFile } from '@/utils/download'
import { getToken } from '@/utils/auth'
@ -296,21 +296,21 @@
data() {
return {
//
loading: false,
loading: false,
//
single: true,
//
multiple: true,
multiple: true,
//
showSearch: true,
showHouse: false,
showHouse: false,
dateRange:[],
taskStatusList:[{id:'1',name:'待验收'},{id:'2',name:'验收合格'},{id:'3',name:'验收未通过'}],
ids:[],
//
total: 0,
total: 0,
//
tableList: [],
tableList: [],
//
title: "",
//
@ -327,7 +327,7 @@
printTableData: [],
};
},
created() {
created() {
this.getList();
},
methods: {
@ -383,7 +383,7 @@
path: '/purchase/goodsAcceptDetail',
query,
})
},
},
//
acceptancePurchase(){
let param={
@ -436,7 +436,7 @@
// ...this.queryParams
// }, `_${new Date().getTime()}.xlsx`)
},
}
};
@ -463,4 +463,4 @@
display: none;
}
}
</style>
</style>

View File

@ -79,10 +79,10 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出</el-button
>
</el-col>
<right-toolbar
@ -236,7 +236,7 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"

View File

@ -1,16 +1,18 @@
<template>
<div>
<el-row :gutter="10" class="mb8">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
<el-button type="warning" plain size="mini" @click="handleExport"
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)">
<svg-icon icon-class="download"/> 导出</el-button>
</el-col>
</el-row>
<el-table
v-loading="loading"
:data="equipmentList"
height="546"
>
>
<el-table-column label="序号" align="center" type="index" />
<el-table-column
label="物资名称"
@ -79,7 +81,7 @@
</el-table>
<el-dialog title="报告管理" :visible.sync="open" width="900px" append-to-body>
<el-dialog title="报告管理" :visible.sync="open" width="900px" append-to-body>
<el-table :data="fileDataList" width="100%" height="546">
<el-table-column label="序号" type="index" width="55" align="center"/>
<el-table-column label="报告类型" align="center" prop="dictLabel" :show-overflow-tooltip="true"/>
@ -107,13 +109,13 @@
上传
</el-button>
</el-upload> -->
<el-button size="mini" type="text" @click="picturePreview(scope.row)" v-if="scope.row.url">
查看
</el-button>
</div>
</template>
</el-table-column>
</el-table>
@ -123,11 +125,11 @@
<el-dialog :visible.sync="dialogVisible" width="500px" height="500px" >
<img width="100%" height="500px" :src="dialogImageUrl" />
</el-dialog>
</div>
</template>
<script>
<script>
import {
getPurchaseCheckInfo
} from '@/api/purchase/goodsArrived'
@ -165,11 +167,11 @@ export default {
//ID
taskId: '',
//
loading: true,
loading: true,
//
taskInfo: {},
//
equipmentList: [],
equipmentList: [],
//
open: false,
rowData:{},
@ -193,7 +195,7 @@ export default {
}
},
computed: {
},
mounted() {
this.taskId = this.queryTaskId
@ -220,8 +222,8 @@ export default {
{dictLabel:"型式试验报告",fileType:"1",name:"",url:""},
{dictLabel:"出厂检测报告",fileType:"2",name:"",url:""},
{dictLabel:"第三方监测报告",fileType:"3",name:"",url:""},
{dictLabel:"其他报告",fileType:"4",name:"",url:""}]
this.getFileData()
{dictLabel:"其他报告",fileType:"4",name:"",url:""}]
this.getFileData()
this.open=true
},
getFileData(){
@ -242,11 +244,11 @@ export default {
})
},
beforeFileUpload(row){
this.rowData.fileType=row.fileType;
this.rowData.fileType=row.fileType;
},
//
handleFileSuccess(response, file, fileList) {
if(response.code==200){
handleFileSuccess(response, file, fileList) {
if(response.code==200){
if(this.taskId==""){//
// console.log(response)
// console.log(this.rowData)
@ -258,7 +260,7 @@ export default {
"url": response.data.url,
"modelId": this.rowData.typeId,
"fileType": this.rowData.fileType,
// "dictLabel": this.rowData.dictLabel,
// "dictLabel": this.rowData.dictLabel,
}
//
let index = this.fileDataList.findIndex(v=>v.fileType==this.rowData.fileType)
@ -275,7 +277,7 @@ export default {
}else{
this.rowData.bmFileInfos.push(obj)
}
}else{//
let param = {
"taskId": this.taskId,
@ -284,7 +286,7 @@ export default {
"url": response.data.url,
"modelId": this.rowData.typeId,
"fileType": this.rowData.fileType,
// "dictLabel": this.rowData.dictLabel,
// "dictLabel": this.rowData.dictLabel,
}
uploadPurchaseFile(param).then((response) => {
this.$modal.msgSuccess('上传成功')

View File

@ -72,10 +72,10 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出数据</el-button
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出</el-button
>
</el-col>
<right-toolbar
@ -187,7 +187,7 @@
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"

View File

@ -76,10 +76,10 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出</el-button
>
</el-col>
</el-row>
@ -210,7 +210,7 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"

View File

@ -1,6 +1,6 @@
<template>
<div>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="创建时间" prop="time">
<el-date-picker
v-model="queryParams.time"
@ -28,7 +28,7 @@
filterable
style="width: 240px"
placeholder="请选择"
>
>
<el-option
v-for="dict in dict.type.repair_task_status"
v-if="dict.value == 0 || dict.value == 1 || dict.value == 2"
@ -38,7 +38,7 @@
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="primary"
@ -67,7 +67,8 @@
<el-button type="danger" plain size="mini" @click="handleReject">退回</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
<el-button type="success" plain size="mini" @click="handleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)">
<svg-icon icon-class="download"/> 导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -99,8 +100,8 @@
<template slot-scope="scope">
<el-button size="mini" plain icon="el-icon-zoom-in" @click="handleSee(scope.row)" >查看</el-button>
<el-button size="mini" type="primary" plain icon="el-icon-edit" v-if="scope.row.repairStatusCode!='1'" @click="handleUpdate(scope.row)">维修</el-button>
<el-button size="mini" type="danger" icon="el-icon-delete" @click="handleReject(scope.row)">驳回</el-button>
<el-button size="mini" type="success" @click="handlePrint(scope.row)">维修任务单</el-button>
<el-button size="mini" type="danger" icon="el-icon-delete" @click="handleReject(scope.row)">驳回</el-button>
<el-button size="mini" type="success" @click="handlePrint(scope.row)">维修任务单</el-button>
</template>
</el-table-column>
</el-table>
@ -231,7 +232,7 @@
<el-table-column label="报废数量" align="center" prop="unitName4" />
<el-table-column label="维修费小计" align="center" prop="unitName5" />
</el-table>
<div
<div
class="tabelAll"
>
<div class="columnAllNum">总计</div>
@ -267,14 +268,14 @@
<el-table-column label="修理项目" align="center" prop="machineTypeName" />
<el-table-column label="更换备品备件/价格" align="center" prop="specificationType"/>
</el-table>
<div
<div
class="tabelAll"
>
<div class="columnAllNum">合计</div>
<div class="columnAll">合计金额</div>
</div>
<div
<div
class="tabelAll"
>
<div class="columnAllNum">报废图片</div>
@ -341,21 +342,21 @@
</template>
<script>
import {
getRepairTaskList,
rejectRepair,
sendList,
} from '@/api/repair/repair.js'
} from '@/api/repair/repair.js'
import { getInfo, h } from '@/api/login'
import vueEasyPrint from "vue-easy-print";
export default {
name: '',
dicts: ['repair_task_status'],
dicts: ['repair_task_status'],
data() {
return {
return {
type: '',
isShowOneFlag: false,
priKey: '',
@ -389,9 +390,9 @@ export default {
time: [],//
agreementCode: '', //
startTime: '',
endTime: '',
endTime: '',
},
companyId: '',
companyId: '',
unitList: [],
proList: [],
//
@ -443,7 +444,7 @@ export default {
resetQuery() {
this.queryParams.time = []
// this.resetForm("queryForm");
this.$refs.queryForm.resetFields()
this.$refs.queryForm.resetFields()
this.handleQuery()
},
// //
@ -463,7 +464,7 @@ export default {
/** 查看按钮操作 */
handleSee(row) {
this.$emit("handelView",row);
},
},
/** 删除按钮操作 */
handleReject(row) {
const taskIds = row.taskId || this.ids;
@ -473,13 +474,13 @@ export default {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download(
'material/repair/export',
{
{
...this.queryParams,
startTime:this.queryParams.time[0],
endTime:this.queryParams.time[1]

View File

@ -88,10 +88,10 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出
</el-button>
</el-col>
<right-toolbar
@ -216,7 +216,7 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"

View File

@ -72,11 +72,11 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
v-hasPermi="['monitor:job:export']"
>导出</el-button>
><svg-icon icon-class="download"/> 导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -144,7 +144,7 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"

View File

@ -83,11 +83,11 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
v-hasPermi="['monitor:job:export']"
>导出</el-button>
><svg-icon icon-class="download"/> 导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -136,7 +136,7 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"

View File

@ -146,7 +146,8 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button class="btn" plain icon="el-icon-download" size="mini" @click="handleExport">导出数据</el-button>
<el-button class="btn" plain size="mini" @click="handleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)">
<svg-icon icon-class="download"/> 导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
</el-row>
@ -192,7 +193,7 @@
<!-- 分页 -->
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@ -652,4 +653,4 @@ export default {
color: #fff !important;
}
}
</style>
</style>

View File

@ -175,7 +175,7 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button class="btn" plain icon="el-icon-download" size="mini" @click="handleExport">导出数据</el-button>
<el-button class="btn" plain size="mini" @click="handleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"><svg-icon icon-class="download"/> 导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
</el-row>
@ -221,7 +221,7 @@
<!-- 分页 -->
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"

View File

@ -175,7 +175,8 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button class="btn" plain icon="el-icon-download" size="mini" @click="handleExport">导出数据</el-button>
<el-button class="btn" plain size="mini" @click="handleExport" style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)">
<svg-icon icon-class="download"/> 导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
</el-row>
@ -221,7 +222,7 @@
<!-- 分页 -->
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"

View File

@ -89,11 +89,11 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
v-hasPermi="['system:config:export']"
>导出</el-button>
><svg-icon icon-class="download"/> 导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button

View File

@ -47,7 +47,7 @@
<div class="action-bar">
<el-col :span="1.5">
<el-button
type="primary"
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
@ -79,13 +79,12 @@
<el-col :span="1.5">
<el-button
type="warning"
style="background: rgba(44,186,178,0.2);border-color: rgba(44,186,178,0.2);color: #2CBAB2;"
icon="el-icon-download"
size="mini"
@click="handleExport"
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
v-hasPermi="['system:dict:export']"
>导出</el-button>
</el-col>
><svg-icon icon-class="download"/> 导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</div>
</el-col>
@ -117,11 +116,11 @@
<template slot-scope="scope">
<el-button
style="color: #2CBAB2;"
type="text"
type="text"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:dict:edit']"
>修改</el-button>
<el-button
<el-button
type="text"
style="color: #FF5129;"
@click="handleDelete(scope.row)"
@ -132,7 +131,7 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@ -413,7 +412,7 @@ export default {
::v-deep.el-button--danger{
background-color: #FF5129;
border-color: #FF5129;
}
}
::v-deep.el-tag.el-tag--info {
background-color: #F5F5F5;
border-color: #B3B3B3;
@ -428,14 +427,14 @@ export default {
background-color: rgba(52,226,199,0.1);
border-color: #34E2C7;
color: #34E2C7;
}
}
.container-box{
//
::v-deep .el-dialog.import-dialog{
position: fixed;
::v-deep .el-dialog.import-dialog{
position: fixed;
right: -70%;
height: 100vh;
}
//
::v-deep .el-dialog__body{
@ -445,7 +444,7 @@ export default {
::v-deep.el-dialog__header{
border-bottom: 1px solid #F0F0F0;
}
}
}
/* 新增:统一的操作栏容器样式,用于将所有按钮和工具栏放在右侧 */
.action-bar {
@ -455,4 +454,4 @@ export default {
gap: 10px; /* 统一设置内部元素的间距 */
width: 100%;
}
</style>
</style>

View File

@ -97,12 +97,11 @@
<el-col :span="1.5">
<el-button
type="warning"
style="background: rgba(44,186,178,0.2);border-color: rgba(44,186,178,0.2);color: #2CBAB2;"
icon="el-icon-download"
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
size="mini"
@click="handleExport"
v-hasPermi="['system:dict:export']"
>导出</el-button>
><svg-icon icon-class="download"/> 导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button

View File

@ -92,11 +92,11 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:logininfor:export']"
>导出
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@ -127,7 +127,7 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"

View File

@ -102,11 +102,11 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
v-hasPermi="['system:operlog:export']"
>导出</el-button>
><svg-icon icon-class="download"/> 导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -152,7 +152,7 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"

View File

@ -76,11 +76,11 @@
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:post:export']"
>导出</el-button>
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
><svg-icon icon-class="download"/> 导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</div>
@ -123,7 +123,7 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"

View File

@ -96,11 +96,11 @@
</el-button>
<el-button
type="warning"
icon="el-icon-download"
size="mini" style="background: rgba(44,186,178,0.2);color: #2CBAB2;border-color: rgba(44,186,178,0.2);"
size="mini"
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
@click="handleExport"
v-hasPermi="['system:role:export']"
>导出
><svg-icon icon-class="download"/> 导出
</el-button>
<!-- 搜索工具栏 -->

View File

@ -104,9 +104,10 @@
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" style="background: rgba(44,186,178,0.2);color: #2CBAB2;border-color: rgba(44,186,178,0.2);" size="mini" @click="handleExport"
<el-button type="primary" size="mini" @click="handleExport"
style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)"
v-hasPermi="['system:user:export']"
>导出
><svg-icon icon-class="download"/> 导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>

View File

@ -97,8 +97,8 @@
<div style="font-size: 20px; font-weight: 800">编码工具台账列表</div>
</el-col>
<el-col :span="16" style="text-align: right;">
<el-button icon="el-icon-download" style="margin-right: 20px" type="primary" size="mini" @click="handleExport">
导出数据
<el-button style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)" type="primary" size="mini" @click="handleExport">
<svg-icon icon-class="download"/> 导出
</el-button>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
</el-col>

View File

@ -1,6 +1,6 @@
<template>
<!-- 基础页面 -->
<div class="app-container" v-loading="isLoading">
<div class="app-container" v-loading="isLoading">
<el-card v-show="showSearch" style="margin-bottom: 20px">
<el-form :model="queryParams" ref="queryForm" size="small" label-width="140px" inline @submit.native.prevent>
<!-- <el-form-item label="管理模式" prop="manageMode">
@ -94,7 +94,7 @@
@keyup.enter.native="handleQuery"
style="width: 300px"
/>
</el-form-item>
</el-form-item>
<!-- 表单按钮 -->
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="background-color: #2CBAB2;border-color: #2CBAB2;">查询</el-button>
@ -110,14 +110,14 @@
<div style="font-size: 20px; font-weight: 800">数量工具台账列表</div>
</el-col>
<el-col :span="16" style="text-align: right;">
<el-button icon="el-icon-download" style="margin-right: 20px" type="primary" size="mini" @click="handleExport">
导出数据
<el-button style="background-color:#fff;border: 1px solid #d9d9d9;color:rgba(0,0,0,.65)" type="primary" size="mini" @click="handleExport">
<svg-icon icon-class="download"/> 导出
</el-button>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
</el-col>
</el-col>
</el-row>
<el-table
<el-table
:data="tableList"
highlight-current-row
border
@ -640,7 +640,7 @@ export default {
padding: 20px;
}
::v-deep.el-tag.el-tag--info {
background-color: #F5F5F5;
border-color: #B3B3B3;
@ -661,7 +661,7 @@ export default {
background: #2CBAB2;
border-color: #2CBAB2;
color: #FFF;
}
}
}
.app-container{
// height: 100vh;

View File

@ -35,14 +35,15 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://10.125.30.218:28080`,
// target: `http://localhost:18080`,
// target: `http://192.168.0.96:28080`,//马
// target: `http://192.168.0.110:18080`,//洪
// target: `http://192.168.0.41:28080`,//蒋
// target: `http://36.33.26.201:17788/proxyApi`, //测试
// target: `http://36.33.26.201:21999/prod-api`, //测试
target: `http://36.33.26.201:21999/prod-api`, //测试
// target: `http://192.168.137.1:18080`,//
//target: `http://112.29.103.165:21001/prod-api`,//
// target: `http://112.29.103.165:21001/prod-api`,//
// target: `http://10.125.30.229:28080`,//
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '',