yrik 4 سال پیش
والد
کامیت
b2116cc3ec
2فایلهای تغییر یافته به همراه30 افزوده شده و 33 حذف شده
  1. 11 14
      ruoyi-ui/src/views/system/notice/index.vue
  2. 19 19
      ruoyi-ui/src/views/under/index.vue

+ 11 - 14
ruoyi-ui/src/views/system/notice/index.vue

@@ -144,25 +144,13 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="单位" prop="deptName">
-             <el-select
-               v-model="queryParams.deptId"
-               placeholder="请选择单位"
-               clearable
-               style="width: 100%;"
-             >
-               <el-option
-                 v-for="dict in typeOptionstwo"
-                 :key="dict.deptId"
-                 :label="dict.deptName"
-                 :value="dict.deptId"
-               />
-             </el-select>
+             <el-cascader :options="typeOptionstwo" :props="{value: 'id'}"   v-model="form.deptId" @change="changeBtn1" :show-all-levels="false"></el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="类型" prop="noticeType">
                 <el-select
-                  v-model="queryParams.noticeType"
+                  v-model="form.noticeType"
                   placeholder="请选择类型"
                   clearable
                   style="width: 100%;"
@@ -273,6 +261,15 @@ export default {
     });
   },
   methods: {
+    changeBtn1(e){
+      if(e.length == 1){
+        this.form.deptId  = e.join(',')
+      }else{
+        this.form.deptId = e[e.length-1]
+      }
+      console.log(e[e.length-1])
+
+    },
     // 单位列表
     getListthuy() {
       this.loading = true;

+ 19 - 19
ruoyi-ui/src/views/under/index.vue

@@ -892,25 +892,25 @@ export default {
     console.log(this.queryParams);
   },
   methods: {
-    backProBtn(){
-		var that = this
-		this.$confirm("是否确认撤销审核", "提醒", {
-		    confirmButtonText: "确定",
-		    cancelButtonText: "取消",
-		    type: "warning",
-		  })
-		  .then(function() {
-		    return setBack({
-		      code: 4,
-		      bmProjectId: that.bmProjectId,
-		    });
-		  })
-		  .then(() => {
-		    this.msgSuccess("撤销成功");
-		    setTimeout(res => {
-		      this.$router.go(-1)
-		    }, 1000)
-		  });
+    backProBtn(){
+      var that=this
+      this.$confirm("是否确认驳回审核", "提醒", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+      .then(({ value }) => {
+          return setBack({
+            code: 4,
+            bmProjectId: that.bmProjectId,
+            remark:value
+          });
+         })
+        .then(() => {
+          this.$router.go(-1);
+          this.getList();
+          this.msgSuccess("驳回成功");
+        });
     },
      handleChange(value){
       if(value.length ==1){