diff --git a/src/api/consult_new_start_project.ts b/src/api/consult_new_start_project.ts
new file mode 100644
index 0000000..28fa10a
--- /dev/null
+++ b/src/api/consult_new_start_project.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 项目咨询--新开工项目管理列表
+export function apiConsultNewStartProjectLists(params: any) {
+ return request.get({ url: '/consult_basic.consult_new_start_project/lists', params })
+}
+
+// 添加项目咨询--新开工项目管理
+export function apiConsultNewStartProjectAdd(params: any) {
+ return request.post({ url: '/consult_basic.consult_new_start_project/add', params })
+}
+
+// 编辑项目咨询--新开工项目管理
+export function apiConsultNewStartProjectEdit(params: any) {
+ return request.post({ url: '/consult_basic.consult_new_start_project/edit', params })
+}
+
+// 删除项目咨询--新开工项目管理
+export function apiConsultNewStartProjectDelete(params: any) {
+ return request.post({ url: '/consult_basic.consult_new_start_project/delete', params })
+}
+
+// 项目咨询--新开工项目管理详情
+export function apiConsultNewStartProjectDetail(params: any) {
+ return request.get({ url: '/consult_basic.consult_new_start_project/detail', params })
+}
\ No newline at end of file
diff --git a/src/api/consult_project.ts b/src/api/consult_project.ts
new file mode 100644
index 0000000..f04f423
--- /dev/null
+++ b/src/api/consult_project.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 项目咨询--基本信息列表
+export function apiConsultProjectLists(params: any) {
+ return request.get({ url: '/consult_basic.consult_project/lists', params })
+}
+
+// 添加项目咨询--基本信息
+export function apiConsultProjectAdd(params: any) {
+ return request.post({ url: '/consult_basic.consult_project/add', params })
+}
+
+// 编辑项目咨询--基本信息
+export function apiConsultProjectEdit(params: any) {
+ return request.post({ url: '/consult_basic.consult_project/edit', params })
+}
+
+// 删除项目咨询--基本信息
+export function apiConsultProjectDelete(params: any) {
+ return request.post({ url: '/consult_basic.consult_project/delete', params })
+}
+
+// 项目咨询--基本信息详情
+export function apiConsultProjectDetail(params: any) {
+ return request.get({ url: '/consult_basic.consult_project/detail', params })
+}
\ No newline at end of file
diff --git a/src/api/data_report.ts b/src/api/data_report.ts
index 7b667cc..42e12da 100644
--- a/src/api/data_report.ts
+++ b/src/api/data_report.ts
@@ -2,20 +2,22 @@ import request from '@/utils/request'
export function cost_approved_project_list(params: any) {
- return request.post({ url: '/cost_consultation_report/cost_approved_project_list', params })
+ return request.get({ url: '/cost_consultation_report/cost_approved_project_list', params })
}
-// 获取首页文章数据
export function cost_project_report(params?: any) {
return request.get({ url: '/cost_consultation_report/cost_project_report', params })
}
-// 底部导航详情
export function project_trace(params?: any) {
return request.get({ url: '/cost_consultation_report/project_trace', params })
}
-// 底部导航保存
-export function setDecorateTabbar(params: any) {
- return request.post({ url: '/decorate.tabbar/save', params })
+export function apiproject_invoice_receipt(params?: any) {
+ return request.get({ url: '/cost_consultation_report/project_invoice_receipt', params })
}
+
+export function apidistribution_project_departments(params?: any) {
+ return request.get({ url: '/cost_consultation_report/distribution_project_departments', params })
+}
+
diff --git a/src/components/dialogTable/dialogTableConfig.ts b/src/components/dialogTable/dialogTableConfig.ts
index b1560d9..d9a2a04 100644
--- a/src/components/dialogTable/dialogTableConfig.ts
+++ b/src/components/dialogTable/dialogTableConfig.ts
@@ -22,6 +22,7 @@ import { apiSupervisionParticipatingUnitsQualificationsLists } from '@/api/super
import { apiCostApprovedProjectLists } from '@/api/cost_approved_project'
import { apiCostProjectLists } from '@/api/cost_project'
import { apiTaskTypeLists } from '@/api/task_type'
+import {apiSupervisionMaterialEquipmentInfoLists}from "@/api/supervision_material_equipment_info"
@@ -201,7 +202,7 @@ export const supervision_material_entry:Iconfig = {
}
export const supervision_material_equipment_info:Iconfig = {
- fetchFn: apiSupervisionMaterialEntryLists,
+ fetchFn: apiSupervisionMaterialEquipmentInfoLists,
serchList: [
{
label: '材料/设备名称',
@@ -213,15 +214,30 @@ export const supervision_material_equipment_info:Iconfig = {
},
{
label:"合同约定品牌",
- value:'brand',
+ value:'contract_brand',
select:[
{
name:"否",
- value:"0"
+ value:0
},
{
name:"是",
- value:"1"
+ value:1
+ },
+
+ ]
+ },
+ {
+ label:"类型",
+ value:'type',
+ select:[
+ {
+ name:"材料",
+ value:0
+ },
+ {
+ name:"设备",
+ value:1
},
]
@@ -254,7 +270,7 @@ export const supervision_participating_units_qualifications:Iconfig = {
],
tableList: [
{ project_name: "项目名称" },
- { company_id: "所属单位" },
+ { company_name: "所属单位" },
{ qualification_name: "资质名称" },
{ qualification_number: "资质编号" },
{ get_date: "发证日期" },
diff --git a/src/views/consult_new_start_project/edit.vue b/src/views/consult_new_start_project/edit.vue
new file mode 100644
index 0000000..7641a2e
--- /dev/null
+++ b/src/views/consult_new_start_project/edit.vue
@@ -0,0 +1,307 @@
+
+
+
+
+
diff --git a/src/views/consult_new_start_project/index.vue b/src/views/consult_new_start_project/index.vue
new file mode 100644
index 0000000..f97fcfa
--- /dev/null
+++ b/src/views/consult_new_start_project/index.vue
@@ -0,0 +1,147 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/consult_project/edit.vue b/src/views/consult_project/edit.vue
new file mode 100644
index 0000000..67a4fdb
--- /dev/null
+++ b/src/views/consult_project/edit.vue
@@ -0,0 +1,363 @@
+
+
+
+
+
diff --git a/src/views/consult_project/index.vue b/src/views/consult_project/index.vue
new file mode 100644
index 0000000..76499b6
--- /dev/null
+++ b/src/views/consult_project/index.vue
@@ -0,0 +1,146 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/cost_projects/edit.vue b/src/views/cost_projects/edit.vue
index 402f2cb..58c4e58 100644
--- a/src/views/cost_projects/edit.vue
+++ b/src/views/cost_projects/edit.vue
@@ -261,7 +261,9 @@ const formData = reactive({
jhgq: '',
depar: '',
principal: '',
+ principal_id: '',
person: '',
+ person_id: '',
invest: '',
budget: '',
cost: '',
@@ -413,7 +415,7 @@ const open = (type = 'add') => {
//打开弹窗
const userclick = async (e: any) => {
e == 'person' ? persoleType.value = 2 : persoleType.value = 1
- label.value = e
+ // label.value = e
showDialog1.value = true
await nextTick()
personnel.value.open()
@@ -426,8 +428,21 @@ const persoleType = ref('1')
const submituser = (e: any) => {
let flag = Array.isArray(e)
let personl;
+ let personl_id;
personl = (flag ? (e.map(item => [item.name])).join(',') : e.name)
- formData[label.value] = personl
+ personl_id = (flag ? (e.map(item => [item.id])).join(',') : e.id)
+
+ console.log(personl_id, 'personl_id')
+ if (flag) {
+ formData.person = personl;
+ formData.person_id = personl_id
+ } else {
+ formData.principal = personl
+ formData.principal_id = personl_id
+ }
+ // formData.person_id = (flag ? (e.map(item => [item.id])).join(',') : e.id)
+ // formData[label.value] = personl
+
showDialog1.value = false
}
diff --git a/src/views/data_report_collection/index.vue b/src/views/data_report_collection/index.vue
index dd22592..47dfc37 100644
--- a/src/views/data_report_collection/index.vue
+++ b/src/views/data_report_collection/index.vue
@@ -2,20 +2,17 @@
-
-
+
+
-
-
-
-
+
查询
重置
-
@@ -24,21 +21,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -51,17 +40,16 @@
-
diff --git a/src/views/data_report_commission/index.vue b/src/views/data_report_commission/index.vue
index dd22592..9151317 100644
--- a/src/views/data_report_commission/index.vue
+++ b/src/views/data_report_commission/index.vue
@@ -24,21 +24,19 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -81,4 +79,3 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
getLists()
-
diff --git a/src/views/data_report_course/index.vue b/src/views/data_report_course/index.vue
index 30b6072..f3562f1 100644
--- a/src/views/data_report_course/index.vue
+++ b/src/views/data_report_course/index.vue
@@ -36,7 +36,8 @@
{{ row.data_reception_status ? '已开始' : "未开始" }}
-
+
{{ row.task_handling_three_level_review_status ? '已上传' : "未上传" }}
@@ -86,4 +87,3 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
getLists()
-
diff --git a/src/views/data_report_department/index.vue b/src/views/data_report_department/index.vue
index 6578ff3..520f5f2 100644
--- a/src/views/data_report_department/index.vue
+++ b/src/views/data_report_department/index.vue
@@ -23,14 +23,13 @@
-
diff --git a/src/views/data_report_profit/index.vue b/src/views/data_report_profit/index.vue
index dd22592..8a0f183 100644
--- a/src/views/data_report_profit/index.vue
+++ b/src/views/data_report_profit/index.vue
@@ -24,21 +24,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -81,4 +72,3 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
getLists()
-
diff --git a/src/views/supervision_accept/edit.vue b/src/views/supervision_accept/edit.vue
index d51d49d..3e3a255 100644
--- a/src/views/supervision_accept/edit.vue
+++ b/src/views/supervision_accept/edit.vue
@@ -17,7 +17,7 @@
-
+
@@ -37,8 +37,7 @@
-
+
@@ -74,7 +73,7 @@
-
+
diff --git a/src/views/supervision_accept/index.vue b/src/views/supervision_accept/index.vue
index 63c2df3..fdf3b57 100644
--- a/src/views/supervision_accept/index.vue
+++ b/src/views/supervision_accept/index.vue
@@ -6,7 +6,10 @@
-
+
+
+
查询
@@ -183,4 +186,3 @@ const handleAccept = async (row: Object | any[]) => {
getLists()
-
diff --git a/src/views/supervision_check_item/edit.vue b/src/views/supervision_check_item/edit.vue
index f4c05ad..5ddb960 100644
--- a/src/views/supervision_check_item/edit.vue
+++ b/src/views/supervision_check_item/edit.vue
@@ -50,7 +50,10 @@
-
检查项
+
+ 检查项
+ +
+
@@ -164,7 +167,6 @@ const handleAdd = () => {
const handleDelete = async (row: any) => {
- if (formData.check_item_detail.length == 1) return
if (row.id) {
await apisupervision_check_item_detail_delete({ id: row.id })
}
diff --git a/src/views/supervision_commencement_report/index.vue b/src/views/supervision_commencement_report/index.vue
index 787233d..76fb8d4 100644
--- a/src/views/supervision_commencement_report/index.vue
+++ b/src/views/supervision_commencement_report/index.vue
@@ -34,7 +34,7 @@
- 文件{{ i + 1 }}查看
+ 文件{{ i + 1 }}查看
@@ -125,4 +125,3 @@ const handleDelete = async (id: number | any[]) => {
getLists()
-
diff --git a/src/views/supervision_company_check/index.vue b/src/views/supervision_company_check/index.vue
index eb8a7af..75b5276 100644
--- a/src/views/supervision_company_check/index.vue
+++ b/src/views/supervision_company_check/index.vue
@@ -34,7 +34,7 @@
-
+
diff --git a/src/views/supervision_construction_management_personnel/edit.vue b/src/views/supervision_construction_management_personnel/edit.vue
index d0381ae..f4f537d 100644
--- a/src/views/supervision_construction_management_personnel/edit.vue
+++ b/src/views/supervision_construction_management_personnel/edit.vue
@@ -24,7 +24,7 @@
-
+
@@ -127,7 +127,7 @@
-
+
@@ -211,7 +211,7 @@ const formData = reactive({
qualification_two_status: '',
remark: '',
annex: [],
- create_user: '',
+ create_user_name: '',
})
const customEvent1 = (e) => {
diff --git a/src/views/supervision_dangerous_engineering_case/index.vue b/src/views/supervision_dangerous_engineering_case/index.vue
index ea51617..f896679 100644
--- a/src/views/supervision_dangerous_engineering_case/index.vue
+++ b/src/views/supervision_dangerous_engineering_case/index.vue
@@ -60,7 +60,7 @@
-
diff --git a/src/views/supervision_entity_parallel_testing/edit.vue b/src/views/supervision_entity_parallel_testing/edit.vue
index a24a71e..edebb66 100644
--- a/src/views/supervision_entity_parallel_testing/edit.vue
+++ b/src/views/supervision_entity_parallel_testing/edit.vue
@@ -17,7 +17,7 @@
-
+
diff --git a/src/views/supervision_entity_parallel_testing/index.vue b/src/views/supervision_entity_parallel_testing/index.vue
index f1703da..f42e1cf 100644
--- a/src/views/supervision_entity_parallel_testing/index.vue
+++ b/src/views/supervision_entity_parallel_testing/index.vue
@@ -13,8 +13,8 @@
-
-
+
+
@@ -132,4 +132,3 @@ const handleDelete = async (id: number | any[]) => {
getLists()
-
diff --git a/src/views/supervision_excess_risk_security_monitoring/edit.vue b/src/views/supervision_excess_risk_security_monitoring/edit.vue
index b13b2ed..977c5ab 100644
--- a/src/views/supervision_excess_risk_security_monitoring/edit.vue
+++ b/src/views/supervision_excess_risk_security_monitoring/edit.vue
@@ -28,19 +28,19 @@
-
+
-
+
-
+
@@ -108,29 +108,29 @@
-
+
-
+
-
+
-
+
-
+
否
@@ -154,7 +154,7 @@
-
+
diff --git a/src/views/supervision_high_risk_security_monitoring/edit.vue b/src/views/supervision_high_risk_security_monitoring/edit.vue
index d92c908..821bd75 100644
--- a/src/views/supervision_high_risk_security_monitoring/edit.vue
+++ b/src/views/supervision_high_risk_security_monitoring/edit.vue
@@ -27,19 +27,19 @@
-
+
-
+
-
+
@@ -94,24 +94,24 @@
-
+
-
+
-
+
-
+
@@ -140,7 +140,7 @@
-
+
diff --git a/src/views/supervision_inspection/edit.vue b/src/views/supervision_inspection/edit.vue
index 8d012c5..9e58099 100644
--- a/src/views/supervision_inspection/edit.vue
+++ b/src/views/supervision_inspection/edit.vue
@@ -18,7 +18,7 @@
+ placeholder="请选择巡视类型">
@@ -85,9 +85,9 @@
-
-
-
+
+
+
@@ -104,11 +104,6 @@
-
- 巡视结果
+
+ 巡视结果
+ +
+
@@ -178,7 +176,10 @@
- 巡视问题
+
+ 巡视问题
+ +
+
@@ -221,9 +222,9 @@ import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiSupervisionInspectionAdd, apiSupervisionInspectionEdit, apisupervision_inspection_result_delete, apisupervision_problem_delete, apiSupervisionInspectionDetail, apisupervision_inspection_result, apisupervision_problem } from '@/api/supervision_inspection'
import { apisupervision_check_item_detailLists } from '@/api/supervision_check_item'
-import { supervision_project, supervision_check_item } from "@/components/dialogTable/dialogTableConfig"
+import { supervision_project, supervision_check_item, supervision_participating_units } from "@/components/dialogTable/dialogTableConfig"
import type { PropType } from 'vue'
-import { supervision_participating_units } from "@/components/dialogTable/dialogTableConfig"
+import { timeFormat } from '@/utils/util'
defineProps({
dictData: {
@@ -265,7 +266,6 @@ const handleAdd = () => {
}
const handleDelete = async (row: any) => {
- if (formData.inspection_result.length == 1) return
if (row.id) {
await apisupervision_inspection_result_delete({ id: row.id })
const index = formData.inspection_result.indexOf(row);
@@ -278,7 +278,7 @@ const handleDelete = async (row: any) => {
}
const handleAdd1 = () => {
- formData.inspection_result.push({
+ formData.inspection_problem.push({
"problem_cate": "",
"problem_description": "",
"problem_name": ""
@@ -286,7 +286,6 @@ const handleAdd1 = () => {
}
const handleDelete1 = async (row: any) => {
- if (formData.inspection_problem.length == 1) return
if (row.id) {
await apisupervision_problem_delete({ id: row.id })
const index = formData.inspection_problem.indexOf(row);
@@ -312,13 +311,13 @@ const formData = reactive({
inspection_position: '',
workers: '',
managers: '',
- start_time: '',
+ start_time: timeFormat('', 'yyyy-mm-dd hh:MM:ss'),
end_time: '',
inspection_user: '',
- company_id: '',
+ company_id: 0,
company_name: '',
inspection_content: '',
- is_importent: '',
+ is_important: '',
follow_user: '',
check_item_detail_ids: [],
check_item_detail_name: '',
@@ -436,11 +435,6 @@ const formRules = reactive({
message: '请输入巡视内容',
trigger: ['blur']
}],
- is_importent: [{
- required: true,
- message: '请输入设置重点关注事项 0-否 1-是',
- trigger: ['blur']
- }],
follow_user: [{
required: true,
message: '请输入关注人',
@@ -468,7 +462,7 @@ const setFormData = async (data: Record) => {
}
}
formData.inspection_type = String(formData.inspection_type)
- formData.is_importent = String(formData.inspection_type)
+ // formData.is_important = (formData.is_important)
formData.company_id == 0 ? formData.company_id = '' : ""
apisupervision_inspection_result({ inspection_id: formData.id }).then(res => {
formData.inspection_result = res.lists
diff --git a/src/views/supervision_inspection/index.vue b/src/views/supervision_inspection/index.vue
index cf170b5..0adf8c2 100644
--- a/src/views/supervision_inspection/index.vue
+++ b/src/views/supervision_inspection/index.vue
@@ -2,14 +2,14 @@
-
-
+
+
+
查询
@@ -45,7 +45,7 @@
-
+
diff --git a/src/views/supervision_large_equipment/edit.vue b/src/views/supervision_large_equipment/edit.vue
index 52f91cc..a5c3837 100644
--- a/src/views/supervision_large_equipment/edit.vue
+++ b/src/views/supervision_large_equipment/edit.vue
@@ -7,7 +7,7 @@
+ @click="showDialog1 = true" readonly />
@@ -102,7 +102,7 @@
-
+
@@ -182,8 +182,8 @@ const formData = reactive({
effective_date_two: '',
qualification_two_status: '',
remark: '',
- annex: '',
- create_user: '',
+ annex: [],
+ create_user_name: '',
})
const customEvent1 = (e) => {
formData.unit_qualification_id = e.id
diff --git a/src/views/supervision_large_mechanical_equipment/edit.vue b/src/views/supervision_large_mechanical_equipment/edit.vue
index de20ccb..fbb4080 100644
--- a/src/views/supervision_large_mechanical_equipment/edit.vue
+++ b/src/views/supervision_large_mechanical_equipment/edit.vue
@@ -46,17 +46,17 @@
-
+
-
+
-
+
@@ -64,7 +64,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/views/supervision_large_mechanical_equipment/index.vue b/src/views/supervision_large_mechanical_equipment/index.vue
index 0a073e6..9ffd494 100644
--- a/src/views/supervision_large_mechanical_equipment/index.vue
+++ b/src/views/supervision_large_mechanical_equipment/index.vue
@@ -11,9 +11,6 @@
-
-
-
diff --git a/src/views/supervision_material_entry/edit.vue b/src/views/supervision_material_entry/edit.vue
index 8f4e4ec..e32498e 100644
--- a/src/views/supervision_material_entry/edit.vue
+++ b/src/views/supervision_material_entry/edit.vue
@@ -69,7 +69,8 @@
-
+
@@ -219,13 +220,18 @@ const customEvent = (e) => {
}
const customEvent1 = (e) => {
formData.company_id = e.id
- formData.company_name = e.project_name
+ formData.company_name = e.unit_name
showDialog2.value = false
}
const customEvent2 = (e) => {
- for (let key in formData.entry_detail[tableIndex.value]) {
- (formData.entry_detail[tableIndex.value])[key] = e[key]
- }
+ // if (formData.entry_detail[tableIndex.value]?.id) delete formData.entry_detail[tableIndex.value].id;
+
+ // for (let key in formData.entry_detail[tableIndex.value]) {
+ // (formData.entry_detail[tableIndex.value])[key] = e[key]
+ // }
+ // showDialog3.value = false
+ let { name, brand, model, unit, contract_brand, entry_number } = e
+ Object.assign(formData.entry_detail[tableIndex.value], { name, brand, model, unit, contract_brand, entry_number })
showDialog3.value = false
}
diff --git a/src/views/supervision_material_equipment_info/edit.vue b/src/views/supervision_material_equipment_info/edit.vue
index d89ca47..a0b5fb2 100644
--- a/src/views/supervision_material_equipment_info/edit.vue
+++ b/src/views/supervision_material_equipment_info/edit.vue
@@ -20,7 +20,7 @@
-
+
diff --git a/src/views/supervision_meeting_minutes/edit.vue b/src/views/supervision_meeting_minutes/edit.vue
index b718b08..adae1a0 100644
--- a/src/views/supervision_meeting_minutes/edit.vue
+++ b/src/views/supervision_meeting_minutes/edit.vue
@@ -3,34 +3,34 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -83,7 +83,7 @@ const formData = reactive({
location: '',
attendees: '',
content: '',
- annex: '',
+ annex: [],
create_user: '',
})
const handleAvatarSuccess_four = (response: any) => {
@@ -104,11 +104,6 @@ const customEvent = (e) => {
// 表单验证
const formRules = reactive({
- project_id: [{
- required: true,
- message: '请输入项目id',
- trigger: ['blur']
- }],
theme: [{
required: true,
message: '请输入会议主题',
@@ -129,11 +124,7 @@ const formRules = reactive({
message: '请输入主持人',
trigger: ['blur']
}],
- recorder: [{
- required: true,
- message: '请输入记录人',
- trigger: ['blur']
- }],
+
location: [{
required: true,
message: '请输入会议地点',
@@ -144,16 +135,8 @@ const formRules = reactive({
message: '请输入与会人员',
trigger: ['blur']
}],
- content: [{
- required: true,
- message: '请输入会议内容',
- trigger: ['blur']
- }],
- create_user: [{
- required: true,
- message: '请输入',
- trigger: ['blur']
- }]
+
+
})
diff --git a/src/views/supervision_project_data_archiving/edit.vue b/src/views/supervision_project_data_archiving/edit.vue
index c59bf6a..2398861 100644
--- a/src/views/supervision_project_data_archiving/edit.vue
+++ b/src/views/supervision_project_data_archiving/edit.vue
@@ -10,7 +10,7 @@
-
+
diff --git a/src/views/supervision_project_info_report/edit.vue b/src/views/supervision_project_info_report/edit.vue
index ffc97d1..08e55b0 100644
--- a/src/views/supervision_project_info_report/edit.vue
+++ b/src/views/supervision_project_info_report/edit.vue
@@ -21,23 +21,23 @@
:value="parseInt(item.value)" />
-
+
{{ item.name }}
-
+
-
+
-
+
-
+
diff --git a/src/views/supervision_project_milestones/edit.vue b/src/views/supervision_project_milestones/edit.vue
index 023e173..e35454d 100644
--- a/src/views/supervision_project_milestones/edit.vue
+++ b/src/views/supervision_project_milestones/edit.vue
@@ -10,19 +10,16 @@
-
+
-
+
-
+
-
-
-
diff --git a/src/views/supervision_project_monthly_report/edit.vue b/src/views/supervision_project_monthly_report/edit.vue
index 8070a60..942e109 100644
--- a/src/views/supervision_project_monthly_report/edit.vue
+++ b/src/views/supervision_project_monthly_report/edit.vue
@@ -45,12 +45,12 @@
-
+
-
+
@@ -78,42 +78,42 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/views/supervision_project_monthly_report/index.vue b/src/views/supervision_project_monthly_report/index.vue
index c55b16e..a664b07 100644
--- a/src/views/supervision_project_monthly_report/index.vue
+++ b/src/views/supervision_project_monthly_report/index.vue
@@ -3,8 +3,8 @@
-
+
diff --git a/src/views/supervision_project_personnel/edit.vue b/src/views/supervision_project_personnel/edit.vue
index a38b4d9..d67f6a0 100644
--- a/src/views/supervision_project_personnel/edit.vue
+++ b/src/views/supervision_project_personnel/edit.vue
@@ -4,8 +4,8 @@
@close="handleClose">
-
+
diff --git a/src/views/supervision_safety_management_personnel/edit.vue b/src/views/supervision_safety_management_personnel/edit.vue
index 568de28..986d156 100644
--- a/src/views/supervision_safety_management_personnel/edit.vue
+++ b/src/views/supervision_safety_management_personnel/edit.vue
@@ -7,7 +7,7 @@
+ @click="showDialog1 = true" readonly />
@@ -127,7 +127,7 @@
-
+
diff --git a/src/views/supervision_safety_management_personnel/index.vue b/src/views/supervision_safety_management_personnel/index.vue
index 7ecde22..0439d85 100644
--- a/src/views/supervision_safety_management_personnel/index.vue
+++ b/src/views/supervision_safety_management_personnel/index.vue
@@ -17,10 +17,6 @@
查询
重置
-
- 查询
- 重置
-
@@ -145,4 +141,3 @@ const handleDelete = async (id: number | any[]) => {
getLists()
-
diff --git a/src/views/supervision_safety_warning_sign/index.vue b/src/views/supervision_safety_warning_sign/index.vue
index 3fe91bc..bf37ad5 100644
--- a/src/views/supervision_safety_warning_sign/index.vue
+++ b/src/views/supervision_safety_warning_sign/index.vue
@@ -35,7 +35,6 @@
-
diff --git a/src/views/supervision_side_station/edit.vue b/src/views/supervision_side_station/edit.vue
index 783d603..4bc9728 100644
--- a/src/views/supervision_side_station/edit.vue
+++ b/src/views/supervision_side_station/edit.vue
@@ -18,7 +18,7 @@
+ placeholder="请选择巡视类型">
diff --git a/src/views/supervision_side_station/index.vue b/src/views/supervision_side_station/index.vue
index 8d2657a..80fe266 100644
--- a/src/views/supervision_side_station/index.vue
+++ b/src/views/supervision_side_station/index.vue
@@ -2,14 +2,15 @@
-
-
-
-
+
-
+
+
+
查询
@@ -34,7 +35,7 @@
-
+
@@ -129,4 +130,3 @@ const handleDelete = async (id: number | any[]) => {
getLists()
-
diff --git a/src/views/supervision_special_operation_personnel/edit.vue b/src/views/supervision_special_operation_personnel/edit.vue
index d6e3556..8b11056 100644
--- a/src/views/supervision_special_operation_personnel/edit.vue
+++ b/src/views/supervision_special_operation_personnel/edit.vue
@@ -5,7 +5,7 @@
-
@@ -37,15 +37,15 @@
-
-
+
+
-
-
+
+
@@ -95,7 +95,7 @@ const formData = reactive({
status: '',
remark: '',
annex: '',
- create_user: '',
+ create_user_name: '',
})
const handleAvatarSuccess_four = (response: any) => {
if (!Array.isArray(formData.annex)) formData.annex = []
diff --git a/src/views/supervision_test_blocks_specimens/edit.vue b/src/views/supervision_test_blocks_specimens/edit.vue
index bb4fdab..4ece1ad 100644
--- a/src/views/supervision_test_blocks_specimens/edit.vue
+++ b/src/views/supervision_test_blocks_specimens/edit.vue
@@ -60,7 +60,7 @@
-
+
@@ -75,10 +75,13 @@
-
-
-
-
+
+
+
+
+
+
问题
diff --git a/src/views/supervision_work_contact/edit.vue b/src/views/supervision_work_contact/edit.vue
index 7d48b87..a5e2fa8 100644
--- a/src/views/supervision_work_contact/edit.vue
+++ b/src/views/supervision_work_contact/edit.vue
@@ -12,7 +12,7 @@
-
+
diff --git a/stats.html b/stats.html
index 60c1020..580f76f 100644
--- a/stats.html
+++ b/stats.html
@@ -4822,7 +4822,7 @@ var drawChart = (function (exports) {