修改很多

src/components/customComponent/AcceptanceModal.vue

@@ -39,6 +39,9 @@
       required: true,
       field: 'clyj',
       component: 'InputTextArea',
+      componentProps: {
+        rows: 5,
+      },
     },
     {
       label: '附件',

src/components/customComponent/AdviceModal.vue

@@ -19,11 +19,18 @@
     { label: '污染地块ID', field: 'wrdkid', component: 'Input', show: false },
     { label: '阶段编码', field: 'scjdbm', component: 'Input', show: false },
     { label: 'pgtype', field: 'pgtype', component: 'Input', show: false },
-    { label: '意见', field: 'clyj', component: 'Input' },
+    {
+      label: '意见',
+      field: 'clyj',
+      required: true,
+      component: 'InputTextArea',
+      componentProps: {
+        rows: 3,
+      },
+    },
     {
       label: '文件',
       field: 'clyjfj',
-      required: true,
       component: 'JUpload',
 
       componentProps: {

src/components/customComponent/ConfirmedModal.vue

@@ -81,7 +81,7 @@
     });
   });
   //设置标题
-  const title = ref('符合评审信息');
+  const title = ref('复核评审信息');
   const dataSource = ref<any>();
   const columns = [
     {
@@ -116,8 +116,8 @@
     try {
       let values = await validate();
       setModalProps({ confirmLoading: true });
-      if(values.nodeType == 1){
-        values.clyj = "复核通过"
+      if (values.nodeType == 1) {
+        values.clyj = '复核通过';
       }
       //提交表单
       await submiDqr(values);

src/components/customComponent/backModal.vue

@@ -43,7 +43,10 @@
     {
       label: '退回意见',
       field: 'clyj',
-      component: 'Input',
+      component: 'InputTextArea',
+      componentProps: {
+        rows: 5,
+      },
       required: true,
     },
     {
@@ -99,7 +102,7 @@
     });
   });
   //设置标题
-  const title = ref('下达意见退回意见');
+  const title = ref('退回意见');
   //表单提交事件
   async function handleSubmit() {
     try {

src/components/customComponent/tableModal.vue

@@ -3,8 +3,7 @@
     width="70%"
     @register="registerModal"
     v-bind="$attrs"
-    :title="type == 'edit' ? '土地使用权人信息 (添加、修改、删除多土地使用权人信息后，需点击“保存”按钮进行保存)' : ''"
-    :helpMessage="['* (添加、修改、删除多土地使用权人信息后，需点击“保存”按钮进行保存)']"
+    :title="type == 'edit' ? '土地使用权人信息 (添加、修改、删除多土地使用权人信息后，需点击“保存”按钮进行保存)' : '查看'"
   >
     <template #footer> </template>
     <a-space style="width: 100%" class="flex justify-end">
@@ -139,6 +138,7 @@
     {
       title: '操作',
       dataIndex: 'operation',
+      colSpan: props.type == 'edit' ? 1 : 0,
     },
   ];
   interface DataItem {

src/layouts/default/index.vue

@@ -190,7 +190,7 @@
           open.value = false;
           //刷新列表
         } finally {
-          open.value = false;
+          // open.value = false;
         }
       }
       return {

src/views/dkgl/fxgk/DetailList.vue

@@ -36,7 +36,7 @@
           <a-button type="primary" v-auth="'fxgk-tbz-scfa'" @click="del">删除方案</a-button>
 
           <a-button type="primary" @click="handleEvaluate" v-auth="'fxgk-tbz-tj'">提交</a-button>
-          <a-button type="primary" @click="NoEval" v-auth="'gkxf-tbz-bps'">不评审</a-button>
+          <a-button type="primary" @click="NoEval" v-auth="'fxgk-tbz-bps'">不评审</a-button>
         </template>
         <template v-else-if="type == '待受理'">
           <a-button type="primary" @click="handleAdd" v-auth="'fxgk-dsl-sl'">受理</a-button>

src/views/dkgl/fxpg/Improved.vue

@@ -30,7 +30,7 @@
       </template>
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" @click="handleView" v-auth="'dkdc-pshdws-jbxx'">查看基本信息</a-button>
+        <a-button type="primary" @click="handleView" v-auth="'fxpg-pshdws-jbxx'">查看基本信息</a-button>
         <a-button type="primary" @click="handleComint" v-auth="'fxpg-dqr-dqr'">待确认</a-button>
       </template>
     </BasicTable>

src/views/dkgl/gkpg/Approved.vue

@@ -30,13 +30,13 @@
       </template>
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" @click="skip" v-auth="'dkdc-tbz-zltb'">查看报告列表</a-button>
+        <a-button type="primary" @click="skip" v-auth="'gkpg-psytg-fa'">查看报告列表</a-button>
         <a-button type="primary" @click="exit('sttc')" v-auth="'gkpg-psytg-sqtc'">申请退出</a-button>
         <a-button type="primary" @click="exit('tc')" v-auth="'gkpg-psytg-tc'">地块退出</a-button>
       </template>
       <!--操作栏-->
     </BasicTable>
-    <ExitModal @register="registerModal" @success="handleSuccess" />
+    <!-- <ExitModal @register="registerModal" @success="handleSuccess" /> -->
   </div>
 </template>
 
@@ -44,16 +44,16 @@
   import { BasicTable } from '/@/components/Table';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useRouter } from 'vue-router';
-  import { useModal } from '/@/components/Modal';
+  // import { useModal } from '/@/components/Modal';
   import { useListPage } from '/@/hooks/system/useListPage';
-  import ExitModal from '@/components/customComponent/ExitModal.vue';
+  // import ExitModal from '@/components/customComponent/ExitModal.vue';
   import { columns, searchFormSchema, useSuspectsData, useCategoryData } from './data';
   import { approvedList, getImportUrl, getExportUrl } from './api';
   import { tcsq, dktc } from '/@/api/common/api';
 
   let router = useRouter();
   const { createMessage } = useMessage();
-  const [registerModal, { openModal }] = useModal();
+  // const [registerModal, { openModal }] = useModal();
   //注册table数据
   const { tableContext } = useListPage({
     tableProps: {

src/views/dkgl/investigate/Filling.vue

@@ -49,9 +49,9 @@
       :cancelText="'取消'"
     >
       <a-radio-group v-model:value="selectdclx">
-        <a-radio :style="radioStyle" value="1">初步调查（没有超标）</a-radio>
-        <a-radio :style="radioStyle" value="2">详细调查</a-radio>
-        <a-radio :style="radioStyle" value="3">初步调查+详细调查</a-radio>
+        <a-radio :style="radioStyle" value="1" style="line-height: 22px">初步调查（没有超标）</a-radio>
+        <a-radio :style="radioStyle" value="2" style="line-height: 22px; margin: 15px 0">详细调查</a-radio>
+        <a-radio :style="radioStyle" value="3" style="line-height: 22px">初步调查+详细调查</a-radio>
       </a-radio-group>
     </a-modal>
     <!-- 点击确定出现的弹框变更的时候 -->

src/views/dkgl/investigate/modal/DataFilling.vue

@@ -222,22 +222,26 @@
     // 判断是详细调查的还是初步调查的
     cbdcBzdw.value = [];
     xxdcBzdw.value = [];
-    dsInfor.value.bzdw.forEach((item) => {
-      if (item.scjdbm == 'S1') {
-        cbdcBzdw.value.push(item);
-      } else if (item.scjdbm == 'S2') {
-        xxdcBzdw.value.push(item);
-      }
-    });
+    if (dsInfor.value.bzdw) {
+      dsInfor.value.bzdw.forEach((item) => {
+        if (item.scjdbm == 'S1') {
+          cbdcBzdw.value.push(item);
+        } else if (item.scjdbm == 'S2') {
+          xxdcBzdw.value.push(item);
+        }
+      });
+    }
     cbjcdw.value = [];
     xxjcdw.value = [];
-    dsInfor.value.jcdw.forEach((item) => {
-      if (item.scjdbm == 'S1') {
-        cbjcdw.value.push(item);
-      } else if (item.scjdbm == 'S2') {
-        xxjcdw.value.push(item);
-      }
-    });
+    if (dsInfor.value.jcdw) {
+      dsInfor.value.jcdw.forEach((item) => {
+        if (item.scjdbm == 'S1') {
+          cbjcdw.value.push(item);
+        } else if (item.scjdbm == 'S2') {
+          xxjcdw.value.push(item);
+        }
+      });
+    }
 
     if (cbdcBzdw.value.length == 0) cbdcBzdw.value.push({ id: null });
 
@@ -246,7 +250,11 @@
     if (cbjcdw.value.length == 0) cbjcdw.value.push({ id: null });
 
     if (xxjcdw.value.length == 0) xxjcdw.value.push({ id: null });
-
+    // jyCl()
+  }
+  getdkInfor();
+  // 校验的处理
+  function jyCl() {
     // 调查方式只能是自行调查 调查形势是初步或者详细调查
     // 需要添加一个调查方式的限制以及  是自行调查还是第三方调查
     cbdcfs.value = dsInfor.value?.cbdc?.cbdcfs;
@@ -285,8 +293,6 @@
       }
     }
   }
-  getdkInfor();
-
   // 获取占地面积
   function getMj(v) {
     zdmj.value = v;

src/views/dkgl/xfpg/Approved.vue

@@ -68,7 +68,7 @@
         autoSubmitOnEnter: true,
         showAdvancedButton: false,
       },
-      showActionColumn:false,
+      showActionColumn: false,
       // actionColumn: {
       //   width: 120,
       // },

src/views/dkgl/xfpg/Review.vue

@@ -4,13 +4,25 @@
     <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <!-- 行业分类 -->
       <template #form-suspect="{ model, field }">
-        <a-select v-model:value="model[field]" placeholder="请选择行业分类" :fieldNames="{ label: 'text', value: 'value' }"
-          :options="isSuspectOptions" @change="changeSuspect"></a-select>
+        <a-select
+          v-model:value="model[field]"
+          placeholder="请选择行业分类"
+          :fieldNames="{ label: 'text', value: 'value' }"
+          :options="isSuspectOptions"
+          @change="changeSuspect"
+        ></a-select>
       </template>
       <template #form-category="{ model, field }">
-        <a-tree-select v-model:value="model[field]" show-search placeholder="请选择二级" allow-clear tree-default-expand-all
-          :field-names="{ label: 'name', value: 'id', children: 'children' }" :tree-data="treeData"
-          tree-node-filter-prop="label">
+        <a-tree-select
+          v-model:value="model[field]"
+          show-search
+          placeholder="请选择二级"
+          allow-clear
+          tree-default-expand-all
+          :field-names="{ label: 'name', value: 'id', children: 'children' }"
+          :tree-data="treeData"
+          tree-node-filter-prop="label"
+        >
           <template #suffixIcon>
             <SmileOutlined />
           </template>
@@ -26,54 +38,54 @@
 </template>
 
 <script lang="ts" name="dkgl-xfpg-Review" setup>
-import { BasicTable } from '/@/components/Table';
-import { useMessage } from '/@/hooks/web/useMessage';
-import { useRouter } from 'vue-router';
-import { useListPage } from '/@/hooks/system/useListPage';
-import { columns, searchFormSchema, useSuspectsData, useCategoryData } from './data';
-import { reviewList, getImportUrl, getExportUrl } from './api';
+  import { BasicTable } from '/@/components/Table';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { useRouter } from 'vue-router';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns, searchFormSchema, useSuspectsData, useCategoryData } from './data';
+  import { reviewList, getImportUrl, getExportUrl } from './api';
 
-let router = useRouter();
-const { createMessage } = useMessage();
-//注册table数据
-const { tableContext } = useListPage({
-  tableProps: {
-    title: '修复效果评估-待评审',
-    api: reviewList,
-    columns,
-    canResize: false,
-    clickToRowSelect: true,
-    showActionColumn: false,
-    //定义rowSelection的类型，默认是checkbox多选，可以设置成radio单选
-    rowKey: 'wrdkid',
-    rowSelection: { type: 'radio' },
-    formConfig: {
-      labelWidth: 120,
-      schemas: searchFormSchema,
-      autoSubmitOnEnter: true,
-      showAdvancedButton: false,
+  let router = useRouter();
+  const { createMessage } = useMessage();
+  //注册table数据
+  const { tableContext } = useListPage({
+    tableProps: {
+      title: '修复效果评估-待评审',
+      api: reviewList,
+      columns,
+      canResize: false,
+      clickToRowSelect: true,
+      showActionColumn: false,
+      //定义rowSelection的类型，默认是checkbox多选，可以设置成radio单选
+      rowKey: 'wrdkid',
+      rowSelection: { type: 'radio' },
+      formConfig: {
+        labelWidth: 120,
+        schemas: searchFormSchema,
+        autoSubmitOnEnter: true,
+        showAdvancedButton: false,
+      },
     },
-  },
-  exportConfig: {
-    name: '修复效果评估-待评审',
-    url: getExportUrl,
-  },
-  importConfig: {
-    url: getImportUrl,
-  },
-});
-const isSuspectOptions = useSuspectsData().data; // 行业分类
-const useCategory = useCategoryData();
-const treeData = useCategory.data; // 行业类别-数据
-const changeSuspect = useCategory.changeIsSuspect; // 行业类别-方法
-const [registerTable, { }, { rowSelection, selectedRowKeys, selectedRows }] = tableContext;
-// 查看报告列表
-function skip() {
-  if (selectedRowKeys.value.length == 0) {
-    createMessage.info('请选择需要处理的内容，每次只能选中一条');
-    return;
+    exportConfig: {
+      name: '修复效果评估-待评审',
+      url: getExportUrl,
+    },
+    importConfig: {
+      url: getImportUrl,
+    },
+  });
+  const isSuspectOptions = useSuspectsData().data; // 行业分类
+  const useCategory = useCategoryData();
+  const treeData = useCategory.data; // 行业类别-数据
+  const changeSuspect = useCategory.changeIsSuspect; // 行业类别-方法
+  const [registerTable, {}, { rowSelection, selectedRowKeys, selectedRows }] = tableContext;
+  // 查看报告列表
+  function skip() {
+    if (selectedRowKeys.value.length == 0) {
+      createMessage.info('请选择需要处理的内容，每次只能选中一条');
+      return;
+    }
+    router.push(`/dkgl/xfpg/DetailList?wrdkid=${selectedRowKeys.value[0]}&type=待评审&jdnzt=T2&isnyd2yzlg=${selectedRows.value[0]?.isnyd2yzlg}`);
   }
-  router.push(`/dkgl/xfpg/DetailList?wrdkid=${selectedRowKeys.value[0]}&type=待评审&jdnzt=T2&isnyd2yzlg=${selectedRows.value[0]?.isnyd2yzlg}`)
-}
 </script>
 <style scoped></style>