图斑撤回优化获取code；非粮化填报审核、整改审核第一层审核优化

src/views/demo/degraining/auditinfo/AuditProgress/index.vue

@@ -191,6 +191,25 @@
         <a-empty :image="simpleImage" />
       </div>
     </div>
+    <a-modal
+      width="100%"
+      wrap-class-name="full-modal"
+      v-model:open="auditOpen"
+      title="填报审核"
+      footer=""
+      :destroyOnClose="true"
+    >
+      <template #footer> </template>
+      <Audit
+        ref="posRef"
+        :processId="processId"
+        :taskId="taskId"
+        :isRead="isRead"
+        :type="type"
+        :auditData="auditData"
+        @closeModel="closeMolder"
+      />
+    </a-modal>
   </div>
 </template>
 
@@ -201,9 +220,19 @@
   import { degrainingPatchSourceOptions } from '@/utils/global';
   import { SearchOutlined } from '@ant-design/icons-vue';
   import { dataProcessing } from '@/views/demo/tiankongdi/util';
-  import { LoadTaskDetailList, DeleteCaiKuangTaskCase, AddCaiKuangTaskFavorite } from '@/api/degraining/index';
+  import {
+    LoadTaskDetailList,
+    DeleteCaiKuangTaskCase,
+    AddCaiKuangTaskFavorite,
+  } from '@/api/degraining/index';
   import { showDrawBack, drawBackSpan } from '@/views/demo/util';
+  import { Audit } from '@/views/demo/workflow/task/process/page';
+  import { getDetail } from '@/api/sys/WFSchemeInfo';
+  import { flowStore } from '@/store/modules/flow';
+  import { useUserStore } from '@/store/modules/user';
 
+  const userStore = useUserStore();
+  const flowWfDataStore = flowStore();
   const props = defineProps([
     'year',
     'batch',
@@ -217,6 +246,7 @@
     'showInfo',
     'openLoading',
     'closeLoading',
+    'getCountList',
   ]);
 
   const simpleImage = Empty.PRESENTED_IMAGE_SIMPLE;
@@ -241,7 +271,6 @@
     emits('openLoading');
     LoadTaskDetailList(params)
       .then((res) => {
-        console.log(res);
         searchList.value = res.items;
       })
       .finally(() => {
@@ -269,6 +298,29 @@
       querysBtn();
     });
   };
+  const showDataId = ref();
+  const auditOpen = ref(false);
+  const processId = ref('');
+  const taskId = ref('');
+  const type = ref('');
+  const auditData = ref();
+  const isRead: any = ref(0);
+  async function goAudit(record) {
+    showDataId.value = record.Id;
+    let data = await getDetail({ code: record.processcode });
+    let scheme = JSON.parse(data.scheme.content);
+    let wfData = scheme.wfData;
+    flowWfDataStore.setWfDataAll(wfData);
+    auditOpen.value = true;
+    processId.value = record.processid;
+    taskId.value = record.taskeid;
+    type.value = record.type;
+    auditData.value = record;
+  }
+  const closeMolder = () => {
+    querysBtn();
+    emits('getCountList');
+  };
 </script>
 
 <style lang="less" scoped>

src/views/demo/degraining/auditinfo/index.vue

@@ -13,6 +13,7 @@
           @showInfo="changeShowInfo"
           @openLoading="openLoading"
           @closeLoading="closeLoading"
+          @getCountList="getCountList"
         />
         <MapList
           @changeTask="changeTask"
@@ -89,7 +90,6 @@
     getCountList();
   };
   const changeShowInfo = (item) => {
-    console.log(item);
     showParent.value = false;
     areaId.value = item.areaid;
     level.value = item.level;

src/views/demo/degraining/illegaltreatment/AuditProgress/index.vue

@@ -240,6 +240,25 @@
         <a-empty :image="simpleImage" />
       </div>
     </div>
+    <a-modal
+      width="100%"
+      wrap-class-name="full-modal"
+      v-model:open="auditOpen"
+      title="整改审核"
+      footer=""
+      :destroyOnClose="true"
+    >
+      <template #footer> </template>
+      <Audit
+        ref="posRef"
+        :processId="processId"
+        :taskId="taskId"
+        :isRead="isRead"
+        :type="type"
+        :auditData="auditData"
+        @closeModel="closeMolder"
+      />
+    </a-modal>
   </div>
 </template>
 
@@ -256,7 +275,13 @@
     AddCaiKuangTaskFavorite,
   } from '@/api/degraining/index';
   import { showDrawBack, drawBackSpan } from '@/views/demo/util';
+  import { Audit } from '@/views/demo/workflow/task/process/page';
+  import { getDetail } from '@/api/sys/WFSchemeInfo';
+  import { flowStore } from '@/store/modules/flow';
+  import { useUserStore } from '@/store/modules/user';
 
+  const userStore = useUserStore();
+  const flowWfDataStore = flowStore();
   const props = defineProps([
     'year',
     'batch',
@@ -270,6 +295,7 @@
     'showInfo',
     'openLoading',
     'closeLoading',
+    'getCountList',
   ]);
 
   const simpleImage = Empty.PRESENTED_IMAGE_SIMPLE;
@@ -294,7 +320,6 @@
     emits('openLoading');
     LoadTaskIllegalDetailList(params)
       .then((res) => {
-        console.log(res);
         searchList.value = res.items;
       })
       .finally(() => {
@@ -322,6 +347,29 @@
       querysBtn();
     });
   };
+  const showDataId = ref();
+  const auditOpen = ref(false);
+  const processId = ref('');
+  const taskId = ref('');
+  const type = ref('');
+  const auditData = ref();
+  const isRead: any = ref(0);
+  async function goAudit(record) {
+    showDataId.value = record.Id;
+    let data = await getDetail({ code: record.processcode });
+    let scheme = JSON.parse(data.scheme.content);
+    let wfData = scheme.wfData;
+    flowWfDataStore.setWfDataAll(wfData);
+    auditOpen.value = true;
+    processId.value = record.processid;
+    taskId.value = record.taskeid;
+    type.value = record.type;
+    auditData.value = record;
+  }
+  const closeMolder = () => {
+    querysBtn();
+    emits('getCountList');
+  };
 </script>
 
 <style lang="less" scoped>

src/views/demo/degraining/illegaltreatment/index.vue

@@ -13,6 +13,7 @@
           @showInfo="changeShowInfo"
           @openLoading="openLoading"
           @closeLoading="closeLoading"
+          @getCountList="getCountList"
         />
         <MapList
           @changeTask="changeTask"
@@ -89,7 +90,6 @@
     getCountList();
   };
   const changeShowInfo = (item) => {
-    console.log(item);
     showParent.value = false;
     areaId.value = item.areaid;
     level.value = item.level;

src/views/demo/workflow/revocation/index.vue

@@ -39,13 +39,13 @@
 </template>
 
 <script lang="ts" setup>
-  import { reactive, h, ref, watch } from 'vue';
+  import { reactive, h, ref, watch, onMounted } from 'vue';
   import { BasicTable, useTable, TableAction } from '@/components/Table';
   import { getRetractPageList } from '@/api/sys/WFTask';
   import { getDetail } from '@/api/sys/WFSchemeInfo';
   import { Tag } from 'ant-design-vue';
   import { flowStore } from '@/store/modules/flow';
-  import { useRoute } from 'vue-router';
+  import { useRoute, useRouter } from 'vue-router';
   import { retract } from '@/api/sys/WFProcess';
   import { useMessage } from '@/hooks/web/useMessage';
   import { Look } from '@/views/demo/workflow/task/process/page';
@@ -70,7 +70,7 @@
   const revokeUnitName = ref('');
   const auditOpen = ref(false);
   const route: any = useRoute();
-  const code = ref(route.name.split('@')[1]);
+  const code = ref(route.params.id);
   searchInfo.Code = code.value;
   const [registerTable, { reload }] = useTable({
     api: getRetractPageList,