Merge remote-tracking branch 'origin/master'

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,
@@ -1293,7 +1293,7 @@
   }
 
   .sign_box {
-    padding: 26px 23px;
+    padding: 0 0 26px;
 
     .sign_tit {
       font-size: 14px;

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

@@ -13,7 +13,8 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label="部门" prop="sysDeptId">
-       <el-select
+        <el-cascader :options="typeOptionstwo" :props="{value: 'id'}" @change="changeBtn" :show-all-levels="false"></el-cascader>
+      <!-- <el-select
          v-model="queryParams.sysDeptId"
          placeholder="请选择部门"
          clearable
@@ -24,7 +25,7 @@
            :key="dict.deptId"
            :label="dict.deptName"
            :value="dict.deptId"
-         />
+         /> -->
        </el-select>
       </el-form-item>
       <el-form-item>
@@ -120,32 +121,17 @@
     <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"
             value-format="yyyy"
             placeholder="选择年"
             style="width: 100%;"
-            @keyup.enter.native="handleQuery"
           >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="部门" prop="sysDeptId">
-         <el-select
-           v-model="form.sysDeptId"
-           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-cascader :options="typeOptionstwo" :props="{value: 'id'}" @change="changeBtn1" :show-all-levels="false"></el-cascader>
         </el-form-item>
         <el-form-item label="目标线索数" prop="plan">
           <el-input v-model="form.plan" placeholder="请输入目标线索数" />
@@ -198,6 +184,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      typeOptionstwo:[],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -213,7 +200,9 @@ export default {
         typeOptionstwo:[]
       },
       // 表单参数
-      form: {},
+      form: {
+        year: new Date()
+      },
       // 表单校验
       rules: {
          targetSigningNum:[
@@ -235,7 +224,7 @@ export default {
                     { required: true, message: '请选择部门', trigger: 'change' }
                   ],
         year: [
-                    { type: 'date', required: true, message: '请选择年份', trigger: 'change' }
+                    { type: 'string', required: true, message: '请选择年份', trigger: 'change' }
                   ],
       }
     };
@@ -245,10 +234,15 @@ export default {
     this.getListthuy()
   },
   methods: {
+    changeBtn(e){
+      this.queryParams.sysDeptId = e[2]
+    },
+    changeBtn1(e){
+      this.form.sysDeptId = e[2]
+    },
     /** 查询 部门招商计划列表 */
     getList() {
       this.loading = true;
-      debugger;
       listPlan(this.queryParams).then(response => {
         this.planList = response.rows;
         this.total = response.total;
@@ -259,7 +253,7 @@ export default {
     getListthuy() {
       this.loading = true;
       listConfigfieu().then((response) => {
-        console.log(response);
+        console.log(response.data)
         this.typeOptionstwo = response.data;
         // this.fileList =  this.queryParams.attachment
         // this.total = response.total;

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() {

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

@@ -106,6 +106,7 @@
                     :on-remove="handleRemove"
                     :on-success="handleSuccpermit"
                     :multiple="true"
+                    :disabled = "disfal"
                     :file-list="fileListther"
                   >
                     <!-- <i slot="default" class="el-icon-plus"></i> -->
@@ -185,6 +186,7 @@
                     :multiple="true"
                     :on-success="handleSuccontract"
                     :file-list="fileListfour"
+                    :disabled = "disfal"
                   >
                     <!-- <i slot="default" class="el-icon-plus"></i> -->
 
@@ -227,6 +229,7 @@
                     :on-remove="handleRemove"
                     :on-success="handleSucc"
                     :multiple="true"
+                    :disabled = "disfal"
                     :file-list="fileListfive"
                   >
                     <!-- <i slot="default" class="el-icon-plus"></i> -->
@@ -439,6 +442,7 @@
                   :on-remove="handleRemove"
                   :on-success="handleSuccntry"
                   :multiple="true"
+                  :disabled = "disfal"
                   :file-list="fileListthertwo"
                 >
                   <!-- <i slot="default" class="el-icon-plus"></i> -->
@@ -506,6 +510,7 @@
             :auto-upload="false"
             :multiple="true"
             list-type="picture"
+            :disabled = "disfal"
           >
             <el-button slot="trigger" :disabled = "disfal" size="small" type="primary"
               >选取文件</el-button
@@ -574,6 +579,7 @@
             :file-list="fileListtherrt"
             :auto-upload="false"
             :multiple="true"
+            :disabled = "disfal"
             list-type="picture"
           >
             <el-button slot="trigger" :disabled = "disfal"  size="small" type="primary"
@@ -654,6 +660,7 @@
             :file-list="fileListtherrt"
             :auto-upload="false"
             :multiple="true"
+            :disabled = "disfal"
             list-type="picture"
           >
             <el-button slot="trigger" :disabled = "disfal"  size="small" type="primary"

ruoyi-ui/src/views/system/dept/index.vue

@@ -171,9 +171,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        parentId: [
-          { required: true, message: "上级部门不能为空", trigger: "blur" }
-        ],
+        // parentId: [
+        //   { required: true, message: "上级部门不能为空", trigger: "blur" }
+        // ],
         deptName: [
           { required: true, message: "部门名称不能为空", trigger: "blur" }
         ],