Merge remote-tracking branch 'origin/master'

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

@@ -722,16 +722,16 @@
           isIndependentLan: "", //是否独立供地(N:Y)
           landArea: "", //供地面积
           landAddress: "", //供地位置
-          landPhoto: "", //土地证ur
+          landPhoto: [], //土地证ur
           circulationLand: "", //流转土地面积
           circulationAddres: "", //流转土地位置
           circulationDoc: [], //土地流转合同
-          circulationPhoto: "", //产权证
+          circulationPhoto: [], //产权证
           leasePlantArea: "", //租赁厂房面积
           leasePlantAddress: "", //租赁厂房位置
-          leasePlantDoc: "", //租赁合同
-          leasePlantPhoto: "", //租赁产权证
-          agreementTot: "", //租赁产权证
+          leasePlantDoc: [], //租赁合同
+          leasePlantPhoto: [], //租赁产权证
+          agreementTot: '', //租赁产权证
           agreementTax: "", // 合同约定税收
           agreementStartdate: "", // 合同约定开工时间
           agreementEnddate: "", //合同约定竣工时间
@@ -774,21 +774,20 @@
     },
     methods: {
       backProBtn(){
-        var that=this
-        this.$prompt("请输入驳回意见", "提醒", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-        .then(({ value }) => {
+        var that = this
+        this.$confirm("是否确认撤销审核", "提醒", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+          .then(function() {
             return setBack({
               code: 4,
               bmProjectId: that.queryParams.bmProjectId,
-              remark:value
             });
-           })
+          })
           .then(() => {
-            this.msgSuccess("驳回成功");
+            this.msgSuccess("撤销成功");
             setTimeout(res => {
               this.$router.go(-1)
             }, 1000)

ruoyi-ui/src/under/index.vue

@@ -490,7 +490,7 @@
           <div class="forieu" style="width: 618px">
             <div class="bure burert">
               <el-upload
-                :action="defaultSettings.urls+'/prod-api/common/upload'"
+                :action="defaultSettings.urls+process+'/common/upload'"
                 :auto-upload="false"
                 ref="upload"
                 :before-upload="beforeAvatarUpload"
@@ -675,7 +675,8 @@ export default {
     tabIndex: Number,
   },
   data() {
-    return {
+    return {
+      process: process.env.VUE_APP_BASE_API,
       defaultSettings,
       disfal:false,
       // 遮罩层

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

@@ -238,7 +238,7 @@ export default {
       if(e.length == 1){
         this.queryParams.sysDeptId  = e.join(',')
       }else{
-         this.queryParams.sysDeptId = e[2]
+         this.queryParams.sysDeptId = e[e.length-1]
       }
 
     },
@@ -246,8 +246,9 @@ export default {
       if(e.length == 1){
         this.form.sysDeptId  = e.join(',')
       }else{
-        this.form.sysDeptId = e[2]
+        this.form.sysDeptId = e[e.length-1]
       }
+      console.log(e[e.length-1])
 
     },
     /** 查询 部门招商计划列表 */

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

@@ -891,24 +891,24 @@ export default {
   },
   methods: {
     backProBtn(){
-      var that=this
-      this.$prompt("请输入驳回意见", "提醒", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-      .then(({ value }) => {
-          return setBack({
-            code: 4,
-            bmProjectId: that.bmProjectId,
-            remark:value
-          });
-         })
-        .then(() => {
-          this.$router.go(-1);
-          // this.getList();
-          this.msgSuccess("驳回成功");
-        });
+		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)
+		  });
     },
     //审核
     applyBtn() {
@@ -1105,6 +1105,7 @@ export default {
     //开工图片列表
     getListtoi() {
       this.loading = true;
+      this.queryParamstwrction.bmProjectId = this.bmProjectId
       listConfigsix(this.queryParamstwrction).then((response) => {
         this.configList = response.rows;
         this.configList.filter((route) => {
@@ -1338,6 +1339,7 @@ export default {
               this.msgSuccess("新增成功");
               this.openther = false;
               this.getListfour();
+              this.getListfive()
             });
           }
         });

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

@@ -238,24 +238,25 @@ export default {
   },
   methods: {
     backProBtn(){
-      var that=this
-      this.$prompt("请输入驳回意见", "提醒", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-      .then(({ value }) => {
-          return setBack({
-            code: 4,
-            bmProjectId: that.form.bmProjectId,
-            remark:value
-          });
-         })
-        .then(() => {
-          this.$router.go(-1);
-          // this.getList();
-          this.msgSuccess("驳回成功");
-        });
+		var that = this
+		this.$confirm("是否确认撤销审核", "提醒", {
+		    confirmButtonText: "确定",
+		    cancelButtonText: "取消",
+		    type: "warning",
+		  })
+		  .then(function() {
+		    return setBack({
+		      code: 4,
+		      bmProjectId: that.form.bmProjectId,
+		    });
+		  })
+		  .then(() => {
+		    this.msgSuccess("撤销成功");
+		    setTimeout(res => {
+		      this.$router.go(-1)
+		    }, 1000)
+		  });
+		  
     },
     reset() {
       var that = this;

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;

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

@@ -504,7 +504,7 @@
           <div class="forieu" style="width: 618px">
             <div class="bure burert">
               <el-upload
-                :action="defaultSettings.urls + process+'/prod-api/common/upload'"
+                :action="defaultSettings.urls + process+'/common/upload'"
                 :auto-upload="false"
                 ref="upload"
                 :before-upload="beforeAvatarUpload"
@@ -894,7 +894,7 @@ export default {
   methods: {
     backProBtn(){
       var that=this
-      this.$prompt("请输入驳回意见", "提醒", {
+      this.$confirm("是否确认驳回审核", "提醒", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -912,13 +912,22 @@ export default {
           this.msgSuccess("驳回成功");
         });
     },
-    handleChange(value){
+     handleChange(value){
+      if(value.length ==1){
+        this.queryParams.referralList[0].sysDeptId = value.join(',')
+      }else{
+         this.queryParams.referralList[0].sysDeptId = value[value.length-1]
+      }
       //0
-      this.queryParams.referralList[0].sysDeptId = value.pop()
+
       console.log(value)
     },
-    handleChangete(value){
-      this.queryParams.referralList[1].sysDeptId = value.pop()
+    handleChangete(value){
+      if(value.length ==1){
+        this.queryParams.referralList[1].sysDeptId = value.join(',')
+      }else{
+        this.queryParams.referralList[1].sysDeptId = value[value.length-1]
+      }
       //1
     console.log(value)
     },