Browse Source

修改

dev_kxc
xzt 11 months ago
parent
commit
8008a837dc
  1. 2
      jwtech-admin-page/src/components/map/index.vue
  2. 106
      jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/editPart.vue
  3. 34
      jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/inspection.vue

2
jwtech-admin-page/src/components/map/index.vue

@ -1034,6 +1034,7 @@ export default {
// stroke: new Stroke({ color: 'black', width: 2 }),
// }),
// }),
zIndex: 999,
});
this.lineVectorLayer = new VectorLayer({
source: that.lineVectorSource,
@ -1050,6 +1051,7 @@ export default {
// color: "#fff",
// }),
// }),
zIndex: 999,
}),
});

106
jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/editPart.vue

@ -11,7 +11,12 @@
>
</div>
<el-table v-loading="loading" border :data="rectificationList">
<el-table
v-loading="loading"
border
:data="rectificationList"
tooltip-effect="dark myTooltips"
>
<el-table-column
label="序号"
type="index"
@ -25,11 +30,19 @@
prop="inspectionId"
min-width="120"
/> -->
<el-table-column
label="责任单位"
align="center"
prop="responsibleUnit"
v-if="menuType === '0'"
min-width="120"
/>
<el-table-column
label="责任单位"
align="center"
prop="responsibleUnit"
:formatter="unitFormat"
v-else
min-width="120"
/>
<el-table-column
@ -57,6 +70,7 @@
align="center"
prop="context"
min-width="120"
show-overflow-tooltip
/>
<el-table-column
@ -67,21 +81,19 @@
min-width="120"
/>
<!-- <el-table-column
<el-table-column
label="整改时间"
align="center"
prop="feedbackTime"
min-width="120"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.feedbackTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column> -->
</el-table-column>
<el-table-column
label="整改反馈"
align="center"
prop="feedback"
min-width="120"
show-overflow-tooltip
/>
<!-- <el-table-column
@ -116,8 +128,16 @@
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row, scope.$index)"
@click="handleUpdate(scope.row, scope.$index, 'XG')"
v-hasPermi="['warn:rectification:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row, scope.$index, 'ZG')"
v-hasPermi="['warn:rectification:review']"
>整改</el-button
>
<el-button
@ -140,7 +160,7 @@
@pagination="getList"
/>
<!-- 添加或修改整改通知书对话框 -->
<!-- 添加或修改整改问题对话框 -->
<el-dialog
:title="title"
:visible.sync="open"
@ -159,7 +179,18 @@
<el-input v-model="form.documentNumber" placeholder="请输入文号" />
</el-form-item> -->
<el-form-item label="责任单位" prop="responsibleUnit">
<el-form-item
label="责任单位"
prop="responsibleUnit"
v-if="menuType == '0'"
>
<el-input
v-model="form.responsibleUnit"
placeholder="请输入责任单位"
disabled
/>
</el-form-item>
<el-form-item label="责任单位" prop="responsibleUnit" v-else>
<el-select
v-model="form.responsibleUnit"
placeholder="请选择责任单位"
@ -167,6 +198,7 @@
clearable
size="small"
style="width: 100%"
:disabled="updataType == 'ZG'"
>
<el-option
v-for="dict in unitOptions"
@ -205,6 +237,7 @@
type="date"
value-format="yyyy-MM-dd"
placeholder="选择检查时间"
:disabled="updataType == 'ZG'"
>
</el-date-picker>
</el-form-item>
@ -213,10 +246,15 @@
v-model="form.context"
placeholder="请输入问题描述"
type="textarea"
:disabled="updataType == 'ZG'"
/>
</el-form-item>
<el-form-item label="整改时间" prop="feedbackTime" v-if="!isAdd">
<el-form-item
label="整改时间"
prop="feedbackTime"
v-if="!isAdd && updataType == 'ZG'"
>
<el-date-picker
clearable
size="small"
@ -228,7 +266,11 @@
>
</el-date-picker>
</el-form-item>
<el-form-item label="整改反馈" prop="feedback" v-if="!isAdd">
<el-form-item
label="整改反馈"
prop="feedback"
v-if="!isAdd && updataType == 'ZG'"
>
<el-input
v-model="form.feedback"
placeholder="请输入整改反馈"
@ -236,7 +278,7 @@
/>
</el-form-item>
<!-- <el-form-item label="整改通知书" prop="rectificationAttachment">
<!-- <el-form-item label="整改问题" prop="rectificationAttachment">
<el-upload
class="upload-demo"
action="thinking/common/upload"
@ -294,7 +336,7 @@ import responsibleUnit from "./responsibleUnit.vue";
export default {
name: "Rectification",
props: ["inspectionId", "proNo", "proCode", "keyType"],
props: ["inspectionId", "proNo", "proCode", "keyType", "menuType"],
components: {
responsibleUnit,
},
@ -312,7 +354,7 @@ export default {
showSearch: true,
//
total: 0,
//
//
rectificationList: [],
// list
changeList: [],
@ -360,6 +402,7 @@ export default {
sort: "desc",
},
},
unitData: {},
unitOptions: [],
unitTypeOptions: [
{
@ -378,6 +421,10 @@ export default {
name: "其他单位",
value: "3",
},
{
name: "项目法人",
value: "9",
},
],
//
form: {},
@ -390,6 +437,13 @@ export default {
{ required: true, message: "请输入发文单位", trigger: "blur" },
{ max: 250, message: "字符长度最大为250", trigger: "blur" },
],
feedbackTime: [
{ required: true, message: "请选择整改时间", trigger: "blur" },
],
feedback: [
{ required: true, message: "请输入整改反馈", trigger: "blur" },
{ max: 250, message: "字符长度最大为250", trigger: "blur" },
],
},
//
headers: {
@ -399,6 +453,7 @@ export default {
isAdd: false,
//
nowIndex: 0,
updataType: "",
};
},
created() {
@ -417,7 +472,7 @@ export default {
this.form.responsibleUnitType = dict.enterpriseType;
console.log(111, this.form.responsibleUnitType);
},
/** 查询整改通知书列表 */
/** 查询整改问题列表 */
getList() {
this.loading = true;
this.queryParams.data.inspectionId = this.inspectionId;
@ -432,7 +487,8 @@ export default {
this.unitParams.data.proNo = this.proNo;
this.unitParams.data.proCode = this.proCode;
listInfo(this.unitParams).then((response) => {
this.unitOptions = response.data.enterpriseInfoList;
this.unitData = response.data;
this.unitOptions = response.data?.enterpriseInfoList;
// console.log(88888888888, this.unitOptions);
});
},
@ -552,13 +608,18 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
if (this.menuType == "0") {
this.form.responsibleUnit = this.unitData.projectLegalPerson;
this.form.responsibleUnitType = "9";
}
this.isAdd = true;
this.open = true;
this.title = "添加整改通知书";
this.title = "添加整改问题";
},
/** 修改按钮操作 */
handleUpdate(row, index) {
handleUpdate(row, index, key) {
this.reset();
this.updataType = key;
this.isAdd = false;
this.nowIndex = index;
this.form = { ...row };
@ -566,7 +627,7 @@ export default {
this.fileList1 = JSON.parse(this.form.rectificationAttachment);
}
this.open = true;
this.title = "修改整改通知书";
this.title = "修改整改问题";
// const id = row.id || this.ids;
// getRectification(id).then((response) => {
// this.form = response.data;
@ -574,7 +635,7 @@ export default {
// this.fileList1 = JSON.parse(this.form.rectificationAttachment);
// }
// this.open = true;
// this.title = "";
// this.title = "";
// });
},
/** 提交按钮 */
@ -711,6 +772,11 @@ export default {
},
};
</script>
<style lang="scss">
.myTooltips {
max-width: 60vw;
}
</style>
<style lang="scss" scoped>
@import "@/assets/css/dialog.scss";
//::v-deep {

34
jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/inspection.vue

@ -70,7 +70,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['warn:${auth}:add']"
v-hasPermi="[`warn:${auth}:add`]"
>新增</el-button
>
</el-col>
@ -166,7 +166,7 @@
type="text"
icon="el-icon-view"
@click="handleUpdate(scope.row, 'SV')"
v-hasPermi="['warn:${auth}:childView']"
v-hasPermi="[`warn:${auth}:childView`]"
>查看问题</el-button
>
<el-button
@ -174,7 +174,7 @@
type="text"
icon="el-icon-plus"
@click="handleAdd(scope.row, 'SA')"
v-hasPermi="['warn:${auth}:childEdit']"
v-hasPermi="[`warn:${auth}:childEdit`]"
>修改检查/新增问题</el-button
>
</template>
@ -248,7 +248,7 @@
type="text"
icon="el-icon-plus"
@click="handleAdd(scope.row, 'FA')"
v-hasPermi="['warn:${auth}:edit']"
v-hasPermi="[`warn:${auth}:add`]"
>新增问题</el-button
>
<!-- <el-button
@ -372,7 +372,10 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="行政处罚书(或处理文件)" prop="checklist">
<el-form-item
:label="menuType == '2' ? '行政处罚书(或处理文件)' : '整改通知'"
prop="checklist"
>
<myUpload :fileList="fileList2" v-if="keyType != 'SV'" />
<template v-else-if="keyType == 'SV' && this.form.checklist">
<div
@ -398,7 +401,7 @@
</el-col> -->
</el-row>
</el-form>
<div v-if="form.projectName">
<div v-if="form.proNo && form.proCode">
<div class="listTitle" style="margin-top: 0">
<span>责令限期整改问题列表</span>
</div>
@ -408,6 +411,7 @@
:proNo="form.proNo"
:proCode="form.proCode"
:keyType="keyType"
:menuType="menuType"
/>
</div>
<div slot="footer" class="dialog-footer">
@ -594,8 +598,10 @@ export default {
// console.log(res)
getInfo(res.id).then((response) => {
console.log(response.data);
this.proNo = response.data.proNo;
this.proCode = response.data.proCode;
// this.proNo = response.data.proNo;
// this.proCode = response.data.proCode;
this.form.proNo = response.data.proNo;
this.form.proCode = response.data.proCode;
});
},
/** 查询监管检查列表 */
@ -781,12 +787,12 @@ export default {
}
});
} else {
if (this.proNo) {
this.form.proNo = this.proNo;
}
if (this.proCode) {
this.form.proCode = this.proCode;
}
// if (this.proNo) {
// this.form.proNo = this.proNo;
// }
// if (this.proCode) {
// this.form.proCode = this.proCode;
// }
this.form.projectName = this.form.projectName.slice(
0,
this.form.projectName.indexOf("[")

Loading…
Cancel
Save