diff --git a/.env.development b/.env.development
index 3a717ae..e743953 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://111.198.10.15:21609
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空

diff --git a/.env.development b/.env.development
index 3a717ae..e743953 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://111.198.10.15:21609
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index 0127d2f..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.107:5909"
+  "baseUrl": "http://111.198.10.15:21611"
 }

diff --git a/.env.development b/.env.development
index 3a717ae..e743953 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://111.198.10.15:21609
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index 0127d2f..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.107:5909"
+  "baseUrl": "http://111.198.10.15:21611"
 }
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index d4e7c8e..e39a72d 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -22,7 +22,7 @@
   },
   {
     text: '使用部门',
-    value: 'succeed',
+    value: 'deptName',
     align: 'center',
   },
   {
@@ -32,12 +32,12 @@
   },
   {
     text: '负责人',
-    value: 'meterIdentify',
+    value: 'directorName',
     align: 'center',
   },
   {
     text: '检定(校准)单位',
-    value: 'checkCycle',
+    value: 'checkOrganization',
     align: 'center',
   },
   {
@@ -47,22 +47,22 @@
   },
   {
     text: '执行状态',
-    value: 'certificateValid',
+    value: 'executeStatusName',
     align: 'center',
   },
   {
     text: '执行时间',
-    value: 'certificateValid',
+    value: '',
     align: 'center',
   },
   {
     text: '检定完成度',
-    value: 'certificateValid',
+    value: '',
     align: 'center',
   },
   {
     text: '检定完成时间',
-    value: 'certificateValid',
+    value: '',
     align: 'center',
   },
 ])

diff --git a/.env.development b/.env.development
index 3a717ae..e743953 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://111.198.10.15:21609
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index 0127d2f..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.107:5909"
+  "baseUrl": "http://111.198.10.15:21611"
 }
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index d4e7c8e..e39a72d 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -22,7 +22,7 @@
   },
   {
     text: '使用部门',
-    value: 'succeed',
+    value: 'deptName',
     align: 'center',
   },
   {
@@ -32,12 +32,12 @@
   },
   {
     text: '负责人',
-    value: 'meterIdentify',
+    value: 'directorName',
     align: 'center',
   },
   {
     text: '检定(校准)单位',
-    value: 'checkCycle',
+    value: 'checkOrganization',
     align: 'center',
   },
   {
@@ -47,22 +47,22 @@
   },
   {
     text: '执行状态',
-    value: 'certificateValid',
+    value: 'executeStatusName',
     align: 'center',
   },
   {
     text: '执行时间',
-    value: 'certificateValid',
+    value: '',
     align: 'center',
   },
   {
     text: '检定完成度',
-    value: 'certificateValid',
+    value: '',
     align: 'center',
   },
   {
     text: '检定完成时间',
-    value: 'certificateValid',
+    value: '',
     align: 'center',
   },
 ])
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 76b6194..5de5517 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -4,7 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import planList from './table.vue'
-import { detailPlan, editPlan, getInfoList, submitPlan } from '@/api/eqpt/measurementPlan/paln'
+import { cancelPlan, delPlan, detailPlan, editPlan, getInfoList, submitPlan } from '@/api/eqpt/measurementPlan/paln'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -92,6 +92,11 @@
     if ($route.query.append) {
       // 修改计量计划为追加
       ruleForm.value.planCategory = '1'
+      ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+      ruleForm.value.createUserId = userStore.id
+      ruleForm.value.createUserName = userStore.name
+      ruleForm.value.createDeptId = userStore.deptId
+      ruleForm.value.createDeptName = userStore.deptName
     }
     // detailPlan(data.id).then((res) => {
     //   // ruleForm.value = res.data
@@ -141,13 +146,21 @@
             ruleForm.value.planType = '2'
           }
           ruleForm.value.equipmentIds = tableRef.value.list.map((item: any) => item.equipmentId)
+          // console.log(tableRef.value.list, 'tableRef.value.list')
           editPlan(ruleForm.value).then((res) => {
             submitId.value = res.data
-            ElMessage.success('保存成功')
-          // close()
-          }).catch((_err) => {
-            ruleForm.value.equipmentIds = tableRef.value.list
+            // close()
+            if (statusName === '已取消' || statusName === '未通过') {
+              submitPlan({ id: submitId.value, formId: SCHEDULE.METERING_PLAN_APPROVAL }).then((res) => {
+                ElMessage.success('已提交')
+                close()
+              })
+            }
+            else {
+              ElMessage.success('保存成功')
+            }
           })
+          ruleForm.value.equipmentIds = tableRef.value.list
         })
       }
       else {
@@ -184,6 +197,59 @@
   formEl?.resetFields()
   close()
 }
+// 打印
+const print = () => {
+
+}
+// 审批
+const approvalDialogRef = ref()
+const apply = (type: string) => {
+  const data = JSON.parse($route.query.row as string)
+  approvalDialogRef.value.initDialog(type, data.taskId, data.processId, ruleForm.value.id)
+}
+// 编辑
+const editForm = () => {
+  $router.push({
+    params: { ...$route.params, type: 'update' },
+    query: { ...$route.query },
+  })
+}
+const delForm = () => {
+  ElMessageBox.confirm(
+    '确认删除此记录吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    delPlan(row.id).then((res) => {
+      ElMessage.success('操作成功')
+      close()
+      // search()
+    })
+  })
+}
+const cancelForm = () => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    cancelPlan({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      close()
+      // search()
+    })
+  })
+}
 </script>
 
 <template>
@@ -191,12 +257,30 @@
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page class="base-info-device" :title="`计量计划-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" @click="submitForm()">
+        <el-button v-if="statusName === '待审批'" type="primary" @click="apply('agree')">
+          同意
+        </el-button>
+        <el-button v-if="statusName === '待审批'" type="primary" @click="apply('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="editBtn(statusName, dialogStatus)" type="primary" @click="editForm()">
+          编辑
+        </el-button>
+        <el-button v-if="statusName === '已通过'" type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过'" type="primary" @click="submitForm()">
           提交
         </el-button>
         <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
+        <el-button v-if="statusName === '审批中'" type="info" @click="cancelForm()">
+          取消
+        </el-button>
+        <el-button v-if="statusName === '已取消' || statusName === '审批'" type="info" @click="delForm()">
+          删除
+        </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
@@ -218,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 30px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 50px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 30px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 50px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">

diff --git a/.env.development b/.env.development
index 3a717ae..e743953 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://111.198.10.15:21609
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index 0127d2f..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.107:5909"
+  "baseUrl": "http://111.198.10.15:21611"
 }
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index d4e7c8e..e39a72d 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -22,7 +22,7 @@
   },
   {
     text: '使用部门',
-    value: 'succeed',
+    value: 'deptName',
     align: 'center',
   },
   {
@@ -32,12 +32,12 @@
   },
   {
     text: '负责人',
-    value: 'meterIdentify',
+    value: 'directorName',
     align: 'center',
   },
   {
     text: '检定(校准)单位',
-    value: 'checkCycle',
+    value: 'checkOrganization',
     align: 'center',
   },
   {
@@ -47,22 +47,22 @@
   },
   {
     text: '执行状态',
-    value: 'certificateValid',
+    value: 'executeStatusName',
     align: 'center',
   },
   {
     text: '执行时间',
-    value: 'certificateValid',
+    value: '',
     align: 'center',
   },
   {
     text: '检定完成度',
-    value: 'certificateValid',
+    value: '',
     align: 'center',
   },
   {
     text: '检定完成时间',
-    value: 'certificateValid',
+    value: '',
     align: 'center',
   },
 ])
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 76b6194..5de5517 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -4,7 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import planList from './table.vue'
-import { detailPlan, editPlan, getInfoList, submitPlan } from '@/api/eqpt/measurementPlan/paln'
+import { cancelPlan, delPlan, detailPlan, editPlan, getInfoList, submitPlan } from '@/api/eqpt/measurementPlan/paln'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -92,6 +92,11 @@
     if ($route.query.append) {
       // 修改计量计划为追加
       ruleForm.value.planCategory = '1'
+      ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+      ruleForm.value.createUserId = userStore.id
+      ruleForm.value.createUserName = userStore.name
+      ruleForm.value.createDeptId = userStore.deptId
+      ruleForm.value.createDeptName = userStore.deptName
     }
     // detailPlan(data.id).then((res) => {
     //   // ruleForm.value = res.data
@@ -141,13 +146,21 @@
             ruleForm.value.planType = '2'
           }
           ruleForm.value.equipmentIds = tableRef.value.list.map((item: any) => item.equipmentId)
+          // console.log(tableRef.value.list, 'tableRef.value.list')
           editPlan(ruleForm.value).then((res) => {
             submitId.value = res.data
-            ElMessage.success('保存成功')
-          // close()
-          }).catch((_err) => {
-            ruleForm.value.equipmentIds = tableRef.value.list
+            // close()
+            if (statusName === '已取消' || statusName === '未通过') {
+              submitPlan({ id: submitId.value, formId: SCHEDULE.METERING_PLAN_APPROVAL }).then((res) => {
+                ElMessage.success('已提交')
+                close()
+              })
+            }
+            else {
+              ElMessage.success('保存成功')
+            }
           })
+          ruleForm.value.equipmentIds = tableRef.value.list
         })
       }
       else {
@@ -184,6 +197,59 @@
   formEl?.resetFields()
   close()
 }
+// 打印
+const print = () => {
+
+}
+// 审批
+const approvalDialogRef = ref()
+const apply = (type: string) => {
+  const data = JSON.parse($route.query.row as string)
+  approvalDialogRef.value.initDialog(type, data.taskId, data.processId, ruleForm.value.id)
+}
+// 编辑
+const editForm = () => {
+  $router.push({
+    params: { ...$route.params, type: 'update' },
+    query: { ...$route.query },
+  })
+}
+const delForm = () => {
+  ElMessageBox.confirm(
+    '确认删除此记录吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    delPlan(row.id).then((res) => {
+      ElMessage.success('操作成功')
+      close()
+      // search()
+    })
+  })
+}
+const cancelForm = () => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    cancelPlan({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      close()
+      // search()
+    })
+  })
+}
 </script>
 
 <template>
@@ -191,12 +257,30 @@
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page class="base-info-device" :title="`计量计划-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" @click="submitForm()">
+        <el-button v-if="statusName === '待审批'" type="primary" @click="apply('agree')">
+          同意
+        </el-button>
+        <el-button v-if="statusName === '待审批'" type="primary" @click="apply('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="editBtn(statusName, dialogStatus)" type="primary" @click="editForm()">
+          编辑
+        </el-button>
+        <el-button v-if="statusName === '已通过'" type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过'" type="primary" @click="submitForm()">
           提交
         </el-button>
         <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
+        <el-button v-if="statusName === '审批中'" type="info" @click="cancelForm()">
+          取消
+        </el-button>
+        <el-button v-if="statusName === '已取消' || statusName === '审批'" type="info" @click="delForm()">
+          删除
+        </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
@@ -218,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 30px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 50px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 30px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 50px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index b6acfd9..1aea9b9 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -55,7 +55,7 @@
   },
   {
     text: '计划分类',
-    value: 'planCategory',
+    value: 'planCategoryName',
     align: 'center',
   },
   {
@@ -75,7 +75,7 @@
   },
   {
     text: '审批状态',
-    value: 'approvalStatus',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ])
@@ -154,14 +154,19 @@
 }
 // 详情
 const detail = (row: any) => {
-  $router.push({
-    path: 'plan/detail',
-    query: {
-      row: JSON.stringify(row),
-      id: row.id,
-      statusName: $props.statusName,
-    },
-  })
+  if ($props.statusName === '草稿箱' || $props.statusName === '未通过' || $props.statusName === '已取消') {
+    handler(row, 'update')
+  }
+  else {
+    $router.push({
+      path: 'plan/detail',
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+        statusName: $props.statusName,
+      },
+    })
+  }
 }
 // 删除
 const delHandler = (row: any) => {
@@ -286,7 +291,7 @@
               </el-button>
               <el-button
                 v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
-                @click="handler(scope.row, 'update')"
+                @click="handler(scope.row, 'update', '')"
               >
                 编辑
               </el-button>
@@ -315,7 +320,7 @@
                 取消
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除

diff --git a/.env.development b/.env.development
index 3a717ae..e743953 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://111.198.10.15:21609
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index 0127d2f..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.107:5909"
+  "baseUrl": "http://111.198.10.15:21611"
 }
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index d4e7c8e..e39a72d 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -22,7 +22,7 @@
   },
   {
     text: '使用部门',
-    value: 'succeed',
+    value: 'deptName',
     align: 'center',
   },
   {
@@ -32,12 +32,12 @@
   },
   {
     text: '负责人',
-    value: 'meterIdentify',
+    value: 'directorName',
     align: 'center',
   },
   {
     text: '检定(校准)单位',
-    value: 'checkCycle',
+    value: 'checkOrganization',
     align: 'center',
   },
   {
@@ -47,22 +47,22 @@
   },
   {
     text: '执行状态',
-    value: 'certificateValid',
+    value: 'executeStatusName',
     align: 'center',
   },
   {
     text: '执行时间',
-    value: 'certificateValid',
+    value: '',
     align: 'center',
   },
   {
     text: '检定完成度',
-    value: 'certificateValid',
+    value: '',
     align: 'center',
   },
   {
     text: '检定完成时间',
-    value: 'certificateValid',
+    value: '',
     align: 'center',
   },
 ])
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 76b6194..5de5517 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -4,7 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import planList from './table.vue'
-import { detailPlan, editPlan, getInfoList, submitPlan } from '@/api/eqpt/measurementPlan/paln'
+import { cancelPlan, delPlan, detailPlan, editPlan, getInfoList, submitPlan } from '@/api/eqpt/measurementPlan/paln'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -92,6 +92,11 @@
     if ($route.query.append) {
       // 修改计量计划为追加
       ruleForm.value.planCategory = '1'
+      ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+      ruleForm.value.createUserId = userStore.id
+      ruleForm.value.createUserName = userStore.name
+      ruleForm.value.createDeptId = userStore.deptId
+      ruleForm.value.createDeptName = userStore.deptName
     }
     // detailPlan(data.id).then((res) => {
     //   // ruleForm.value = res.data
@@ -141,13 +146,21 @@
             ruleForm.value.planType = '2'
           }
           ruleForm.value.equipmentIds = tableRef.value.list.map((item: any) => item.equipmentId)
+          // console.log(tableRef.value.list, 'tableRef.value.list')
           editPlan(ruleForm.value).then((res) => {
             submitId.value = res.data
-            ElMessage.success('保存成功')
-          // close()
-          }).catch((_err) => {
-            ruleForm.value.equipmentIds = tableRef.value.list
+            // close()
+            if (statusName === '已取消' || statusName === '未通过') {
+              submitPlan({ id: submitId.value, formId: SCHEDULE.METERING_PLAN_APPROVAL }).then((res) => {
+                ElMessage.success('已提交')
+                close()
+              })
+            }
+            else {
+              ElMessage.success('保存成功')
+            }
           })
+          ruleForm.value.equipmentIds = tableRef.value.list
         })
       }
       else {
@@ -184,6 +197,59 @@
   formEl?.resetFields()
   close()
 }
+// 打印
+const print = () => {
+
+}
+// 审批
+const approvalDialogRef = ref()
+const apply = (type: string) => {
+  const data = JSON.parse($route.query.row as string)
+  approvalDialogRef.value.initDialog(type, data.taskId, data.processId, ruleForm.value.id)
+}
+// 编辑
+const editForm = () => {
+  $router.push({
+    params: { ...$route.params, type: 'update' },
+    query: { ...$route.query },
+  })
+}
+const delForm = () => {
+  ElMessageBox.confirm(
+    '确认删除此记录吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    delPlan(row.id).then((res) => {
+      ElMessage.success('操作成功')
+      close()
+      // search()
+    })
+  })
+}
+const cancelForm = () => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    cancelPlan({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      close()
+      // search()
+    })
+  })
+}
 </script>
 
 <template>
@@ -191,12 +257,30 @@
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page class="base-info-device" :title="`计量计划-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" @click="submitForm()">
+        <el-button v-if="statusName === '待审批'" type="primary" @click="apply('agree')">
+          同意
+        </el-button>
+        <el-button v-if="statusName === '待审批'" type="primary" @click="apply('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="editBtn(statusName, dialogStatus)" type="primary" @click="editForm()">
+          编辑
+        </el-button>
+        <el-button v-if="statusName === '已通过'" type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过'" type="primary" @click="submitForm()">
           提交
         </el-button>
         <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
+        <el-button v-if="statusName === '审批中'" type="info" @click="cancelForm()">
+          取消
+        </el-button>
+        <el-button v-if="statusName === '已取消' || statusName === '审批'" type="info" @click="delForm()">
+          删除
+        </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
@@ -218,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 30px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 50px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 30px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 50px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index b6acfd9..1aea9b9 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -55,7 +55,7 @@
   },
   {
     text: '计划分类',
-    value: 'planCategory',
+    value: 'planCategoryName',
     align: 'center',
   },
   {
@@ -75,7 +75,7 @@
   },
   {
     text: '审批状态',
-    value: 'approvalStatus',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ])
@@ -154,14 +154,19 @@
 }
 // 详情
 const detail = (row: any) => {
-  $router.push({
-    path: 'plan/detail',
-    query: {
-      row: JSON.stringify(row),
-      id: row.id,
-      statusName: $props.statusName,
-    },
-  })
+  if ($props.statusName === '草稿箱' || $props.statusName === '未通过' || $props.statusName === '已取消') {
+    handler(row, 'update')
+  }
+  else {
+    $router.push({
+      path: 'plan/detail',
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+        statusName: $props.statusName,
+      },
+    })
+  }
 }
 // 删除
 const delHandler = (row: any) => {
@@ -286,7 +291,7 @@
               </el-button>
               <el-button
                 v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
-                @click="handler(scope.row, 'update')"
+                @click="handler(scope.row, 'update', '')"
               >
                 编辑
               </el-button>
@@ -315,7 +320,7 @@
                 取消
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index c8a20d1..9448127 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -130,7 +130,6 @@
   if (!multi.value) {
     // 单选
     if (selectList.value.length) {
-      console.log('dandandandan')
       emits('add', selectList.value[0])
       // emits('add', device)
       dialogFormVisible.value = false
@@ -141,7 +140,6 @@
     }
   }
   else {
-    console.log('duoduoduo')
     // 多选
     if (selectList.value.length) {
       emits('add', selectList.value)
@@ -202,7 +200,7 @@
       <normal-table
         v-if="dialogFormVisible"
         :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="multi" @change="changePage" @multiSelect="multiSelect"
+        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <!-- <el-table-column v-if="!multi" label="" width="55" align="center">

diff --git a/.env.development b/.env.development
index 3a717ae..e743953 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://111.198.10.15:21609
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index 0127d2f..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.107:5909"
+  "baseUrl": "http://111.198.10.15:21611"
 }
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index d4e7c8e..e39a72d 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -22,7 +22,7 @@
   },
   {
     text: '使用部门',
-    value: 'succeed',
+    value: 'deptName',
     align: 'center',
   },
   {
@@ -32,12 +32,12 @@
   },
   {
     text: '负责人',
-    value: 'meterIdentify',
+    value: 'directorName',
     align: 'center',
   },
   {
     text: '检定(校准)单位',
-    value: 'checkCycle',
+    value: 'checkOrganization',
     align: 'center',
   },
   {
@@ -47,22 +47,22 @@
   },
   {
     text: '执行状态',
-    value: 'certificateValid',
+    value: 'executeStatusName',
     align: 'center',
   },
   {
     text: '执行时间',
-    value: 'certificateValid',
+    value: '',
     align: 'center',
   },
   {
     text: '检定完成度',
-    value: 'certificateValid',
+    value: '',
     align: 'center',
   },
   {
     text: '检定完成时间',
-    value: 'certificateValid',
+    value: '',
     align: 'center',
   },
 ])
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 76b6194..5de5517 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -4,7 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import planList from './table.vue'
-import { detailPlan, editPlan, getInfoList, submitPlan } from '@/api/eqpt/measurementPlan/paln'
+import { cancelPlan, delPlan, detailPlan, editPlan, getInfoList, submitPlan } from '@/api/eqpt/measurementPlan/paln'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -92,6 +92,11 @@
     if ($route.query.append) {
       // 修改计量计划为追加
       ruleForm.value.planCategory = '1'
+      ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+      ruleForm.value.createUserId = userStore.id
+      ruleForm.value.createUserName = userStore.name
+      ruleForm.value.createDeptId = userStore.deptId
+      ruleForm.value.createDeptName = userStore.deptName
     }
     // detailPlan(data.id).then((res) => {
     //   // ruleForm.value = res.data
@@ -141,13 +146,21 @@
             ruleForm.value.planType = '2'
           }
           ruleForm.value.equipmentIds = tableRef.value.list.map((item: any) => item.equipmentId)
+          // console.log(tableRef.value.list, 'tableRef.value.list')
           editPlan(ruleForm.value).then((res) => {
             submitId.value = res.data
-            ElMessage.success('保存成功')
-          // close()
-          }).catch((_err) => {
-            ruleForm.value.equipmentIds = tableRef.value.list
+            // close()
+            if (statusName === '已取消' || statusName === '未通过') {
+              submitPlan({ id: submitId.value, formId: SCHEDULE.METERING_PLAN_APPROVAL }).then((res) => {
+                ElMessage.success('已提交')
+                close()
+              })
+            }
+            else {
+              ElMessage.success('保存成功')
+            }
           })
+          ruleForm.value.equipmentIds = tableRef.value.list
         })
       }
       else {
@@ -184,6 +197,59 @@
   formEl?.resetFields()
   close()
 }
+// 打印
+const print = () => {
+
+}
+// 审批
+const approvalDialogRef = ref()
+const apply = (type: string) => {
+  const data = JSON.parse($route.query.row as string)
+  approvalDialogRef.value.initDialog(type, data.taskId, data.processId, ruleForm.value.id)
+}
+// 编辑
+const editForm = () => {
+  $router.push({
+    params: { ...$route.params, type: 'update' },
+    query: { ...$route.query },
+  })
+}
+const delForm = () => {
+  ElMessageBox.confirm(
+    '确认删除此记录吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    delPlan(row.id).then((res) => {
+      ElMessage.success('操作成功')
+      close()
+      // search()
+    })
+  })
+}
+const cancelForm = () => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    cancelPlan({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      close()
+      // search()
+    })
+  })
+}
 </script>
 
 <template>
@@ -191,12 +257,30 @@
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page class="base-info-device" :title="`计量计划-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" @click="submitForm()">
+        <el-button v-if="statusName === '待审批'" type="primary" @click="apply('agree')">
+          同意
+        </el-button>
+        <el-button v-if="statusName === '待审批'" type="primary" @click="apply('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="editBtn(statusName, dialogStatus)" type="primary" @click="editForm()">
+          编辑
+        </el-button>
+        <el-button v-if="statusName === '已通过'" type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过'" type="primary" @click="submitForm()">
           提交
         </el-button>
         <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
+        <el-button v-if="statusName === '审批中'" type="info" @click="cancelForm()">
+          取消
+        </el-button>
+        <el-button v-if="statusName === '已取消' || statusName === '审批'" type="info" @click="delForm()">
+          删除
+        </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
@@ -218,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 30px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 50px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 30px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 50px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index b6acfd9..1aea9b9 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -55,7 +55,7 @@
   },
   {
     text: '计划分类',
-    value: 'planCategory',
+    value: 'planCategoryName',
     align: 'center',
   },
   {
@@ -75,7 +75,7 @@
   },
   {
     text: '审批状态',
-    value: 'approvalStatus',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ])
@@ -154,14 +154,19 @@
 }
 // 详情
 const detail = (row: any) => {
-  $router.push({
-    path: 'plan/detail',
-    query: {
-      row: JSON.stringify(row),
-      id: row.id,
-      statusName: $props.statusName,
-    },
-  })
+  if ($props.statusName === '草稿箱' || $props.statusName === '未通过' || $props.statusName === '已取消') {
+    handler(row, 'update')
+  }
+  else {
+    $router.push({
+      path: 'plan/detail',
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+        statusName: $props.statusName,
+      },
+    })
+  }
 }
 // 删除
 const delHandler = (row: any) => {
@@ -286,7 +291,7 @@
               </el-button>
               <el-button
                 v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
-                @click="handler(scope.row, 'update')"
+                @click="handler(scope.row, 'update', '')"
               >
                 编辑
               </el-button>
@@ -315,7 +320,7 @@
                 取消
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index c8a20d1..9448127 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -130,7 +130,6 @@
   if (!multi.value) {
     // 单选
     if (selectList.value.length) {
-      console.log('dandandandan')
       emits('add', selectList.value[0])
       // emits('add', device)
       dialogFormVisible.value = false
@@ -141,7 +140,6 @@
     }
   }
   else {
-    console.log('duoduoduo')
     // 多选
     if (selectList.value.length) {
       emits('add', selectList.value)
@@ -202,7 +200,7 @@
       <normal-table
         v-if="dialogFormVisible"
         :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="multi" @change="changePage" @multiSelect="multiSelect"
+        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <!-- <el-table-column v-if="!multi" label="" width="55" align="center">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 2b8f5a6..24dddae 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -111,22 +111,24 @@
 const deviceRef = ref()
 // 选中的行
 const selectRow = ref()
+const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
     deviceRef.value.initDialog(false)
+    isMuit.value = false
     selectRow.value = index
+    console.log(selectRow.value, 'selectRow.value')
   }
 }
 // 选择设备
 const confirm = (device: IlistObjType) => {
   // 判断是单选还是多选
-  if (Array.isArray(device)) {
+  if (isMuit.value) {
     // 多选
-    console.log(device)
     device.forEach((item) => {
       list.value.push({
         ...item,
-        equipmentId: device.id,
+        equipmentId: item.id,
         id: null,
         groupId: null,
       })
@@ -142,6 +144,7 @@
         id: null,
         groupId: null,
       }
+      console.log(row, 'row')
       list.value[selectRow.value] = row
     }
     else {
@@ -156,6 +159,7 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
+  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {

diff --git a/.env.development b/.env.development
index 3a717ae..e743953 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://111.198.10.15:21609
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index 0127d2f..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.107:5909"
+  "baseUrl": "http://111.198.10.15:21611"
 }
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index d4e7c8e..e39a72d 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -22,7 +22,7 @@
   },
   {
     text: '使用部门',
-    value: 'succeed',
+    value: 'deptName',
     align: 'center',
   },
   {
@@ -32,12 +32,12 @@
   },
   {
     text: '负责人',
-    value: 'meterIdentify',
+    value: 'directorName',
     align: 'center',
   },
   {
     text: '检定(校准)单位',
-    value: 'checkCycle',
+    value: 'checkOrganization',
     align: 'center',
   },
   {
@@ -47,22 +47,22 @@
   },
   {
     text: '执行状态',
-    value: 'certificateValid',
+    value: 'executeStatusName',
     align: 'center',
   },
   {
     text: '执行时间',
-    value: 'certificateValid',
+    value: '',
     align: 'center',
   },
   {
     text: '检定完成度',
-    value: 'certificateValid',
+    value: '',
     align: 'center',
   },
   {
     text: '检定完成时间',
-    value: 'certificateValid',
+    value: '',
     align: 'center',
   },
 ])
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 76b6194..5de5517 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -4,7 +4,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import planList from './table.vue'
-import { detailPlan, editPlan, getInfoList, submitPlan } from '@/api/eqpt/measurementPlan/paln'
+import { cancelPlan, delPlan, detailPlan, editPlan, getInfoList, submitPlan } from '@/api/eqpt/measurementPlan/paln'
 import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -92,6 +92,11 @@
     if ($route.query.append) {
       // 修改计量计划为追加
       ruleForm.value.planCategory = '1'
+      ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+      ruleForm.value.createUserId = userStore.id
+      ruleForm.value.createUserName = userStore.name
+      ruleForm.value.createDeptId = userStore.deptId
+      ruleForm.value.createDeptName = userStore.deptName
     }
     // detailPlan(data.id).then((res) => {
     //   // ruleForm.value = res.data
@@ -141,13 +146,21 @@
             ruleForm.value.planType = '2'
           }
           ruleForm.value.equipmentIds = tableRef.value.list.map((item: any) => item.equipmentId)
+          // console.log(tableRef.value.list, 'tableRef.value.list')
           editPlan(ruleForm.value).then((res) => {
             submitId.value = res.data
-            ElMessage.success('保存成功')
-          // close()
-          }).catch((_err) => {
-            ruleForm.value.equipmentIds = tableRef.value.list
+            // close()
+            if (statusName === '已取消' || statusName === '未通过') {
+              submitPlan({ id: submitId.value, formId: SCHEDULE.METERING_PLAN_APPROVAL }).then((res) => {
+                ElMessage.success('已提交')
+                close()
+              })
+            }
+            else {
+              ElMessage.success('保存成功')
+            }
           })
+          ruleForm.value.equipmentIds = tableRef.value.list
         })
       }
       else {
@@ -184,6 +197,59 @@
   formEl?.resetFields()
   close()
 }
+// 打印
+const print = () => {
+
+}
+// 审批
+const approvalDialogRef = ref()
+const apply = (type: string) => {
+  const data = JSON.parse($route.query.row as string)
+  approvalDialogRef.value.initDialog(type, data.taskId, data.processId, ruleForm.value.id)
+}
+// 编辑
+const editForm = () => {
+  $router.push({
+    params: { ...$route.params, type: 'update' },
+    query: { ...$route.query },
+  })
+}
+const delForm = () => {
+  ElMessageBox.confirm(
+    '确认删除此记录吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    delPlan(row.id).then((res) => {
+      ElMessage.success('操作成功')
+      close()
+      // search()
+    })
+  })
+}
+const cancelForm = () => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    cancelPlan({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      close()
+      // search()
+    })
+  })
+}
 </script>
 
 <template>
@@ -191,12 +257,30 @@
     <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page class="base-info-device" :title="`计量计划-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" @click="submitForm()">
+        <el-button v-if="statusName === '待审批'" type="primary" @click="apply('agree')">
+          同意
+        </el-button>
+        <el-button v-if="statusName === '待审批'" type="primary" @click="apply('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="editBtn(statusName, dialogStatus)" type="primary" @click="editForm()">
+          编辑
+        </el-button>
+        <el-button v-if="statusName === '已通过'" type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过'" type="primary" @click="submitForm()">
           提交
         </el-button>
         <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
+        <el-button v-if="statusName === '审批中'" type="info" @click="cancelForm()">
+          取消
+        </el-button>
+        <el-button v-if="statusName === '已取消' || statusName === '审批'" type="info" @click="delForm()">
+          删除
+        </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
@@ -218,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 30px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 50px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 30px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 50px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index b6acfd9..1aea9b9 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -55,7 +55,7 @@
   },
   {
     text: '计划分类',
-    value: 'planCategory',
+    value: 'planCategoryName',
     align: 'center',
   },
   {
@@ -75,7 +75,7 @@
   },
   {
     text: '审批状态',
-    value: 'approvalStatus',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ])
@@ -154,14 +154,19 @@
 }
 // 详情
 const detail = (row: any) => {
-  $router.push({
-    path: 'plan/detail',
-    query: {
-      row: JSON.stringify(row),
-      id: row.id,
-      statusName: $props.statusName,
-    },
-  })
+  if ($props.statusName === '草稿箱' || $props.statusName === '未通过' || $props.statusName === '已取消') {
+    handler(row, 'update')
+  }
+  else {
+    $router.push({
+      path: 'plan/detail',
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+        statusName: $props.statusName,
+      },
+    })
+  }
 }
 // 删除
 const delHandler = (row: any) => {
@@ -286,7 +291,7 @@
               </el-button>
               <el-button
                 v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
-                @click="handler(scope.row, 'update')"
+                @click="handler(scope.row, 'update', '')"
               >
                 编辑
               </el-button>
@@ -315,7 +320,7 @@
                 取消
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index c8a20d1..9448127 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -130,7 +130,6 @@
   if (!multi.value) {
     // 单选
     if (selectList.value.length) {
-      console.log('dandandandan')
       emits('add', selectList.value[0])
       // emits('add', device)
       dialogFormVisible.value = false
@@ -141,7 +140,6 @@
     }
   }
   else {
-    console.log('duoduoduo')
     // 多选
     if (selectList.value.length) {
       emits('add', selectList.value)
@@ -202,7 +200,7 @@
       <normal-table
         v-if="dialogFormVisible"
         :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="multi" @change="changePage" @multiSelect="multiSelect"
+        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <!-- <el-table-column v-if="!multi" label="" width="55" align="center">
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 2b8f5a6..24dddae 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -111,22 +111,24 @@
 const deviceRef = ref()
 // 选中的行
 const selectRow = ref()
+const isMuit = ref(false)
 const select = (text: string, index: any) => {
   if (text === '设备名称') {
     deviceRef.value.initDialog(false)
+    isMuit.value = false
     selectRow.value = index
+    console.log(selectRow.value, 'selectRow.value')
   }
 }
 // 选择设备
 const confirm = (device: IlistObjType) => {
   // 判断是单选还是多选
-  if (Array.isArray(device)) {
+  if (isMuit.value) {
     // 多选
-    console.log(device)
     device.forEach((item) => {
       list.value.push({
         ...item,
-        equipmentId: device.id,
+        equipmentId: item.id,
         id: null,
         groupId: null,
       })
@@ -142,6 +144,7 @@
         id: null,
         groupId: null,
       }
+      console.log(row, 'row')
       list.value[selectRow.value] = row
     }
     else {
@@ -156,6 +159,7 @@
 // 批量增加
 const batch = () => {
   deviceRef.value.initDialog(true)
+  isMuit.value = true
 }
 watch(() => $props.data as IlistObjType[], (newVal: IlistObjType[]) => {
   if (newVal) {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 9becee3..baf7017 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -288,6 +288,9 @@
               close()
             })
           }
+          else {
+            ElMessage.success('保存成功')
+          }
         })
       })
     }