报废流程问题修复
This commit is contained in:
parent
83483e286e
commit
b6d2c1ce4a
|
|
@ -226,14 +226,17 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="备注" align="center" prop="remark" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
v-model="scope.row.remark"
|
||||
placeholder="请输入备注"
|
||||
clearable
|
||||
style="width: 100%"
|
||||
:disabled="isView"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
<el-tooltip :content="scope.row.remark" placement="top">
|
||||
<el-input
|
||||
v-model="scope.row.remark"
|
||||
placeholder="请输入备注"
|
||||
clearable
|
||||
style="width: 100%"
|
||||
:disabled="isView"
|
||||
@keyup.enter.native="handleQuery"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="附件" align="center" prop="fileList" min-width="200">
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@
|
|||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-circle-check"
|
||||
|
||||
v-if="scope.row.taskStatus == 0"
|
||||
@click="handleUpdate(scope.row, 'update')"
|
||||
>审核</el-button
|
||||
>
|
||||
|
|
@ -866,7 +866,7 @@ export default {
|
|||
|
||||
//图片查看
|
||||
picturePreview(file) {
|
||||
this.dialogImageUrl = file.fileUrl;
|
||||
this.dialogImageUrl = this.uploadUrl + file.fileUrl;
|
||||
console.log("xxxxxxxxxx",this.dialogImageUrl)
|
||||
const parts = file.fileName.split(".");
|
||||
const extension = parts.pop();
|
||||
|
|
|
|||
|
|
@ -814,6 +814,7 @@ export default {
|
|||
},
|
||||
data() {
|
||||
return {
|
||||
uploadUrl: process.env.VUE_APP_BASE_API + '/system', // 上传的图片服务器地址
|
||||
deptList: [],
|
||||
dicSelectList: [],
|
||||
deptTypeList: [],
|
||||
|
|
@ -1336,7 +1337,7 @@ export default {
|
|||
|
||||
//图片查看
|
||||
picturePreview(file) {
|
||||
this.dialogImageUrl = file.fileUrl;
|
||||
this.dialogImageUrl = this.uploadUrl + file.fileUrl;
|
||||
const parts = file.fileName.split(".");
|
||||
const extension = parts.pop();
|
||||
if (extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF') {
|
||||
|
|
|
|||
|
|
@ -39,7 +39,8 @@
|
|||
>
|
||||
<el-option label="待审核" value="0" />
|
||||
<el-option label="已通过" value="1" />
|
||||
<el-option label="已驳回" value="2" />
|
||||
<el-option label="维修驳回" value="2" />
|
||||
<el-option label="报废驳回" value="3" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
|
|
@ -122,7 +123,12 @@
|
|||
</span>
|
||||
<span v-if="scope.row.taskStatus === 2">
|
||||
<el-tag type="danger">
|
||||
未通过
|
||||
维修驳回
|
||||
</el-tag>
|
||||
</span>
|
||||
<span v-if="scope.row.taskStatus === 3">
|
||||
<el-tag type="danger">
|
||||
报废驳回
|
||||
</el-tag>
|
||||
</span>
|
||||
</template>
|
||||
|
|
@ -837,7 +843,7 @@ export default {
|
|||
|
||||
//图片查看
|
||||
picturePreview(file) {
|
||||
this.dialogImageUrl = file.fileUrl;
|
||||
this.dialogImageUrl = this.uploadUrl + file.fileUrl;
|
||||
const parts = file.fileName.split(".");
|
||||
const extension = parts.pop();
|
||||
if (extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF') {
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@
|
|||
@click="resetQuery"
|
||||
>重置</el-button
|
||||
>
|
||||
<el-button
|
||||
<!-- <el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
|
|
@ -118,7 +118,7 @@
|
|||
@click="handleExport"
|
||||
v-hasPermi="['machinery:coding:export']"
|
||||
>导出</el-button
|
||||
>
|
||||
> -->
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue