Commit 15c12d48 authored by 盖献康's avatar 盖献康

feat: 任务详情(功能、UI)

parent 7c9420c9
...@@ -146,3 +146,11 @@ export function removeTask(data) { ...@@ -146,3 +146,11 @@ export function removeTask(data) {
}) })
} }
// 查询任务详情
export function getTaskById(data) {
return request({
url: '/task/getById',
method: 'post',
data
})
}
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
:key="index" :key="index"
:class="getClass(index)" :class="getClass(index)"
> >
<div style="text-align: right"> <div v-show="isEdit" style="text-align: right">
<span <span
type="text" type="text"
class="el-icon-close" class="el-icon-close"
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<el-form-item label="车辆识别码(VIN)"> <el-form-item label="车辆识别码(VIN)">
<el-select <el-select
v-model="card.identificationCode" v-model="card.identificationCode"
:disabled="!isEdit"
@change="handleIdentificationCodeChange(card, $event)" @change="handleIdentificationCodeChange(card, $event)"
> >
<el-option <el-option
...@@ -31,6 +32,7 @@ ...@@ -31,6 +32,7 @@
<el-form-item label="样品编号"> <el-form-item label="样品编号">
<el-select <el-select
v-model="card.sampleNumber" v-model="card.sampleNumber"
:disabled="!isEdit"
@change="handleSampleNumberChange(card, $event)" @change="handleSampleNumberChange(card, $event)"
> >
<el-option <el-option
...@@ -46,7 +48,8 @@ ...@@ -46,7 +48,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
<div class="box-card-add" @click="addCard"> <!-- 新增操作 -->
<div v-show="isEdit" class="box-card-add" @click="addCard">
<span class="el-icon-plus" /> <span class="el-icon-plus" />
</div> </div>
</div> </div>
...@@ -67,6 +70,10 @@ export default { ...@@ -67,6 +70,10 @@ export default {
vehicleSampleInformation: { vehicleSampleInformation: {
type: Array, type: Array,
default: () => [] default: () => []
},
isEdit: {
type: Boolean,
default: true
} }
}, },
watch: { watch: {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
:key="index" :key="index"
:class="getClass(index)" :class="getClass(index)"
> >
<div style="text-align: right"> <div v-show="isEdit" style="text-align: right">
<span <span
type="text" type="text"
class="el-icon-close" class="el-icon-close"
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<el-form-item label="样品编号"> <el-form-item label="样品编号">
<el-select <el-select
v-model="card.sampleNumber" v-model="card.sampleNumber"
:disabled="!isEdit"
@change="handleSampleNumberChange(card, $event)" @change="handleSampleNumberChange(card, $event)"
> >
<el-option <el-option
...@@ -33,7 +34,8 @@ ...@@ -33,7 +34,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
<div class="box-card-add" @click="addCard"> <!-- 新增操作 -->
<div v-show="isEdit" class="box-card-add" @click="addCard">
<span class="el-icon-plus" /> <span class="el-icon-plus" />
</div> </div>
</div> </div>
...@@ -54,6 +56,10 @@ export default { ...@@ -54,6 +56,10 @@ export default {
partSampleInformation: { partSampleInformation: {
type: Array, type: Array,
default: () => [] default: () => []
},
isEdit: {
type: Boolean,
default: true
} }
}, },
watch: { watch: {
......
...@@ -807,9 +807,9 @@ export default { ...@@ -807,9 +807,9 @@ export default {
computed: { computed: {
...mapGetters(['standard', 'standardList']) ...mapGetters(['standard', 'standardList'])
}, },
destroyed() { // destroyed() {
this.websock.close() // 离开路由之后断开websocket连接 // this.websock.close() // 离开路由之后断开websocket连接
}, // },
methods: { methods: {
getInspectionItemDict() { getInspectionItemDict() {
getDicts('inspection_item').then(response => { getDicts('inspection_item').then(response => {
...@@ -821,6 +821,7 @@ export default { ...@@ -821,6 +821,7 @@ export default {
...rest ...rest
}) })
) )
console.log('aaa', this.inspectionItemList)
}) })
}, },
getUserByRole() { getUserByRole() {
...@@ -1103,6 +1104,7 @@ export default { ...@@ -1103,6 +1104,7 @@ export default {
this.taskCreateRequest.taskList = this.model.inspectionItemList this.taskCreateRequest.taskList = this.model.inspectionItemList
this.tableData.forEach(item => { this.tableData.forEach(item => {
item.deptName = item.dept.deptName item.deptName = item.dept.deptName
item.name = item.nickName
}) })
this.taskCreateRequest.auditors = this.tableData this.taskCreateRequest.auditors = this.tableData
this.taskCreateRequest.sample = this.currentVehicleSampleInformation this.taskCreateRequest.sample = this.currentVehicleSampleInformation
...@@ -1121,9 +1123,16 @@ export default { ...@@ -1121,9 +1123,16 @@ export default {
}, },
// 暂存 // 暂存
handleSave() { handleSave() {
this.$refs.form.validate(valid => { // this.$refs.form.validate(valid => {
if (valid) { // if (valid) {
this.$modal.msgSuccess('暂存成功') // this.$modal.msgSuccess('暂存成功')
// }
// })
// 假装跳转详情页
this.$router.push({
path: '/task/task-detail',
query: {
taskId: '1763404524439060481'
} }
}) })
} }
......
This diff is collapsed.
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