Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui
This commit is contained in:
commit
d4cb578751
|
|
@ -46,7 +46,7 @@ export function updateProject(data) {
|
|||
export function delProject(proId) {
|
||||
return request({
|
||||
url: '/material/bm_project/' + proId,
|
||||
method: 'post'
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -90,7 +90,7 @@ export function updateProjectLot(data) {
|
|||
export function delProjectLot(lotId) {
|
||||
return request({
|
||||
url: '/material/base/bmProjectLot/' + lotId,
|
||||
method: 'post'
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
//工程项目下拉数据
|
||||
|
|
@ -131,7 +131,7 @@ export function updateUnit(data) {
|
|||
export function delUnit(unitId) {
|
||||
return request({
|
||||
url: '/material/bm_unit/' + unitId,
|
||||
method: 'post'
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -174,7 +174,7 @@ export function unitPersonAll(query) {
|
|||
export function delUnitPerson(unitId) {
|
||||
return request({
|
||||
url: '/material/bm_unit_person/' + unitId,
|
||||
method: 'post'
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -266,7 +266,7 @@ export function statusUnitType(data) {
|
|||
export function delUnitType(typeIds) {
|
||||
return request({
|
||||
url: '/material/bm_unit_type/' + typeIds,
|
||||
method: 'post'
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -301,7 +301,7 @@ export function updatePropInfo(data) {
|
|||
export function delPropInfo(id) {
|
||||
return request({
|
||||
url: `/material/bm_asset_attributes/${id}`,
|
||||
method: 'post'
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ export function queryKeeperNameApi(query) {
|
|||
export function delMaType(typeId) {
|
||||
return request({
|
||||
url: '/material/ma_type/' + typeId,
|
||||
method: 'post',
|
||||
method: 'delete',
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ export function getZichanType(query) {
|
|||
export function delDevice(id) {
|
||||
return request({
|
||||
url: '/material/ma_machine/' + id,
|
||||
method: 'post',
|
||||
method: 'delete',
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -76,6 +76,6 @@ export function updateMaType(data) {
|
|||
export function delMaType(id) {
|
||||
return request({
|
||||
url: '/material/ma_part_type/' + id,
|
||||
method: 'post',
|
||||
method: 'delete',
|
||||
})
|
||||
}
|
||||
|
|
@ -32,7 +32,7 @@ export function getFacturerDetail(id) {
|
|||
export function delFacturer(id) {
|
||||
return request({
|
||||
url: '/material/ma_supplier_info/' + id,
|
||||
method: 'post',
|
||||
method: 'delete',
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ export function queryKeeperNameApi(query) {
|
|||
export function delHouse(id) {
|
||||
return request({
|
||||
url: '/material/wh_house_info/' + id,
|
||||
method: 'post',
|
||||
method: 'delete',
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -51,12 +51,11 @@ export function getListDetailById(query) {
|
|||
|
||||
|
||||
// 导出
|
||||
export function exportNewBuy(data) {
|
||||
export function exportNewBuy(purchaseId) {
|
||||
return request({
|
||||
url: '/material/purchase/bind/downloadQrCode',
|
||||
url: '/material/purchase/bind/downloadQrCode?purchaseId='+purchaseId,
|
||||
method: 'post',
|
||||
responseType: 'blob',
|
||||
data: data,
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ export function getAuditInfo(query) {
|
|||
//修试审核二级-通过,驳回
|
||||
export function auditPass(data) {
|
||||
return request({
|
||||
url: '/material/repair_audit_details',
|
||||
url: '/material/repair_audit_details/innerAudit',
|
||||
method: 'put',
|
||||
data: data,
|
||||
})
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@ export function getListTested(query) {
|
|||
params: query
|
||||
})
|
||||
}
|
||||
// // 查询修试审核详细列表
|
||||
// export function getAuditInfo(query) {
|
||||
// return request({
|
||||
// url: '/material/repair_audit_details/getRepairAuditList',
|
||||
// method: 'get',
|
||||
// params: query
|
||||
// })
|
||||
// }
|
||||
|
||||
// 查询修试审核详细列表
|
||||
export function getRepairedDetailList(taskId) {
|
||||
return request({
|
||||
url: '/material/repair/getRepairedDetailList?taskId='+taskId,
|
||||
method: 'get',
|
||||
})
|
||||
}
|
||||
|
||||
// //修试审核二级-通过,驳回
|
||||
// export function auditPass(data) {
|
||||
|
|
|
|||
|
|
@ -381,10 +381,9 @@ export default {
|
|||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download(
|
||||
'material/base/maPropInfo/export',
|
||||
'material/bm_asset_attributes/export',
|
||||
{
|
||||
...this.queryParams,
|
||||
dataCondition: this.ids,
|
||||
},
|
||||
`资产属性_${new Date().getTime()}.xlsx`,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['machinery:type:add']"
|
||||
v-hasPermi="['ma:info:add']"
|
||||
>新增</el-button
|
||||
>
|
||||
</el-col>
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['machinery:type:edit']"
|
||||
v-hasPermi="['ma:info:edit']"
|
||||
>
|
||||
编辑
|
||||
</el-button>
|
||||
|
|
@ -76,7 +76,7 @@
|
|||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['machinery:type:del']"
|
||||
v-hasPermi="['ma:info:remove']"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@
|
|||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleView(scope.row)"
|
||||
v-hasPermi="['machinery:type:config']"
|
||||
v-hasPermi="['ma:type:query']"
|
||||
>
|
||||
查看
|
||||
</el-button>
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@
|
|||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleBind"
|
||||
v-hasPermi="['machinery:type:add']"
|
||||
v-hasPermi="['ma:keeper:add']"
|
||||
>绑定</el-button
|
||||
>
|
||||
</el-col>
|
||||
|
|
@ -116,7 +116,7 @@
|
|||
icon="el-icon-minus"
|
||||
size="mini"
|
||||
@click="handleNoBind"
|
||||
v-hasPermi="['machinery:type:add']"
|
||||
v-hasPermi="['ma:keeper:remove']"
|
||||
>解绑</el-button
|
||||
>
|
||||
</el-col>
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@
|
|||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleBind"
|
||||
v-hasPermi="['machinery:type:add']"
|
||||
v-hasPermi="['ma:repair:add']"
|
||||
>绑定</el-button
|
||||
>
|
||||
</el-col>
|
||||
|
|
@ -116,7 +116,7 @@
|
|||
icon="el-icon-minus"
|
||||
size="mini"
|
||||
@click="handleNoBind"
|
||||
v-hasPermi="['machinery:type:add']"
|
||||
v-hasPermi="['ma:repair:remove']"
|
||||
>解绑</el-button
|
||||
>
|
||||
</el-col>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['machinery:type:add']"
|
||||
v-hasPermi="['warehouse:info:add']"
|
||||
>新增</el-button
|
||||
>
|
||||
</el-col>
|
||||
|
|
@ -118,7 +118,7 @@
|
|||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['machinery:type:edit']"
|
||||
v-hasPermi="['warehouse:info:edit']"
|
||||
>
|
||||
编辑
|
||||
</el-button>
|
||||
|
|
@ -127,7 +127,7 @@
|
|||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['machinery:type:del']"
|
||||
v-hasPermi="['warehouse:info:remove']"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="操作" align="center" width="300">
|
||||
<el-table-column label="操作" align="center" width="400">
|
||||
<template slot-scope="{ row }">
|
||||
<el-button
|
||||
size="mini"
|
||||
|
|
@ -158,7 +158,6 @@
|
|||
size="mini"
|
||||
type="success"
|
||||
@click="onDownloadQr(row)"
|
||||
v-if="queryType === 1"
|
||||
>
|
||||
<svg-icon icon-class="qr-icon" />
|
||||
下载
|
||||
|
|
@ -389,7 +388,9 @@ import {
|
|||
getListDetailById,
|
||||
getNewBuyBindListDetailsApi,
|
||||
getMaCodeInfo,
|
||||
exportNewBuy,
|
||||
} from "@/api/purchase/goodsBind";
|
||||
import { downloadFile } from '@/utils/download'
|
||||
import { getToken } from "@/utils/auth";
|
||||
import {
|
||||
uploadPurchaseFile,
|
||||
|
|
@ -712,9 +713,11 @@ export default {
|
|||
}
|
||||
},
|
||||
|
||||
// 下载
|
||||
onDownloadQr() {
|
||||
console.log("二维码下载");
|
||||
/** 导出二维码按钮操作 */
|
||||
onDownloadQr(row) {
|
||||
exportNewBuy(row.id).then(res => {
|
||||
downloadFile({ fileName: `二维码_${new Date().getTime()}.zip`, fileData: res, fileType: 'application/zip;charset=utf-8' })
|
||||
})
|
||||
},
|
||||
// 填充
|
||||
handleAdd() {
|
||||
|
|
|
|||
|
|
@ -171,15 +171,6 @@
|
|||
@click="handleNotice(row)"
|
||||
>驳回</el-button
|
||||
>
|
||||
<el-button
|
||||
plain
|
||||
size="mini"
|
||||
type="success"
|
||||
@click="onDownloadQr(row)"
|
||||
>
|
||||
<svg-icon icon-class="qr-icon" />
|
||||
下载
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
|
|||
|
|
@ -102,6 +102,12 @@
|
|||
align="center"
|
||||
prop="typeRepairedNum"
|
||||
show-overflow-tooltip
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="待报废数量"
|
||||
align="center"
|
||||
prop="typeScrapNum"
|
||||
show-overflow-tooltip
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="待修数量"
|
||||
|
|
@ -133,11 +139,6 @@
|
|||
width="1200px"
|
||||
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-column label="序号" type="index" width="55" align="center" />
|
||||
<el-table-column
|
||||
|
|
@ -1140,6 +1141,7 @@ export default {
|
|||
trigger: "blur",
|
||||
},
|
||||
],
|
||||
|
||||
},
|
||||
rulesMiddle: {
|
||||
repairNum: [
|
||||
|
|
@ -1150,13 +1152,13 @@ export default {
|
|||
},
|
||||
],
|
||||
|
||||
// supplierId: [
|
||||
// {
|
||||
// required: true,
|
||||
// message: "请选择厂家",
|
||||
// trigger: "change",
|
||||
// },
|
||||
// ],
|
||||
supplierId: [
|
||||
{
|
||||
required: true,
|
||||
message: "请选择厂家",
|
||||
trigger: "change",
|
||||
},
|
||||
],
|
||||
|
||||
partPrice: [
|
||||
{
|
||||
|
|
@ -1267,7 +1269,7 @@ export default {
|
|||
const res = await getAppRepairMaTypeList(param);
|
||||
this.equipmentList = res.data;
|
||||
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)
|
||||
},
|
||||
|
|
@ -1306,7 +1308,7 @@ export default {
|
|||
const res = await getAppRepairMaTypeList(param);
|
||||
this.equipmentList = res.data;
|
||||
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("通过成功");
|
||||
}
|
||||
|
|
@ -1330,7 +1332,7 @@ export default {
|
|||
const res = await getAppRepairMaTypeList(param);
|
||||
this.equipmentList = res.data;
|
||||
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("合格成功");
|
||||
})
|
||||
|
|
@ -1437,7 +1439,7 @@ export default {
|
|||
const res = await getAppRepairMaTypeList(param);
|
||||
this.equipmentList = res.data;
|
||||
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;
|
||||
// console.log(this.equipmentList)
|
||||
|
|
@ -1453,7 +1455,7 @@ export default {
|
|||
const res = await getAppRepairMaTypeList(param);
|
||||
this.equipmentList = res.data;
|
||||
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;
|
||||
},
|
||||
|
|
@ -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() {
|
||||
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){
|
||||
this.$refs["formLeft","formMiddle","formRight"].validate(async(valid)=>{
|
||||
refTemp.push(this.$refs.formRight)
|
||||
}
|
||||
const valid = await this.validateForms(refTemp)
|
||||
if(valid){
|
||||
for (let i = 0; i < this.partItems.length; i++) {
|
||||
this.innerRowData.repairDeviceList[0].numberInRepairPartList.push({
|
||||
|
|
@ -1909,65 +1924,129 @@ export default {
|
|||
const res = await getAppRepairMaTypeList(param);
|
||||
this.equipmentList = res.data;
|
||||
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;
|
||||
}
|
||||
});
|
||||
}
|
||||
})
|
||||
}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.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);
|
||||
});
|
||||
this.openNum=false;
|
||||
}
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
// this.$refs.refTemp.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,
|
||||
// });
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
// if(this.formRight.scrapNum!=0){
|
||||
// this.$refs["formLeft","formMiddle","formRight"].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.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{
|
||||
this.flagSave = false;
|
||||
}
|
||||
if(Number(this.formMiddle.repairNum)==0){
|
||||
this.resetForm("formMiddle")
|
||||
}
|
||||
if(Number(this.formRight.scrapNum)==0){
|
||||
this.resetForm("formRight")
|
||||
}
|
||||
},
|
||||
|
||||
},
|
||||
|
|
|
|||
|
|
@ -189,19 +189,19 @@
|
|||
|
||||
<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 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="num" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="编号" align="center" prop="code" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="提交人" align="center" prop="createBy" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="提交时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="状态" align="center" prop="taskStatus" >
|
||||
<template slot-scope="scope">
|
||||
<el-table-column label="数量" align="center" prop="repairNum" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="提交人" align="center" prop="updateBy" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="提交时间" align="center" prop="updateTime" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="状态" align="center" prop="status" >
|
||||
<!-- <template slot-scope="scope">
|
||||
<dict-tag
|
||||
:options="dict.type.repair_end_task_status"
|
||||
:value="scope.row.taskStatus"
|
||||
/>
|
||||
</template>
|
||||
</template> -->
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="操作"
|
||||
|
|
@ -215,14 +215,14 @@
|
|||
size="mini"
|
||||
type="success"
|
||||
@click="InBoundSuccess(scope.row)"
|
||||
v-if="scope.row.taskStatus == 0 "
|
||||
v-if="scope.row.status != '已入库' "
|
||||
>
|
||||
通过
|
||||
</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="danger"
|
||||
v-if="scope.row.taskStatus == 0 "
|
||||
v-if="scope.row.status != '已入库' "
|
||||
@click="InBoundFail(scope.row)"
|
||||
>
|
||||
不通过
|
||||
|
|
@ -244,7 +244,7 @@
|
|||
<script>
|
||||
import {
|
||||
getListTested,
|
||||
|
||||
getRepairedDetailList
|
||||
} from "@/api/repair/testedInBound";
|
||||
import { downloadFile } from "@/utils/download";
|
||||
export default {
|
||||
|
|
@ -318,12 +318,6 @@ export default {
|
|||
this.total = response.total;
|
||||
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.title = "查看"
|
||||
this.getInBoundInfo = [
|
||||
{'typeName':'p1','taskStatus':0},
|
||||
{'typeName':'p2','taskStatus':1}
|
||||
]
|
||||
this.totalView = 2
|
||||
getRepairedDetailList(row.id).then((response) => {
|
||||
this.getInBoundInfo = response.rows;
|
||||
this.totalView = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
// this.getInBoundInfo = [
|
||||
// {'typeName':'p1','taskStatus':0},
|
||||
// {'typeName':'p2','taskStatus':1}
|
||||
// ]
|
||||
this.showView = true;
|
||||
},
|
||||
|
||||
|
|
@ -356,14 +354,19 @@ export default {
|
|||
},
|
||||
|
||||
//一级页面审核按钮
|
||||
handleUpdate(){
|
||||
handleUpdate(row){
|
||||
// this.getListView()
|
||||
this.title = "审核"
|
||||
this.getInBoundInfo = [
|
||||
{'typeName':'p1','taskStatus':0},
|
||||
{'typeName':'p2','taskStatus':1}
|
||||
]
|
||||
this.totalView = 2
|
||||
getRepairedDetailList(row.id).then((response) => {
|
||||
this.getInBoundInfo = response.rows;
|
||||
this.totalView = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
// this.getInBoundInfo = [
|
||||
// {'typeName':'p1','taskStatus':0},
|
||||
// {'typeName':'p2','taskStatus':1}
|
||||
// ]
|
||||
// this.totalView = 2
|
||||
this.showView = true;
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -116,47 +116,8 @@
|
|||
/>
|
||||
</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>
|
||||
</template>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue