1

ruoyi-ui/src/components/ProjectDec/SignContract.vue

@@ -797,7 +797,7 @@
           cancelButtonText: "取消",
           type: "warning",
         })
-          .then(function() {
+          .then(function({ value }) {
             return setReject({
               code: 2,
               bmProjectId: that.queryParams.bmProjectId,

ruoyi-ui/src/views/deptplan/index.vue

@@ -121,7 +121,6 @@
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <el-form-item label="年度" prop="year">
-          <!-- <el-input v-model="form.year" placeholder="请输入年度" /> -->
           <el-date-picker
             v-model="form.year"
             type="year"
@@ -133,20 +132,6 @@
         </el-form-item>
         <el-form-item label="部门" prop="sysDeptId">
           <el-cascader :options="typeOptionstwo" :props="{value: 'id'}" @change="changeBtn1" :show-all-levels="false"></el-cascader>
-         <!-- <el-select
-
-           placeholder="系统内置"
-           clearable
-           size="small"
-           style="width: 100%;"
-         >
-           <el-option
-             v-for="dict in typeOptionstwo"
-             :key="dict.deptId"
-             :label="dict.deptName"
-             :value="dict.deptId"
-           />
-         </el-select> -->
         </el-form-item>
         <el-form-item label="目标线索数" prop="plan">
           <el-input v-model="form.plan" placeholder="请输入目标线索数" />
@@ -216,6 +201,7 @@ export default {
       },
       // 表单参数
       form: {
+        year: new Date()
       },
       // 表单校验
       rules: {
@@ -238,7 +224,7 @@ export default {
                     { required: true, message: '请选择部门', trigger: 'change' }
                   ],
         year: [
-                    { type: 'date', required: true, message: '请选择年份', trigger: 'change' }
+                    { type: 'date', required: true, message: '请选择年份' }
                   ],
       }
     };

ruoyi-ui/src/views/management/info/index.vue

@@ -347,19 +347,22 @@
             _this.msgSuccess("提交成功");
           })
         } else {
-          this.$confirm('是否确认驳回', "提醒", {
+          this.$prompt("请输入驳回意见", "提醒", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-            return setReject({
-              code: 2,
-              bmProjectId: scrop.id
-            });
-          }).then(() => {
-            _this.getList();
-            _this.msgSuccess("提交成功");
+            type: "warning",
           })
+            .then(function({ value }) {
+              return setReject({
+                code: 2,
+                bmProjectId: scrop.id,
+                remark:value
+              });
+            })
+            .then(({ value }) => {
+              _this.msgSuccess("驳回成功");
+              _this.getList();
+            });
         }
       },
       xs_submit() {