From de549a920959426bdc260891219ead7efa4dd37f Mon Sep 17 00:00:00 2001
From: 刘淇 <290219706@qq.com>
Date: Mon, 28 Sep 2026 13:15:42 +0800
Subject: [PATCH] 养护。动态表单
---
api/common.js | 29 +++++++++++++++++++++++++++++
common/config/env.js | 6 +++---
pages-sub/daily/maintain-manage/add-record.vue | 403 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------
pages-sub/daily/maintain-manage/index.vue | 6 +++---
pages-sub/daily/maintain-manage/pending-plan-detail.vue | 5 ++++-
pages-sub/daily/maintain-manage/road-detail-list.vue | 4 ++--
蓝信H5改造工作量评估.xlsx | Bin 0 -> 22414 bytes
7 files changed, 302 insertions(+), 151 deletions(-)
create mode 100644 蓝信H5改造工作量评估.xlsx
diff --git a/api/common.js b/api/common.js
index 60afa1e..7ff1cf1 100644
--- a/api/common.js
+++ b/api/common.js
@@ -47,6 +47,35 @@ export const getAllCompanyList = (params) => {
};
+/**
+ * 拉取字段配置
+ * @param {Object} params {`businessType`、`bizType`、`workTypeId`}
+ * @returns {Promise}
+ */
+export const getByType = (params) => {
+ return get('/app-api/app/garden/work-field-config/get-by-type', params);
+};
+
+/**
+ * 拉取枚举选项 用于 `fieldType=3`(枚举)且 `options` 为空(即非静态来源)时获取可选项。
+ * @param {Object} params {}
+ * @returns {Promise}
+ */
+export const getOptionsByCode = (params) => {
+ return get('/app-api/app/garden/work-field-config/options', params);
+};
+
+/**
+ * 拉取拉取物料列表 用于`fieldType=6`(物料)字段,列出可领物料及库存。
+ * @param {Object} params {}
+ * @returns {Promise}
+ */
+export const getMaterialsByCode = (params) => {
+ return get('/app-api/app/garden/work-field-config/materials', params);
+};
+
+
+
diff --git a/common/config/env.js b/common/config/env.js
index 95bbb62..5ec8714 100644
--- a/common/config/env.js
+++ b/common/config/env.js
@@ -2,10 +2,10 @@
const env = {
// 开发环境
development: {
- // baseUrl: 'https://test.jichengshanshui.com.cn:28302',
+ baseUrl: 'https://test.jichengshanshui.com.cn:28302',
// https://test.jichengshanshui.com.cn:28302
- baseUrl: 'http://192.168.1.111:48081',
+ // baseUrl: 'http://192.168.1.111:48081',
uploadUrl: 'https://test.jichengshanshui.com.cn:28302',
// baseApi:'admin-api',
@@ -23,7 +23,7 @@ const env = {
// 获取当前环境
const getEnv = () => {
- const currentEnv = 'production';
+ const currentEnv = 'development';
return currentEnv;
};
diff --git a/pages-sub/daily/maintain-manage/add-record.vue b/pages-sub/daily/maintain-manage/add-record.vue
index dbff351..f28f38e 100644
--- a/pages-sub/daily/maintain-manage/add-record.vue
+++ b/pages-sub/daily/maintain-manage/add-record.vue
@@ -1,92 +1,85 @@
-
+
+
+
+
+
+
+
+
+ {{ item.unit }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
- uploadImgs(event)"
- @delete="(event) => deleteImg(event)"
- @on-exceed="handleExceed"
- multiple
- :max-count="3"
- upload-text="选择图片"
- del-color="#ff4d4f"
- class="upload-wrap"
- >
+
+ uploadImgs(event)"
+ @delete="(event) => deleteImg(event)" @on-exceed="handleExceed" multiple :max-count="3" upload-text="选择图片"
+ del-color="#ff4d4f" class="upload-wrap">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
diff --git a/pages-sub/daily/maintain-manage/index.vue b/pages-sub/daily/maintain-manage/index.vue
index cfef69a..15462e3 100644
--- a/pages-sub/daily/maintain-manage/index.vue
+++ b/pages-sub/daily/maintain-manage/index.vue
@@ -309,7 +309,7 @@ const fetchData = async (pageNo, pageSize) => {
// 跳转到计划明细页面
const goToDetail = (item) => {
uni.navigateTo({
- url: `/pages-sub/daily/maintain-manage/road-detail-list?roadId=${item.roadId}&finish_state=${item.finishState || ''}`
+ url: `/pages-sub/daily/maintain-manage/road-detail-list?roadId=${item.roadId}&finish_state=${item.finishState || ''} &businessType=${item.busiLine}`
})
}
@@ -318,11 +318,11 @@ const submitRecord = (item) => {
console.log('提交记录:', item)
if (item.planFinishNum == 0) { // 去新增
uni.navigateTo({
- url: `/pages-sub/daily/maintain-manage/add-record?finishState=${item.finishState}&planNo=${item.planNo}`
+ url: `/pages-sub/daily/maintain-manage/add-record?finishState=${item.finishState}&planNo=${item.planNo} &businessType=${item.busiLine}`
})
} else {
uni.navigateTo({
- url: `/pages-sub/daily/maintain-manage/pending-plan-detail?finishState=${item.finishState}&planNo=${item.planNo}&planTypeId=${item.planTypeId}`
+ url: `/pages-sub/daily/maintain-manage/pending-plan-detail?finishState=${item.finishState}&planNo=${item.planNo}&planTypeId=${item.planTypeId} &businessType=${item.busiLine}`
})
}
diff --git a/pages-sub/daily/maintain-manage/pending-plan-detail.vue b/pages-sub/daily/maintain-manage/pending-plan-detail.vue
index eebb207..b520d99 100644
--- a/pages-sub/daily/maintain-manage/pending-plan-detail.vue
+++ b/pages-sub/daily/maintain-manage/pending-plan-detail.vue
@@ -97,12 +97,15 @@ const batchNo = ref('')
const planNo = ref('')
const finishState = ref('')
const planTypeId = ref('')
+const businessType = ref('')
+
// 页面加载接收参数(逻辑完全保留)
onLoad((options) => {
planNo.value = options.planNo;
finishState.value = options.finishState
planTypeId.value = options.planTypeId
+ businessType.value = options.businessType
});
// 页面显示时请求数据(逻辑完全保留)
@@ -140,7 +143,7 @@ const gotoFinishPlanDetail = (i) => {
// 新增记录(逻辑完全保留)
const addNewRecord = () => {
uni.navigateTo({
- url: `/pages-sub/daily/maintain-manage/add-record?planNo=${planNo.value}`,
+ url: `/pages-sub/daily/maintain-manage/add-record?planNo=${planNo.value}&planTypeId=${planTypeId.value}&businessType=${businessType.value}`,
});
};
diff --git a/pages-sub/daily/maintain-manage/road-detail-list.vue b/pages-sub/daily/maintain-manage/road-detail-list.vue
index 307e60a..0c5913a 100644
--- a/pages-sub/daily/maintain-manage/road-detail-list.vue
+++ b/pages-sub/daily/maintain-manage/road-detail-list.vue
@@ -179,11 +179,11 @@ const submitRecord = (item) => {
console.log('提交记录:', item.planFinishNum)
if (item.planFinishNum == 0) {
uni.navigateTo({
- url: `/pages-sub/daily/maintain-manage/add-record?finishState=${item.finishState}&planNo=${item.planNo}`
+ url: `/pages-sub/daily/maintain-manage/add-record?finishState=${item.finishState}&planNo=${item.planNo}&businessType=${item.busiLine}`
})
} else {
uni.navigateTo({
- url: `/pages-sub/daily/maintain-manage/pending-plan-detail?finishState=${item.finishState}&planNo=${item.planNo}&planTypeId=${item.planTypeId}`
+ url: `/pages-sub/daily/maintain-manage/pending-plan-detail?finishState=${item.finishState}&planNo=${item.planNo}&planTypeId=${item.planTypeId}&businessType=${item.busiLine}`
})
}
}
diff --git a/蓝信H5改造工作量评估.xlsx b/蓝信H5改造工作量评估.xlsx
new file mode 100644
index 0000000..c5bc2d0
Binary files /dev/null and b/蓝信H5改造工作量评估.xlsx differ
--
libgit2 0.21.4