--no commit message

@@ -128,3 +128,15 @@ export function getZtQlxx (params) {
     data
   })
 }
+/**
+ * @description: 添加审核意见
+ * @param {*} data
+ * @author: renchao
+ */
+ export function addidea (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/djbRepair/sh',
+    method: 'post',
+    data
+  })
+}

@@ -302,7 +302,7 @@
           </el-form-item>
         </el-col>
       </div>
-      <el-row class="btn">
+      <el-row class="btn" v-if="!$route.query.viewtype">
         <el-form-item>
           <el-button type="primary" @click="onSubmit">保存</el-button>
         </el-form-item>

@@ -471,7 +471,7 @@
           />
         </div>
       </div>
-      <el-row class="btn">
+      <el-row class="btn" v-if="!$route.query.viewtype">
         <el-form-item>
           <el-button type="primary" @click="onSubmit">保存</el-button>
         </el-form-item>

@@ -253,7 +253,7 @@
           />
         </div>
       </div>
-      <el-row class="btn">
+      <el-row class="btn" v-if="!$route.query.viewtype">
         <el-form-item>
           <el-button type="primary" @click="onSubmit">保存</el-button>
         </el-form-item>

@@ -328,7 +328,7 @@
           />
         </div>
       </div>
-      <el-row class="btn">
+      <el-row class="btn" v-if="!$route.query.viewtype">
         <el-form-item>
           <el-button type="primary" @click="onSubmit">保存</el-button>
         </el-form-item>
@@ -429,6 +429,7 @@ export default {
   mounted() {},
   methods: {
     loadData() {
+
       this.propsParam.isEdit=this.$parent.isEdit
       init(this.propsParam).then((res) => {
         if (res.code == 200) {

@@ -273,7 +273,7 @@
           />
         </div>
       </div>
-      <el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
+      <el-row class="btn" v-if="!$route.query.viewtype">
         <el-form-item>
           <el-button type="primary" @click="onSubmit">保存</el-button>
         </el-form-item>
@@ -375,6 +375,7 @@ export default {
       return store.getters.dictData[val];
     },
     loadData() {
+
       this.propsParam.isEdit = this.$parent.isEdit;
       init(this.propsParam).then((res) => {
         if (res.code == 200) {

@@ -292,7 +292,7 @@
           />
         </div>
       </div>
-      <el-row class="btn">
+      <el-row class="btn" v-if="!$route.query.viewtype">
         <el-form-item>
           <el-button type="primary" @click="onSubmit">保存</el-button>
         </el-form-item>

@@ -203,8 +203,7 @@
           />
         </div>
       </div>
-      <!-- <el-row class="btn" v-if="!$route.query.viewtype && ableOperation"> -->
-        <el-row class="btn">
+        <el-row class="btn" v-if="!$route.query.viewtype">
         <el-form-item>
           <el-button type="primary" @click="onSubmit">保存</el-button>
         </el-form-item>

@@ -4,230 +4,213 @@
  * @LastEditTime: 2023-05-17 10:41:24
 -->
 <template>
-  <div class='spyj loadingtext'>
+  <div class="spyj loadingtext">
     <div class="box">
       <b class="spyj_title">审批表</b>
-      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
-        <div class="spyj_form" v-for="(item, index) in tableData" :key="index">
-          <div class="item_left">
-            {{ item.jdmc }}意见
-          </div>
+      <el-form
+        :model="ruleForm"
+        :rules="rules"
+        ref="rule"
+        label-width="120px"
+      >
+        <div class="spyj_form">
+          <div class="item_left">意见</div>
           <div class="item_right">
             <el-row>
               <el-col :span="24">
                 <el-form-item label-width="0" class="opinion_item" prop="shyj">
-                  <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入审批意见"
-                    v-if="item.stepShjy == '1' && ableOperation" v-model="ruleForm.shyj"></el-input>
-                  <el-input type="textarea" :rows="4" class="opinion" v-model="item.shyj" v-else :disabled="true">
-                  </el-input>
-                  <el-button class="opinion_btn" @click="commonOpinion"
-                    v-if="item.stepShjy == '1' && ableOperation">常用意见</el-button>
+                  <el-input
+                    type="textarea"
+                    :rows="4"
+                    class="opinion"
+                    placeholder="请输入审批意见"
+                    v-model="ruleForm.shyj"
+                  ></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="16">
                 <el-form-item label="审查人" prop="shryxm">
-                  {{ item.shryxm }}
+                  <el-input v-model="ruleForm.shryxm"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="审核时间" prop="shjssj" :key="refresh">
-                  {{ item.shjssj }}
+                  <el-date-picker
+                    v-model="ruleForm.shsj"
+                    type="date"
+                    placeholder="选择日期"
+                    value-format="yyyy/MM/dd HH:mm:ss"
+                    format="yyyy/MM/dd"
+                  >
+                  </el-date-picker>
                 </el-form-item>
               </el-col>
             </el-row>
           </div>
         </div>
-        <div class="submit_button" v-if="ableOperation">
+        <div class="submit_button" v-if="!$route.query.viewtype">
           <el-button type="primary" @click="onSubmit">保存</el-button>
         </div>
       </el-form>
     </div>
-    <el-empty v-if="isNoData" description="暂无数据"></el-empty>
+    <!-- <el-empty v-if="isNoData" description="暂无数据"></el-empty> -->
   </div>
 </template>
 <script>
-  import { getSpyjList, saveSpyj, saveSpyjBySlsq } from "@/api/fqsq.js";
-  import { mapGetters } from 'vuex'
-  export default {
-    computed: {
-      ...mapGetters(['userData', 'yjsqOptions'])
-    },
-    data () {
-      return {
-        isNoData: false,
-        bsmSlsq: '',
-        //刷新值
-        refresh: 10,
-        ableOperation: true,
-        bsmSlsq: this.$route.query.bsmSlsq,
-        bestepid: this.$route.query.bestepid,
-        ruleForm: {},
-        rules: {
-          shyj: [
-            { required: true, message: '请输入审批意见', trigger: 'blur' }
-          ],
-        },
-        tableData: [],
-        propsParam: {}
-      }
-    },
-    watch: {
-      yjsqOptions: {
-        handler (val) {
-          this.ruleForm.shyj = val
-        },
-        deep: true,
-        immediate: true
+import { addidea } from "@/api/djbbl.js";
+import { mapGetters } from "vuex";
+export default {
+  computed: {
+    ...mapGetters(["userData", "yjsqOptions"]),
+  },
+  data() {
+    return {
+      isNoData: false,
+      //刷新值
+      refresh: 10,
+      ableOperation: true,
+      ruleForm: {
       },
-    },
-    mounted () {
-      this.propsParam = this.$attrs;
-      if (this.$route.query.viewtype) {
-        this.ableOperation = false
-      }
-      this.list();
-    },
-    methods: {
-      //审批意见数据初始化
-      list () {
-        let that = this
-        this.$startLoading()
-        var formdata = new FormData();
-        formdata.append("bsmBusiness", this.propsParam.bsmRepair);
-        formdata.append("bestepid", this.$route.query.bestepid);
-        formdata.append("ableOperation", this.ableOperation)
-        getSpyjList(formdata).then((res) => {
-          this.$endLoading()
-          if (res.code === 200 && res.result) {
-            console.log("this.tableData this.tableData this.tableData ",this.tableData );
-            this.tableData = res.result ? res.result : []
-              console.log("this.tableDatathis.tableDatathis.tableDatathis.tableData",this.tableData);
-            if (res.result.length == 0) {
-              that.isNoData = true
-            }
-            this.ruleForm = res.result[res.result.length - 1]
-          }
-        })
-      },
-      onSubmit () {
-        this.ruleForm.bsmSlsq = this.bsmSlsq
-        this.ruleForm.bestepid = this.bestepid
-        saveSpyjBySlsq(this.ruleForm).then(res => {
-          if (res.code === 200) {
-            this.$message.success("保存成功")
-            this.refresh += 1
-          } else {
-            this.$message.error(res.message)
-          }
-        })
-      },
-      //打开常用意见列表弹窗
-      commonOpinion () {
-        this.$popupDialog("常用意见", "djbworkflow/components/dialog/commonOpinion", {}, "70%", true)
+      rules: {
+        shyj: [{ required: true, message: "请输入审批意见", trigger: "blur" }],
       },
-      //使用常用意见
-      useOpinion (opinion) {
-        this.ruleForm.shyj = opinion
-      }
-    }
-  }
+      tableData: [1],
+    };
+  },
+
+  watch: {
+
+  },
+    created() {
+  },
+  mounted() {
+  },
+  methods: {
+    onSubmit() {
+      this.ruleForm.bsmBusiness =this.$parent.bsmRepair;
+      this.ruleForm.jdmc = "审核";
+      addidea(this.ruleForm).then((res) => {
+        if (res.code === 200) {
+          this.$message.success("保存成功");
+          this.refresh += 1;
+        } else {
+          this.$message.error(res.message);
+        }
+      });
+    },
+    //打开常用意见列表弹窗
+    // commonOpinion() {
+    //   this.$popupDialog(
+    //     "常用意见",
+    //     "djbworkflow/components/dialog/commonOpinion",
+    //     {},
+    //     "70%",
+    //     true
+    //   );
+    // },
+    // //使用常用意见
+    // useOpinion(opinion) {
+    //   this.ruleForm.shyj = opinion;
+    // },
+  },
+};
 </script>
-<style scoped lang='scss'>
-  @import "~@/styles/mixin.scss";
+<style scoped lang="scss">
+@import "~@/styles/mixin.scss";
 
-  .spyj {
+.spyj {
+  width: 100%;
+  height: 100%;
+  background-color: #f5f5f5;
+  padding: 5px;
+  .box {
+    overflow-x: auto;
     width: 100%;
-    height: 100%;
-    background-color: #f5f5f5;
-    padding: 5px;
-    .box {
-      overflow-x: auto;
-      width: 100%;
-      height: 95%;
-      background: #fff;
-      text-align: center;
-      padding: 4px;
-      overflow-y: scroll;
-      padding-top: 20px;
-      padding: 20px 40px;
-    }
-    .spyj_title {
-      line-height: 68px;
-      border: 1px solid $borderColor;
-      text-align: center;
-      font-size: 22px;
-      font-weight: 400;
-      background-color: #eceef2;
-      display: block;
-      border-bottom: none;
-    }
+    height: 95%;
+    background: #fff;
+    text-align: center;
+    padding: 4px;
+    overflow-y: scroll;
+    padding-top: 20px;
+    padding: 20px 40px;
+  }
+  .spyj_title {
+    line-height: 68px;
+    border: 1px solid $borderColor;
+    text-align: center;
+    font-size: 22px;
+    font-weight: 400;
+    background-color: #eceef2;
+    display: block;
+    border-bottom: none;
+  }
 
-    /deep/.el-form-item {
-      margin-bottom: 0;
-    }
+  /deep/.el-form-item {
+    margin-bottom: 0;
+  }
 
-    .bottom10 {
-      margin-bottom: 15px;
-    }
+  .bottom10 {
+    margin-bottom: 15px;
+  }
+
+  .spyj_form {
+    display: flex;
+    border: 1px solid $borderColor;
 
-    .spyj_form {
+    .item_left {
+      width: 150px;
+      background-color: #f8f8fa;
+      color: #606266;
       display: flex;
-      border: 1px solid $borderColor;
+      font-size: 14px;
+      text-indent: 80px;
+      align-items: center;
+      border-right: 1px solid $borderColor;
+    }
+
+    .item_right {
+      flex: 1;
+      width: 100%;
 
-      .item_left {
-        width: 150px;
+      /deep/.el-form-item__label {
         background-color: #f8f8fa;
-        color: #606266;
-        display: flex;
-        font-size: 14px;
-        text-indent: 80px;
-        align-items: center;
-        border-right: 1px solid $borderColor;
       }
-
-      .item_right {
-        flex: 1;
-        width: 100%;
-
-        /deep/.el-form-item__label {
-          background-color: #f8f8fa;
-        }
-        /deep/.el-form-item__content {
-          display: block;
-          text-align: left;
-          text-indent: 10px;
+      /deep/.el-form-item__content {
+        display: block;
+        text-align: left;
+        text-indent: 10px;
+      }
+      .opinion_item {
+        /deep/.el-form-item__error {
+          margin-top: -16px !important;
+          left: 3px;
         }
-        .opinion_item {
-          /deep/.el-form-item__error {
-            margin-top: -16px !important;
-            left: 3px;
-          }
 
-          border-bottom: 1px solid $borderColor;
-        }
+        border-bottom: 1px solid $borderColor;
+      }
 
-        .opinion {
-          position: relative;
-          font-size: 14px;
+      .opinion {
+        position: relative;
+        font-size: 14px;
 
-          /deep/.el-textarea__inner {
-            border: none;
-          }
+        /deep/.el-textarea__inner {
+          border: none;
         }
+      }
 
-        .opinion_btn {
-          position: absolute;
-          right: 15px;
-          bottom: 10px;
-        }
+      .opinion_btn {
+        position: absolute;
+        right: 15px;
+        bottom: 10px;
       }
     }
+  }
 
-    .submit_button {
-      text-align: center;
-      margin: 15px 0;
-    }
+  .submit_button {
+    text-align: center;
+    margin: 15px 0;
   }
+}
 </style>

@@ -127,6 +127,7 @@ export default {
       treedata: {},
       tabdata: [],
       defaultNode: {},
+      bsmRepair:""
     };
   },
   mounted() {
@@ -166,6 +167,9 @@ export default {
     },
     // 获取右侧选项卡
     getCurrentSelectProps(val) {
+      if(val.bsmRepair){
+         this.bsmRepair=val.bsmRepair
+      }
       if (val.bdcdyid) {
         this.oneSelectProps = val;
       }
@@ -215,11 +219,9 @@ export default {
     },
     //切换选项卡内容组件
     getFromRouter(tabname) {
-      console.log("切换选项卡内容组件", tabname,this.tabList);
       this.componentTag = getForm(tabname);
     },
     closefp() {
-      console.log("点击分屏");
       this.splitScreen = this.splitScreen ? false : true;
       this.$store.dispatch("app/set1tScreen", this.splitScreen);
       this.getFromRouter(this.tabList[0].value);

 <!--
- * @Description: 
+ * @Description:
  * @Autor: renchao
  * @LastEditTime: 2023-07-05 09:55:42
 -->
@@ -67,9 +67,11 @@
       ...mapGetters(["dictData"])
     },
     created () {
-      this.ableOperation = this.$parent?.currentSelectTab?.ableOperation || false
       this.clmlInitList(1)
     },
+      mounted() {
+    this.ableOperation = this.$parent.isEdit;
+  },
     methods: {
       // 自动预览
       nextPriview () {
@@ -125,7 +127,6 @@
         this.previewImg.bsmSj = item.bsmSj;
       },
       updateList (val) {
-        console.log(val, 'valvalvalval');
         let that = this
         if (val.children.length != []) { //删除最后一张图片时 val=null
           this.tableData.forEach(item => {
@@ -339,4 +340,4 @@
       }
     }
   }
-</style>
\ No newline at end of file
+</style>

@@ -83,6 +83,7 @@
       },
     },
     mounted () {
+      this.propsParam.isEdit=this.$parent.isEdit
       this.propsParam = this.$attrs;
       if (this.$route.query.viewtype) {
         this.ableOperation = false

@@ -198,9 +198,9 @@
             "/djbworkFrameview?bsmSlsq=" +
             item.bsmSlsq +
             "&bestepid=" +
-            item.bestepid +
-            "&isEdit=" +
-            true
+            item.bestepid+
+            "&bsmBusiness=" +
+            "&viewtype=1"
           );
           window.open(href, `urlname${item.bsmSlsq}`);
         } else {