diff --git a/.env.development b/.env.development
index eb8185a..764306d 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ VITE_APP_ENV = 'development'
# 开发环境
# 李陈杰 209
-VITE_APP_BASE_API = 'http://192.168.110.188:8899'
+VITE_APP_BASE_API = 'http://192.168.110.149:8899'
# 曾涛
# VITE_APP_BASE_API = 'http://192.168.110.180:8899'
# 罗成
diff --git a/src/views/design/designChange/indexEdit.vue b/src/views/design/designChange/indexEdit.vue
index 2e7703f..b7bbd5f 100644
--- a/src/views/design/designChange/indexEdit.vue
+++ b/src/views/design/designChange/indexEdit.vue
@@ -314,14 +314,14 @@ let volumeMap = new Map();
const handleSelect = (val) => {
let obj = volumeMap.get(val);
- console.log('🚀 ~ handleSelect ~ obj:', obj);
-
fileVoList.value = obj.fileVoList;
designId.value = obj.design;
form.value.volumeName = obj.volumeName;
form.value.specialty = obj.specialty;
form.value.specialtyName = obj.specialtyName;
form.value.extendDetail.subName = obj.designSubitem;
+ form.value.saveFile = [];
+ getBlueprintList();
};
// 获取图纸列表
const blueprintListAll = ref([]);
@@ -331,9 +331,6 @@ const getBlueprintList = async () => {
};
const handleRadio = (val) => {
form.value.saveFile = [];
- if (val == 2) {
- getBlueprintList();
- }
};
/** 表单重置 */
@@ -351,8 +348,15 @@ const getInfo = () => {
let id = routeParams.value.id.split('_')[0];
const res = await getDesignChange(id);
Object.assign(form.value, res.data);
- console.log(form.value);
-
+ if (form.value.status != 'draft') {
+ form.value.id = id + '_audit';
+ }
+ if (form.value.extendDetail.designDisposal == 2) {
+ let obj = volumeMap.get(form.value.volumeNo);
+ designId.value = obj.design;
+ form.value.saveFile = form.value.saveFile.split(',');
+ getBlueprintList();
+ }
if (form.value.changeReason.length > 0) {
form.value.changeReason = form.value.changeReason.split(',');
}
@@ -504,9 +508,7 @@ onMounted(() => {
.el-input__inner,
.el-select .el-input__inner {
border-radius: 4px;
- transition:
- border-color 0.2s,
- box-shadow 0.2s;
+ transition: border-color 0.2s, box-shadow 0.2s;
&:focus {
border-color: var(--primary-light);
@@ -516,9 +518,7 @@ onMounted(() => {
.el-textarea__inner {
border-radius: 4px;
- transition:
- border-color 0.2s,
- box-shadow 0.2s;
+ transition: border-color 0.2s, box-shadow 0.2s;
&:focus {
border-color: var(--primary-light);
diff --git a/src/views/design/subcontract/index.vue b/src/views/design/subcontract/index.vue
index 4262682..51892ce 100644
--- a/src/views/design/subcontract/index.vue
+++ b/src/views/design/subcontract/index.vue
@@ -49,7 +49,7 @@
diff --git a/src/views/formalities/formalitiesAreConsolidated/index.vue b/src/views/formalities/formalitiesAreConsolidated/index.vue
index 0f9bbe8..8e80b7f 100644
--- a/src/views/formalities/formalitiesAreConsolidated/index.vue
+++ b/src/views/formalities/formalitiesAreConsolidated/index.vue
@@ -47,16 +47,16 @@
- 新增
+ 新增
-
- 新增数据
+
+ 新增数据
diff --git a/src/views/project/landTransfer/BasicData/enterRoad/index.vue b/src/views/project/landTransfer/BasicData/enterRoad/index.vue
index 2c73084..268bacc 100644
--- a/src/views/project/landTransfer/BasicData/enterRoad/index.vue
+++ b/src/views/project/landTransfer/BasicData/enterRoad/index.vue
@@ -31,11 +31,17 @@
模板下载
-
-
- 导入excel
-
-
+
+
+ 导入excel
+
+
@@ -102,7 +108,7 @@