From 2815b7d6b0b99dcb95c0affcf8ad9bfce163340d Mon Sep 17 00:00:00 2001
From: dhr <2216804034@qq.com>
Date: Fri, 29 Aug 2025 19:54:27 +0800
Subject: [PATCH 1/2] 1

---
 src/views/design/subcontract/index.vue        |  2 +-
 .../formalitiesAreConsolidated/index.vue      | 10 ++--
 .../BasicData/enterRoad/index.vue             | 47 +++++++++++--------
 .../BasicData/landBlock/index.vue             |  2 +-
 .../landTransferLedger/index.vue              |  2 +-
 .../landTransferLedgerFangzhen/index.vue      |  2 +-
 .../nonTransferLedger/index.vue               |  2 +-
 src/views/project/subcontract/index.vue       |  2 +-
 8 files changed, 39 insertions(+), 30 deletions(-)

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 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button v-hasPermi="['design:subcontract:add']" :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
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 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['formalities:listOfFormalities:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['formalities:formalitiesAreConsolidated:getTree']"
+              >新增</el-button
+            >
             <span style="margin-left: 10px"
               ><el-tooltip class="box-item" effect="dark" content="从原有模板列表选择新增" placement="top">
                 <el-icon color="#409efc"><WarningFilled /></el-icon> </el-tooltip
             ></span>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="addTemplate()" v-hasPermi="['formalities:formalitiesAreConsolidated:addFormalities']"
-              >新增数据</el-button
-            >
+          <el-col :span="1.5" v-hasPermi="['formalities:listOfFormalities:list']">
+            <el-button type="primary" plain icon="Plus" @click="addTemplate()">新增数据</el-button>
             <span style="margin-left: 10px">
               <el-tooltip class="box-item" effect="dark" content="创建新模板并添加数据" placement="top">
                 <el-icon color="#409efc"><WarningFilled /></el-icon>
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 @@
             <el-button type="success" plain icon="Plus" @click="downloadTemplate" v-hasPermi="['land:enterRoad:import']">模板下载</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-upload ref="uploadRef" class="upload-demo" :http-request="handleImport" :show-file-list="false">
-                <template #trigger>
-                  <el-button plain type="primary">导入excel</el-button>
-                </template>
-              </el-upload>
+            <el-upload
+              ref="uploadRef"
+              v-hasPermi="['land:enterRoad:upload']"
+              class="upload-demo"
+              :http-request="handleImport"
+              :show-file-list="false"
+            >
+              <template #trigger>
+                <el-button plain type="primary">导入excel</el-button>
+              </template>
+            </el-upload>
           </el-col>
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['land:enterRoad:remove']"
@@ -93,7 +99,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button :loading="buttonLoading" type="primary" v-hasPermi="['land:enterRoad:add']" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
@@ -102,7 +108,7 @@
 </template>
 
 <script setup name="EnterRoad" lang="ts">
-import { listEnterRoad, getEnterRoad, delEnterRoad, addEnterRoad, updateEnterRoad ,importEnterRoad} from '@/api/system/landTransfer/enterRoad';
+import { listEnterRoad, getEnterRoad, delEnterRoad, addEnterRoad, updateEnterRoad, importEnterRoad } from '@/api/system/landTransfer/enterRoad';
 import { EnterRoadVO, EnterRoadQuery, EnterRoadForm } from '@/api/system/landTransfer/enterRoad/types';
 import { listLandBlock } from '@/api/system/landTransfer/landBlock';
 import { useUserStoreHook } from '@/store/modules/user';
@@ -267,20 +273,23 @@ const listeningProject = watch(
 
 // 导入文件
 const handleImport = (options: any) => {
-   loading.value = true;
+  loading.value = true;
   let formData = new FormData();
   formData.append('file', options.file);
-  importEnterRoad(currentProject.value?.id,formData).then((res) => {
-    if (res.code == 200) {
-      proxy.$modal.msgSuccess(res.msg || '导入成功');
-      getListLand();
-      getList();
-    }
-  }).catch((err) => {
-    proxy.$modal.msgError(err.msg || '导入失败');
-  }).finally(() => {
-    loading.value = false;
-  });
+  importEnterRoad(currentProject.value?.id, formData)
+    .then((res) => {
+      if (res.code == 200) {
+        proxy.$modal.msgSuccess(res.msg || '导入成功');
+        getListLand();
+        getList();
+      }
+    })
+    .catch((err) => {
+      proxy.$modal.msgError(err.msg || '导入失败');
+    })
+    .finally(() => {
+      loading.value = false;
+    });
 };
 // 下载模板
 const downloadTemplate = () => {
diff --git a/src/views/project/landTransfer/BasicData/landBlock/index.vue b/src/views/project/landTransfer/BasicData/landBlock/index.vue
index 12ec35f..09bfb19 100644
--- a/src/views/project/landTransfer/BasicData/landBlock/index.vue
+++ b/src/views/project/landTransfer/BasicData/landBlock/index.vue
@@ -99,7 +99,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm" v-hasPermi="['land:landBlock:add']">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
diff --git a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
index c9bb0f4..28839b3 100644
--- a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
+++ b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
@@ -208,7 +208,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button v-hasPermi="['land:landTransferLedger:add']" :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
diff --git a/src/views/project/landTransfer/BusinessLedger/landTransferLedgerFangzhen/index.vue b/src/views/project/landTransfer/BusinessLedger/landTransferLedgerFangzhen/index.vue
index 4de4cb7..ff53174 100644
--- a/src/views/project/landTransfer/BusinessLedger/landTransferLedgerFangzhen/index.vue
+++ b/src/views/project/landTransfer/BusinessLedger/landTransferLedgerFangzhen/index.vue
@@ -142,7 +142,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button v-hasPermi="['land:landTransferLedger:add']" :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
diff --git a/src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index.vue b/src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index.vue
index 2daab93..cae05e3 100644
--- a/src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index.vue
+++ b/src/views/project/landTransfer/BusinessLedger/nonTransferLedger/index.vue
@@ -145,7 +145,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button :loading="buttonLoading" type="primary" v-hasPermi="['land:landTransferLedger:add']" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
diff --git a/src/views/project/subcontract/index.vue b/src/views/project/subcontract/index.vue
index e9d49a2..f3d658a 100644
--- a/src/views/project/subcontract/index.vue
+++ b/src/views/project/subcontract/index.vue
@@ -119,7 +119,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button v-hasPermi="['design:subcontract:add']" :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>

From 80e22c8f920b1aa0ead772438ea85a5878a2dae2 Mon Sep 17 00:00:00 2001
From: dhr <2216804034@qq.com>
Date: Sat, 30 Aug 2025 00:31:16 +0800
Subject: [PATCH 2/2] youhua

---
 .env.development                            |  2 +-
 src/views/design/designChange/indexEdit.vue | 26 ++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

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 90718bc..cea41b2 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);