维修单新增功能
This commit is contained in:
parent
d05c298682
commit
a8728866f4
|
|
@ -44,6 +44,32 @@ export function getMachineHistoryRecordListApi(query) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 维修检验试验列表
|
||||||
|
export function getRepairInspectionApi(query) {
|
||||||
|
return request({
|
||||||
|
url: '/material//repair/getRepairInspection',
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 维修检验试验列表
|
||||||
|
export function getTestRecordApi(query) {
|
||||||
|
return request({
|
||||||
|
url: '/material//repair/getTestRecord',
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getTestRecordDetails(query) {
|
||||||
|
return request({
|
||||||
|
url: '/material/repair/getTestRecordDetails',
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// 入库记录列表
|
// 入库记录列表
|
||||||
export function getInputRecordListApi(query) {
|
export function getInputRecordListApi(query) {
|
||||||
|
|
|
||||||
|
|
@ -308,7 +308,7 @@ export default {
|
||||||
|
|
||||||
if (nodeSignConfig == 0 && this.form.roleIds) {
|
if (nodeSignConfig == 0 && this.form.roleIds) {
|
||||||
this.form.configValuesList = this.form.roleIds.split(',')
|
this.form.configValuesList = this.form.roleIds.split(',')
|
||||||
} else {
|
} else if(this.form.roleIds){
|
||||||
this.form.configValuesList = this.form.configValues.split(',')
|
this.form.configValuesList = this.form.configValues.split(',')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -77,20 +77,21 @@
|
||||||
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span>
|
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="退料单位" align="center" prop="unitName" width="100"/>
|
<el-table-column label="退料单位" align="center" prop="backUnitName" width="150"/>
|
||||||
<el-table-column label="退料工程" align="center" prop="proName" width="100"/>
|
<el-table-column label="退料工程" align="center" prop="projectName" width="150"/>
|
||||||
<el-table-column label="维修单号" align="center" prop="code" width="150px" :show-overflow-tooltip="true"/>
|
<el-table-column label="维修单号" align="center" prop="repairCode" width="150px" :show-overflow-tooltip="true"/>
|
||||||
|
<el-table-column label="维修时间" align="center" prop="repairTime" width="150px" :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="typeModelName" :show-overflow-tooltip="true"/>
|
<el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="计量单位" align="center" prop="unit" :show-overflow-tooltip="true"/>
|
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="退料数量" align="center" prop="backNum"/>
|
<el-table-column label="退料数量" align="center" prop="repairNum"/>
|
||||||
<el-table-column label="抽检数量" align="center" prop="cjNum" :show-overflow-tooltip="true"></el-table-column>
|
<el-table-column label="抽检数量" align="center" prop="num" :show-overflow-tooltip="true"></el-table-column>
|
||||||
<el-table-column label="试验数量" align="center" prop="syNum" width="100"></el-table-column>
|
<el-table-column label="试验数量" align="center" prop="repairNum" width="100"></el-table-column>
|
||||||
<el-table-column label="抽检人" align="center" prop="backMan"></el-table-column>
|
<el-table-column label="抽检人" align="center" prop="backMan"></el-table-column>
|
||||||
<el-table-column label="试验人" align="center" prop="backDate" width="100"></el-table-column>
|
<el-table-column label="试验人" align="center" prop="backMan" width="100"></el-table-column>
|
||||||
<el-table-column label="额定载荷" align="center" prop="statusName" :show-overflow-tooltip="true"/>
|
<el-table-column label="额定载荷" align="center" prop="ratedLoad" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="试验载荷" align="center" prop="statusName" :show-overflow-tooltip="true"/>
|
<el-table-column label="试验载荷" align="center" prop="testLoad" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="持荷时间" align="center" prop="statusName" :show-overflow-tooltip="true"/>
|
<el-table-column label="持荷时间" align="center" prop="holdingTime" :show-overflow-tooltip="true"/>
|
||||||
</el-table>
|
</el-table>
|
||||||
<pagination
|
<pagination
|
||||||
v-show="total > 0"
|
v-show="total > 0"
|
||||||
|
|
@ -105,7 +106,7 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import {
|
import {
|
||||||
getMachineHistoryRecordListApi
|
getRepairInspectionApi
|
||||||
} from '@/api/stquery/stquery';
|
} from '@/api/stquery/stquery';
|
||||||
import {
|
import {
|
||||||
getProjectList,
|
getProjectList,
|
||||||
|
|
@ -242,14 +243,14 @@ export default {
|
||||||
pageSize: this.queryParams.pageSize,
|
pageSize: this.queryParams.pageSize,
|
||||||
pageNum: this.queryParams.pageNum
|
pageNum: this.queryParams.pageNum
|
||||||
}
|
}
|
||||||
const res = await getMachineHistoryRecordListApi(params)
|
const res = await getRepairInspectionApi(params)
|
||||||
this.loading = false
|
this.loading = false
|
||||||
if(res.data.rows.length>0){
|
if(res.rows.length>0){
|
||||||
this.tableList = res.data.rows;
|
this.tableList = res.rows;
|
||||||
}else{
|
}else{
|
||||||
this.tableList=[]
|
this.tableList=[]
|
||||||
}
|
}
|
||||||
this.total = res.data.total;
|
this.total = res.total;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.loading = false
|
this.loading = false
|
||||||
} finally {
|
} finally {
|
||||||
|
|
@ -296,7 +297,7 @@ export default {
|
||||||
}
|
}
|
||||||
const currentTime = formatTime(new Date());
|
const currentTime = formatTime(new Date());
|
||||||
this.download(
|
this.download(
|
||||||
'material/complex_query/exportMachineHistoryRecord',
|
'material/repair/getRepairInspectionExport',
|
||||||
{
|
{
|
||||||
...params,
|
...params,
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -77,9 +77,9 @@
|
||||||
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span>
|
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="退料单位" align="center" prop="unitName" />
|
<el-table-column label="退料单位" align="center" prop="backUnitName" />
|
||||||
<el-table-column label="退料工程" align="center" prop="proName" />
|
<el-table-column label="退料工程" align="center" prop="projectName" />
|
||||||
<el-table-column label="维修单号" align="center" prop="code" :show-overflow-tooltip="true"/>
|
<el-table-column label="维修单号" align="center" prop="repairCode" :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="typeModelName" :show-overflow-tooltip="true"/>
|
<el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="设备编号" align="center" prop="maCode" :show-overflow-tooltip="true"/>
|
<el-table-column label="设备编号" align="center" prop="maCode" :show-overflow-tooltip="true"/>
|
||||||
|
|
@ -247,7 +247,8 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import {
|
import {
|
||||||
getMachineHistoryRecordListApi
|
getTestRecordApi,
|
||||||
|
getTestRecordDetails
|
||||||
} from '@/api/stquery/stquery';
|
} from '@/api/stquery/stquery';
|
||||||
import {
|
import {
|
||||||
getProjectList,
|
getProjectList,
|
||||||
|
|
@ -417,14 +418,14 @@ export default {
|
||||||
pageSize: this.queryParams.pageSize,
|
pageSize: this.queryParams.pageSize,
|
||||||
pageNum: this.queryParams.pageNum
|
pageNum: this.queryParams.pageNum
|
||||||
}
|
}
|
||||||
const res = await getMachineHistoryRecordListApi(params)
|
const res = await getTestRecordApi(params)
|
||||||
this.loading = false
|
this.loading = false
|
||||||
if(res.data.rows.length>0){
|
if(res.rows.length>0){
|
||||||
this.tableList = res.data.rows;
|
this.tableList = res.rows;
|
||||||
}else{
|
}else{
|
||||||
this.tableList=[]
|
this.tableList=[]
|
||||||
}
|
}
|
||||||
this.total = res.data.total;
|
this.total = res.total;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.loading = false
|
this.loading = false
|
||||||
} finally {
|
} finally {
|
||||||
|
|
@ -454,7 +455,7 @@ export default {
|
||||||
let param = {
|
let param = {
|
||||||
id:row.id,
|
id:row.id,
|
||||||
}
|
}
|
||||||
const res = await getRepairRecord(param)
|
const res = await getTestRecordDetails(param)
|
||||||
this.printInfo = res.data[0]
|
this.printInfo = res.data[0]
|
||||||
if(this.printInfo && this.printInfo.ratedLoad) {
|
if(this.printInfo && this.printInfo.ratedLoad) {
|
||||||
this.testResult1 = this.printInfo.ratedLoad + '(T/MPa)'
|
this.testResult1 = this.printInfo.ratedLoad + '(T/MPa)'
|
||||||
|
|
@ -528,7 +529,7 @@ export default {
|
||||||
}
|
}
|
||||||
const currentTime = formatTime(new Date());
|
const currentTime = formatTime(new Date());
|
||||||
this.download(
|
this.download(
|
||||||
'material/complex_query/exportMachineHistoryRecord',
|
'material/repair/getTestRecordExport',
|
||||||
{
|
{
|
||||||
...params,
|
...params,
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue