测试问题修改

This commit is contained in:
zzyuan 2024-11-29 11:23:13 +08:00
parent 1732b2a5de
commit 663800aadd
5 changed files with 41 additions and 22 deletions

View File

@ -390,7 +390,7 @@
list-type="picture-card" list-type="picture-card"
accept=".png, .jpg, .jpeg, .pdf" accept=".png, .jpg, .jpeg, .pdf"
:on-change="handleChangeBusinessList" :on-change="handleChangeBusinessList"
:class="{ disabled: uploadDisabled }" :class="{ disabled: true }"
:on-preview="picturePreview" :on-preview="picturePreview"
:on-remove="handleRemoveElectricianImgList" :on-remove="handleRemoveElectricianImgList"
:disabled="isEdits" :disabled="isEdits"
@ -425,7 +425,7 @@
</el-dialog> </el-dialog>
<!-- 查看全部图片的弹窗 --> <!-- 查看全部图片的弹窗 -->
<el-dialog :title="title" :visible.sync="showAllImg" width="600px" append-to-body> <el-dialog :title="title" :visible.sync="showAllImg" width="800px" append-to-body>
<el-form ref="form" label-width="120px"> <el-form ref="form" label-width="120px">
<el-form-item label="营业执照"> <el-form-item label="营业执照">
<el-upload <el-upload
@ -438,7 +438,7 @@
list-type="picture-card" list-type="picture-card"
accept=".png, .jpg, .jpeg, .pdf" accept=".png, .jpg, .jpeg, .pdf"
:on-change="handleChangeBusinessList" :on-change="handleChangeBusinessList"
:class="{ disabled: uploadDisabled }" :class="{ disabled: true }"
:on-preview="picturePreview" :on-preview="picturePreview"
:on-remove="handleRemoveElectricianImgList" :on-remove="handleRemoveElectricianImgList"
:disabled="isEdits" :disabled="isEdits"
@ -460,7 +460,6 @@
</span> </span>
</span> </span>
</div> </div>
<i class="el-icon-plus avatar-uploader-icon"></i> <i class="el-icon-plus avatar-uploader-icon"></i>
</el-upload> </el-upload>
</el-form-item> </el-form-item>

View File

@ -806,15 +806,20 @@ export default {
getTreeData() { getTreeData() {
getMaTypeList().then((response) => { getMaTypeList().then((response) => {
this.treeOptions = response.data; this.treeOptions = response.data;
if ( console.log(this.treeOptions)
this.treeOptions.length > 0 && if (this.treeOptions.length > 0 ){
this.treeOptions[0].children.length > 0 if(this.treeOptions[0].children&&this.treeOptions[0].children.length > 0) {
) { const firstNode = this.treeOptions[0].children[0];
const firstNode = this.treeOptions[0].children[0]; this.queryParams.typeId = firstNode.id;
this.queryParams.typeId = firstNode.id; this.queryParams.level = 1;
this.queryParams.level = 1; this.queryParams.houseId = firstNode.houseId;
this.queryParams.houseId = firstNode.houseId; this.getList();
this.getList(); }else{
this.queryParams.typeId = this.treeOptions[0].id;
this.queryParams.level = 0;
this.queryParams.houseId = this.treeOptions[0].id;
this.getList();
}
} }
}); });
}, },

View File

@ -428,12 +428,12 @@
print() { print() {
this.$refs.remarksPrintRef.print() this.$refs.remarksPrintRef.print()
}, },
handleExport() { handleExport() {
// this.download('/material/ma_machine/export', { this.download(
// ...this.queryParams "/material/purchase_check_info/export",
// }, `_${new Date().getTime()}.xlsx`) { ...this.queryParams },
`新购到货验收_${new Date().getTime()}.xlsx`
);
}, },

View File

@ -40,7 +40,6 @@
v-model="maForm.productionTime" v-model="maForm.productionTime"
style="width: 240px" style="width: 240px"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
type="date" type="date"
placeholder="请选择出厂日期" placeholder="请选择出厂日期"
@change="productionTimeChange" @change="productionTimeChange"
@ -261,7 +260,7 @@
<el-table-column label="操作" align="center" width="100"> <el-table-column label="操作" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: space-between;"> <div style="display: flex;align-items: center;justify-content: space-between;">
<el-upload ref="upload" :limit="1" :headers="upload.headers" <el-upload ref="upload" :limit="3" :headers="upload.headers"
:action="upload.url" :show-file-list="false" accept=".png, .jpg, .jpeg, .pdf, .doc, .docx" :action="upload.url" :show-file-list="false" accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
:on-success="handleFileSuccess" :auto-upload="true" :on-success="handleFileSuccess" :auto-upload="true"
> >

View File

@ -47,7 +47,16 @@
>新购到货入库</el-button >新购到货入库</el-button
> >
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
</el-col>
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
@ -482,7 +491,14 @@ export default {
this.dialogVisible = true this.dialogVisible = true
} }
}, },
/** 导出按钮操作 */
handleExport() {
this.download(
"/material/purchase_check_info/exportDetails",
{ taskId: this.taskId },
`新购到货详情_${new Date().getTime()}.xlsx`
);
},
} }
}; };