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

Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui

This commit is contained in:
zzyuan 2024-11-29 17:04:55 +08:00
parent 7665908991 47860e17be
commit d4cb578751
20 changed files with 281 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/basic/basic.js
View File

@ -46,7 +46,7 @@ export function updateProject(data) {
export function delProject(proId) { export function delProject(proId) {
return request({ return request({
url: '/material/bm_project/' + proId, url: '/material/bm_project/' + proId,
method: 'post' method: 'delete'
}) })
} }
@ -90,7 +90,7 @@ export function updateProjectLot(data) {
export function delProjectLot(lotId) { export function delProjectLot(lotId) {
return request({ return request({
url: '/material/base/bmProjectLot/' + lotId, url: '/material/base/bmProjectLot/' + lotId,
method: 'post' method: 'delete'
}) })
} }
//工程项目下拉数据 //工程项目下拉数据
@ -131,7 +131,7 @@ export function updateUnit(data) {
export function delUnit(unitId) { export function delUnit(unitId) {
return request({ return request({
url: '/material/bm_unit/' + unitId, url: '/material/bm_unit/' + unitId,
method: 'post' method: 'delete'
}) })
} }
@ -174,7 +174,7 @@ export function unitPersonAll(query) {
export function delUnitPerson(unitId) { export function delUnitPerson(unitId) {
return request({ return request({
url: '/material/bm_unit_person/' + unitId, url: '/material/bm_unit_person/' + unitId,
method: 'post' method: 'delete'
}) })
} }
@ -266,7 +266,7 @@ export function statusUnitType(data) {
export function delUnitType(typeIds) { export function delUnitType(typeIds) {
return request({ return request({
url: '/material/bm_unit_type/' + typeIds, url: '/material/bm_unit_type/' + typeIds,
method: 'post' method: 'delete'
}) })
} }
@ -301,7 +301,7 @@ export function updatePropInfo(data) {
export function delPropInfo(id) { export function delPropInfo(id) {
return request({ return request({
url: `/material/bm_asset_attributes/${id}`, url: `/material/bm_asset_attributes/${id}`,
method: 'post' method: 'delete'
}) })
} }

2
src/api/ma/base.js
View File

@ -74,7 +74,7 @@ export function queryKeeperNameApi(query) {
export function delMaType(typeId) { export function delMaType(typeId) {
return request({ return request({
url: '/material/ma_type/' + typeId, url: '/material/ma_type/' + typeId,
method: 'post', method: 'delete',
}) })
} }

2
src/api/ma/device.js
View File

@ -40,7 +40,7 @@ export function getZichanType(query) {
export function delDevice(id) { export function delDevice(id) {
return request({ return request({
url: '/material/ma_machine/' + id, url: '/material/ma_machine/' + id,
method: 'post', method: 'delete',
}) })
} }

2
src/api/ma/partType.js
View File

@ -76,6 +76,6 @@ export function updateMaType(data) {
export function delMaType(id) { export function delMaType(id) {
return request({ return request({
url: '/material/ma_part_type/' + id, url: '/material/ma_part_type/' + id,
method: 'post', method: 'delete',
}) })
} }

2
src/api/ma/supplier.js
View File

@ -32,7 +32,7 @@ export function getFacturerDetail(id) {
export function delFacturer(id) { export function delFacturer(id) {
return request({ return request({
url: '/material/ma_supplier_info/' + id, url: '/material/ma_supplier_info/' + id,
method: 'post', method: 'delete',
}) })
} }

2
src/api/ma/whHouse.js
View File

@ -31,7 +31,7 @@ export function queryKeeperNameApi(query) {
export function delHouse(id) { export function delHouse(id) {
return request({ return request({
url: '/material/wh_house_info/' + id, url: '/material/wh_house_info/' + id,
method: 'post', method: 'delete',
}) })
} }

5
src/api/purchase/goodsBind.js
View File

@ -51,12 +51,11 @@ export function getListDetailById(query) {
// 导出 // 导出
export function exportNewBuy(data) { export function exportNewBuy(purchaseId) {
return request({ return request({
url: '/material/purchase/bind/downloadQrCode', url: '/material/purchase/bind/downloadQrCode?purchaseId='+purchaseId,
method: 'post', method: 'post',
responseType: 'blob', responseType: 'blob',
data: data,
}) })
} }

2
src/api/repair/testExamine.js
View File

@ -20,7 +20,7 @@ export function getAuditInfo(query) {
//修试审核二级-通过，驳回 //修试审核二级-通过，驳回
export function auditPass(data) { export function auditPass(data) {
return request({ return request({
url: '/material/repair_audit_details', url: '/material/repair_audit_details/innerAudit',
method: 'put', method: 'put',
data: data, data: data,
}) })

16
src/api/repair/testedInBound.js
View File

@ -8,14 +8,14 @@ export function getListTested(query) {
params: query params: query
}) })
} }
// // 查询修试审核详细列表
// export function getAuditInfo(query) { // 查询修试审核详细列表
// return request({ export function getRepairedDetailList(taskId) {
// url: '/material/repair_audit_details/getRepairAuditList', return request({
// method: 'get', url: '/material/repair/getRepairedDetailList?taskId='+taskId,
// params: query method: 'get',
// }) })
// } }
// //修试审核二级-通过，驳回 // //修试审核二级-通过，驳回
// export function auditPass(data) { // export function auditPass(data) {

3
src/views/material/basic/bmAssetAttributes/index.vue
View File

@ -381,10 +381,9 @@ export default {
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download( this.download(
'material/base/maPropInfo/export', 'material/bm_asset_attributes/export',
{ {
...this.queryParams, ...this.queryParams,
dataCondition: this.ids,
}, },
`资产属性_${new Date().getTime()}.xlsx`, `资产属性_${new Date().getTime()}.xlsx`,
) )

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

@ -24,7 +24,7 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['machinery:type:add']" v-hasPermi="['ma:info:add']"
>新增</el-button >新增</el-button
> >
</el-col> </el-col>
@ -67,7 +67,7 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['machinery:type:edit']" v-hasPermi="['ma:info:edit']"
> >
编辑 编辑
</el-button> </el-button>
@ -76,7 +76,7 @@
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['machinery:type:del']" v-hasPermi="['ma:info:remove']"
> >
删除 删除
</el-button> </el-button>

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

@ -185,7 +185,7 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['machinery:type:config']" v-hasPermi="['ma:type:query']"
> >
查看 查看
</el-button> </el-button>

4
src/views/material/ma/typeConfigKeeper/index.vue
View File

@ -105,7 +105,7 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleBind" @click="handleBind"
v-hasPermi="['machinery:type:add']" v-hasPermi="['ma:keeper:add']"
>绑定</el-button >绑定</el-button
> >
</el-col> </el-col>
@ -116,7 +116,7 @@
icon="el-icon-minus" icon="el-icon-minus"
size="mini" size="mini"
@click="handleNoBind" @click="handleNoBind"
v-hasPermi="['machinery:type:add']" v-hasPermi="['ma:keeper:remove']"
>解绑</el-button >解绑</el-button
> >
</el-col> </el-col>

4
src/views/material/ma/typeConfigRepair/index.vue
View File

@ -105,7 +105,7 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleBind" @click="handleBind"
v-hasPermi="['machinery:type:add']" v-hasPermi="['ma:repair:add']"
>绑定</el-button >绑定</el-button
> >
</el-col> </el-col>
@ -116,7 +116,7 @@
icon="el-icon-minus" icon="el-icon-minus"
size="mini" size="mini"
@click="handleNoBind" @click="handleNoBind"
v-hasPermi="['machinery:type:add']" v-hasPermi="['ma:repair:remove']"
>解绑</el-button >解绑</el-button
> >
</el-col> </el-col>

6
src/views/material/ma/whHouse/index.vue
View File

@ -39,7 +39,7 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['machinery:type:add']" v-hasPermi="['warehouse:info:add']"
>新增</el-button >新增</el-button
> >
</el-col> </el-col>
@ -118,7 +118,7 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['machinery:type:edit']" v-hasPermi="['warehouse:info:edit']"
> >
编辑 编辑
</el-button> </el-button>
@ -127,7 +127,7 @@
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['machinery:type:del']" v-hasPermi="['warehouse:info:remove']"
> >
删除 删除
</el-button> </el-button>

13
src/views/material/purchase/goodsBind/component/bindTools.vue
View File

@ -130,7 +130,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="300"> <el-table-column label="操作" align="center" width="400">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
size="mini" size="mini"
@ -158,7 +158,6 @@
size="mini" size="mini"
type="success" type="success"
@click="onDownloadQr(row)" @click="onDownloadQr(row)"
v-if="queryType === 1"
> >
<svg-icon icon-class="qr-icon" /> <svg-icon icon-class="qr-icon" />
下载 下载
@ -389,7 +388,9 @@ import {
getListDetailById, getListDetailById,
getNewBuyBindListDetailsApi, getNewBuyBindListDetailsApi,
getMaCodeInfo, getMaCodeInfo,
exportNewBuy,
} from "@/api/purchase/goodsBind"; } from "@/api/purchase/goodsBind";
import { downloadFile } from '@/utils/download'
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
import { import {
uploadPurchaseFile, uploadPurchaseFile,
@ -712,9 +713,11 @@ export default {
} }
}, },
// 下载 /** 导出二维码按钮操作 */
onDownloadQr() { onDownloadQr(row) {
console.log("二维码下载"); exportNewBuy(row.id).then(res => {
downloadFile({ fileName: `二维码_${new Date().getTime()}.zip`, fileData: res, fileType: 'application/zip;charset=utf-8' })
})
}, },
// 填充 // 填充
handleAdd() { handleAdd() {

9
src/views/material/purchase/goodsBind/component/home.vue
View File

@ -171,15 +171,6 @@
@click="handleNotice(row)" @click="handleNotice(row)"
>驳回</el-button >驳回</el-button
> >
<el-button
plain
size="mini"
type="success"
@click="onDownloadQr(row)"
>
<svg-icon icon-class="qr-icon" />
下载
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

229
src/views/material/repair/repairManage/component/edit.vue
View File

@ -102,6 +102,12 @@
align="center" align="center"
prop="typeRepairedNum" prop="typeRepairedNum"
show-overflow-tooltip show-overflow-tooltip
></el-table-column>
<el-table-column
label="待报废数量"
align="center"
prop="typeScrapNum"
show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="待修数量" label="待修数量"
@ -133,11 +139,6 @@
width="1200px" width="1200px"
append-to-body append-to-body
> >
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" size="mini">合格</el-button>
</el-col>
</el-row>
<el-table :data="repairDeviceList" width="100%" height="450px"> <el-table :data="repairDeviceList" width="100%" height="450px">
<el-table-column label="序号" type="index" width="55" align="center" /> <el-table-column label="序号" type="index" width="55" align="center" />
<el-table-column <el-table-column
@ -1140,6 +1141,7 @@ export default {
trigger: "blur", trigger: "blur",
}, },
], ],
}, },
rulesMiddle: { rulesMiddle: {
repairNum: [ repairNum: [
@ -1150,13 +1152,13 @@ export default {
}, },
], ],
// supplierId: [ supplierId: [
// { {
// required: true, required: true,
// message: "请选择厂家", message: "请选择厂家",
// trigger: "change", trigger: "change",
// }, },
// ], ],
partPrice: [ partPrice: [
{ {
@ -1267,7 +1269,7 @@ export default {
const res = await getAppRepairMaTypeList(param); const res = await getAppRepairMaTypeList(param);
this.equipmentList = res.data; this.equipmentList = res.data;
this.equipmentList.forEach((e) => { this.equipmentList.forEach((e) => {
e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum); e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum)-Number(e.typeScrapNum);
}); });
// this.GetDeviceTypeTreeFn(data.backApplyInfo.agreementId) // this.GetDeviceTypeTreeFn(data.backApplyInfo.agreementId)
}, },
@ -1306,7 +1308,7 @@ export default {
const res = await getAppRepairMaTypeList(param); const res = await getAppRepairMaTypeList(param);
this.equipmentList = res.data; this.equipmentList = res.data;
this.equipmentList.forEach((e) => { this.equipmentList.forEach((e) => {
e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum); e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum)-Number(e.typeScrapNum);
}); });
this.$modal.msgSuccess("通过成功"); this.$modal.msgSuccess("通过成功");
} }
@ -1330,7 +1332,7 @@ export default {
const res = await getAppRepairMaTypeList(param); const res = await getAppRepairMaTypeList(param);
this.equipmentList = res.data; this.equipmentList = res.data;
this.equipmentList.forEach((e) => { this.equipmentList.forEach((e) => {
e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum); e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum)-Number(e.typeScrapNum);
}); });
this.$modal.msgSuccess("合格成功"); this.$modal.msgSuccess("合格成功");
}) })
@ -1437,7 +1439,7 @@ export default {
const res = await getAppRepairMaTypeList(param); const res = await getAppRepairMaTypeList(param);
this.equipmentList = res.data; this.equipmentList = res.data;
this.equipmentList.forEach((e) => { this.equipmentList.forEach((e) => {
e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum); e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum)-Number(e.typeScrapNum);
}); });
this.openCode = false; this.openCode = false;
// console.log(this.equipmentList) // console.log(this.equipmentList)
@ -1453,7 +1455,7 @@ export default {
const res = await getAppRepairMaTypeList(param); const res = await getAppRepairMaTypeList(param);
this.equipmentList = res.data; this.equipmentList = res.data;
this.equipmentList.forEach((e) => { this.equipmentList.forEach((e) => {
e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum); e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum)-Number(e.typeScrapNum);
}); });
this.openCode = false; this.openCode = false;
}, },
@ -1863,10 +1865,23 @@ export default {
} }
}, },
async validateForms(refs){
const validationResults = await Promise.all(refs.map(ref =>ref.validate()))
return validationResults.every(result=> result===true)
},
//数量管理保存 //数量管理保存
async saveNumAll() { async saveNumAll() {
let refTemp = [];
if(this.formLeft.repairNum!=0){
refTemp.push(this.$refs.formLeft)
}
if(this.formMiddle.repairNum!=0){
refTemp.push(this.$refs.formMiddle)
}
if(this.formRight.scrapNum!=0){ if(this.formRight.scrapNum!=0){
this.$refs["formLeft","formMiddle","formRight"].validate(async(valid)=>{ refTemp.push(this.$refs.formRight)
}
const valid = await this.validateForms(refTemp)
if(valid){ if(valid){
for (let i = 0; i < this.partItems.length; i++) { for (let i = 0; i < this.partItems.length; i++) {
this.innerRowData.repairDeviceList[0].numberInRepairPartList.push({ this.innerRowData.repairDeviceList[0].numberInRepairPartList.push({
@ -1909,65 +1924,129 @@ export default {
const res = await getAppRepairMaTypeList(param); const res = await getAppRepairMaTypeList(param);
this.equipmentList = res.data; this.equipmentList = res.data;
this.equipmentList.forEach((e) => { this.equipmentList.forEach((e) => {
e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum); e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum)-Number(e.typeScrapNum);
}); });
this.openNum=false; this.openNum=false;
} }
}); });
} }
}) // this.$refs.refTemp.validate(async(valid)=>{
}else{ // if(valid){
this.$refs["formLeft","formMiddle"].validate(async(valid)=>{ // for (let i = 0; i < this.partItems.length; i++) {
if(valid){ // this.innerRowData.repairDeviceList[0].numberInRepairPartList.push({
for (let i = 0; i < this.partItems.length; i++) { // isCharge: this.partItems[i].isCharge,
this.innerRowData.repairDeviceList[0].numberInRepairPartList.push({ // partId: this.partItems[i].partId,
isCharge: this.partItems[i].isCharge, // partNum: this.partItems[i].partNum,
partId: this.partItems[i].partId, // repairNum: this.formLeft.repairNum,
partNum: this.partItems[i].partNum, // });
repairNum: this.formLeft.repairNum, // }
}); // }
} // })
for (let i = 0; i < this.partItemsMiddle.length; i++) { // }
this.innerRowData.repairDeviceList[0].numberOutRepairPartList.push({ // if(this.formRight.scrapNum!=0){
isCharge: this.partItemsMiddle[i].isCharge, // this.$refs["formLeft","formMiddle","formRight"].validate(async(valid)=>{
partPrice: this.partItemsMiddle[i].partPrice, // if(valid){
partNum: this.partItemsMiddle[i].partNum, // for (let i = 0; i < this.partItems.length; i++) {
partName: this.partItemsMiddle[i].partName, // this.innerRowData.repairDeviceList[0].numberInRepairPartList.push({
supplierId: this.formMiddle.supplierId, // isCharge: this.partItems[i].isCharge,
repairNum: this.formMiddle.repairNum, // partId: this.partItems[i].partId,
}); // partNum: this.partItems[i].partNum,
} // repairNum: this.formLeft.repairNum,
this.uploadKey = Date.now(); // });
if(this.fileList.length!=0){ // }
await this.getImaUpload(), // for (let i = 0; i < this.partItemsMiddle.length; i++) {
this.formRight.fileList = this.fileListTemp; // this.innerRowData.repairDeviceList[0].numberOutRepairPartList.push({
}else{ // isCharge: this.partItemsMiddle[i].isCharge,
this.formRight.fileList = this.fileListTemp; // partPrice: this.partItemsMiddle[i].partPrice,
} // partNum: this.partItemsMiddle[i].partNum,
console.log('this.formRight',this.formRight) // partName: this.partItemsMiddle[i].partName,
this.innerRowData.repairDeviceList[0].numberScrapRepairPartList.push(this.formRight) // supplierId: this.formMiddle.supplierId,
this.innerRowData.repairDeviceList[0].repairType = 1; // repairNum: this.formMiddle.repairNum,
saveCodeList(this.innerRowData.repairDeviceList).then(async (response) => { // });
if (response.code == 200) { // }
this.$modal.msgSuccess("保存成功"); // this.uploadKey = Date.now();
this.fileList=[]; // if(this.fileList.length!=0){
this.fileListTemp=[]; // await this.getImaUpload(),
let param = { // this.formRight.fileList = this.fileListTemp;
taskId: this.repairRow.taskId, // }else{
keyword: "", // this.formRight.fileList = this.fileListTemp;
}; // }
this.taskIdTemp = this.repairRow.taskId; // console.log('this.formRight',this.formRight)
const res = await getAppRepairMaTypeList(param); // this.innerRowData.repairDeviceList[0].numberScrapRepairPartList.push(this.formRight)
this.equipmentList = res.data; // this.innerRowData.repairDeviceList[0].repairType = 1;
this.equipmentList.forEach((e) => { // saveCodeList(this.innerRowData.repairDeviceList).then(async (response) => {
e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum); // if (response.code == 200) {
}); // this.$modal.msgSuccess("保存成功");
this.openNum=false; // this.fileList=[];
} // this.fileListTemp=[];
}); // let param = {
} // taskId: this.repairRow.taskId,
}) // keyword: "",
} // };
// this.taskIdTemp = this.repairRow.taskId;
// const res = await getAppRepairMaTypeList(param);
// this.equipmentList = res.data;
// this.equipmentList.forEach((e) => {
// e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum)-Number(e.typeScrapNum);
// });
// this.openNum=false;
// }
// });
// }
// })
// }else{
// this.$refs["formLeft","formMiddle"].validate(async(valid)=>{
// if(valid){
// for (let i = 0; i < this.partItems.length; i++) {
// this.innerRowData.repairDeviceList[0].numberInRepairPartList.push({
// isCharge: this.partItems[i].isCharge,
// partId: this.partItems[i].partId,
// partNum: this.partItems[i].partNum,
// repairNum: this.formLeft.repairNum,
// });
// }
// for (let i = 0; i < this.partItemsMiddle.length; i++) {
// this.innerRowData.repairDeviceList[0].numberOutRepairPartList.push({
// isCharge: this.partItemsMiddle[i].isCharge,
// partPrice: this.partItemsMiddle[i].partPrice,
// partNum: this.partItemsMiddle[i].partNum,
// partName: this.partItemsMiddle[i].partName,
// supplierId: this.formMiddle.supplierId,
// repairNum: this.formMiddle.repairNum,
// });
// }
// this.uploadKey = Date.now();
// if(this.fileList.length!=0){
// await this.getImaUpload(),
// this.formRight.fileList = this.fileListTemp;
// }else{
// this.formRight.fileList = this.fileListTemp;
// }
// console.log('this.formRight',this.formRight)
// this.innerRowData.repairDeviceList[0].numberScrapRepairPartList.push(this.formRight)
// this.innerRowData.repairDeviceList[0].repairType = 1;
// saveCodeList(this.innerRowData.repairDeviceList).then(async (response) => {
// if (response.code == 200) {
// this.$modal.msgSuccess("保存成功");
// this.openNum=false;
// }
// });
// this.fileList=[];
// this.fileListTemp=[];
// let param = {
// taskId: this.repairRow.taskId,
// keyword: "",
// };
// this.taskIdTemp = this.repairRow.taskId;
// const res = await getAppRepairMaTypeList(param);
// this.equipmentList = res.data;
// this.equipmentList.forEach((e) => {
// e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum)-Number(e.typeScrapNum);
// });
// }
// })
// }
}, },
//数量管理取消 //数量管理取消
@ -1995,6 +2074,12 @@ export default {
}else{ }else{
this.flagSave = false; this.flagSave = false;
} }
if(Number(this.formMiddle.repairNum)==0){
this.resetForm("formMiddle")
}
if(Number(this.formRight.scrapNum)==0){
this.resetForm("formRight")
}
}, },
}, },

61
src/views/material/repair/testedInBound/index.vue
View File

@ -189,19 +189,19 @@
<el-table :data="getInBoundInfo" width="600px" height="450" @selection-change="handleSelectionChange"> <el-table :data="getInBoundInfo" width="600px" height="450" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" :selectable="selectable"/> <el-table-column type="selection" width="55" align="center" :selectable="selectable"/>
<el-table-column label="类型名称" align="center" prop="maTypeName" :show-overflow-tooltip="true"/> <el-table-column label="类型名称" align="center" prop="typeName2" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true"/> <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="数量" align="center" prop="num" :show-overflow-tooltip="true" /> <el-table-column label="数量" align="center" prop="repairNum" :show-overflow-tooltip="true" />
<el-table-column label="编号" align="center" prop="code" :show-overflow-tooltip="true" /> <el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" />
<el-table-column label="提交人" align="center" prop="createBy" :show-overflow-tooltip="true" /> <el-table-column label="提交人" align="center" prop="updateBy" :show-overflow-tooltip="true" />
<el-table-column label="提交时间" align="center" prop="createTime" :show-overflow-tooltip="true" /> <el-table-column label="提交时间" align="center" prop="updateTime" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="taskStatus" > <el-table-column label="状态" align="center" prop="status" >
<template slot-scope="scope"> <!-- <template slot-scope="scope">
<dict-tag <dict-tag
:options="dict.type.repair_end_task_status" :options="dict.type.repair_end_task_status"
:value="scope.row.taskStatus" :value="scope.row.taskStatus"
/> />
</template> </template> -->
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
@ -215,14 +215,14 @@
size="mini" size="mini"
type="success" type="success"
@click="InBoundSuccess(scope.row)" @click="InBoundSuccess(scope.row)"
v-if="scope.row.taskStatus == 0 " v-if="scope.row.status != '已入库' "
> >
通过 通过
</el-button> </el-button>
<el-button <el-button
size="mini" size="mini"
type="danger" type="danger"
v-if="scope.row.taskStatus == 0 " v-if="scope.row.status != '已入库' "
@click="InBoundFail(scope.row)" @click="InBoundFail(scope.row)"
> >
不通过 不通过
@ -244,7 +244,7 @@
<script> <script>
import { import {
getListTested, getListTested,
getRepairedDetailList
} from "@/api/repair/testedInBound"; } from "@/api/repair/testedInBound";
import { downloadFile } from "@/utils/download"; import { downloadFile } from "@/utils/download";
export default { export default {
@ -318,12 +318,6 @@ export default {
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
// this.testedList = [
// {'repairNum':'X20241121001','taskStatus':0},
// {'repairNum':'X20241121002','taskStatus':1}
// ]
// this.total = 2;
// this.loading = false;
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
@ -340,14 +334,18 @@ export default {
}, },
//一级页面查看按钮 //一级页面查看按钮
handleView(){ handleView(row){
// this.getListView() // this.getListView()
this.title = "查看" this.title = "查看"
this.getInBoundInfo = [ getRepairedDetailList(row.id).then((response) => {
{'typeName':'p1','taskStatus':0}, this.getInBoundInfo = response.rows;
{'typeName':'p2','taskStatus':1} this.totalView = response.total;
] this.loading = false;
this.totalView = 2 });
// this.getInBoundInfo = [
// {'typeName':'p1','taskStatus':0},
// {'typeName':'p2','taskStatus':1}
// ]
this.showView = true; this.showView = true;
}, },
@ -356,14 +354,19 @@ export default {
}, },
//一级页面审核按钮 //一级页面审核按钮
handleUpdate(){ handleUpdate(row){
// this.getListView() // this.getListView()
this.title = "审核" this.title = "审核"
this.getInBoundInfo = [ getRepairedDetailList(row.id).then((response) => {
{'typeName':'p1','taskStatus':0}, this.getInBoundInfo = response.rows;
{'typeName':'p2','taskStatus':1} this.totalView = response.total;
] this.loading = false;
this.totalView = 2 });
// this.getInBoundInfo = [
// {'typeName':'p1','taskStatus':0},
// {'typeName':'p2','taskStatus':1}
// ]
// this.totalView = 2
this.showView = true; this.showView = true;
}, },

41
src/views/system/log/businessLog/index.vue
View File

@ -116,47 +116,8 @@
/> />
</div> </div>
<el-table
:key="tableKey"
v-loading="listLoading"
:data="list"
border
fit
highlight-current-row
style="width: 100%"
:max-height="tableHeight"
>
<el-table-column label="序号" align="center" width="80" type="index">
<template slot-scope="scope">
<span>{{
(listQuery.pageNum - 1) * listQuery.pageSize + scope.$index + 1
}}</span>
</template>
</el-table-column>
<el-table-column label="操作人" align="center" prop="operaUserName" />
<el-table-column label="操作时间" align="center" prop="operTime" />
<el-table-column label="IP地址" align="center" prop="ip" />
<el-table-column label="操作模块" align="center" prop="model" />
<el-table-column label="操作类型" align="center" prop="operType" />
<el-table-column label="操作详情" align="center" prop="operateDetail" />
<el-table-column label="操作结果" align="center" prop="result">
<template slot-scope="{ row }">
{{ row.result }}
</template>
</el-table-column>
<el-table-column label="操作参数" align="center" prop="params" />
<el-table-column label="操作方法" align="center" prop="method" />
<el-table-column label="操作路径" align="center" prop="operUri" />
<el-table-column label="执行时间(ms)" align="center" prop="times" />
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="listQuery.pageNum"
:limit.sync="listQuery.pageSize"
@pagination="getList"
/>
</div> </div>
</template> </template>