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

+/*
+ * @Description:
+ * @Autor: renchao
+ * @LastEditTime: 2023-05-16 14:01:26
+ */
+import request from '@/utils/request'
+let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
+
+/**
+ * @description: 获取审批意见
+ * @param {*} data
+ * @author: renchao
+ */
+export function getSpyjList (data) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/opinion/getSpyjList',
+        method: 'post',
+        data
+    })
+}
+
+/**
+ * @description: 保存审批意见
+ * @param {*} data
+ * @author: renchao
+ */
+export function saveSpyj (data) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/opinion/saveSpyj',
+        method: 'post',
+        data
+    })
+}
+/**
+ * @description: 根据受理申请保存审批意见
+ * @param {*} data
+ * @author: renchao
+ */
+export function saveSpyjBySlsq (data) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/opinion/saveSpyjBySlsq',
+        method: 'post',
+        data
+    })
+}
+
+/**
+ * @description: 获取用户常用意见
+ * @param {*} data
+ * @author: renchao
+ */
+export function getUserCommonOpinion (data) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/opinion/getUserCommonOpinion',
+        method: 'post',
+        data
+    })
+}
+
+/**
+ * @description: 新增用户常用意见
+ * @param {*} params
+ * @author: renchao
+ */
+export function addUserCommonOpinion (params) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/opinion/addUserCommonOpinion',
+        method: 'get',
+        params
+    })
+}
+
+/**
+ * @description: 删除常用意见
+ * @param {*} params
+ * @author: renchao
+ */
+export function delUserCommonOpinion (params) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/opinion/delUserCommonOpinion',
+        method: 'get',
+        params
+    })
+}

@@ -53,18 +53,6 @@ export function deleteCollectBiz (bsmSqyw) {
         method: 'post'
     })
 }
-/**
- * @description: 国有建设用地使用权/房屋使用权 -选择不动产单元
- * @param {*} data
- * @author: renchao
- */
-export function choiceBdcdy (data) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/choiceBdcdy',
-        method: 'post',
-        data
-    })
-}
 
 /**
  * @description: 选择补录权利信息

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-05-16 14:01:26
+ * @LastEditTime: 2023-05-17 10:24:24
  */
 import request from '@/utils/request'
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
 /**
+ * @description: 流程图
+ * @param {*} bsmSlsq
+ * @param {*} bestepid
+ * @author: renchao
+ */
+export function getWorkFlowImage (bsmSlsq, bestepid) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/business/workFlow/getWorkFlowImage',
+    method: 'get',
+    params: {
+      bsmSlsq: bsmSlsq,
+      bestepid: bestepid
+    }
+  })
+}
+/**
  * @description: 转出
  * @param {*} data
  * @author: renchao
@@ -84,7 +100,7 @@ export function getStepFormInfo (data) {
  * @param {*} data
  * @author: renchao
  */
- export function getBlYbxStepFormInfo (data) {
+export function getBlYbxStepFormInfo (data) {
   return request({
     url: SERVER.SERVERAPI + '/rest/business/workFlow/getBlYbxStepFormInfo',
     method: 'post',
@@ -103,128 +119,139 @@ export function stepExpandInfo (data) {
     data
   })
 }
-
 /**
- * @description: 获取审批意见
+ * @description: 登簿接口
  * @param {*} data
  * @author: renchao
  */
-export function getSpyjList (data) {
+export function record (data) {
   return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/opinion/getSpyjList',
+    url: SERVER.SERVERAPI + '/rest/business/workFlow/record',
+    method: 'post',
+    data
+  })
+}
+
+// 终止任务
+export function stopTask (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/business/workFlow/stopTask',
     method: 'post',
     data
   })
 }
 
 /**
- * @description: 保存审批意见
- * @param {*} data
+ * @description: 获取用户任务权限
+ * @param {*} params
  * @author: renchao
  */
-export function saveSpyj (data) {
+export function judgeUserTaskPermission (params) {
   return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/opinion/saveSpyj',
-        method: 'post',
-        data
+    url: SERVER.SERVERAPI + '/rest/business/workFlow/judgeUserTaskPermission',
+    method: 'get',
+    params
   })
 }
+
 /**
- * @description: 根据受理申请保存审批意见
+ * @description: 获取申请书数据
  * @param {*} data
  * @author: renchao
  */
-export function saveSpyjBySlsq (data) {
+export function getPrintApplicationInfo (data) {
   return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/opinion/saveSpyjBySlsq',
+    url: SERVER.SERVERAPI + '/rest/business/workFlow/getPrintApplicationInfo',
     method: 'post',
     data
   })
 }
 
 /**
- * @description: 获取用户常用意见
+ * @description: 国有建设用地使用权/房屋使用权 -选择不动产单元
  * @param {*} data
  * @author: renchao
  */
-export function getUserCommonOpinion (data) {
+export function choiceBdcdy (data) {
   return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/opinion/getUserCommonOpinion',
+    url: SERVER.SERVERAPI + '/rest/business/workFlow/choiceBdcdy',
     method: 'post',
     data
   })
 }
-
 /**
- * @description: 新增用户常用意见
- * @param {*} params
+ * @description: 待办箱/不动产单元删除接口
+ * @param {*} data
  * @author: renchao
  */
-export function addUserCommonOpinion (params) {
+export function deleteFlow (data) {
   return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/opinion/addUserCommonOpinion',
-        method: 'get',
-        params
+    url: SERVER.SERVERAPI + '/rest/business/workFlow/deleteFlow',
+    method: 'post',
+    data
   })
 }
-
 /**
- * @description: 删除常用意见
- * @param {*} params
+ * @description: 业务办理-发起业务申请流程
+ * @param {*} data
  * @author: renchao
  */
-export function delUserCommonOpinion (params) {
+export function startBusinessFlow (data) {
   return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/opinion/delUserCommonOpinion',
-        method: 'get',
-        params
+    url: SERVER.SERVERAPI + '/rest/business/workFlow/startBusinessFlow',
+    method: 'post',
+    data
   })
 }
 
 /**
- * @description: 登簿接口
+ * @description: 业务办理-发起补录申请流程
  * @param {*} data
  * @author: renchao
  */
-export function record (data) {
+export function startRepairFlow (data) {
   return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/record',
+    url: SERVER.SERVERAPI + '/rest/business/workFlow/startRepairFlow',
     method: 'post',
     data
   })
 }
 
-// 终止任务
-export function stopTask (data) {
+/**
+ * @description: 申请列表删除
+ * @param {*} data
+ * @author: renchao
+ */
+export function deleteSlbdcdy (data) {
   return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/stopTask',
+    url: SERVER.SERVERAPI + '/rest/business/workFlow/deleteSlbdcdy',
     method: 'post',
     data
   })
 }
 
 /**
- * @description: 获取用户任务权限
- * @param {*} params
+ * @description: 认领任务
+ * @param {*} bsmSlsq
+ * @param {*} bestepid
  * @author: renchao
  */
-export function judgeUserTaskPermission (params) {
+export function claimTask (bsmSlsq, bestepid) {
   return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/judgeUserTaskPermission',
+    url: SERVER.SERVERAPI + '/rest/business/workFlow/claimTask?bsmSlsq=' + bsmSlsq + '&bestepid=' + bestepid,
     method: 'get',
-        params
   })
 }
 
 /**
- * @description: 获取申请书数据
- * @param {*} data
+ * @description: 取消认领任务
+ * @param {*} bsmSlsq
+ * @param {*} bestepid
  * @author: renchao
  */
-export function getPrintApplicationInfo (data) {
+export function unClaimTask (bsmSlsq, bestepid) {
   return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/getPrintApplicationInfo',
-        method: 'post',
-        data
+    url: SERVER.SERVERAPI + '/rest/business/workFlow/unClaimTask?bsmSlsq=' + bsmSlsq + '&bestepid=' + bestepid,
+    method: 'get',
   })
 }

@@ -56,20 +56,3 @@ export function saveData (data, djlx) {
         data
     })
 }
-
-/**
- * @description: 流程图
- * @param {*} bsmSlsq
- * @param {*} bestepid
- * @author: renchao
- */
-export function getWorkFlowImage (bsmSlsq, bestepid) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/getWorkFlowImage',
-        method: 'get',
-        params: {
-            bsmSlsq: bsmSlsq,
-            bestepid: bestepid
-        }
-    })
-}

@@ -50,20 +50,3 @@ export function saveData (data) {
         data
     })
 }
-
-/**
- * @description: 流程图
- * @param {*} bsmSlsq
- * @param {*} bestepid
- * @author: renchao
- */
-export function getWorkFlowImage (bsmSlsq, bestepid) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/getWorkFlowImage',
-        method: 'get',
-        params: {
-            bsmSlsq: bsmSlsq,
-            bestepid: bestepid
-        }
-    })
-}

@@ -50,20 +50,3 @@ export function saveData (data) {
         data
     })
 }
-
-/**
- * @description: 流程图
- * @param {*} bsmSlsq
- * @param {*} bestepid
- * @author: renchao
- */
-export function getWorkFlowImage (bsmSlsq, bestepid) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/getWorkFlowImage',
-        method: 'get',
-        params: {
-            bsmSlsq: bsmSlsq,
-            bestepid: bestepid
-        }
-    })
-}

@@ -67,18 +67,6 @@ export function saveBatchData (data, djlx) {
         data
     })
 }
-
-// 流程图
-export function getWorkFlowImage (bsmSlsq, bestepid) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/getWorkFlowImage',
-        method: 'get',
-        params: {
-            bsmSlsq: bsmSlsq,
-            bestepid: bestepid
-        }
-    })
-}
 // 上传单个文件
 export function sjClmxUpload (data) {
     return request({

@@ -89,43 +89,6 @@ export function searchTaskToDo (data) {
         data
     })
 }
-/**
- * @description: 待办箱/不动产单元删除接口
- * @param {*} data
- * @author: renchao
- */
-export function deleteFlow (data) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/deleteFlow',
-        method: 'post',
-        data
-    })
-}
-/**
- * @description: 业务办理-发起业务申请流程
- * @param {*} data
- * @author: renchao
- */
-export function startBusinessFlow (data) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/startBusinessFlow',
-        method: 'post',
-        data
-    })
-}
-
-/**
- * @description: 业务办理-发起补录申请流程
- * @param {*} data
- * @author: renchao
- */
-export function startRepairFlow (data) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/startRepairFlow',
-        method: 'post',
-        data
-    })
-}
 
 /**
  * @description: 已办箱列表查询接口
@@ -201,31 +164,6 @@ export function deleteCollectBiz (bsmSqyw) {
         method: 'post'
     })
 }
-/**
- * @description: 国有建设用地使用权/房屋使用权 -选择不动产单元
- * @param {*} data
- * @author: renchao
- */
-export function choiceBdcdy (data) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/choiceBdcdy',
-        method: 'post',
-        data
-    })
-}
-
-/**
- * @description: 申请列表删除
- * @param {*} data
- * @author: renchao
- */
-export function deleteSlbdcdy (data) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/deleteSlbdcdy',
-        method: 'post',
-        data
-    })
-}
 
 /**
  * @description: 获取自然幢下其他户
@@ -241,32 +179,6 @@ export function selectOtherH (data) {
 }
 
 /**
- * @description: 认领任务
- * @param {*} bsmSlsq
- * @param {*} bestepid
- * @author: renchao
- */
-export function claimTask (bsmSlsq, bestepid) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/claimTask?bsmSlsq=' + bsmSlsq + '&bestepid=' + bestepid,
-        method: 'get',
-    })
-}
-
-/**
- * @description: 取消认领任务
- * @param {*} bsmSlsq
- * @param {*} bestepid
- * @author: renchao
- */
-export function unClaimTask (bsmSlsq, bestepid) {
-    return request({
-        url: SERVER.SERVERAPI + '/rest/business/workFlow/unClaimTask?bsmSlsq=' + bsmSlsq + '&bestepid=' + bestepid,
-        method: 'get',
-    })
-}
-
-/**
  * @description: 业务办理-选择农用地信息-根据条件进行列表查询
  * @param {*} data
  * @author: renchao

@@ -16,7 +16,7 @@
   </div>
 </template>
 <script>
-  import { deleteFlow } from "@/api/ywbl.js"
+  import { deleteFlow } from "@/api/workFlow.js"
   import store from '@/store/index.js'
   export default {
     components: {},

@@ -60,10 +60,9 @@
 </template>
 <script>
 import { mapGetters } from "vuex";
-import { leftMenu } from "@/api/fqsq.js";
+import { leftMenu, deleteSlbdcdy } from "@/api/workFlow.js";
 import { deleteRepairRecord } from "@/api/djbbl.js";
 import { leftMenubl } from "@/api/djbbl.js";
-import { deleteSlbdcdy } from "@/api/ywbl.js";
 import { getBdcqljqtsx } from "@/api/registerBook.js";
 import { loadTreeData, getNode } from "./djbFrameData.js";
 export default {

@@ -21,7 +21,7 @@
 </template>
 
 <script>
-  import { stopTask } from "@/api/fqsq.js";
+  import { stopTask } from "@/api/workFlow.js";
   export default {
     props: {
       formData: {

@@ -46,7 +46,7 @@
 
 <script>
 
-  import { getTaskBackNode, sendBackTask } from "@/api/fqsq.js"
+  import { getTaskBackNode, sendBackTask } from "@/api/workFlow.js"
   import { popupCacel } from "@/utils/popup.js";
 
   export default {

@@ -24,7 +24,7 @@
 </template>
 
 <script>
-  import { completeTask, getNextLinkInfo } from "@/api/fqsq.js"
+  import { completeTask, getNextLinkInfo } from "@/api/workFlow.js"
   export default {
     components: {
     },

@@ -136,7 +136,7 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="预告登记种类">
+            <el-form-item label="预告登记种类"  prop="ygdj.ygdjlx" :rules="rules.ygdjlxrules">
               <el-select v-model="ruleForm.ygdj.ygdjlx">
                 <el-option
                   v-for="item in dictData['A29']"
@@ -217,17 +217,17 @@
               <el-input v-model="ruleForm.ygdj.jzmj"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
             <el-form-item label="注销预告业务号">
               <el-input v-model="ruleForm.ygdj.zxygywh"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
             <el-form-item label="注销预告原因">
               <el-input v-model="ruleForm.ygdj.zxygyy"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
             <el-form-item label="注销时间">
               <el-input v-model="ruleForm.ygdj.zxsj"></el-input>
             </el-form-item>
@@ -375,6 +375,7 @@ export default {
         djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
         dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
         djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
+        ygdjlxrules: [{ required: true, message: "预告登记种类", trigger: "change" }],
       },
     };
   },

@@ -145,21 +145,31 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
+            <el-form-item label="登记时间：">
+              <el-input v-model="ruleForm.yydj.djsj"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="附记：">
+              <el-input v-model="ruleForm.yydj.fj"></el-input>
+            </el-form-item>
+          </el-col>
+            <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
             <el-form-item label="注销异议业务号">
               <el-input v-model="ruleForm.yydj.zxyyywh"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
             <el-form-item label="注销异议原因">
               <el-input v-model="ruleForm.yydj.zxyyyy"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
             <el-form-item label="注销异议登簿人">
               <el-input v-model="ruleForm.yydj.zxyydbr"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
             <el-form-item label="注销异议登记时间">
                <el-date-picker
                 v-model="ruleForm.yydj.zxyydjsj"
@@ -171,16 +181,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="登记时间：">
-              <el-input v-model="ruleForm.yydj.djsj"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="附记：">
-              <el-input v-model="ruleForm.yydj.fj"></el-input>
-            </el-form-item>
-          </el-col>
         </el-row>
         <div class="slxx_title title-block">
           权利人信息

@@ -3,9 +3,7 @@
  * @Autor: miaofang
  * @LastEditTime: 2023-06-14 15:01:31
  */
-import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js";
 import { getPrintTemplateByCode } from "@/api/system";
-import { getPrintApplicationInfo } from "@/api/fqsq";
 import { getQllxByBdcdyid } from "@/api/djbbl.js";
 import { uploadUndo } from "@/api/clxx";
 import { deleteFlow } from "@/api/djbbl";
@@ -15,7 +13,10 @@ import {
   record,
   completeTask,
   getNextLinkInfo,
-} from "@/api/fqsq.js";
+  getWorkFlowImage,
+  getPrintApplicationInfo,
+  unClaimTask
+} from "@/api/workFlow.js";
 import { mapGetters } from 'vuex'
 import { log } from "bpmn-js-token-simulation";
 export default {
@@ -35,7 +36,7 @@ export default {
       batchButtonName: '',
       // 受理申请信息
       slsq: {},
-      isshow:true
+      ableOperation:true
     }
   },
   mounted () {
@@ -55,15 +56,18 @@ export default {
         if (res.code === 200) {
             this.leftButtonList = res.result.button;
             this.rightButtonList = res.result.operation;
-            console.log("this.rightButtonList[1].name",this.rightButtonList[1].name);
-            if(this.rightButtonList[1].name!="删除"){
-              this.$refs.Menu.getleftMenubl(1);
-            }else{
+           let arr=this.rightButtonList.filter((item) => {
+              return item.name=="删除"
+            })
+
+            if(arr.length){
+              console.log("1111111111111111111");
               this.$refs.Menu.getleftMenubl();
+            }else{
+              this.ableOperation=false
+              console.log("22222222222222");
+              this.$refs.Menu.getleftMenubl(1);
             }
-
-            console.log("this.rightButtonList ",this.rightButtonList);
-          // this.rightButtonList.splice(0,2)
         }
       })
 

@@ -69,7 +69,7 @@
 <script>
   import WorkFlow from "./mixin/index";
   import { getForm } from "./flowform";
-  import { getStepFormInfo } from "@/api/fqsq.js";
+  import { getStepFormInfo } from "@/api/workFlow.js";
   import NoticeBar from "@/components/NoticeBar/index";
   import ProcessViewer from "./components/processViewer.vue";
   // 引入左侧菜单

@@ -73,7 +73,7 @@
 <script>
 import WorkFlow from "./mixin/index";
 import { getForm } from "./flowform";
-import { getBlYbxStepFormInfo } from "@/api/fqsq.js";
+import { getBlYbxStepFormInfo } from "@/api/workFlow.js";
 import NoticeBar from "@/components/NoticeBar/index";
 import ProcessViewer from "./components/processViewer.vue";
 // 引入左侧菜单

@@ -16,7 +16,7 @@
   import { searchTaskToDo } from "@/api/ywbl";
   import {
     leftMenu
-  } from "@/api/fqsq.js";
+  } from "@/api/workFlow.js";
   export default {
     data () {
       return {

@@ -28,7 +28,7 @@
 </template>
 <script>
   import store from '@/store/index.js'
-  import { getUserCommonOpinion, addUserCommonOpinion, delUserCommonOpinion } from "@/api/fqsq.js"
+  import { getUserCommonOpinion, addUserCommonOpinion, delUserCommonOpinion } from "@/api/opinion.js"
   export default {
     components: {},
     props: {

@@ -40,8 +40,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex'
-import { leftMenu } from "@/api/fqsq.js"
-import { deleteSlbdcdy } from "@/api/ywbl.js";
+import { leftMenu, deleteSlbdcdy } from "@/api/workFlow.js"
 export default {
   data () {
     return {

@@ -53,8 +53,7 @@
 </template>
 <script>
   import { mapGetters } from 'vuex'
-  import { leftMenu } from "@/api/fqsq.js"
-  import { deleteFlow } from "@/api/ywbl.js";
+  import { leftMenu, deleteFlow } from "@/api/workFlow.js"
   export default {
     data () {
       return {

@@ -48,7 +48,7 @@
   </div>
 </template>
 <script>
-  import { getSpyjList, saveSpyj, saveSpyjBySlsq } from "@/api/fqsq.js";
+  import { getSpyjList, saveSpyj, saveSpyjBySlsq } from "@/api/opinion.js";
   import { mapGetters } from 'vuex'
   export default {
     computed: {

@@ -21,7 +21,7 @@
 </template>
 
 <script>
-  import { stopTask } from "@/api/fqsq.js";
+  import { stopTask } from "@/api/workFlow.js";
   export default {
     props: {
       formData: {

@@ -22,7 +22,12 @@
           <template slot-scope="scope">
           <i
             class="el-icon-minus pointer"
-            @click="deleClick(scope.$index, scope.row)"></i>
+            @click="deleClick(scope.$index, scope.row)"
+            v-if="!$route.query.viewtype == 1"
+          ></i>
+            <div style="text-align:center;" v-else>
+            {{ scope.$index+1}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column prop="yt" label="土地用途" min-width="100">

@@ -46,7 +46,7 @@
 
 <script>
 
-  import { getTaskBackNode, sendBackTask } from "@/api/fqsq.js"
+  import { getTaskBackNode, sendBackTask } from "@/api/workFlow.js"
   import { popupCacel } from "@/utils/popup.js";
 
   export default {

@@ -24,7 +24,7 @@
 </template>
 
 <script>
-  import { completeTask, getNextLinkInfo } from "@/api/fqsq.js"
+  import { completeTask, getNextLinkInfo } from "@/api/workFlow.js"
   export default {
     components: {
     },

@@ -3,18 +3,19 @@
  * @Autor: renchao
  * @LastEditTime: 2023-07-13 11:06:42
  */
-import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js";
 import { getPrintTemplateByCode } from "@/api/system";
-import { getPrintApplicationInfo } from "@/api/fqsq";
 import { uploadUndo } from "@/api/clxx";
-import { deleteFlow } from "@/api/ywbl";
 import { getLodop } from "@/utils/LodopFuncs"
 import {
   stepExpandInfo,
   record,
   completeTask,
   getNextLinkInfo,
-} from "@/api/fqsq.js";
+  getWorkFlowImage,
+  getPrintApplicationInfo,
+  deleteFlow,
+  unClaimTask
+} from "@/api/workFlow.js";
 import { mapGetters } from 'vuex'
 import { getZrzbsm } from "@/api/lpb";
 import { ywPopupDialog } from "@/utils/popup.js";

@@ -60,10 +60,9 @@
 <script>
   import WorkFlow from "./mixin/index"
   import publicFlow from "./mixin/public.js"
-  import { getStepFormInfo } from "@/api/fqsq.js"
+  import { getStepFormInfo, unClaimTask } from "@/api/workFlow.js"
   import { getForm } from "./flowform"
   import NoticeBar from "@/components/NoticeBar/index"
-  import { unClaimTask } from "@/api/ywbl.js"
   import ProcessViewer from "./components/processViewer.vue"
   // 引入左侧菜单
   import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue"

@@ -53,7 +53,7 @@
 <script>
   import WorkFlow from "./mixin/index"
   import publicFlow from "./mixin/public.js"
-  import { getStepFormInfo } from "@/api/fqsq.js"
+  import { getStepFormInfo } from "@/api/workFlow.js"
   import { getForm } from "./flowform"
   import NoticeBar from "@/components/NoticeBar/index";
   // 引入左侧菜单

@@ -104,8 +104,8 @@
   import table from "@/utils/mixin/table";
   import searchMin from "../components/mixin/index";
   import { datas, sendThis } from "./dbxdata";
-  import { searchTaskToDo, deleteFlow, claimTask } from "@/api/ywbl";
-  import { judgeUserTaskPermission } from "@/api/fqsq";
+  import { searchTaskToDo } from "@/api/ywbl";
+  import { judgeUserTaskPermission, deleteFlow, claimTask } from "@/api/workFlow.js";
   import { log } from 'bpmn-js-token-simulation';
   export default {
     name: "dbx",
@@ -217,7 +217,7 @@
                 "&sqywbm=" +
                 item.djywbm
               );
-               window.open(href, `urlname${item.bsmSlsq}`);
+               window.open(href, `djbworkFrame${item.bsmSlsq}`);
               }else{
                      const { href } = this.$router.resolve(
                 "/workFrame?bsmSlsq=" +
@@ -228,7 +228,7 @@
                 "&sqywbm=" +
                 item.djywbm
               );
-               window.open(href, `urlname${item.bsmSlsq}`);
+               window.open(href, `workFrame${item.bsmSlsq}`);
               }
 
               localStorage.setItem('ywbl', JSON.stringify(item));

@@ -207,7 +207,7 @@
             "&bsmBusiness=" +
             "&viewtype=1"
           );
-          window.open(href, `urlname${item.bsmSlsq}`);
+          window.open(href, `djbworkFrameview${item.bsmSlsq}`);
         } else {
           const { href } = this.$router.resolve(
             "/workFrameView?bsmSlsq=" +
@@ -217,7 +217,7 @@
             "&bsmBusiness=" +
             "&viewtype=1"
           );
-          window.open(href, `urlname${item.bsmSlsq}`);
+          window.open(href, `workFrameView${item.bsmSlsq}`);
         }
 
 

@@ -79,7 +79,8 @@
   import { ywPopupDialog } from "@/utils/popup.js";
   import { datas, sendThis } from "../javascript/cfdj.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
-  import { selectCfdj, startBusinessFlow, choiceBdcdy } from "@/api/ywbl.js";
+  import { selectCfdj } from "@/api/ywbl.js";
+  import { startBusinessFlow, choiceBdcdy } from "@/api/workFlow.js";
   export default {
     props: {
       isJump: { type: Boolean, default: false },

@@ -66,7 +66,8 @@
   import { ywPopupDialog } from "@/utils/popup.js";
   import { datas, sendThis } from "../javascript/diyaq.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
-  import { selectDiyaq, startBusinessFlow } from "@/api/ywbl.js";
+  import { selectDiyaq } from "@/api/ywbl.js";
+  import { startBusinessFlow } from "@/api/workFlow.js";
   export default {
     mixins: [table, jump],
     props: {

@@ -133,7 +133,8 @@
   import { ywPopupDialog } from "@/utils/popup.js";
   import { datas, sendThis } from "../javascript/fwsyq.js";
   import jump from "@/views/ywbl/ywsq/components/mixin/jump";
-  import { selectScBdcdy, startBusinessFlow, choiceBdcdy, selectOtherH, selectZrz, selectDz } from "@/api/ywbl.js";
+  import { selectOtherH, selectZrz, selectDz } from "@/api/ywbl.js";
+  import { startBusinessFlow, choiceBdcdy } from "@/api/workFlow.js";
   export default {
     mixins: [table, jump],
     props: {

@@ -52,7 +52,8 @@
   import { ywPopupDialog } from "@/utils/popup.js";
   import { datas, sendThis } from "../javascript/nydsyq100.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
-  import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js";
+  import { selectZdjbxx } from "@/api/ywbl.js";
+  import { startBusinessFlow } from "@/api/workFlow.js";
   export default {
     mixins: [table, jump],
     props: {

@@ -52,7 +52,8 @@
   import { ywPopupDialog } from "@/utils/popup.js";
   import { datas, sendThis } from "../javascript/selectJsydsyq.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
-  import { startBusinessFlow, selectNydsyqQlxx } from "@/api/ywbl.js";
+  import { selectNydsyqQlxx } from "@/api/ywbl.js";
+  import { startBusinessFlow } from "@/api/workFlow.js";
   export default {
     mixins: [table, jump],
     props: {

@@ -66,7 +66,8 @@
   import { ywPopupDialog } from "@/utils/popup.js";
   import { datas, sendThis } from "../javascript/selecBdcql.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
-  import { selectQlxx, startBusinessFlow } from "@/api/ywbl.js";
+  import { selectQlxx } from "@/api/ywbl.js";
+  import { startBusinessFlow } from "@/api/workFlow.js";
   import { getQllxByBsmSqyw } from "@/api/system.js";
   export default {
     mixins: [table, jump],

@@ -60,7 +60,7 @@
   import store from '@/store/index.js'
   import table from "@/utils/mixin/table";
   import { ywPopupDialog } from "@/utils/popup.js";
-  import { startRepairFlow } from "@/api/ywbl.js";
+  import { startRepairFlow } from "@/api/workFlow.js";
   import { datas, sendThis } from "../javascript/selectDjbbl.js";
   import { selectRepairQlxx } from "@/api/selectQlxx.js";
   import jump from "../components/mixin/djbbljump";

@@ -58,7 +58,8 @@
   import { ywPopupDialog } from "@/utils/popup.js";
   import { datas, sendThis } from "../javascript/selectFwsyq.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
-  import { selectFwsyq, startBusinessFlow } from "@/api/ywbl.js";
+  import { selectFwsyq } from "@/api/ywbl.js";
+  import { startBusinessFlow } from "@/api/workFlow.js";
   export default {
     mixins: [table, jump],
     props: {

@@ -58,7 +58,8 @@
   import { ywPopupDialog } from "@/utils/popup.js";
   import { datas, sendThis } from "../javascript/selectH.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
-  import { selectHQjdc, startBusinessFlow } from "@/api/ywbl.js";
+  import { selectHQjdc } from "@/api/ywbl.js";
+  import { startBusinessFlow } from "@/api/workFlow.js";
   export default {
     mixins: [table, jump],
     props: {

@@ -66,7 +66,8 @@
   import { ywPopupDialog } from "@/utils/popup.js";
   import { datas, sendThis } from "../javascript/selectJsydsyq.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
-  import { startBusinessFlow, selectJsydQlxx } from "@/api/ywbl.js";
+  import { selectJsydQlxx } from "@/api/ywbl.js";
+  import { startBusinessFlow } from "@/api/workFlow.js";
   export default {
     mixins: [table, jump],
     props: {

@@ -144,7 +144,8 @@
   import { ywPopupDialog } from "@/utils/popup.js";
   import { datas, datastwo, sendThis } from "../javascript/selectJsydsyqhbfg.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
-  import { startBusinessFlow, selectJsydQlxxSplitMergeBefore, selectZdjbxxSplitMergeLast } from "@/api/ywbl.js";
+  import { selectJsydQlxxSplitMergeBefore, selectZdjbxxSplitMergeLast } from "@/api/ywbl.js";
+  import { startBusinessFlow } from "@/api/workFlow.js";
   export default {
     mixins: [table, jump],
     props: {

@@ -56,7 +56,8 @@
   import store from '@/store/index.js'
   import table from "@/utils/mixin/table";
   import { ywPopupDialog } from "@/utils/popup.js";
-  import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js";
+  import { selectZdjbxx } from "@/api/ywbl.js";
+  import { startBusinessFlow } from "@/api/workFlow.js";
   import { datas, sendThis } from "../javascript/selectQjzdjbxx.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   export default {

@@ -66,7 +66,8 @@
   import { ywPopupDialog } from "@/utils/popup.js";
   import { datas, sendThis } from "../javascript/selectTdsyq.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
-  import { startBusinessFlow, selectTdsyqQlxx } from "@/api/ywbl.js";
+  import { selectTdsyqQlxx } from "@/api/ywbl.js";
+  import { startBusinessFlow } from "@/api/workFlow.js";
   export default {
     mixins: [table, jump],
     props: {

@@ -58,7 +58,8 @@
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import table from "@/utils/mixin/table";
   import jump from "./mixin/jump";
-  import { selectYgdj200, startBusinessFlow } from "@/api/ywbl.js";
+  import { selectYgdj200 } from "@/api/ywbl.js";
+  import { startBusinessFlow } from "@/api/workFlow.js";
   export default {
     mixins: [table, jump],
     props: {

@@ -58,7 +58,8 @@
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import table from "@/utils/mixin/table";
   import jump from "./mixin/jump";
-  import { selectYgdy, startBusinessFlow } from "@/api/ywbl.js";
+  import { selectYgdy } from "@/api/ywbl.js";
+  import { startBusinessFlow } from "@/api/workFlow.js";
   export default {
     mixins: [table, jump],
     props: {

@@ -58,7 +58,8 @@
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import table from "@/utils/mixin/table";
   import jump from "./mixin/jump";
-  import { selectHQjdc, startBusinessFlow } from "@/api/ywbl.js";
+  import { selectHQjdc } from "@/api/ywbl.js";
+  import { startBusinessFlow } from "@/api/workFlow.js";
   export default {
     mixins: [table, jump],
     props: {