style(CCAP/CQC关键零部件管理)：修改页面样式

src/locales/controlPlan/relationshipManagement/CCAPCriticalParts/cn.json

@@ -15,5 +15,6 @@
   "MaintainContent": "内容维护",
   "CopyandAdd": "复制新增",
   "AddBusinessUnit": "添加事业部",
-  "Delete": "删除"
+  "Delete": "删除",
+  "confirmDelete": "是否确认删除该数据项？"
 }

src/locales/controlPlan/relationshipManagement/CCAPCriticalParts/en.json

@@ -15,5 +15,6 @@
   "MaintainContent": "Maintain Content",
   "CopyandAdd": "Copy and Add",
   "AddBusinessUnit": "Add Business Unit",
-  "Delete": "Delete"
+  "Delete": "Delete",
+  "confirmDelete": "Are you sure you want to delete this data item?"
 }

src/locales/controlPlan/relationshipManagement/maintainContent/cn.json

@@ -32,5 +32,6 @@
   "businessDivision": "事业部",
   "BusinessUnit": "事业部",
   "Operations": "操作",
-  "Delete": "删除"
+  "Delete": "删除",
+  "confirmDelete": "是否确认删除该数据项？"
 }

src/locales/controlPlan/relationshipManagement/maintainContent/en.json

@@ -6,7 +6,7 @@
   "cccCertificationMark": "3C Certification Mark",
   "totalTableProjectModel": "Master Table Project Model",
   "totalTableProjectManufacturerName": "Master Table Project Manufacturer",
-  "totalTableProjectCertificateNumber": "Master Table Project Certificate No.",
+  "totalTableProjectCertificateNumber": "Master Table Project Certificate Number",
   "p8PostMassProductionUnit": "P8 Post-Mass Production Unit",
   "source": "Source",
   "sort": "Sort",
@@ -27,5 +27,6 @@
   "businessDivision": "Business division",
   "BusinessUnit": "Business Unit",
   "Operations": "Operations",
-  "Delete": "Delete"
+  "Delete": "Delete",
+  "confirmDelete": "Are you sure you want to delete this data item?"
 }

src/views/controlPlan/relationshipManagement/CCAPCriticalParts/CCAPMaintainContent.vue

@@ -140,14 +140,16 @@
         <el-button class="btn-B" icon="Refresh" @click="resetQuery">{{cn.reset}}/{{en.reset}}</el-button>
       </el-form-item>
       <el-button
-          style="border: 1px solid #0154fb;color: #0154fb;float: right;margin-bottom: 24px;"
+          style="float: right;"
+          class="btn-C"
           plain
           v-show="isDefault === '1'"
           @click="handleAdd"
           v-hasPermi="['control:config:add']"
       >{{cn.addPart}}/{{en.addPart}}</el-button>
       <el-button
-          style="border: 1px solid #0154fb;color: #0154fb;float: right;margin-bottom: 24px;"
+          style="float: right;"
+          class="btn-C"
           plain
           v-show="isDefault === '0'"
           @click="bulkEdit"
@@ -278,9 +280,7 @@
         </template>
         <template #default="scope">
           <el-button link style="color: rgb(0,0,255)" type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['control:config:edit']">编辑</el-button>
-          <el-button link type="danger" @click="handleDelete(scope.row)" v-show="scope.row.source === '1'">
-            删除
-          </el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row)" v-show="scope.row.source === '1'">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -319,9 +319,6 @@
       </template>
     </el-drawer>
 
-
-
-
     <!-- 通用添加或修改抽屉-->
     <el-drawer v-model="open"  direction="rtl" :title="title">
       <template #default>
@@ -404,6 +401,15 @@
         </div>
       </template>
     </el-drawer>
+
+    <!-- 删除弹出框 -->
+    <DeleteDialog
+        :visible="undoDialogVisible"
+        :content="`${cn.confirmDelete}`"
+        :english-content="`${en.confirmDelete}`"
+        @confirm="confirmDelete"
+        @cancel="cancel"
+    />
   </div>
 </template>
 
@@ -418,6 +424,7 @@ import en from "@/locales/controlPlan/relationshipManagement/maintainContent/en.
 import {ArrowLeft} from "@element-plus/icons-vue";
 import {ref} from "vue";
 import useUserStore from "@/store/modules/user.js";
+import DeleteDialog from "@/components/DeleteDialog/index.vue";
 const route = useRoute();
 const router = useRouter();
 const { proxy } = getCurrentInstance();
@@ -445,7 +452,9 @@ const divisionName = ref(null);
 const updateName = ref(route.query.updateName || '--');
 //是否通用（0-否，1-是）
 const isDefault = ref(route.query.isDefault);
-console.log("cn"+cn.cancel)
+const undoDialogVisible = ref(false)
+const deleteParams = ref({});
+
 
 const userStore = useUserStore(); // 获取 Store 实例
 
@@ -561,6 +570,7 @@ function objectSpanMethod({ row, rowIndex, columnIndex }) {
 
 // 取消按钮
 function cancel() {
+  undoDialogVisible.value = false;
   open.value = false;
   reset();
 }
@@ -593,15 +603,7 @@ function back() {
   })
 }
 
-// 最近更新人
-const latestUpdateByName = computed(() => latestRecord.value?.updateByName || "");
-// 最新更新时间的记录
-const latestRecord = computed(() => {
-  if (!partsList.value || partsList.value.length === 0) return null;
-  return partsList.value.reduce((latest, current) => {
-    return new Date(current.updateTime) > new Date(latest.updateTime) ? current : latest;
-  }, partsList.value[0]);
-});
+
 
 
 // 获取零部件一级名称的方法
@@ -771,25 +773,35 @@ function submitBulkForm(){
 /** 删除按钮操作 */
 function handleDelete(row) {
   const { partNameId, partsRelationId, specialConfigId } = row;
-
-  proxy.$modal.confirm('确定要删除该记录吗？').then(() => {
-    return deleteCriticalPart(partNameId, partsRelationId, specialConfigId);
-  }).then(() => {
-    // 成功回调
-    getList();
-    proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
+  // 保存参数
+  deleteParams.value = { partNameId, partsRelationId, specialConfigId };
+  undoDialogVisible.value = true;
 }
+// 确认删除
+function confirmDelete() {
+  const { partNameId, partsRelationId, specialConfigId } = deleteParams.value;
 
+  if (!partNameId) {
+    proxy.$modal.msgError("无效的删除参数");
+    return;
+  }
 
-/** 导出按钮操作 */
-function handleExport() {
-  proxy.download('control/config/export', {
-    ...queryParams.value
-  }, `config_${new Date().getTime()}.xlsx`)
+  deleteCriticalPart(partNameId, partsRelationId, specialConfigId)
+      .then(() => {
+        getList()
+        proxy.$modal.msgSuccess('删除成功')
+      })
+      .catch((error) => {
+        proxy.$modal.msgError('删除失败: ' + (error.message || '未知错误'))
+      })
+      .finally(() => {
+        undoDialogVisible.value = false
+      })
 }
 
 
+
+
 onMounted(() => {
   // 加载用户信息
   userStore.getInfo();
@@ -802,8 +814,4 @@ getList();
 
 </script>
 
-<style scoped>
-.custom-left .el-form-item__content {
-  text-align: left;
-}
-</style>
+

src/views/controlPlan/relationshipManagement/CCAPCriticalParts/index.vue

@@ -150,37 +150,19 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button class="btn-B"  @click="dialogCancel">取消</el-button>
-          <el-button class="btn-A" type="primary" @click="dialogSure">
-            确定
-          </el-button>
+          <el-button class="btn-A" type="primary" @click="dialogSure">确定</el-button>
         </div>
       </template>
     </el-dialog>
 
-
-    <!-- 添加或修改关键零部件和事业部关系对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="relationRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="认证机构" prop="certificationBody">
-          <el-input v-model="form.certificationBody" placeholder="请输入认证机构" />
-        </el-form-item>
-        <el-form-item label="是否通用" prop="isDefault">
-          <el-input v-model="form.isDefault" placeholder="请输入是否通用" />
-        </el-form-item>
-        <el-form-item label="逻辑删除" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入逻辑删除" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
+    <!-- 删除弹出框 -->
+    <DeleteDialog
+        :visible="undoDialogVisible"
+        :content="`${cn.confirmDelete}`"
+        :english-content="`${en.confirmDelete}`"
+        @confirm="confirmDelete"
+        @cancel="cancel"
+    />
   </div>
 </template>
 
@@ -198,6 +180,7 @@ import en from "@/locales/controlPlan/relationshipManagement/CCAPCriticalParts/e
 import {ref} from "vue";
 import { useRouter } from 'vue-router';
 import {ElMessage} from "element-plus";
+import DeleteDialog from "@/components/DeleteDialog/index.vue";
 
 
 
@@ -233,6 +216,8 @@ const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
 const businessUnitOptions = ref([])
+const undoDialogVisible = ref(false)
+const currentDeleteId = ref(null)
 
 const data = reactive({
   form: {
@@ -281,6 +266,7 @@ function getList() {
 
 // 取消按钮
 function cancel() {
+  undoDialogVisible.value = false;
   open.value = false;
   reset();
 }
@@ -289,6 +275,7 @@ function cancel() {
 function reset() {
   form.value = {
     id: null,
+    currentDeleteId: null,
     divisionId: null,
     divisionName: null,
     certificationBody: "CCAP",
@@ -353,11 +340,11 @@ function handleMaintainContentView(row) {
   proxy.$router.push({
     path: '/control/relationshipManagement/CCAPMaintainContent',
     query: {
+      isDefault: row.isDefault,
       businessRelationId: row.id,
       certificationBody: row.certificationBody,
       divisionName: row.divisionName,
-      updateName: row.updateName,
-      isDefault: row.isDefault
+      updateName: row.updateName
     }
   })}
 
@@ -476,20 +463,35 @@ function dialogSure(){
   })
 }
 /** 删除按钮操作 */
-const handleDelete = (row) => {
-  proxy.$modal.confirm('是否确认删除事业部为"' + Object.values(row.divisionName).join('、') + '"的数据项？').then(function() {
-    console.log("删除的行数据:", row.id)
-    return deleteById(row.id);
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  currentDeleteId.value = _ids // 存储要删除的ID
+  undoDialogVisible.value = true // 显示确认对话框
+}
+// 确认删除
+function confirmDelete() {
+  if (!currentDeleteId.value) return
+
+  deleteById(currentDeleteId.value)
+      .then(() => {
+        getList()
+        proxy.$modal.msgSuccess('删除成功')
+      })
+      .catch((error) => {
+        proxy.$modal.msgError('删除失败: ' + (error.message || '未知错误'))
+      })
+      .finally(() => {
+        undoDialogVisible.value = false // 关闭对话框
+        currentDeleteId.value = null // 清空存储的ID
+      })
 }
 
 
+
+
 onMounted(() => {
-  getBusinessUnitList()
+  getBusinessUnitList();
+  getList();
 })
 
-getList();
 </script>

src/views/controlPlan/relationshipManagement/CQCCriticalParts/CQCMaintainContent.vue

@@ -116,7 +116,8 @@
         <el-button class="btn-B" icon="Refresh" @click="resetQuery">{{cn.reset}}/{{en.reset}}</el-button>
       </el-form-item>
       <el-button
-          style="border: 1px solid #0154fb;color: #0154fb;float: right;margin-bottom: 24px;"
+          style="float: right;"
+          class="btn-C"
           plain
           v-if="isDefault === '1'"
           @click="handleAdd"
@@ -611,15 +612,6 @@ function submitForm() {
 
 
 
-
-/** 导出按钮操作 */
-function handleExport() {
-  proxy.download('control/config/export', {
-    ...queryParams.value
-  }, `config_${new Date().getTime()}.xlsx`)
-}
-
-
 onMounted(() => {
   // 加载用户信息
   userStore.getInfo();

src/views/controlPlan/relationshipManagement/CQCCriticalParts/index.vue

@@ -157,30 +157,14 @@
       </template>
     </el-dialog>
 
-
-    <!-- 添加或修改关键零部件和事业部关系对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="relationRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="认证机构" prop="certificationBody">
-          <el-input v-model="form.certificationBody" placeholder="请输入认证机构" />
-        </el-form-item>
-        <el-form-item label="是否通用" prop="isDefault">
-          <el-input v-model="form.isDefault" placeholder="请输入是否通用" />
-        </el-form-item>
-        <el-form-item label="逻辑删除" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入逻辑删除" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
+    <!-- 删除弹出框 -->
+    <DeleteDialog
+        :visible="undoDialogVisible"
+        :content="`${cn.confirmDelete}`"
+        :english-content="`${en.confirmDelete}`"
+        @confirm="confirmDelete"
+        @cancel="cancel"
+    />
   </div>
 </template>
 
@@ -198,7 +182,9 @@ import en from "@/locales/controlPlan/relationshipManagement/CCAPCriticalParts/e
 import {ref} from "vue";
 import { useRouter } from 'vue-router';
 import {ElMessage} from "element-plus";
-
+import DeleteDialog from "@/components/DeleteDialog/index.vue";
+const undoDialogVisible = ref(false)
+const currentDeleteId = ref(null)
 
 
 const { proxy } = getCurrentInstance();
@@ -281,6 +267,7 @@ function getList() {
 
 // 取消按钮
 function cancel() {
+  undoDialogVisible.value = false;
   open.value = false;
   reset();
 }
@@ -289,6 +276,7 @@ function cancel() {
 function reset() {
   form.value = {
     id: null,
+    currentDeleteId: null,
     divisionId: null,
     divisionName: null,
     certificationBody: "CQC",
@@ -384,6 +372,7 @@ function handleCopyAdd(row){
   });
 
 }
+
 //添加事业部按钮
 function handleAddDivision(row){
   tableDialogTitle.value = '添加事业部'
@@ -415,6 +404,7 @@ function dialogCancel(){
   tableDialogForm.value.id = null
   getList()
 }
+
 //添加事业部和复制新增对话框确定按钮
 function dialogSure(){
   dialogRef2.value.validate((v)=>{
@@ -475,15 +465,29 @@ function dialogSure(){
     }
   })
 }
+
 /** 删除按钮操作 */
-const handleDelete = (row) => {
-  proxy.$modal.confirm('是否确认删除事业部为"' + Object.values(row.divisionName).join('、') + '"的数据项？').then(function() {
-    console.log("删除的行数据:", row.id)
-    return deleteById(row.id);
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  currentDeleteId.value = _ids // 存储要删除的ID
+  undoDialogVisible.value = true // 显示确认对话框
+}
+// 确认删除
+function confirmDelete() {
+  if (!currentDeleteId.value) return
+
+  deleteById(currentDeleteId.value)
+      .then(() => {
+        getList()
+        proxy.$modal.msgSuccess('删除成功')
+      })
+      .catch((error) => {
+        proxy.$modal.msgError('删除失败: ' + (error.message || '未知错误'))
+      })
+      .finally(() => {
+        undoDialogVisible.value = false // 关闭对话框
+        currentDeleteId.value = null // 清空存储的ID
+      })
 }