bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BUG修复

This commit is contained in:
syruan 2024-12-03 09:18:08 +08:00 committed by syruan
parent 2c622722ac
commit 74a0d87455
5 changed files with 129 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/views/material/back/component/home.vue
View File

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

53
src/views/material/basic/bmProject/index.vue
View File

@ -47,25 +47,25 @@
>新建</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="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport">
>导入数据</el-button 导出数据
> </el-button>
</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>
<right-toolbar <right-toolbar
@ -139,10 +139,16 @@
prop="telphone" prop="telphone"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column
label="i8工程编号"
align="center"
prop="externalId"
:show-overflow-tooltip="true"
/>
<el-table-column <el-table-column
label="工程状态" label="工程状态"
align="center" align="center"
prop="proStatus" prop="proStatusName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
</el-table-column> </el-table-column>
@ -207,7 +213,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
@ -235,7 +241,7 @@
placeholder="请选择工程类型" placeholder="请选择工程类型"
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
v-for="keeper in proDataRange" v-for="keeper in proDataRange"
:key="keeper.value" :key="keeper.value"
:label="keeper.label" :label="keeper.label"
@ -244,7 +250,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
@ -279,7 +285,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -302,7 +308,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
@ -324,7 +330,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
@ -345,7 +351,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
@ -362,7 +368,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm" :loading="isLoading">确 定</el-button> <el-button type="primary" @click="submitForm" :loading="isLoading">确 定</el-button>
@ -488,7 +494,6 @@ export default {
this.getProjectType() this.getProjectType()
}, },
methods: { methods: {
async getProjectType(){ async getProjectType(){
let prodataRes = await queryProDataApi('bm_project_type'); let prodataRes = await queryProDataApi('bm_project_type');
this.proDataRange = prodataRes.data.map((item) => { this.proDataRange = prodataRes.data.map((item) => {
@ -613,7 +618,7 @@ export default {
this.reset() this.reset()
getProjectListDetail(row.proId).then((response) => { getProjectListDetail(row.proId).then((response) => {
this.form = response.data this.form = response.data
this.form.impUnit =Number(this.form.impUnit) this.form.impUnit =Number(this.form.impUnit)
}) })
this.open = true this.open = true
this.title = '编辑工程' this.title = '编辑工程'

12
src/views/material/ma/partType/index.vue
View File

@ -79,9 +79,9 @@
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
> >
<el-form-item label="关键字" prop="keyword"> <el-form-item label="关键字" prop="keyWord">
<el-input <el-input
v-model="queryParams.keyword" v-model="queryParams.keyWord"
placeholder="请输入关键字" placeholder="请输入关键字"
clearable clearable
style="width: 240px" style="width: 240px"
@ -356,8 +356,8 @@
</el-form> </el-form>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { import {
getListByPartType, getListByPartType,
@ -568,7 +568,7 @@ export default {
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.queryParams.keyWord = null; this.keyWord = null;
this.handleQuery(); this.handleQuery();
}, },
@ -796,4 +796,4 @@ export default {
> .el-tree-node__content { > .el-tree-node__content {
background-color: #8decf1; background-color: #8decf1;
} }
</style> </style>

96
src/views/material/ma/supplier/index.vue
View File

@ -8,9 +8,9 @@
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
maxlength="20" maxlength="20"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -27,7 +27,7 @@
v-hasPermi="['ma:info:add']" v-hasPermi="['ma:info:add']"
>新增</el-button >新增</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
@ -37,14 +37,14 @@
@click="handleExport" @click="handleExport"
>导出 >导出
</el-button> </el-button>
</el-col> </el-col>
<right-toolbar <right-toolbar
:showSearch.sync="showSearch" :showSearch.sync="showSearch"
@queryTable="getList" @queryTable="getList"
></right-toolbar> ></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="houseList" ref="multipleTable" row-key="teamId"> <el-table v-loading="loading" :data="houseList" ref="multipleTable" row-key="teamId">
<!-- <el-table-column type="selection" width="55" align="center" :reserve-selection="true" /> --> <!-- <el-table-column type="selection" width="55" align="center" :reserve-selection="true" /> -->
<el-table-column label="序号" align="center" width="80" type="index"> <el-table-column label="序号" align="center" width="80" type="index">
@ -83,7 +83,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@ -91,7 +91,7 @@
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
<!-- 新增或修改弹窗 --> <!-- 新增或修改弹窗 -->
<el-dialog :title="title" :visible.sync="showHouse" width="1000px" append-to-body> <el-dialog :title="title" :visible.sync="showHouse" width="1000px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px" > <el-form ref="form" :model="form" :rules="rules" label-width="120px" >
@ -115,7 +115,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="法人代表" prop="legalPerson" > <el-form-item label="法人代表" prop="legalPerson" >
@ -135,7 +135,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
@ -147,8 +147,8 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row > <el-row >
<el-col :span="12"> <el-col :span="12">
<el-form-item label="主要联系范围" prop="businessScope"> <el-form-item label="主要联系范围" prop="businessScope">
<el-input <el-input
@ -159,8 +159,8 @@
show-word-limit show-word-limit
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
@ -173,9 +173,9 @@
show-word-limit show-word-limit
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="营业执照"> <el-form-item label="营业执照">
<el-upload <el-upload
class = "upload-demo" class = "upload-demo"
@ -215,21 +215,21 @@
<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>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 图片查看弹窗 --> <!-- 图片查看弹窗 -->
<el-dialog :visible.sync="dialogVisible" width="600px" height="600px" > <el-dialog :visible.sync="dialogVisible" width="600px" height="600px" >
<img width="100%" height="500px" :src="dialogImageUrl" /> <img width="100%" height="500px" :src="dialogImageUrl" />
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { getListFacturer,getFacturerDetail,editFacturer,addFacturer,delFacturer,deleteFile } from "@/api/ma/supplier"; import { getListFacturer,getFacturerDetail,editFacturer,addFacturer,delFacturer,deleteFile } from "@/api/ma/supplier";
import { imgUpLoadThree, fileUpLoad } from '@/api/system/upload' import { imgUpLoadThree, fileUpLoad } from '@/api/system/upload'
@ -244,27 +244,27 @@
uploadKey: Date.now(), uploadKey: Date.now(),
// 遮罩层 // 遮罩层
loading: false, loading: false,
loadingTwo: false, loadingTwo: false,
// 是否显示项目部Id // 是否显示项目部Id
showName: false, showName: false,
// 是否显示施工预警信息 // 是否显示施工预警信息
showWarn: false, showWarn: false,
// 非单个禁用 // 非单个禁用
single: true, single: true,
// 非多个禁用 // 非多个禁用
multiple: true, multiple: true,
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: true,
showHouse: false, showHouse: false,
// 总条数 // 总条数
total: 0, total: 0,
totalTwo : 0, totalTwo : 0,
@ -321,7 +321,7 @@
message: "请输入正确的联系电话", message: "请输入正确的联系电话",
trigger: "blur" trigger: "blur"
} }
], ],
}, },
//上传 //上传
@ -334,7 +334,7 @@
}; };
}, },
computed: { computed: {
//图片上传1张后，隐藏上传框 //图片上传1张后，隐藏上传框
uploadDisabled() { uploadDisabled() {
return this.businessLicenseListTemp.length > 2 return this.businessLicenseListTemp.length > 2
@ -374,7 +374,7 @@
this.$modal.msgError(error) this.$modal.msgError(error)
}) })
}, },
//上传组件-图片查看 //上传组件-图片查看
picturePreview(file) { picturePreview(file) {
@ -437,7 +437,7 @@
if(file.status === 'ready'){ if(file.status === 'ready'){
downloadFile({ fileName: file.name, fileData: file.raw, fileType: 'application/vnd.ms-excel;charset=utf-8' }) downloadFile({ fileName: file.name, fileData: file.raw, fileType: 'application/vnd.ms-excel;charset=utf-8' })
}else if(file.status === 'success'){ }else if(file.status === 'success'){
downloadFileData( { fileName: file.name, fileUrl: file.url } ) downloadFileData( { fileName: file.name, fileUrl: file.url } )
// downloadFileData({ fileName: file.name,fileUrl:file.url }) // downloadFileData({ fileName: file.name,fileUrl:file.url })
} }
@ -478,7 +478,7 @@
fileList.forEach(file=>{ fileList.forEach(file=>{
if(extension === 'pdf'){ if(extension === 'pdf'){
this.urlTemp = require('../../../../assets/file.png'); this.urlTemp = require('../../../../assets/file.png');
} }
}); });
this.businessLicenseListTemp = fileList; this.businessLicenseListTemp = fileList;
@ -519,7 +519,7 @@
this.businessLicenseListTemp.forEach(item=>{ this.businessLicenseListTemp.forEach(item=>{
if(item.name.includes('/')){ if(item.name.includes('/')){
const fileNameWithTimestamp = item.name.split('/').pop(); const fileNameWithTimestamp = item.name.split('/').pop();
const parts = fileNameWithTimestamp.split('_'); const parts = fileNameWithTimestamp.split('_');
const fileType = item.name.split('.').pop(); const fileType = item.name.split('.').pop();
const mainFileName = parts.slice(0, parts.length - 1).join('_'); const mainFileName = parts.slice(0, parts.length - 1).join('_');
item.name = mainFileName + '.' +fileType; item.name = mainFileName + '.' +fileType;
@ -532,7 +532,7 @@
this.title = '修改' this.title = '修改'
}) })
}, },
// 表单重置 // 表单重置
reset() { reset() {
this.form = {}; this.form = {};
this.resetForm("form"); this.resetForm("form");
@ -546,9 +546,9 @@
}, },
//** 提交按钮 */ //** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(async valid => { this.$refs["form"].validate(async valid => {
if (valid) { if (valid) {
if (this.form.supplierId != undefined) { if (this.form.supplierId != undefined) {
const reqData = new FormData(); const reqData = new FormData();
if(this.businessLicenseListTemp.length!=0){ if(this.businessLicenseListTemp.length!=0){
@ -588,8 +588,8 @@
} else { } else {
this.$modal.msgError(res.msg); this.$modal.msgError(res.msg);
} }
}, },
async getImaUploadEdit(){ async getImaUploadEdit(){
this.businessLicenseFileList = [] this.businessLicenseFileList = []
const {fileTwo} = await this.getFileData() const {fileTwo} = await this.getFileData()
@ -611,8 +611,8 @@
this.$modal.msgError(res.msg); this.$modal.msgError(res.msg);
} }
} }
}, },
async addFacturerTemp(form){ async addFacturerTemp(form){
this.form.bmFileInfos=this.businessLicenseFileList this.form.bmFileInfos=this.businessLicenseFileList
addFacturer(form).then(response => { addFacturer(form).then(response => {
@ -640,7 +640,7 @@
async deleteFile(){ async deleteFile(){
if(this.delBusinessFileIdList.length>0){ if(this.delBusinessFileIdList.length>0){
this.delBusinessFileIdList.forEach(async item=>{ this.delBusinessFileIdList.forEach(async item=>{
const urlcode = Base64.encode(item) const urlcode = Base64.encode(item)
const urlen = encodeURIComponent(urlcode) const urlen = encodeURIComponent(urlcode)
await deleteFile(urlen); await deleteFile(urlen);
@ -659,7 +659,7 @@
} }
const blob = await response.blob(); const blob = await response.blob();
const reader = new FileReader(); const reader = new FileReader();
reader.onloadend = () => { reader.onloadend = () => {
this.base64Data = reader.result; // 获取 Base64 数据并存储 this.base64Data = reader.result; // 获取 Base64 数据并存储
}; };
@ -694,13 +694,13 @@
}) })
.catch(() => {}) .catch(() => {})
}, },
handleExport() { handleExport() {
this.download('/material/wh_house_info/export', { this.download('/material/ma_supplier_info/export', {
...this.queryParams ...this.queryParams
}, `仓库管理_${new Date().getTime()}.xlsx`) }, `物资厂家管理_${new Date().getTime()}.xlsx`)
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
@ -740,7 +740,7 @@
overflow: revert; overflow: revert;
} }
::v-deep .el-upload-list__item-actions{ ::v-deep .el-upload-list__item-actions{
overflow:hidden; overflow:hidden;
} }
.upload-demo{ .upload-demo{
display: flex; display: flex;
@ -790,4 +790,4 @@
color: #fff; color: #fff;
font-size: 20px; font-size: 20px;
} }
</style> </style>

11
src/views/material/ma/type/index.vue
View File

@ -247,7 +247,7 @@
maxlength="30" maxlength="30"
:disabled="isLevel1Disabled" :disabled="isLevel1Disabled"
/> />
<!-- <el-option <!-- <el-option
v-for="keeper in keeperDataRange" v-for="keeper in keeperDataRange"
:key="keeper.value" :key="keeper.value"
:label="keeper.label" :label="keeper.label"
@ -398,6 +398,7 @@
v-model="form.name3" v-model="form.name3"
placeholder="请输入" placeholder="请输入"
maxlength="20" maxlength="20"
type="number"
style="width: 170px" style="width: 170px"
/> />
</el-form-item> </el-form-item>
@ -408,6 +409,7 @@
v-model="form.name2" v-model="form.name2"
placeholder="请输入" placeholder="请输入"
maxlength="20" maxlength="20"
type="number"
style="width: 170px" style="width: 170px"
/> />
</el-form-item> </el-form-item>
@ -422,6 +424,7 @@
v-model="form.name1" v-model="form.name1"
placeholder="请输入" placeholder="请输入"
maxlength="20" maxlength="20"
type="number"
style="width: 160px" style="width: 160px"
/> />
</el-form-item> </el-form-item>
@ -435,6 +438,7 @@
<el-input <el-input
v-model="form.name10" v-model="form.name10"
placeholder="请输入" placeholder="请输入"
type="number"
maxlength="20" maxlength="20"
style="width: 160px" style="width: 160px"
/> />
@ -474,6 +478,7 @@
<el-form-item label="检验周期" prop="testCycle"> <el-form-item label="检验周期" prop="testCycle">
<el-input <el-input
v-model="form.testCycle" v-model="form.testCycle"
type="number"
placeholder="请输入" placeholder="请输入"
maxlength="20" maxlength="20"
style="width: 150px" style="width: 150px"
@ -485,6 +490,7 @@
<el-form-item label="抽检比例(%)" prop="name11"> <el-form-item label="抽检比例(%)" prop="name11">
<el-input <el-input
v-model="form.name11" v-model="form.name11"
type="number"
placeholder="请输入" placeholder="请输入"
maxlength="20" maxlength="20"
style="width: 170px" style="width: 170px"
@ -526,6 +532,7 @@
<el-form-item label="持荷时间(分)" prop="holdingTime"> <el-form-item label="持荷时间(分)" prop="holdingTime">
<el-input <el-input
v-model="form.holdingTime" v-model="form.holdingTime"
type="number"
placeholder="请输入" placeholder="请输入"
maxlength="20" maxlength="20"
style="width: 170px" style="width: 170px"
@ -807,7 +814,7 @@ export default {
getMaTypeList().then((response) => { getMaTypeList().then((response) => {
this.treeOptions = response.data; this.treeOptions = response.data;
console.log(this.treeOptions) console.log(this.treeOptions)
if (this.treeOptions.length > 0 ){ if (this.treeOptions.length > 0 ){
if(this.treeOptions[0].children&&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;