1

src/views/mechanism/ledger/index.vue

@@ -7,7 +7,9 @@
             <el-form-item label="设备名称" prop="devicename">
               <el-input v-model="queryParams.devicename" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-
+            <el-form-item label="工区" prop="workArea">
+              <el-input v-model="queryParams.workArea" placeholder="请输入工区" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -160,6 +162,7 @@ const data = reactive<PageData<MechanicalrewritingForm, MechanicalrewritingQuery
     qualification: undefined,
     equipmentPhoto: undefined,
     verificationReport: undefined,
+    workArea: undefined,
     params: {}
   },
   rules: {

src/views/progress/constructionSchedulePlan/index.vue

@@ -102,6 +102,15 @@
                 v-hasPermi="['progress:constructionSchedulePlan:remove']"
               />
             </el-tooltip>
+            <el-button
+              v-if="scope.row.status != '4'"
+              link
+              type="primary"
+              @click="handleFinish(scope.row)"
+              v-hasPermi="['progress:constructionSchedulePlan:editFinish']"
+            >
+              确定
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -172,7 +181,8 @@ import {
   delConstructionSchedulePlan,
   addConstructionSchedulePlan,
   updateConstructionSchedulePlan,
-  getProjectStructure
+  getProjectStructure,
+  finishConstructionSchedulePlan
 } from '@/api/progress/constructionSchedulePlan';
 import {
   ConstructionSchedulePlanVO,
@@ -282,7 +292,13 @@ const cancel = () => {
   reset();
   dialog.visible = false;
 };
-
+const handleFinish = async (row: ConstructionSchedulePlanVO) => {
+  const res = await finishConstructionSchedulePlan(row.id);
+  if (res.code === 200) {
+    proxy.$modal.msgSuccess('操作成功');
+    getList();
+  }
+};
 const handleExport = async () => {
   const ids = queryParams.value.projectId;
   proxy?.download('/progress/constructionSchedulePlan/exportTemplate/' + ids, {}, `施工里程碑计划模版.xlsx`, true);