Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -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
+  })
+}

@@ -124,6 +124,7 @@ export default {
     //读取申请单元信息
     loadBdcdylist(add) {
       var formdata = new FormData();
+      if(this.bsmSlsq){
            formdata.append("bsmSlsq", this.bsmSlsq);
       formdata.append("bestepid", this.bestepid);
       leftMenu(formdata).then((res) => {
@@ -135,6 +136,8 @@ export default {
           }
         }
       });
+      }
+
 
     },
     // 获取右侧菜单

@@ -59,16 +59,17 @@
         <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" />
         <el-table-column label="流程状态" header-align="center" align="center">
           <template slot-scope="scope">
-            <div v-if="scope.row.finishTime == null">正在办理</div>
-            <div v-else>已完结</div>
+            <div v-if="scope.row.endTime">已完结</div>
+            <div v-else>正在办理</div>
           </template>
         </el-table-column>
         <el-table-column label="环节名称" prop="name" minWidth="100" align="center" />
         <el-table-column label="办理人" prop="agent" minWidth="120" align="center" />
-        <el-table-column label="处理时间" prop="createTime" width="160" align="center" />
-        <el-table-column label="办结时间" prop="finishTime" width="160" align="center" />
-        <el-table-column label="操作方式" align="center">
-        </el-table-column>
+        <el-table-column label="转入时间" prop="createTime" :formatter="formatDate" width="160" align="center" />
+        <el-table-column label="认领时间" prop="claimTime" :formatter="formatDate" width="160" align="center" />
+        <el-table-column label="转出时间" prop="endTime" :formatter="formatDate" width="160" align="center" />
+        <el-table-column label="操作方式" prop="controls" align="center"/>
+        <el-table-column label="意见" prop="idea" align="center"/>
       </el-table>
     </div>
   </div>
@@ -118,6 +119,14 @@
       this.clearViewer()
     },
     methods: {
+      formatDate(row, column) {
+          let data = row[column.property]
+          if(data == null) {
+              return null
+          }
+          let dt = new Date(data)
+           return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' ' + dt.getHours() + ':' + dt.getMinutes() + ':' + dt.getSeconds()
+        },
       processReZoom () {
         this.defaultZoom = 1
         this.bpmnViewer.get('canvas').zoom('fit-viewport', 'auto')
@@ -237,13 +246,32 @@
        // 获取流程记录
       getCommentList() {
         this.formData.allCommentList.forEach(async (item,index) => {
+          item.comments.forEach(element => {
+            if(element.type=="COMPLETE"){
+              this.formData.allCommentList[index].idea=element.message
+               this.formData.allCommentList[index].controls="完成"
+            }
+          });
             this.formData.allCommentList[index].agent=item.assignee.name
         })
-        setTimeout(() => {
-           this.taskList =this.formData.allCommentList;
+        this.formData.handlinglist.forEach(async (item,index) => {
+          if(item.assignee.name){
+            this.formData.handlinglist[index].agent=item.assignee.name
+          }else{
+            let str=""
+            item.countersign.forEach((item) => {
+               str+=item.name+","
+            })
+            str=str.slice(0, -1);
+            this.formData.allCommentList[index].agent=str
+          }
+
+        })
+           this.taskList =[...this.formData.allCommentList,...this.formData.handlinglist];
+          //  this.taskList =this.formData.allCommentList;
           //  处理数据之后赋值
             this.taskCommentList=this.taskList
-        }, 100)
+
       },
 
       // 设置流程图元素状态

@@ -373,8 +373,8 @@
               v-model="ruleForm.qlxx.djsj"
               type="date"
               placeholder="选择日期"
-              value-format="yyyy/MM/dd HH:mm:ss"
-              format="yyyy/MM/dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd"
             >
             </el-date-picker>
           </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>

@@ -110,7 +110,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
-              <el-input v-model="ruleForm.qlxx.djsj"></el-input>
+               <el-date-picker
+                v-model="ruleForm.qlxx.djsj"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -253,7 +260,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>

@@ -69,7 +69,7 @@
             <el-form-item label="登记类型：">
               <el-select v-model="ruleForm.qlxx.djlx">
                 <el-option
-                  v-for="item in dictData['A21']"
+                  v-for="item in djlxlist"
                   :key="item.dcode"
                   :label="item.dname"
                   :value="item.dcode"
@@ -219,28 +219,35 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="不动产权证号：">
+            <el-form-item label="不动产权证号：" prop="qlxx.bdcqzh"  :rules="rules.bdcqzhrules">
               <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="区县代码：">
+            <el-form-item label="区县代码：" prop="qlxx.qxdm" :rules="rules.qxdmrules">
               <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="登记机构：">
+            <el-form-item label="登记机构：" prop="qlxx.djjg" :rules="rules.djjgrules">
               <el-input v-model="ruleForm.qlxx.djjg"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="登簿人：">
+            <el-form-item label="登簿人：" prop="qlxx.dbr" :rules="rules.dbrrules">
               <el-input v-model="ruleForm.qlxx.dbr"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="登记时间：">
-              <el-input v-model="ruleForm.qlxx.djsj"></el-input>
+            <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
+              <el-date-picker
+                v-model="ruleForm.qlxx.djsj"
+                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>
@@ -328,7 +335,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>
@@ -366,6 +373,34 @@ export default {
 
       //表单是否可操作
       propsParam: this.$attrs,
+           // 登记类型
+      djlxlist: [
+        {
+          dcode: "100",
+          dname: "首次登记",
+        },
+        {
+          dcode: "200",
+          dname: "转移登记",
+        },
+        {
+          dcode: "300",
+          dname: "变更登记",
+        },
+        {
+          dcode: "500",
+          dname: "更正登记",
+        },
+
+        {
+          dcode: "901",
+          dname: "补证",
+        },
+        {
+          dcode: "902",
+          dname: "换证",
+        },
+      ],
       // 权属状态
       qsztlist: [
         {
@@ -384,7 +419,15 @@ export default {
       czrOptions: [],
       ruleForm: {},
      //传递参数\
-      rules: {},
+         rules: {
+          bdcqzhrules:[
+            { required: true, message: "不动产权证号：", trigger: "change" },
+          ],
+        qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
+        djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
+        dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
+        djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
+      },
     };
   },
   created() {
@@ -393,6 +436,7 @@ export default {
   mounted() {},
   methods: {
     loadData() {
+
       this.propsParam.isEdit=this.$parent.isEdit
       init(this.propsParam).then((res) => {
         if (res.code == 200) {
@@ -423,6 +467,8 @@ export default {
       this.key++;
     },
     onSubmit() {
+       this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
       if (this.ruleForm.qlrData.length == 0) {
         this.$message({
           showClose: true,
@@ -496,7 +542,11 @@ export default {
             type: "error",
           });
         }
+      });         } else {
+          return false;
+        }
       });
+
     },
   },
 };

@@ -69,7 +69,7 @@
             <el-form-item label="登记类型：">
               <el-select v-model="ruleForm.qlxx.djlx">
                 <el-option
-                  v-for="item in dictData['A21']"
+                  v-for="item in djlxlist"
                   :key="item.dcode"
                   :label="item.dname"
                   :value="item.dcode"
@@ -148,28 +148,55 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="不动产权证号：">
+            <el-form-item
+              label="不动产权证号："
+              prop="qlxx.bdcqzh"
+              :rules="rules.bdcqzhrules"
+            >
               <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="区县代码：">
+            <el-form-item
+              label="区县代码："
+              prop="qlxx.qxdm"
+              :rules="rules.qxdmrules"
+            >
               <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="登记机构：">
+            <el-form-item
+              label="登记机构："
+              prop="qlxx.djjg"
+              :rules="rules.djjgrules"
+            >
               <el-input v-model="ruleForm.qlxx.djjg"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="登簿人：">
+            <el-form-item
+              label="登簿人："
+              prop="qlxx.dbr"
+              :rules="rules.dbrrules"
+            >
               <el-input v-model="ruleForm.qlxx.dbr"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="登记时间：">
-              <el-input v-model="ruleForm.qlxx.djsj"></el-input>
+            <el-form-item
+              label="登记时间："
+              prop="qlxx.djsj"
+              :rules="rules.djsjrules"
+            >
+             <el-date-picker
+                v-model="ruleForm.qlxx.djsj"
+                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>
@@ -253,7 +280,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>
@@ -289,6 +316,34 @@ export default {
       propsParam: this.$attrs,
       ableOperation: true,
       key: 0,
+      // 登记类型
+      djlxlist: [
+        {
+          dcode: "100",
+          dname: "首次登记",
+        },
+        {
+          dcode: "200",
+          dname: "转移登记",
+        },
+        {
+          dcode: "300",
+          dname: "变更登记",
+        },
+        {
+          dcode: "500",
+          dname: "更正登记",
+        },
+
+        {
+          dcode: "901",
+          dname: "补证",
+        },
+        {
+          dcode: "902",
+          dname: "换证",
+        },
+      ],
       // 权属状态
       qsztlist: [
         {
@@ -300,13 +355,21 @@ export default {
           dname: "历史",
         },
       ],
-      tdxz:null,
+      tdxz: null,
       isShow: false,
       disabled: true,
       czrOptions: [],
       ruleForm: {},
       //传递参数\
-      rules: {},
+      rules: {
+        bdcqzhrules: [
+          { required: true, message: "不动产权证号：", trigger: "change" },
+        ],
+        qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
+        djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
+        dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
+        djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
+      },
     };
   },
   created() {
@@ -319,14 +382,15 @@ export default {
       return store.getters.dictData[val];
     },
     loadData() {
-    this.propsParam.isEdit=this.$parent.isEdit
+
+      this.propsParam.isEdit = this.$parent.isEdit;
       init(this.propsParam).then((res) => {
         if (res.code == 200) {
           this.ruleForm = res.result;
-            if( this.ruleForm.tdytqxList.length>0){
-            this.tdxz=this.ruleForm.tdytqxList[0].qlxzbm
-          }else{
-            this.tdxz=null
+          if (this.ruleForm.tdytqxList.length > 0) {
+            this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm;
+          } else {
+            this.tdxz = null;
           }
           this.isShow = true;
         }
@@ -349,6 +413,8 @@ export default {
       this.key++;
     },
     onSubmit() {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
           if (this.ruleForm.qlrData.length == 0) {
             this.$message({
               showClose: true,
@@ -402,6 +468,10 @@ export default {
               });
             }
           });
+        } else {
+          return false;
+        }
+      });
     },
   },
 };

@@ -111,7 +111,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
-              <el-input v-model="ruleForm.qlxx.djsj"></el-input>
+              <el-date-picker
+                v-model="ruleForm.qlxx.djsj"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -292,7 +299,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>

@@ -110,7 +110,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
-              <el-input v-model="ruleForm.qlxx.djsj"></el-input>
+               <el-date-picker
+                v-model="ruleForm.qlxx.djsj"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -154,7 +161,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="注销异议登记时间">
-              <el-input v-model="ruleForm.yydj.zxyydjsj"></el-input>
+               <el-date-picker
+                v-model="ruleForm.yydj.zxyydjsj"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -203,8 +217,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,140 +4,143 @@
  * @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>
+      <div v-for="(item, index) in tableData" :key="index">
+      <el-form :model="tableData[index]" label-width="120px" :rules="rules" :ref="'ruleFormRef'+index">
+        <div class="spyj_form" >
+          <div class="item_left">{{ item.jdmc }}意见</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-form-item
+                  label-width="0"
+                  class="opinion_item"
+                  prop="shyj"
+                >
+                  <el-input
+                    type="textarea"
+                    :rows="4"
+                    class="opinion"
+                    placeholder="请输入审批意见"
+                    v-model="item.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-form-item
+                  label="审查人"
+                  prop="shryxm"
+                >
+                  <el-input v-model="item.shryxm"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="审核时间" prop="shjssj" :key="refresh">
-                  {{ item.shjssj }}
+                <el-form-item
+                  label="审核时间"
+                  prop="shsj"
+                >
+                  <el-date-picker
+                    v-model="item.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">
-          <el-button type="primary" @click="onSubmit">保存</el-button>
-        </div>
       </el-form>
       </div>
-    <el-empty v-if="isNoData" description="暂无数据"></el-empty>
+       <div class="submit_button" v-if="!$route.query.viewtype">
+          <el-button type="primary" @click="onSubmit('ruleFormRef')">保存</el-button>
+        </div>
+    </div>
+    <!-- <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 {
+import { addidea } from "@/api/djbbl.js";
+import { mapGetters } from "vuex";
+export default {
   computed: {
-      ...mapGetters(['userData', 'yjsqOptions'])
+    ...mapGetters(["userData", "yjsqOptions"]),
   },
-    data () {
+  data() {
     return {
       isNoData: false,
-        bsmSlsq: '',
-        //刷新值
-        refresh: 10,
       ableOperation: true,
-        bsmSlsq: this.$route.query.bsmSlsq,
-        bestepid: this.$route.query.bestepid,
-        ruleForm: {},
+
+        tableData: [{ jdmc: "初审" }, { jdmc: "复审" }, { jdmc: "核定" }],
+
       rules: {
-          shyj: [
-            { required: true, message: '请输入审批意见', trigger: 'blur' }
-          ],
-        },
-        tableData: [],
-        propsParam: {}
-      }
-    },
-    watch: {
-      yjsqOptions: {
-        handler (val) {
-          this.ruleForm.shyj = val
-        },
-        deep: true,
-        immediate: true
+        shyj: [{ required: true, message: "请填写意见", trigger: "blur" }],
+        shryxm: [{ required: true, message: "审查人", trigger: "blur" }],
+        shsj: [{ required: true, message: "审核时间", trigger: "blur" }],
       },
+    };
   },
-    mounted () {
-      this.propsParam = this.$attrs;
-      if (this.$route.query.viewtype) {
-        this.ableOperation = false
-      }
-      this.list();
-    },
+
+  watch: {},
+  created() {},
+  mounted() {},
   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 => {
+    onSubmit(formName) {
+      const falg = []
+      for (let index = 0; index < this.tableData.length; index++) {
+        this.$refs[formName + index][0].validate((valid) => {
+          if (valid) {
+            falg.push(1)
+          }
+        });
+      }
+      if (falg.length == this.tableData.length) {
+          this.tableData.forEach((item, index) => {
+            item["bsmBusiness"] = this.$parent.bsmRepair;
+          }),
+           addidea(this.tableData).then((res) => {
               if (res.code === 200) {
-            this.$message.success("保存成功")
-            this.refresh += 1
+                this.$message.success("保存成功");
+                this.refresh += 1;
+              } else {
+                this.$message.error(res.message);
+              }
+            });
+        alert(1)
       } else {
-            this.$message.error(res.message)
+         return false;
       }
-        })
     },
-      //打开常用意见列表弹窗
-      commonOpinion () {
-        this.$popupDialog("常用意见", "djbworkflow/components/dialog/commonOpinion", {}, "70%", true)
+    // onSubmit() {
+    //   this.$refs.tablelist[index].validate((valid) => {
+    //     if (valid) {
+    //       this.tableData.forEach((item, index) => {
+    //         item["bsmBusiness"] = this.$parent.bsmRepair;
+    //       }),
+    //         addidea(this.tableData).then((res) => {
+    //           if (res.code === 200) {
+    //             this.$message.success("保存成功");
+    //             this.refresh += 1;
+    //           } else {
+    //             this.$message.error(res.message);
+    //           }
+    //         });
+    //     }
+    //   });
+    // },
   },
-      //使用常用意见
-      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;
@@ -229,5 +232,5 @@
     text-align: center;
     margin: 15px 0;
   }
-  }
+}
 </style>

@@ -75,10 +75,11 @@ export default {
                 finishedInfo: {
                   finishedTaskSet: result.finishedActivityIds,
                   unfinishedTaskSet: result.runningActivityIds,
-                rejectedTaskSet: result.rejectedTaskSet,
+                  rejectedTaskSet: {},
                   finishedSequenceFlowSet: result.finishedSequenceFlowIds
                 },
-              allCommentList: result.historyTaskList
+                handlinglist:result.runningTasks,
+                allCommentList: result.finishedTasks
               }, '80%', true)
             })
             break;

@@ -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 => {

@@ -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 {