yrik 4 anni fa
parent
commit
c264e1ba7e

+ 2 - 0
ruoyi-ui/src/views/management/nstruction/index.vue

@@ -849,6 +849,8 @@ export default {
     this.setrd = this.$route.query.setrd;
     if(this.setrd !== 5){
       this.disfal = true
+    }else{
+      this.disfal = false
     }
     console.log(this.bmjdeu);
     this.getList();

+ 24 - 11
ruoyi-ui/src/views/management/roduction/index.vue

@@ -60,6 +60,7 @@
                   placeholder="请输入已完成投资额"
                   clearable
                   size="small"
+                  :disabled = "disfal"
                   style="width: 335px"
                 />
               </el-form-item>
@@ -68,6 +69,7 @@
                   v-model="form.macInvestment"
                   placeholder="请输入设备投资额度"
                   clearable
+                  :disabled = "disfal"
                   size="small"
                   style="width: 335px"
                 />
@@ -76,6 +78,7 @@
                 <el-date-picker
                   type="date"
                   placeholder="选择日期"
+                  :disabled = "disfal"
                   v-model="form.productDate"
                   style="width: 335px"
                 ></el-date-picker>
@@ -90,6 +93,7 @@
                       :on-remove="handleRemove"
                       :on-success="handleOnsuccess"
                       :file-list="productPhotoList"
+                       :disabled = "disfal"
                     >
                       <i class="el-icon-plus"></i>
                       <!-- <el-button slot="trigger" size="small" type="primary"
@@ -116,6 +120,7 @@
                   placeholder="项目入规(限)"
                   clearable
                   size="small"
+                  :disabled = "disfal"
                   style="width: 335px"
                 >
                   <el-option
@@ -129,6 +134,7 @@
               <el-form-item label="项目入规时间:" prop="okDate">
                 <el-date-picker
                   type="date"
+                  :disabled = "disfal"
                   placeholder="选择项目入规时间"
                   v-model="form.okDate"
                   style="width: 335px"
@@ -161,6 +167,7 @@ export default {
   name: "production",
   data() {
     return {
+      disfal:false,
       process: process.env.VUE_APP_BASE_API,
       defaultSettings,
       //父级项目id
@@ -204,6 +211,11 @@ export default {
     that.bmProjectId = that.$route.query.setid;
     that.form.bmProjectId = that.$route.query.setid;
     that.setrd = that.$route.query.setrd;
+    if(that.setrd !== 7){
+      this.disfal  = true
+    }else{
+      this.disfal  = false
+    }
     that.getDicts("sys_yes_no").then((response) => {
       that.typeOptions = response.data;
     });
@@ -350,22 +362,23 @@ export default {
     //驳回
     backBtn() {
       var that = this;
-      this.$confirm("是否确认驳回", "提醒", {
+      this.$prompt("请输入驳回意见", "提醒", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
-        .then(function () {
-          return setReject({
-            code: 2,
-            bmProjectId: that.bmProjectId,
+        .then(({ value }) => {
+            return setReject({
+              code: 2,
+              bmProjectId: that.bmProjectId,
+              remark:value
+            });
+           })
+          .then(() => {
+            this.$router.go(-1);
+            this.getList();
+            this.msgSuccess("驳回成功");
           });
-        })
-        .then(() => {
-          this.$router.go(-1);
-          this.getList();
-          this.msgSuccess("驳回成功");
-        });
     },
 
     // 取消按钮