|
@@ -417,7 +417,13 @@
|
|
|
min-width="100px"
|
|
|
:show-overflow-tooltip="true"
|
|
|
></el-table-column>
|
|
|
-
|
|
|
+ <el-table-column
|
|
|
+ sortable
|
|
|
+ prop="state"
|
|
|
+ label="报工状态"
|
|
|
+ min-width="100px"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ ></el-table-column>
|
|
|
<el-table-column
|
|
|
sortable
|
|
|
prop="signtime"
|
|
@@ -523,7 +529,7 @@
|
|
|
filterable
|
|
|
clearable
|
|
|
v-model="dialog.editorBox.form.dataa.state"
|
|
|
- placeholder="设备名称"
|
|
|
+ placeholder=""
|
|
|
style="width: 100%"
|
|
|
>
|
|
|
<el-option
|
|
@@ -646,11 +652,7 @@
|
|
|
:show-close="!loading"
|
|
|
>
|
|
|
<div>
|
|
|
- <el-form
|
|
|
- size="mini"
|
|
|
- ref="dialog_form_arr"
|
|
|
- label-width="0px"
|
|
|
- >
|
|
|
+ <el-form size="mini" ref="dialog_form_arr" label-width="0px">
|
|
|
<el-table
|
|
|
stripe
|
|
|
id="singleTable"
|
|
@@ -690,7 +692,7 @@
|
|
|
:loading="loading"
|
|
|
>点击下载
|
|
|
</el-button>
|
|
|
- <el-button
|
|
|
+ <el-button
|
|
|
size="small"
|
|
|
type="primary"
|
|
|
@click="delFilevalue(scope.row)"
|
|
@@ -703,7 +705,7 @@
|
|
|
</el-form>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
- <el-dialog
|
|
|
+ <el-dialog
|
|
|
:title="'审批文件下载列表'"
|
|
|
:visible.sync="dialog.editorBox.showtypea"
|
|
|
width="610px"
|
|
@@ -711,11 +713,7 @@
|
|
|
:show-close="!loading"
|
|
|
>
|
|
|
<div>
|
|
|
- <el-form
|
|
|
- size="mini"
|
|
|
- ref="dialog_form_arr"
|
|
|
- label-width="0px"
|
|
|
- >
|
|
|
+ <el-form size="mini" ref="dialog_form_arr" label-width="0px">
|
|
|
<el-table
|
|
|
stripe
|
|
|
id="singleTable"
|
|
@@ -1077,7 +1075,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- signtime:'',
|
|
|
+ signtime: "",
|
|
|
tableDatavalue: [],
|
|
|
fileList: [],
|
|
|
dialogImagename: "",
|
|
@@ -1336,7 +1334,10 @@ export default {
|
|
|
that.getselect();
|
|
|
},
|
|
|
methods: {
|
|
|
- // 附件删除
|
|
|
+ reject() {
|
|
|
+ this.dialog.editorBox.show = false;
|
|
|
+ },
|
|
|
+ // 附件删除
|
|
|
delFilevalue(row) {
|
|
|
let that = this;
|
|
|
let params = {
|
|
@@ -1451,7 +1452,6 @@ export default {
|
|
|
that.tableDatavalue = arr;
|
|
|
that.dialog.editorBox.showtypea = true;
|
|
|
that.tableLoading = false;
|
|
|
- console.log("tableDatavalue" + tableDatavalue);
|
|
|
} else {
|
|
|
that.$message.error(res.message);
|
|
|
}
|
|
@@ -1473,13 +1473,12 @@ export default {
|
|
|
that.tableDatavalue = arr;
|
|
|
that.dialog.editorBox.showtype = true;
|
|
|
that.tableLoading = false;
|
|
|
- console.log("tableDatavalue" + tableDatavalue);
|
|
|
} else {
|
|
|
that.$message.error(res.message);
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
// 使用说明文档 路径
|
|
|
fileRemoveHandle4(file, fileList) {
|
|
|
let that = this;
|
|
@@ -1586,7 +1585,7 @@ export default {
|
|
|
constructionunits: item.constructionunits,
|
|
|
construpeople: item.construpeople,
|
|
|
construfile: item.construfile,
|
|
|
- state :item.state
|
|
|
+ state: item.state,
|
|
|
});
|
|
|
}
|
|
|
that.tableDataa = arr;
|