Niko
/
shuili_manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改

dev_kxc
xzt 11 months ago
parent
b7e7ced32b
commit
8008a837dc
3 changed files with 108 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
View File

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

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

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

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

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

Write Preview
Loading…
Cancel
Save