Skip to content

N
NLT-e-cigarette
Commit d8b73a06 authored by 11528's avatar 11528
Browse files
Options

维修记录页面完善

parent e039519c
Show whitespace changes
Inline Side-by-side
Showing with 210 additions and 108 deletions
src/api/repairRecord.js
View file @ d8b73a06
......@@ -8,3 +8,12 @@ export function listRepairRecord(query) {
params: query
})
}
// 维修工单详情
export function listRepairRecordDetails(query) {
return request({
url: '/nltmaintain/queryNltMaintainsDetail',
method: 'get',
params: query
})
}
src/views/ProductionProcess/workOrder.vue
View file @ d8b73a06
......@@ -155,14 +155,14 @@
@click="handleDetail(scope.row)"
>详情</el-link>
<el-link
v-if="scope.row.status === '1'"
v-if="scope.row.status === 1"
size="mini"
type="primary"
style="margin-left: 10px"
@click="handleUpdate(scope.row)"
>编辑生产模型</el-link>
<el-link
v-if="scope.row.status === '0'"
v-if="scope.row.status === 0"
size="mini"
type="danger"
style="margin-left: 10px"
......@@ -623,7 +623,7 @@ export default {
this.total3 = response.total
this.Loading3 = false
})
}else {
} else {
this.rowsStation.orderModelId = row.orderModelId
listStation(this.rowsStation).then(response => {
this.stationList = response.rows
......@@ -652,6 +652,7 @@ export default {
path: '/ProductionProcess/ModelDetails',
query: {
businessId: row.orderModelId,
orderBusinessId: row.businessId,
type: '2'
}
})
......
src/views/productionInfo/ModelDetails.vue
View file @ d8b73a06
......@@ -1065,7 +1065,8 @@ export default {
} else if (this.htmlType === '2') {
nltordermodelUpdate({
...params,
businessId: this.$route.query.businessId
businessId: this.$route.query.businessId,
orderBusinessId: this.$route.query.orderBusinessId
}).then(res => {
this.$message.success('编辑成功')
this.$router.push({
......
src/views/repair/repairRecord.vue
View file @ d8b73a06
......@@ -23,7 +23,7 @@
<div>不良描述</div>
<div>Reject Description</div>
</div>
<el-select v-model="queryParams.rejectType" placeholder="请选择" style="width: 100%" @change="code">
<el-select v-model="queryParams.rejectType" placeholder="请选择" style="width: 100%">
<el-option
v-for="dict in positionOption"
:key="dict.dictValue"
......@@ -32,6 +32,21 @@
/>
</el-select>
</el-form-item>
<el-form-item label="保修时间" prop="rejectDescription">
<div slot="label" class="labelClass">
<div>保修时间</div>
<div>Repair Time</div>
</div>
<el-date-picker
v-model="queryParams.createdDate"
align="right"
type="date"
style="width: 150px"
placeholder="选择日期"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
/>
</el-form-item>
<el-form-item>
<el-button class="redBtn" type="danger" size="small" @click="handleQuery">查询 Query</el-button>
<el-button class="resetBtn" size="small" @click="resetQuery">重置 Reset</el-button>
......@@ -141,80 +156,151 @@
/>
</el-col>
</el-row>
<el-dialog :close-on-click-modal="false" class="badDialog" title="维修工单详情" :visible.sync="openBad" width="60%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="auto">
<el-dialog :close-on-click-modal="false" class="badDialog" title="维修工单详情" :visible.sync="openBad" width="70%" append-to-body>
<el-form :model="form" label-width="auto" class="formClass">
<el-row>
<el-col :span="12">
<el-form-item class="labelHeight" label="不良类型" prop="rejectType">
<div slot="label" class="labelClassRequired">
<div class="labelName">不良类型</div>
<div class="labelName">Reject Type</div>
<el-col :span="8">
<el-form-item label="维修单号" prop="repairNo" :show-overflow-tooltip="true">
<div slot="label" class="labelClass">
<div class="labelName">维修单号</div>
<div class="labelName">Repair No.</div>
</div>
<el-select v-model="form.rejectType" placeholder="请选择" style="width: 100%" @change="code">
<el-option
v-for="dict in positionOption"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
<span>{{ form.repairNo || '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="labelHeight" label="不良编码" prop="rejectCode">
<div slot="label" class="labelClassRequired">
<div class="labelName">不良编码</div>
<div class="labelName">Reject Code</div>
<el-col :span="8">
<el-form-item label="状态" prop="flag" :show-overflow-tooltip="true">
<div slot="label" class="labelClass">
<div class="labelName">状态</div>
<div class="labelName">Status</div>
</div>
<span>{{ form.flag || '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="报修时间" prop="createDate" :show-overflow-tooltip="true">
<div slot="label" class="labelClass">
<div class="labelName">报修时间</div>
<div class="labelName">Create Date</div>
</div>
<span>{{ form.createDate || '-' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6" style="margin-right: 10px">
<el-input v-model="form.rejectTypes" type="text" :disabled="true" />
<el-col :span="8">
<el-form-item label="报修工号" prop="maintainCode" :show-overflow-tooltip="true">
<div slot="label" class="labelClass">
<div class="labelName">报修工号</div>
<div class="labelName">B/N</div>
</div>
<span>{{ form.maintainCode || '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="16">
<el-input v-model.trim="form.rejectCode" show-word-limit :maxlength="20" placeholder="请输入不良编码" />
<el-col :span="8">
<el-form-item label="报修工站" prop="stationName" :show-overflow-tooltip="true">
<div slot="label" class="labelClass">
<div class="labelName">报修工站</div>
<div class="labelName">Position</div>
</div>
<span>{{ form.stationName || '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="SN编码" prop="sn" :show-overflow-tooltip="true">
<div slot="label" class="labelClass">
<div class="labelName">SN编码</div>
<div class="labelName">SN</div>
</div>
<span>{{ form.sn || '-' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="不良类型" prop="rejectType" :show-overflow-tooltip="true">
<div slot="label" class="labelClass">
<div class="labelName">不良类型</div>
<div class="labelName">Code</div>
</div>
<span>{{ form.rejectType || '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不良描述" prop="rejectDescription" :show-overflow-tooltip="true">
<div slot="label" class="labelClass">
<div class="labelName">不良描述</div>
<div class="labelName">Reject Description</div>
</div>
<span>{{ form.rejectDescription || '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="维修时间" prop="repairDate" :show-overflow-tooltip="true">
<div slot="label" class="labelClass">
<div class="labelName">维修时间</div>
<div class="labelName">Repair Time</div>
</div>
<span>{{ form.repairDate || '-' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item class="labelHeight" label="状态" prop="flag">
<el-col :span="8">
<el-form-item label="维修工号" prop="repairCode" :show-overflow-tooltip="true">
<div slot="label" class="labelClass">
<div class="labelName">状态</div>
<div class="labelName">Status</div>
<div class="labelName">维修工号</div>
<div class="labelName">Repair B/N</div>
</div>
<el-radio-group v-model="form.flag">
<el-radio label="1">启用</el-radio>
<el-radio label="0">停用</el-radio>
</el-radio-group>
<span>{{ form.repairCode || '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="维修辅料料号" prop="auxiliaryMaters" :show-overflow-tooltip="true">
<div slot="label" class="labelClass">
<div class="labelName">维修辅料料号</div>
<div>Auxiliary No</div>
</div>
<span>{{ form.auxiliaryMatersOne || '-' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item class="labelHeight" label="不良描述" prop="rejectDescription">
<div slot="label" class="labelClassRequired">
<div class="labelName">不良描述</div>
<el-form-item label="备注" prop="remarks" :show-overflow-tooltip="true">
<div slot="label" class="labelClass">
<div class="labelName">备注</div>
<div class="labelName">PS</div>
</div>
<el-input v-model.trim="form.rejectDescription" show-word-limit :maxlength="128" placeholder="请输入不良描述" />
<span>{{ form.remarks || '-' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item class="labelHeight" prop="specificExplanation">
<div slot="label" class="labelClassRequired">
<div class="labelName">Reject Description</div>
<div v-for="(item,index) in form.materSNs" :key="index">
<el-col :span="8">
<el-form-item label="维修SN" prop="maintainSn">
<div slot="label" class="labelClass">
<div>维修SN</div>
<div>Reject Type</div>
</div>
<span>{{ item.maintainSn || '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="替换SN" prop="replaceSn">
<div slot="label" class="labelClass">
<div>替换SN</div>
<div>Reject Code</div>
</div>
<el-input v-model.trim="form.specificExplanation" show-word-limit :maxlength="128" placeholder="请输入Reject Description" />
<span>{{ item.replaceSn || '-' }}</span>
</el-form-item>
</el-col>
</div>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button class="canleBtn" @click="cancel">取 消 Cancel</el-button>
<el-button class="redBtn" type="danger" @click="submitForm">确 定 Confirm</el-button>
</div>
</el-dialog>
</div>
......@@ -222,14 +308,13 @@
</template>
<script>
import { listData } from '@/api/system/dict/data'
import { listRepairRecord } from '@/api/repairRecord'
import { getDicts } from '@/api/system/dict/data'
import { listRepairRecord, listRepairRecordDetails } from '@/api/repairRecord'
export default {
name: 'RepairRecord',
data() {
return {
importLoading: false,
// 遮罩层
loading: false,
// 用户表格数据
......@@ -240,23 +325,55 @@ export default {
page: 1,
rows: 10,
repairNo: undefined,
rejectType: undefined
rejectType: undefined,
createdDate: undefined
},
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now()
},
shortcuts: [{
text: '今天',
onClick(picker) {
picker.$emit('pick', new Date())
}
}]
},
openBad: false,
form: {
// 维修单号
repairNo: '',
// 状态
flag: '',
// 报修时间
createDate: '',
// 报修工号
maintainCode: '',
// 报修工站
stationName: '',
// sn
sn: '',
// 不良类型
rejectType: '',
rejectCode: '',
positionId: '',
// 不良描述
rejectDescription: '',
flag: '',
specificExplanation: '',
rejectTypes: ''
// 维修时间
repairDate: '',
// 维修工号
repairCode: '',
// 备注
remarks: '',
// 维修辅料料号
auxiliaryMaters: '',
auxiliaryMatersOne: '',
// 维修sn, 替换sn
materSNs: {
maintainSn: '',
replaceSn: ''
}
},
// 类型下拉框数据
positionOption: [],
messageForm: {
message: ''
}
positionOption: []
}
},
/** 路由离开前存储筛选条件*/
......@@ -276,12 +393,9 @@ export default {
this.queryParams = { ...param }
}
this.getList()
this.getDictFun()
},
methods: {
// // 限制输入特殊字符
keyUp(e) {
e.target.value = e.target.value.replace(/[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g, '')
},
/** 分页查询列表操作 */
getList() {
this.loading = true
......@@ -290,31 +404,9 @@ export default {
this.loading = false
})
},
// 不良类型value存放
code(dict) {
this.$forceUpdate()
this.form.rejectTypes = dict
},
/** 表单重置操作 */
reset() {
this.form = {
businessId: undefined,
positionId: undefined,
positionName: undefined,
rejectCode: undefined,
rejectType: undefined,
rejectTypes: undefined,
rejectDescription: undefined,
delFlag: undefined,
flag: undefined,
createBy: undefined,
updateBy: undefined,
remark: undefined,
specificExplanations: [
{ specificExplanation: '' }
]
}
this.resetForm('form')
this.form = {}
},
/** 查询按钮操作 */
handleQuery() {
......@@ -324,20 +416,22 @@ export default {
resetQuery() {
this.queryParams.rows = 10
this.queryParams.page = 1
this.queryParams.rejectCode = undefined
this.queryParams.rejectDescription = undefined
this.queryParams.rejectType = undefined
this.queryParams.repairNo = undefined
this.queryParams.createdDate = undefined
this.handleQuery()
},
/** 修改按钮操作 */
/** 详情按钮操作 */
handleUpdate(row) {
this.getDictFun()
this.reset()
this.openBad = true
this.form = JSON.parse(JSON.stringify(row))
this.form.rejectTypes = this.form.rejectType
this.title = '修改'
console.log(this.form)
// this.getChildrenDept(userId)
const params = {
businessId: row.businessId
}
listRepairRecordDetails(params).then(res => {
this.form = res.data
this.form.auxiliaryMatersOne = this.form.auxiliaryMaters.join(',')
})
},
/** 取消 Cancel按钮操作 */
cancel() {
......@@ -346,12 +440,9 @@ export default {
},
/** 获取数据字典方法 **/
getDictFun() {
const params = {
dictType: 'defectType',
flag: '1'
}
listData(params).then(response => {
this.positionOption = response.rows
const params = 'defectType'
getDicts(params).then(response => {
this.positionOption = response.data
})
}
}
......@@ -414,14 +505,14 @@ export default {
}
.labelClass{
position: relative;
right: 13px;
right: 0;
text-align: center;
}
.labelClassRequired{
text-align: center;
position: relative;
bottom: 17px;
right: 13px;
bottom: 0;
right: 2px;
}
.el-input .el-input__inner {
padding: 0 10px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment