Merge remote-tracking branch 'origin/master'

src/main/java/com/hz/employmentsite/controller/companyService/CompanyController.java

@@ -1,6 +1,8 @@
 package com.hz.employmentsite.controller.companyService;
 
 import com.github.pagehelper.PageInfo;
+import com.hz.employmentsite.filter.exception.BaseErrorEnum;
+import com.hz.employmentsite.filter.exception.BaseException;
 import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.util.ExcelHelper;
@@ -30,18 +32,33 @@ public class CompanyController {
     @GetMapping("/getList")
     public BaseResponse<PageInfo<CompanyVo>> getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
                                                      @RequestParam(required = false) String primaryKey, @RequestParam(required = false) String companyName,
-                                                     @RequestParam(required = false) String companyCode,@RequestParam(required = false) String recordStatus,
-                                                     @RequestParam(required = false) String regionCode,@RequestParam(required = false) String streetCode) {
+                                                     @RequestParam(required = false) String companyCode, @RequestParam(required = false) String recordStatus,
+                                                     @RequestParam(required = false) String regionCode, @RequestParam(required = false) String streetCode) {
 
-        PageInfo<CompanyVo> result = companyService.getList(pageIndex,pageSize,primaryKey,companyName,companyCode,recordStatus,regionCode,streetCode);
+        PageInfo<CompanyVo> result = companyService.getList(pageIndex, pageSize, primaryKey, companyName, companyCode, recordStatus, regionCode, streetCode);
 
         return RespGenerstor.success(result);
     }
 
+    @GetMapping("/getCompanyByID")
+    public BaseResponse<CompanyVo> getCompanyById(String id) {
+        var data = companyService.getDataById(id);
+        if (data == null) {
+            data = new CompanyVo();
+        }
+        return RespGenerstor.success(data);
+    }
+
+    @PostMapping("/save")
+    public BaseResponse<Integer> save(@RequestBody CompanyVo data) {
+        var result = companyService.save(data, accountService.getLoginUserID());
+        return RespGenerstor.success(result);
+    }
 
     @ResponseBody
-    @PostMapping("/delete")
-    public BaseResponse<Integer> delete(@RequestBody List<String> idList){
-        return RespGenerstor.success(companyService.delete(idList));
+    @GetMapping("/delete")
+    public BaseResponse<Integer> delete(String id) {
+        Integer result = companyService.delete(id);
+        return RespGenerstor.success(result);
     }
 }

src/main/java/com/hz/employmentsite/services/impl/companyService/CompanyServiceImpl.java

@@ -4,13 +4,18 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.mapper.PcCompanyMapper;
 import com.hz.employmentsite.mapper.cquery.CompanyCQuery;
+import com.hz.employmentsite.model.PcCompany;
 import com.hz.employmentsite.model.PcCompanyExample;
+import com.hz.employmentsite.model.PcCompanyWithBLOBs;
 import com.hz.employmentsite.services.service.companyService.CompanyService;
+import com.hz.employmentsite.util.StringUtils;
 import com.hz.employmentsite.vo.companyService.CompanyVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 @Service("CompanyService")
 public class CompanyServiceImpl implements CompanyService {
@@ -18,22 +23,94 @@ public class CompanyServiceImpl implements CompanyService {
     @Autowired
     private CompanyCQuery companyCQuery;
 
+    @Autowired
+    private StringUtils stringUtils;
+
     @Autowired
     private PcCompanyMapper pcCompanyMapper;
 
     @Override
     public PageInfo<CompanyVo> getList(Integer pageIndex, Integer pageSize, String primaryKey, String companyName, String companyCode, String recordStatus, String regionCode, String streetCode) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<CompanyVo> dataList = companyCQuery.getList(primaryKey,companyName,companyCode,recordStatus,regionCode,streetCode);
+        List<CompanyVo> dataList = companyCQuery.getList(primaryKey, companyName, companyCode, recordStatus, regionCode, streetCode);
         PageInfo<CompanyVo> result = new PageInfo(dataList);
         return result;
     }
 
     @Override
-    public Integer delete(List<String> idList){
+    public Integer save(CompanyVo data, String userId) {
+        Integer result = 0;
+        Boolean isExist = data.getCompanyID() != null;
+        PcCompanyWithBLOBs dbData = null;
+        PcCompanyExample exp = new PcCompanyExample();
+        PcCompanyExample.Criteria cro = exp.createCriteria();
+        if (isExist) {
+            cro.andCompanyIDEqualTo(data.getCompanyID());
+            dbData = pcCompanyMapper.selectByExampleWithBLOBs(exp).stream().findFirst().orElse(null);
+        }
+        if (dbData == null) {
+            dbData = new PcCompanyWithBLOBs();
+            dbData.setCompanyID(UUID.randomUUID().toString());
+            dbData.setCompanyName(data.getCompanyName());
+            dbData.setCompanyCode(data.getCompanyCode());
+            dbData.setSiteID(data.getSiteID());
+            dbData.setRegionCode(data.getRegionCode());
+            dbData.setStreetCode(data.getStreetCode());
+            dbData.setAddress(data.getAddress());
+            dbData.setWorkSituation(data.getWorkSituation());
+            dbData.setCompanyModel(data.getCompanyModel());
+            dbData.setCompanyType(data.getCompanyType());
+            dbData.setUserName(data.getUserName());
+            dbData.setUserMobile(data.getUserMobile());
+            dbData.setCompanyEmail(data.getCompanyEmail());
+            dbData.setFrName(data.getFrName());
+            dbData.setValidTime(data.getValidTime());
+            dbData.setRecordStatus(data.getRecordStatus());
+            dbData.setBusinScope(data.getBusinScope());
+            dbData.setCompanyDesc(data.getCompanyDesc());
+            dbData.setCreateTime(new Date());
+            dbData.setCreateUserID(userId);
+            result = pcCompanyMapper.insert(dbData);
+
+        } else {
+            dbData.setCompanyName(data.getCompanyName());
+            dbData.setCompanyCode(data.getCompanyCode());
+            dbData.setSiteID(data.getSiteID());
+            dbData.setRegionCode(data.getRegionCode());
+            dbData.setStreetCode(data.getStreetCode());
+            dbData.setAddress(data.getAddress());
+            dbData.setWorkSituation(data.getWorkSituation());
+            dbData.setCompanyModel(data.getCompanyModel());
+            dbData.setCompanyType(data.getCompanyType());
+            dbData.setUserName(data.getUserName());
+            dbData.setUserMobile(data.getUserMobile());
+            dbData.setCompanyEmail(data.getCompanyEmail());
+            dbData.setFrName(data.getFrName());
+            dbData.setValidTime(data.getValidTime());
+            dbData.setRecordStatus(data.getRecordStatus());
+            dbData.setBusinScope(data.getBusinScope());
+            dbData.setCompanyDesc(data.getCompanyDesc());
+            dbData.setModifyTime(new Date());
+            dbData.setModifyUserID(userId);
+            result = pcCompanyMapper.updateByPrimaryKeySelective(dbData);
+        }
+        return result;
+    }
+
+
+    @Override
+    public Integer delete(String id) {
         PcCompanyExample contactExample = new PcCompanyExample();
-        contactExample.or().andCompanyIDIn(idList);
+        contactExample.or().andCompanyIDEqualTo(id);
         pcCompanyMapper.deleteByExample(contactExample);
         return pcCompanyMapper.deleteByExample(contactExample);
     }
+
+    @Override
+    public CompanyVo getDataById(String id) {
+        if (stringUtils.IsNullOrEmpty(id)) {
+            return null;
+        }
+        return companyCQuery.getList(id, null, null, null, null, null).stream().findFirst().orElse(null);
+    }
 }

src/main/java/com/hz/employmentsite/services/service/companyService/CompanyService.java

@@ -7,7 +7,12 @@ import java.util.List;
 
 public interface CompanyService {
 
-    PageInfo<CompanyVo> getList(Integer pageIndex, Integer pageSize, String siteName, String companyName,String companyCode,String recordStatus,String regionCode,String streetCode);
+    PageInfo<CompanyVo> getList(Integer pageIndex, Integer pageSize, String siteName, String companyName, String companyCode, String recordStatus, String regionCode, String streetCode);
+
+    Integer save(CompanyVo dat, String userId);
+
+    Integer delete(String id);
+
+    CompanyVo getDataById(String id);
 
-    Integer delete(List<String> idList);
 }

src/main/java/com/hz/employmentsite/vo/companyService/CompanyVo.java

@@ -53,4 +53,8 @@ public class CompanyVo {
     public String streetName;
 
     public  Integer postCount;
+
+    public  String businScope;
+
+    public String companyDesc;
 }

src/main/resources/generatorConfig.xml

@@ -99,7 +99,9 @@
 
         <table schema="" tableName="pc_post"><property name="useActualColumnNames" value="true"/></table>
         <table schema="" tableName="pc_post"><property name="useActualColumnNames" value="true"/></table>
+        <table schema="" tableName="pc_company"><property name="useActualColumnNames" value="true"/></table>
         -->
 
+
     </context>
 </generatorConfiguration>

src/main/resources/mapping/cquery/CompanyCQuery.xml

@@ -12,7 +12,7 @@
         on company.StreetCode = area.code
         where 1=1
         <if test="primaryKey!='' and primaryKey!=null">
-            and companyID in (${primaryKey})
+            and companyID = #{primaryKey}
         </if>
         <if test="companyName!='' and companyName!=null">
             and companyName like Concat('%',#{companyName},'%')

vue/src/api/companyService/company.ts

@@ -14,12 +14,34 @@ export function getList(params: any) {
   );
 }
 
-export function del(data: any) {
+export function getCompanyById(id: string) {
+  return request<object>({
+    url: 'companyService/company/getCompanyByID',
+    method: 'get',
+    params: {id}
+  }, {
+    isNew: true
+  })
+}
+
+export function save(data: any) {
+  return request<object>({
+    url: 'companyService/company/save',
+    method: 'post',
+    data: data
+  }, {
+    isNew: true,
+    successMsg: '提交成功！',
+    errorMsg: '提交失败！'
+  })
+}
+
+export function del(id) {
   return request<object>(
     {
-      url: 'institution/delete',
-      method: 'post',
-      data: data,
+      url: 'companyService/company/delete',
+      method: 'get',
+      params: {id},
     },
     {
       isNew: true,

vue/src/views/companyService/company/edit.vue

@@ -8,32 +8,32 @@
           <a-form-item
             label="企业名称"
             :label-col="{ span: 6 }"
-            name="CompanyName"
+            name="companyName"
             :rules="[{ required: true, message: '请输入企业名称!' }]"
           >
-            <a-input v-model:value="dataModel.CompanyName" placeholder=""/>
+            <a-input v-model:value="dataModel.companyName" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="8">
           <a-form-item
             label="统一信用代码"
             :label-col="{ span: 6 }"
-            name="CompanyCode"
+            name="companyCode"
             :rules="[{ required: true, message: '请输入统一信用代码!' }]"
           >
-            <a-input v-model:value="dataModel.CompanyCode" placeholder=""/>
+            <a-input v-model:value="dataModel.companyCode" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="8">
           <a-form-item
             label="所属驿站"
             :label-col="{ span: 6 }"
-            name="SiteID"
-            :rules="[{ required: true, message: '请选择所属驿站!' }]"
+            name="siteID"
+            :rules="[{ required: false, message: '请选择所属驿站!' }]"
           >
             <a-select
               ref="select"
-              v-model:value="dataModel.SiteID"
+              v-model:value="dataModel.siteID"
               :options="studentTypelist"
               :field-names="{ label: 'name', value: 'value' }"
             >
@@ -48,14 +48,15 @@
           <a-form-item
             label="所属县区"
             :label-col="{ span: 6 }"
-            name="RegionCode"
+            name="regionCode"
             :rules="[{ required: true, message: '请选择所属县区!' }]"
           >
             <a-select
               ref="select"
-              v-model:value="dataModel.RegionCode"
-              :options="studentTypelist"
-              :field-names="{ label: 'name', value: 'value' }"
+              v-model:value="dataModel.regionCode"
+              :options="regionList"
+              :field-names="{ label: 'name', value: 'code' }"
+              @change="changeCity"
             >
             </a-select>
           </a-form-item>
@@ -64,14 +65,14 @@
           <a-form-item
             label="所属街道"
             :label-col="{ span: 6 }"
-            name="StreetCode"
+            name="streetCode"
             :rules="[{ required: true, message: '请选择所属街道!' }]"
           >
             <a-select
               ref="select"
-              v-model:value="dataModel.StreetCode"
-              :options="studentTypelist"
-              :field-names="{ label: 'name', value: 'value' }"
+              v-model:value="dataModel.streetCode"
+              :options="streetList"
+              :field-names="{ label: 'name', value: 'code' }"
             >
             </a-select>
           </a-form-item>
@@ -80,10 +81,10 @@
           <a-form-item
             label="企业办公地址"
             :label-col="{ span: 6 }"
-            name="Address"
+            name="address"
             :rules="[{ required: true, message: '请输入企业办公地址!' }]"
           >
-            <a-input v-model:value="dataModel.Address" placeholder=""/>
+            <a-input v-model:value="dataModel.address" placeholder=""/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -94,32 +95,32 @@
           <a-form-item
             label="用工情况"
             :label-col="{ span: 6 }"
-            name="WorkSituation"
+            name="workSituation"
             :rules="[{ required: true, message: '请输入用工情况!' }]"
           >
-            <a-input v-model:value="dataModel.WorkSituation" placeholder=""/>
+            <a-input v-model:value="dataModel.workSituation" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="8">
           <a-form-item
             label="企业规模"
             :label-col="{ span: 6 }"
-            name="CompanyModel"
+            name="companyModel"
             :rules="[{ required: true, message: '请输入企业规模!' }]"
           >
-            <a-input v-model:value="dataModel.CompanyModel" placeholder=""/>
+            <a-input v-model:value="dataModel.companyModel" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="8">
           <a-form-item
             label="企业分类"
             :label-col="{ span: 6 }"
-            name="CompanyType"
-            :rules="[{ required: true, message: '请选择企业分类!' }]"
+            name="companyType"
+            :rules="[{ required: false, message: '请选择企业分类!' }]"
           >
             <a-select
               ref="select"
-              v-model:value="dataModel.CompanyType"
+              v-model:value="dataModel.companyType"
               :options="studentStatuslist"
               :field-names="{ label: 'name', value: 'value' }"
             >
@@ -132,30 +133,30 @@
           <a-form-item
             label="企业联系人"
             :label-col="{ span: 6 }"
-            name="UserName"
+            name="userName"
             :rules="[{ required: true, message: '请输入企业联系人!' }]"
           >
-            <a-input v-model:value="dataModel.UserName" placeholder=""/>
+            <a-input v-model:value="dataModel.userName" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="8">
           <a-form-item
             label="企业联系电话"
             :label-col="{ span: 6 }"
-            name="UserMobile"
+            name="userMobile"
             :rules="[{ required: true, message: '请输入企业联系电话!' }]"
           >
-            <a-input v-model:value="dataModel.UserMobile" placeholder=""/>
+            <a-input v-model:value="dataModel.userMobile" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="8">
           <a-form-item
             label="企业邮箱"
             :label-col="{ span: 6 }"
-            name="CompanyEmail"
+            name="companyEmail"
             :rules="[{ required: true, message: '请选择企业邮箱!' }]"
           >
-            <a-input v-model:value="dataModel.CompanyEmail" placeholder=""/>
+            <a-input v-model:value="dataModel.companyEmail" placeholder=""/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -164,21 +165,21 @@
           <a-form-item
             label="法定代表人"
             :label-col="{ span: 6 }"
-            name="FrName"
+            name="frName"
             :rules="[{ required: true, message: '请选择法定代表人!' }]"
           >
-            <a-input v-model:value="dataModel.FrName" placeholder=""/>
+            <a-input v-model:value="dataModel.frName" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="8">
           <a-form-item
             label="营业执照有效期"
             :label-col="{ span: 6 }"
-            name="ValidTime"
+            name="validTime"
             :rules="[{ required: true, message: '请输入营业执照有效期!' }]"
           >
             <a-date-picker
-              v-model:value="dataModel.ValidTime"
+              v-model:value="dataModel.validTime"
               picker="date"
               value-format="YYYY-MM-DD"
             />
@@ -188,12 +189,12 @@
           <a-form-item
             label="企业状态"
             :label-col="{ span: 6 }"
-            name="RecordStatus"
-            :rules="[{ required: true, message: '请选择企业状态!' }]"
+            name="recordStatus"
+            :rules="[{ required: false, message: '请选择企业状态!' }]"
           >
             <a-select
               ref="select"
-              v-model:value="dataModel.RecordStatus"
+              v-model:value="dataModel.recordStatus"
               :options="studentStatuslist"
               :field-names="{ label: 'name', value: 'value' }"
             >
@@ -205,15 +206,15 @@
       <a-divider orientation="left">其他信息</a-divider>
       <a-row>
         <a-col class="table-bottom-a1">
-          <a-form-item :label-col="{span:8}" label="" name="BusinScope">
-            <a-textarea v-model:value="dataModel.BusinScope" placeholder="经营范围" :rows="4"/>
+          <a-form-item :label-col="{span:8}" label="" name="businScope">
+            <a-textarea v-model:value="dataModel.businScope" placeholder="经营范围" :rows="4"/>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row>
         <a-col class="table-bottom-a1">
-          <a-form-item :label-col="{span:8}" label="" name="CompanyDesc">
-            <a-textarea v-model:value="dataModel.CompanyDesc" placeholder="企业简介" :rows="4"/>
+          <a-form-item :label-col="{span:8}" label="" name="companyDesc">
+            <a-textarea v-model:value="dataModel.companyDesc" placeholder="企业简介" :rows="4"/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -226,49 +227,83 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, reactive, ref, toRefs } from 'vue';
-import { useRouter } from 'vue-router';
-import type { SelectProps } from 'ant-design-vue';
-import { useTabsViewStore } from '@/store/modules/tabsView';
+import {defineComponent, reactive, ref, toRefs} from 'vue';
+import {useRouter} from 'vue-router';
+import type {SelectProps} from 'ant-design-vue';
+import {useTabsViewStore} from '@/store/modules/tabsView';
 import BUploadFile from '@/components/file/uploadFile.vue';
+import {get} from "@/api/common";
+import {save, getCompanyById} from '@/api/companyService/company'
 
 interface FormState {
   dataModel: any;
 }
 
 export default defineComponent(
-{
-  components: { BUploadFile },
-  setup()
   {
-    const formState = reactive<FormState>({ dataModel: {} });
-    const router = useRouter();
-    const postStatuslist = ref<SelectProps['options']>();
-    // const fullpath = router.currentRoute.value.fullPath;
-    const tabsViewStore = useTabsViewStore();
+    components: {BUploadFile},
+    setup() {
+      const formState = reactive<FormState>({dataModel: {}});
+      const router = useRouter();
+      const postStatuslist = ref<SelectProps['options']>();
+      // const fullpath = router.currentRoute.value.fullPath;
+      const tabsViewStore = useTabsViewStore();
 
-    const onClose = () => {
-      tabsViewStore.closeCurrentTabByPath('/companyService/enterprise/add');
-      tabsViewStore.closeCurrentTabByPath('/companyService/enterprise/edit');
-      router.push({ name: '/companyService/enterprise/index' });
-    };
+      const regionList = ref<SelectProps['options']>();
+      const streetList = ref<SelectProps['options']>();
+      const fullpath = router.currentRoute.value.fullPath;
 
-    const onFinish=()=>{
+      const onClose = () => {
+        tabsViewStore.closeCurrentTabByPath('/companyService/enterprise/add');
+        tabsViewStore.closeCurrentTabByPath('/companyService/enterprise/edit');
+        router.push({name: '/companyService/enterprise/index'});
+      };
 
-    }
 
-    const loadData = () => {
+      get('system/area/getCityList', {}).then(data => {
+        console.log(data);
+        regionList.value = data;
+        console.log(regionList.value);
+      });
+
+      const changeCity = () => {
+        get('system/area/getAreaList', {code: formState.dataModel.regionCode}).then(data => {
+          console.log(data);
+          streetList.value = data;
+          console.log(streetList.value);
+        })
+      }
+
+      const onFinish = () => {
+        save(formState.dataModel).then(result => {
+          if (result) {
+            tabsViewStore.closeCurrentTab(fullpath);
+            tabsViewStore.addTabByPath('/companyService/enterprise/index', {reload: 1});
+          }
+        })
+      }
 
-    };
+      const loadData = (id: any) => {
+        getCompanyById(id).then(result => {
+          formState.dataModel = result;
+        })
+      };
 
-    return {
-      ...toRefs(formState),
-      loadData,
-      onClose,
-      onFinish,
-      postStatuslist
+      return {
+        ...toRefs(formState),
+        loadData,
+        onClose,
+        onFinish,
+        regionList,
+        streetList,
+        changeCity,
+        postStatuslist
+      }
+    },
+    created() {
+      const id = history.state.params?.id;
+      this.loadData(id);
     }
-  }
-})
+  })
 </script>
 

vue/src/views/companyService/company/index.vue

@@ -56,8 +56,8 @@
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
           <a-button type="primary" html-type="submit" @click='onAdd'>新增</a-button>
-          <a-button type="primary" html-type="submit" >导入</a-button>
-          <a-button type="primary" html-type="submit" >导出</a-button>
+          <a-button type="primary" html-type="submit">导入</a-button>
+          <a-button type="primary" html-type="submit">导出</a-button>
         </a-col>
       </a-row>
     </a-form>
@@ -89,13 +89,13 @@ import type {TableColumnsType, TableProps} from 'ant-design-vue';
 import {getList, del} from '@/api/companyService/company';
 import BExportExcel from "@/components/basic/excel/exportExcel/exportExcel.vue";
 import {getPaginationTotalTitle} from "@/utils/common";
-import {message, Modal, SelectProps} from "ant-design-vue";
+import { Modal, SelectProps} from "ant-design-vue";
 import dayjs from "dayjs";
-import { useTabsViewStore } from '@/store/modules/tabsView';
+import {useTabsViewStore} from '@/store/modules/tabsView';
 import {get} from "@/api/common";
 
 export default defineComponent({
-  components: { DownOutlined, UpOutlined, BExportExcel},
+  components: {DownOutlined, UpOutlined, BExportExcel},
   setup() {
     const formRef = ref<FormInstance>();
     const searchParams = reactive({
@@ -150,18 +150,18 @@ export default defineComponent({
     const institutionEditModelRef = ref();
     const tabsViewStore = useTabsViewStore();
 
-    const changeCity=()=>{
-      get('system/area/getAreaList',{code:searchParams.regionCode}).then(data=>{
+    const changeCity = () => {
+      get('system/area/getAreaList', {code: searchParams.regionCode}).then(data => {
         console.log(data);
-        streetList.value=data;
+        streetList.value = data;
         console.log(streetList.value);
       })
       loadData();
     }
 
-    get('system/area/getCityList',{}).then(data=>{
+    get('system/area/getCityList', {}).then(data => {
       console.log(data);
-      regionList.value=data;
+      regionList.value = data;
       console.log(regionList.value);
     });
 
@@ -188,15 +188,6 @@ export default defineComponent({
     }
 
     const onDel = (item: any) => {
-      if (item) {
-        formState.selectedRowKeys.push(item.InstitutionID as never)
-      }
-
-      if (formState.selectedRowKeys.length <= 0) {
-        message.warning('请选择需要删除的数据！');
-        return false;
-      }
-
       Modal.confirm({
         title: '确认删除选中的公司信息?',
         icon: createVNode(ExclamationCircleOutlined),
@@ -206,7 +197,7 @@ export default defineComponent({
         okButtonProps: {},
         cancelText: '取消',
         onOk() {
-          del(formState.selectedRowKeys).then(() => {
+          del(item.companyID).then(() => {
             loadData();
           });
         },
@@ -220,7 +211,7 @@ export default defineComponent({
       tabsViewStore.addTabByPath('/companyService/enterprise/add', null);
     };
     const onEdit = (item: any) => {
-      tabsViewStore.addTabByPath('/companyService/enterprise/edit', { id: item.CompanyID });
+      tabsViewStore.addTabByPath('/companyService/enterprise/edit', { id: item.companyID });
     };
 
     return {

vue/src/views/taskAndLog/dotask/index.vue

@@ -21,7 +21,7 @@
           <a-button type="primary" html-type="submit" @click="onSearch">查询</a-button>
         </a-col>
       </a-row>
-      <a-row>
+      <a-row :gutter="24">
         <a-col :span="6">
           <a-form-item label="所属县区" :label-col="{span:6}" name="regionCode">
             <a-select
@@ -79,7 +79,7 @@
         <template #bodyCell="{ column, text, record }">
           <template v-if="column.key === 'operation'">
             <div class="table-operation">
-              <a-button type="link" size="small" @click='onOperates(record.institutionID,"修改",false)'>编辑</a-button>
+              <a-button type="link" size="small" @click='onEdit(record)'>编辑</a-button>
               <a-button type="link" size="small" @click="onDel(record)">删除</a-button>
             </div>
           </template>