处置完成接受地状态修改

src/views/dkgl/soil/data.ts

@@ -98,31 +98,31 @@ export const CZwccolumns: BasicColumn[] = [
             if (record.flag == 1)
                 return '提交'
             if (record.flag == 2)
-                return '已接受'
+                return '完成'
             if (record.flag == 3)
                 return '退回'
         },
     },
-    {
-        title: '实际转运时间',
-        dataIndex: 'sjzysj',
-        resizable: true,
-    },
-    {
-        title: '实际转运总量',
-        dataIndex: 'sjzyzl',
-        resizable: true,
-    },
-    {
-        title: '处置时间',
-        dataIndex: 'czsj',
-        resizable: true,
-    },
-    {
-        title: '处置总量',
-        dataIndex: 'czzl',
-        resizable: true,
-    },
+    // {
+    //     title: '实际转运时间',
+    //     dataIndex: 'sjzysj',
+    //     resizable: true,
+    // },
+    // {
+    //     title: '实际转运总量',
+    //     dataIndex: 'sjzyzl',
+    //     resizable: true,
+    // },
+    // {
+    //     title: '处置时间',
+    //     dataIndex: 'czsj',
+    //     resizable: true,
+    // },
+    // {
+    //     title: '处置总量',
+    //     dataIndex: 'czzl',
+    //     resizable: true,
+    // },
     {
         title: '地块所在地主管部门',
         dataIndex: 'szdRealname',
@@ -132,7 +132,7 @@ export const CZwccolumns: BasicColumn[] = [
         title: '地块所在地主管部门是否确认',
         dataIndex: 'szdFlag',
         customRender: ({ record }: any) => {
-            return (record.szdFlag || record.szdFlag === 0) ? (record.szdFlag == '1' ? '是' : '否') : '';
+            return (record.szdFlag || record.szdFlag === 0) ? (record.szdFlag == '1' ? '是' : record.szdFlag == '-1' ? '待确认' : record.szdFlag == '2' ? '进行中' : '否') : '';
         },
         resizable: true,
     },
@@ -144,9 +144,10 @@ export const CZwccolumns: BasicColumn[] = [
     {
         title: '接收地主管部门是否确认',
         dataIndex: 'jsdFlag',
-        customRender: ({ record }: any) => {
-            return (record.jsdFlag || record.jsdFlag === 0) ? (record.jsdFlag == '1' ? '是' : '否') : '';
-        },
+        slots: { customRender: 'jsdFlag' },
+        // customRender: ({ record }: any) => {
+        //     return (record.jsdFlag || record.jsdFlag === 0) ? (record.jsdFlag == '1' ? '是' : '否') : '';
+        // },
         resizable: true,
     },
 ];

src/views/dkgl/soil/dispose.vue

@@ -12,11 +12,20 @@
         <a-button type="primary" @click="handle('dgszbm')" v-auth="'trwy-czwcbs-dgszbm'" :disabled="szdshow">地块所在地部门确认</a-button>
         <a-button type="primary" @click="handle('jsdbm')" v-auth="'trwy-czwcbs-jsdbm'" :disabled="jsshow">接收地部门确认</a-button>
       </template>
+
+      <template #jsdFlag="{ record }">
+        <span>{{ (record.jsdFlag || record.jsdFlag === 0) ? (record.jsdFlag == '1' ? '是' : record.jsdFlag == '-1' ? '待确认' : record.jsdFlag == '2' ? '进行中' : '否') : '' }}</span>
+        <a-button type="link" v-if="record.jsdFlag == '2'" @click="handleQrxx(record)">查看</a-button>
+      </template>
     </BasicTable>
     <!--接收完成填报 -->
     <czfillingModal @register="registerModal" @success="handleSuccess" />
     <!--部门确认 -->
     <depconfirmationModal @register="registerbmModal" @success="handleSuccess" />
+
+    <a-modal v-model:visible="openvisible" title="确认部门信息" @ok="openvisible=false" :footer="false">
+      <a-table :dataSource="modalList" :columns="modalcolumns" />
+    </a-modal>
   </div>
 </template>
 
@@ -36,14 +45,25 @@
 
   const [registerModal, { openModal }] = useModal();
   const [registerbmModal, { openModal: openbmModal }] = useModal();
-
+  const openvisible = ref(false)
   const userStore: any = useUserStore();
   const szdshow = ref(true);
   const jsshow = ref(true);
+  const modalcolumns = ref([{
+    title: '接受部门名称',
+    dataIndex: 'name',
+    algin:'center',
+    width:'200'
+  },{
+    title: '确认状态',
+    dataIndex: 'zt',
+    algin:'center',
+    width:'200'
+  }])
   //注册table数据
   const { tableContext } = useListPage({
     tableProps: {
-      title: '重点监管地块',
+      title: '处置完成',
       api: zyjhCzwcList,
       columns: CZwccolumns,
       canResize: false,
@@ -120,6 +140,25 @@
       }
     }
   }
+
+  const modalList = ref<any>([])
+  //查看接受地确认企业信息
+  function handleQrxx(record) {
+    openvisible.value = true
+    modalList.value = []
+    const listName = (record.jsdRealname).split(',')
+    const jsdzgbm = record.jsdzgbm.split(',')
+    const index = jsdzgbm.indexOf(record.jsdQr)
+    for (let i = 0; i < listName.length; i++) {
+      const element = listName[i];
+      let obj = {
+        name: element,
+        zt: index==i?'已确认':'未确认'
+      }
+      modalList.value.push(obj)
+    }
+   
+  }
   function skip(record) {
     openModal(true, {
       record: record,