diff --git a/src/views/material/basic/bmProject/index.vue b/src/views/material/basic/bmProject/index.vue
index 6f00558c..b89dbe4f 100644
--- a/src/views/material/basic/bmProject/index.vue
+++ b/src/views/material/basic/bmProject/index.vue
@@ -74,6 +74,7 @@
             <el-table-column label="项目经理" align="center" prop="proManager" :show-overflow-tooltip="true" />
             <el-table-column label="联系电话" align="center" prop="telphone" :show-overflow-tooltip="true" />
             <el-table-column label="i8工程编号" align="center" prop="externalId" :show-overflow-tooltip="true" />
+            <el-table-column label="工程竣工时间" align="center" prop="actualEndDate" :show-overflow-tooltip="true" />
             <el-table-column label="工程状态" align="center" prop="proStatus" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.bm_project_status" :value="scope.row.proStatus" />
@@ -209,33 +210,45 @@
                 </el-row>
 
                 <el-row :gutter="24">
+                    <el-col :span="12">
+                        <el-form-item label="工程竣工时间" prop="actualEndDate">
+                            <el-date-picker
+                                v-model="form.actualEndDate"
+                                type="date"
+                                placeholder="请选择工程竣工时间"
+                                value-format="yyyy-MM-dd"
+                                style="width: 100%"
+                            />
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="12">
                         <el-form-item label="项目经理" prop="proManager">
                             <el-input v-model="form.proManager" placeholder="请输入项目经理姓名" maxlength="20" />
                         </el-form-item>
                     </el-col>
+                </el-row>
+
+                <el-row :gutter="24">
                     <el-col :span="12">
                         <el-form-item label="联系电话" prop="telphone">
                             <el-input v-model="form.telphone" placeholder="请输入联系电话" maxlength="11" />
                         </el-form-item>
                     </el-col>
-                </el-row>
-
-                <el-row :gutter="24">
                     <el-col :span="12">
                         <el-form-item label="合同主体单位" prop="contractPart">
                             <el-input v-model="form.contractPart" placeholder="请输入合同主体单位" maxlength="50" />
                         </el-form-item>
                     </el-col>
+
+                </el-row>
+
+                <el-row :gutter="24">
                     <el-col :span="12">
                         <el-form-item label="所属项目中心" prop="proCenter">
                             <el-input v-model="form.proCenter" placeholder="请输入所属项目中心" maxlength="50" />
                         </el-form-item>
                     </el-col>
-                </el-row>
-
-                <el-row :gutter="24">
-                    <el-col :span="20">
+                    <el-col :span="12">
                         <el-form-item label="备注" prop="remark">
                             <el-input
                                 type="textarea"
@@ -645,6 +658,7 @@ export default {
                 this.form.proCenter = ''
                 this.form.impUnit = ''
                 this.form.proStatus = ''
+                this.form.actualEndDate = ''
                 return
             }
             const current = this.i8ProOpts.find(item => item.id == val)
@@ -657,6 +671,7 @@ export default {
             this.form.proCenter = current.textcol1
             this.form.impUnit = this.impUnitList.find(item => item.label == current.oname)?.value
             this.form.proStatus = this.proStatusOpts.find(item => item.label == current.stat)?.value
+            this.form.actualEndDate = current.factEndDt
         }
     }
 }
diff --git a/src/views/material/basic/bmUnit/index.vue b/src/views/material/basic/bmUnit/index.vue
index 9d586dd2..7d7e9f0b 100644
--- a/src/views/material/basic/bmUnit/index.vue
+++ b/src/views/material/basic/bmUnit/index.vue
@@ -47,7 +47,7 @@
                     >新建</el-button
                 >
             </el-col>
-            <el-col :span="1.5">
+            <!-- <el-col :span="1.5">
                 <el-button
                     type="primary"
                     plain
@@ -56,7 +56,7 @@
                     @click="handlePeople"
                     >人员配置</el-button
                 >
-            </el-col>
+            </el-col> -->
             <el-col :span="1.5">
                 <el-button
                     type="warning"
diff --git a/src/views/repair-testing/one-machine/index.vue b/src/views/repair-testing/one-machine/index.vue
index 4b5336d9..cb93ebe2 100644
--- a/src/views/repair-testing/one-machine/index.vue
+++ b/src/views/repair-testing/one-machine/index.vue
@@ -47,7 +47,7 @@
                             :normalizer="normalizer"
                             noOptionsText="没有数据"
                             noChildrenText="没有数据了"
-                            placeholder="请选择领工程"
+                            placeholder="请选择工程"
                             noResultsText="没有搜索结果"
                             :disable-branch-nodes="true"
                             v-model="queryParams.proId"
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 06658083..ba1a900e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -644,56 +644,56 @@ export default {
       })
     },
     confirmPassword(row){
-      this.$prompt('请输入密码,鉴别用户', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        closeOnClickModal: false,
-        inputPattern: /^.{8,16}$/,
-        inputErrorMessage: '用户密码长度必须介于 8 和 16 之间',
-        inputValidator: (value) => {
-          // 调用 validateNewPassword 校验
-          const errorMessage=function(error) {
-            if (error) {
-              return error.message;
-            } else {
-              console.log('验证通过');
-            }
-          };
-          validateNewPassword(null, value, errorMessage);
-        }
-      }).then(({ value }) => {
-        confirmPassword(value).then(response => {
-          this.$modal.msgSuccess('验证成功')
+      // this.$prompt('请输入密码,鉴别用户', '提示', {
+      //   confirmButtonText: '确定',
+      //   cancelButtonText: '取消',
+      //   closeOnClickModal: false,
+      //   inputPattern: /^.{8,16}$/,
+      //   inputErrorMessage: '用户密码长度必须介于 8 和 16 之间',
+      //   inputValidator: (value) => {
+      //     // 调用 validateNewPassword 校验
+      //     const errorMessage=function(error) {
+      //       if (error) {
+      //         return error.message;
+      //       } else {
+      //         console.log('验证通过');
+      //       }
+      //     };
+      //     validateNewPassword(null, value, errorMessage);
+      //   }
+      // }).then(({ value }) => {
+      //   confirmPassword(value).then(response => {
+      //     this.$modal.msgSuccess('验证成功')
           this.handleUpdate(row)
-        })
-      }).catch(() => {
-      })
+      //   })
+      // }).catch(() => {
+      // })
     },
     confirmResetPwd(row){
-      this.$prompt('请输入密码,鉴别用户', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        closeOnClickModal: false,
-        inputPattern: /^.{8,16}$/,
-        inputErrorMessage: '用户密码长度必须介于 8 和 16 之间',
-        inputValidator: (value) => {
-          // 调用 validateNewPassword 校验
-          const errorMessage=function(error) {
-            if (error) {
-              return error.message;
-            } else {
-              console.log('验证通过');
-            }
-          };
-          validateNewPassword(null, value, errorMessage);
-        }
-      }).then(({ value }) => {
-        confirmPassword(value).then(response => {
-          this.$modal.msgSuccess('验证成功')
+      // this.$prompt('请输入密码,鉴别用户', '提示', {
+      //   confirmButtonText: '确定',
+      //   cancelButtonText: '取消',
+      //   closeOnClickModal: false,
+      //   inputPattern: /^.{8,16}$/,
+      //   inputErrorMessage: '用户密码长度必须介于 8 和 16 之间',
+      //   inputValidator: (value) => {
+      //     // 调用 validateNewPassword 校验
+      //     const errorMessage=function(error) {
+      //       if (error) {
+      //         return error.message;
+      //       } else {
+      //         console.log('验证通过');
+      //       }
+      //     };
+      //     validateNewPassword(null, value, errorMessage);
+      //   }
+      // }).then(({ value }) => {
+      //   confirmPassword(value).then(response => {
+      //     this.$modal.msgSuccess('验证成功')
           this.handleResetPwd(row)
-        })
-      }).catch(() => {
-      })
+      //   })
+      // }).catch(() => {
+      // })
     },
     /** 重置密码按钮操作 */
     handleResetPwd(row) {