街道获取调整提交

vue/src/views/baseSettings/institution/edit.vue

@@ -15,19 +15,19 @@
       <a-row type="flex">
         <a-col :span="7">
           <a-form-item label="企业名称" name="CompanyName" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.companyName}}</label>
+            <label v-if="opCategory==3">{{dataModel.companyName}}</label>
             <a-input v-model:value="dataModel.companyName" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="7">
           <a-form-item label="企业地址" name="CompanyAddress" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.companyAddress }}</label>
+            <label v-if="opCategory==3">{{dataModel.companyAddress }}</label>
             <a-input v-model:value="dataModel.companyAddress" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="10">
           <a-form-item label="负责人姓名" name="DutyUserName" :label-col="{span:10}" >
-            <label v-if="isDetail">{{dataModel.fzrName}}</label>
+            <label v-if="opCategory==3">{{dataModel.fzrName}}</label>
             <a-input v-model:value="dataModel.fzrName" placeholder=""/>
 <!--            <a-date-picker  name="feedbackDate2" v-model:value="dataModel.feedbackDate"   value-format="YYYY-MM-DD" picker="date"
                             placeholder="请选择问题反馈日期"  v-if="!isDetail"  />
@@ -41,19 +41,19 @@
       <a-row type="flex">
         <a-col :span="7">
           <a-form-item label="负责人电话"  name="DutyUserMobile" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.fzrMobile }}</label>
+            <label v-if="opCategory==3">{{dataModel.fzrMobile }}</label>
             <a-input v-model:value="dataModel.fzrMobile" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="7">
           <a-form-item label="法人姓名"  name="LegalerName" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.frName }}</label>
+            <label v-if="opCategory==3">{{dataModel.frName }}</label>
             <a-input v-model:value="dataModel.frName" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="10">
           <a-form-item label="法人电话"  name="LegalerMobile" :label-col="{span:10}">
-            <label v-if="isDetail">{{dataModel.frMobile }}</label>
+            <label v-if="opCategory==3">{{dataModel.frMobile }}</label>
             <a-input v-model:value="dataModel.frMobile" placeholder=""/>
           </a-form-item>
         </a-col>
@@ -61,7 +61,7 @@
       <a-row type="flex">
         <a-col :span="7">
           <a-form-item label="企业机构代码"  name="CompanyCode" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.companyCode }}</label>
+            <label v-if="opCategory==3">{{dataModel.companyCode }}</label>
             <a-input v-model:value="dataModel.companyCode" placeholder=""/>
           </a-form-item>
         </a-col>
@@ -113,12 +113,12 @@
       </a-row>
       <a-divider orientation="left">其他</a-divider>
       <a-row>
-        <a-textarea :auto-size="{ minRows: 4, maxRows: 10 }"  v-model:value="dataModel.companyDesc"  :disabled="isDetail"
+        <a-textarea :auto-size="{ minRows: 4, maxRows: 10 }"  v-model:value="dataModel.companyDesc" :disabled="opCategory==3"
                     placeholder="企业简介" style="text-align: center;" />
       </a-row>
       <a-row style="height: 10px"></a-row>
       <a-row>
-        <a-textarea :auto-size="{ minRows: 4, maxRows: 10 }"  v-model:value="dataModel.remarkDesc"  :disabled="isDetail"
+        <a-textarea :auto-size="{ minRows: 4, maxRows: 10 }"  v-model:value="dataModel.remarkDesc"  :disabled="opCategory==3"
                     placeholder="备注" style="text-align: center;" />
       </a-row>
     </a-form>
@@ -152,9 +152,9 @@ export default defineComponent({
     const visible = ref<boolean>(false);
     const confirmLoading = ref<boolean>(false);
     const title = ref();
-    const isAllowCommit = ref<boolean>(false);
-    const isDetail = ref<boolean>(false);
+    const opCategory = ref<any>();
     const isAllowAdd = ref<boolean>(true);
+    const isAllowCommit = ref<boolean>(false);
     const pageParams = reactive({
       pageIndex: 1,
       pageSize: 10,
@@ -191,9 +191,9 @@ export default defineComponent({
       });
     }
 
-    const show = (id: any,method:string,ifDetail:boolean) => {
+    const show = (id: any,method:string,category:any) => {
       title.value ="运营机构管理-"+method;
-      isDetail.value = ifDetail;
+      opCategory.value = category;
       loadData(id);
       visible.value = true;
     };
@@ -314,7 +314,7 @@ export default defineComponent({
       resolveDateDetail,*/
       isAllowCommit,
       isAllowAdd,
-      isDetail,
+      opCategory,
       visible,
       title,
       confirmLoading,

vue/src/views/baseSettings/institution/index.vue

@@ -70,7 +70,7 @@
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
 <!--functioncode="T014001"-->
-          <a-button type="primary" html-type="submit" @click='onOperates(null,"新增",false)' >新增</a-button>
+          <a-button type="primary" html-type="submit" @click='onOperates(null,"新增",1)' >新增</a-button>
           <BExportExcel :title="'导出'" :filename="'运营机构信息'" :url="'/institution/export'" :params="{...searchParams, rows:100000}"></BExportExcel>
         </a-col>
       </a-row>
@@ -85,7 +85,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='onOperates(record.institutionID,"修改",2)' >编辑</a-button>
               <a-button type="link" size="small" @click="onDel(record)" >删除</a-button>
             </div>
           </template>
@@ -206,8 +206,8 @@ export default defineComponent({
       });
     };
 
-    const onOperates = (id: string,operation:string,isDetail:boolean) => {
-      institutionEditModelRef.value.show(id,operation,isDetail);
+    const onOperates = (id: string,operation:string,opCategory:any) => {
+      institutionEditModelRef.value.show(id,operation,opCategory);
     };
 
     return {

vue/src/views/baseSettings/site/edit.vue

@@ -15,20 +15,20 @@
       <a-row type="flex">
         <a-col :span="7">
           <a-form-item label="驿站编号" name="SiteCode" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.siteCode}}</label>
+            <label v-if="opCategory==3">{{dataModel.siteCode}}</label>
             <a-input v-model:value="dataModel.siteCode" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="7">
           <a-form-item label="站点名称" name="SiteName" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.siteName }}</label>
+            <label v-if="opCategory==3">{{dataModel.siteName }}</label>
             <a-input v-model:value="dataModel.siteName" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="10">
           <a-form-item label="所属机构" name="InstitutionName" :label-col="{span:10}" >
-            <label v-if="isDetail">{{dataModel.institutionName}}</label>
-            <a-select v-if ="!isDetail" ref="select" v-model:value="dataModel.institutionID" :options="institutionList"
+            <label v-if="opCategory==3">{{dataModel.institutionName}}</label>
+            <a-select  ref="select" v-model:value="dataModel.institutionID" :options="institutionList"
                       :field-names="{ label: 'text', value: 'value' }" :allow-clear="true" > </a-select>
 <!--            <a-input v-model:value="dataModel.institutionName" placeholder=""/>-->
           </a-form-item>
@@ -37,21 +37,21 @@
       <a-row type="flex">
         <a-col :span="7">
           <a-form-item label="所属县区"  name="RegionCode" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.regionCode}}</label>
-            <a-select v-if ="!isDetail" ref="select" v-model:value="dataModel.regionCode" :options="regionList"
-              :field-names="{ label: 'name', value: 'code' }" :allow-clear="true" @change="getStreetList('')" > </a-select>
+            <label v-if="opCategory==3">{{dataModel.regionCode}}</label>
+            <a-select ref="select" v-model:value="dataModel.regionCode" :options="regionList"
+              :field-names="{ label: 'name', value: 'code' }" :allow-clear="true" @change="getStreetList()" > </a-select>
           </a-form-item>
         </a-col>
         <a-col :span="7">
           <a-form-item label="所属街道"  name="StreetCode" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.streetCode }}</label>
-            <a-select  v-if ="!isDetail" ref="select" v-model:value="dataModel.streetCode" :options="streetList"
+            <label v-if="opCategory==3">{{dataModel.streetCode }}</label>
+            <a-select ref="select" v-model:value="dataModel.streetCode" :options="streetList"
               :field-names="{ label: 'name', value: 'code' }" :allow-clear="true" > </a-select>
           </a-form-item>
         </a-col>
         <a-col :span="10">
           <a-form-item label="详细地址"  name="DetailAddress" :label-col="{span:10}">
-            <label v-if="isDetail">{{dataModel.detailAddress }}</label>
+            <label v-if="opCategory==3">{{dataModel.detailAddress }}</label>
             <a-input v-model:value="dataModel.detailAddress" placeholder=""/>
           </a-form-item>
         </a-col>
@@ -59,26 +59,26 @@
       <a-row type="flex">
         <a-col :span="7">
           <a-form-item label="站点负责人"  name="FzrName" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.fzrName }}</label>
+            <label v-if="opCategory==3">{{dataModel.fzrName }}</label>
             <a-input v-model:value="dataModel.fzrName" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="7">
           <a-form-item label="联系电话"  name="FzrMobile" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.fzrMobile }}</label>
+            <label v-if="opCategory==3">{{dataModel.fzrMobile }}</label>
             <a-input v-model:value="dataModel.fzrMobile" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="10">
           <a-form-item label="驿站坐标"  name="SiteXY" :label-col="{span:10}">
-            <label v-if="isDetail">{{dataModel.sitePosition}}</label>
+            <label v-if="opCategory==3">{{dataModel.sitePosition}}</label>
             <a-input v-model:value="dataModel.sitePosition" placeholder=""/>
           </a-form-item>
         </a-col>
       </a-row>
       <a-divider orientation="left">其他信息</a-divider>
       <a-row>
-        <a-textarea :auto-size="{ minRows: 4, maxRows: 10 }"  v-model:value="dataModel.remarkDesc"  :disabled="isDetail"
+        <a-textarea :auto-size="{ minRows: 4, maxRows: 10 }"  v-model:value="dataModel.remark"  :disabled="opCategory==3"
                     placeholder="备注" style="text-align: center;" />
       </a-row>
     </a-form>
@@ -111,7 +111,7 @@ export default defineComponent({
     const confirmLoading = ref<boolean>(false);
     const title = ref();
     const isAllowCommit = ref<boolean>(false);
-    const isDetail = ref<boolean>(false);
+    const opCategory = ref<any>();
     const formState = reactive({
       total: 0,
       selectedRowKeys: [],
@@ -127,8 +127,8 @@ export default defineComponent({
       const regionResult: any = await getRegionCodeList();
       regionList.value = regionResult;
     }
-    const getStreetList = async function(regionCode: string){
-      const streetResult: any = await getStreetCodeList(regionCode);
+    const getStreetList = async function(){
+      const streetResult: any = await getStreetCodeList(formData.dataModel.regionCode);
       streetList.value = streetResult;
     }
     const getSiteUserList = async function(){
@@ -147,7 +147,7 @@ export default defineComponent({
         formData.dataModel = result;
         console.log("dataModel",formData.dataModel);
         if (formData.dataModel.regionCode != null){
-          getStreetList(formData.dataModel.regionCode);
+          getStreetList();
         }
         if (formData.dataModel.siteX !=null && formData.dataModel.siteY != null){
           formData.dataModel.sitePosition = "X:"+formData.dataModel.siteX+" Y:"+formData.dataModel.siteX;
@@ -155,10 +155,10 @@ export default defineComponent({
       });
     }
 
-    const show = (id: any,method:string,ifDetail:boolean) => {
-      isDetail.value = ifDetail;
-      loadData(id);
+    const show = (id: any,method:string,category:any) => {
       title.value ="驿站站点管理-"+method;
+      opCategory.value = category;
+      loadData(id);
       visible.value = true;
     };
 
@@ -202,7 +202,7 @@ export default defineComponent({
       siteUserList,
       institutionList,
       isAllowCommit,
-      isDetail,
+      opCategory,
       visible,
       title,
       confirmLoading,

vue/src/views/baseSettings/site/index.vue

@@ -55,7 +55,7 @@
       </a-row>
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
-          <a-button type="primary" html-type="submit" @click='onOperates(null,"新增",false)' >新增</a-button>
+          <a-button type="primary" html-type="submit" @click='onOperates(null,"新增",1)' >新增</a-button>
           <a-button type="primary" >驿站地图</a-button>
           <BExportExcel :title="'导出'" :filename="'驿站站点信息'" :url="'/siteInfo/export'" :params="{...searchParams, rows:100000}"></BExportExcel>
         </a-col>
@@ -71,7 +71,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.siteID.toString(),"修改",false)' >编辑</a-button>
+              <a-button type="link" size="small" @click='onOperates(record.siteID.toString(),"修改",2)' >编辑</a-button>
               <a-button type="link" size="small" @click="onDel(record)" >删除</a-button>
             </div>
           </template>
@@ -194,8 +194,8 @@ export default defineComponent({
       });
     };
 
-    const onOperates = (id: string,operation:string,isDetail:boolean) => {
-      siteInfoEditModelRef.value.show(id,operation,isDetail);
+    const onOperates = (id: string,operation:string,opCategory:any) => {
+      siteInfoEditModelRef.value.show(id,operation,opCategory);
     };
     const loadData = async function () {
       formState.loading = true;

vue/src/views/baseSettings/user/edit.vue

@@ -15,20 +15,20 @@
       <a-row type="flex">
         <a-col :span="7">
           <a-form-item label="姓名" name="Name" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.name}}</label>
+            <label v-if="opCategory==3">{{dataModel.name}}</label>
             <a-input v-model:value="dataModel.name" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="7">
           <a-form-item label="性别" name="Gender" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.gender }}</label>
-            <a-select v-if ="!isDetail" ref="select" v-model:value="dataModel.gender" :options="genderList"
+            <label v-if="opCategory==3">{{dataModel.gender }}</label>
+            <a-select ref="select" v-model:value="dataModel.gender" :options="genderList"
                       :field-names="{ label: 'name', value: 'value' }" :allow-clear="false" > </a-select>
           </a-form-item>
         </a-col>
         <a-col :span="10">
           <a-form-item label="联系电话" name="Mobile" :label-col="{span:10}" >
-            <label v-if="isDetail">{{dataModel.mobile}}</label>
+            <label v-if="opCategory==3">{{dataModel.mobile}}</label>
             <a-input v-model:value="dataModel.mobile" placeholder=""/>
           </a-form-item>
         </a-col>
@@ -36,8 +36,8 @@
       <a-row type="flex">
         <a-col :span="7">
           <a-form-item label="角色"  name="RoleID" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.roleID }}</label>
-            <a-select v-if ="!isDetail" ref="select" v-model:value="dataModel.roleID" :options="roleList"
+            <label v-if="opCategory==3">{{dataModel.roleID }}</label>
+            <a-select ref="select" v-model:value="dataModel.roleID" :options="roleList"
                       :field-names="{ label: 'name', value: 'value' }" :allow-clear="false" > </a-select>
           </a-form-item>
         </a-col>
@@ -76,7 +76,7 @@ export default defineComponent({
     const confirmLoading = ref<boolean>(false);
     const title = ref();
     const isAllowCommit = ref<boolean>(false);
-    const isDetail = ref<boolean>(false);
+    const opCategory = ref<any>();
     const formState = reactive({
       total: 0,
       selectedRowKeys: [],
@@ -92,12 +92,12 @@ export default defineComponent({
       });
     }
 
-    const show = (id: any,method:string,ifDetail:boolean) => {
-      loadData(id);
+    const show = (id: any,method:string,category:any) => {
       title.value ="人员管理-"+method;
-      isDetail.value = ifDetail;
+      opCategory.value = category;
       getGenderList();
       getRoleList();
+      loadData(id);
       visible.value = true;
     };
 
@@ -150,7 +150,7 @@ export default defineComponent({
       ...toRefs(formData),
       formState,
       isAllowCommit,
-      isDetail,
+      opCategory,
       visible,
       title,
       confirmLoading,

vue/src/views/baseSettings/user/index.vue

@@ -20,7 +20,7 @@
 
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
-          <a-button type="primary" html-type="submit" @click='onOperates(null,"新增",false)' >新增</a-button>
+          <a-button type="primary" html-type="submit" @click='onOperates(null,"新增",1)' >新增</a-button>
           <BExportExcel :title="'导出'" :filename="'驿站人员信息'" :url="'/userInfo/export'" :params="{...searchParams, rows:100000}"></BExportExcel>
         </a-col>
       </a-row>
@@ -35,7 +35,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.siteUserID.toString(),"修改",false)' >编辑</a-button>
+              <a-button type="link" size="small" @click='onOperates(record.siteUserID.toString(),"修改",2)' >编辑</a-button>
               <a-button type="link" size="small" @click="onDel(record)" >删除</a-button>
             </div>
           </template>
@@ -135,8 +135,8 @@ export default defineComponent({
       });
     };
 
-    const onOperates = (id: string,operation:string,isDetail:boolean) => {
-      userInfoEditModelRef.value.show(id,operation,isDetail);
+    const onOperates = (id: string,operation:string,opCategory:any) => {
+      userInfoEditModelRef.value.show(id,operation,opCategory);
     };
     const loadData = async function () {
       formState.loading = true;

vue/src/views/taskAndLog/dowork/edit.vue

@@ -15,43 +15,39 @@
       <a-row type="flex">
         <a-col :span="7">
           <a-form-item label="姓名" name="UserName" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.userName}}</label>
-            <a-select v-if ="!isDetail" ref="select" v-model:value="dataModel.siteUserID" :options="siteUserList"
+            <label v-if="opCategory==3">{{dataModel.userName}}</label>
+            <a-select ref="select" v-model:value="dataModel.siteUserID" :options="siteUserList"
                       :field-names="{ label: 'text', value: 'value' }" :allow-clear="true" > </a-select>
 <!--            <a-input v-model:value="dataModel.userName" placeholder=""/>-->
           </a-form-item>
         </a-col>
         <a-col :span="7">
             <a-form-item label="日志类型" name="LogTypeName" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.logTypeName }}</label>
-              <a-select v-if ="!isDetail" ref="select" v-model:value="dataModel.doTypeID" :options="logTypeList"
+            <label v-if="opCategory==3">{{dataModel.logTypeName }}</label>
+              <a-select ref="select" v-model:value="dataModel.doTypeID" :options="logTypeList"
                         :field-names="{ label: 'name', value: 'value' }" :allow-clear="false" > </a-select>
 <!--            <a-input v-model:value="dataModel.logTypeName" placeholder=""/>-->
           </a-form-item>
         </a-col>
         <a-col :span="10">
           <a-form-item label="完成时间" name="WorkTime" :label-col="{span:10}" >
-            <label v-if="isDetail">{{dataModel.workTime}}</label>
-            <a-date-picker
-              v-model:value="dataModel.workTime"
-              picker="date"
-              value-format="YYYY-MM-DD"
-            />
+            <label v-if="opCategory==3">{{dataModel.workTime}}</label>
+            <a-date-picker  v-model:value="dataModel.workTime" picker="date" value-format="YYYY-MM-DD" />
           </a-form-item>
         </a-col>
       </a-row>
       <a-row type="flex">
         <a-col :span="7">
           <a-form-item label="所属县区"  name="RegionCode" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.regionCode}}</label>
-            <a-select v-if ="!isDetail" ref="select" v-model:value="dataModel.regionCode" :options="regionList"
-                      :field-names="{ label: 'name', value: 'code' }" :allow-clear="true" @change="getStreetList('')" > </a-select>
+            <label v-if="opCategory==3">{{dataModel.regionCode}}</label>
+            <a-select ref="select" v-model:value="dataModel.regionCode" :options="regionList"
+                      :field-names="{ label: 'name', value: 'code' }" :allow-clear="true" @change="getStreetList()" ></a-select>
           </a-form-item>
         </a-col>
         <a-col :span="7">
           <a-form-item label="所属街道"  name="StreetCode" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.streetCode }}</label>
-            <a-select  v-if ="!isDetail" ref="select" v-model:value="dataModel.streetCode" :options="streetList"
+            <label v-if="opCategory==3">{{dataModel.streetCode }}</label>
+            <a-select  ref="select" v-model:value="dataModel.streetCode" :options="streetList"
                        :field-names="{ label: 'name', value: 'code' }" :allow-clear="true" > </a-select>
           </a-form-item>
         </a-col>
@@ -59,12 +55,12 @@
         </a-col>
       </a-row>
       <a-row>
-        <a-textarea :auto-size="{ minRows: 4, maxRows: 10 }"  v-model:value="dataModel.workContent"  :disabled="isDetail"
+        <a-textarea :auto-size="{ minRows: 4, maxRows: 10 }"  v-model:value="dataModel.workContent"  :disabled="opCategory==3"
                     placeholder="完成情况" style="text-align: center;" />
       </a-row>
       <a-divider orientation="left">其他</a-divider>
       <b-upload-file :fileRefId="dataModel.doWorkID" :readonly="false" :multiple="true"
-                     :setFileList="setFileList" :accept="'.pdf,.png,.jpg'" :disabled="isDetail"></b-upload-file>
+                     :setFileList="setFileList" :accept="'.pdf,.png,.jpg'" :disabled="opCategory==3"></b-upload-file>
 
     </a-form>
   </a-modal>
@@ -96,7 +92,7 @@ export default defineComponent({
     const confirmLoading = ref<boolean>(false);
     const title = ref();
     const isAllowCommit = ref<boolean>(false);
-    const isDetail = ref<boolean>(false);
+    const opCategory = ref<any>();
     const formState = reactive({
       total: 0,
       selectedRowKeys: [],
@@ -115,8 +111,8 @@ export default defineComponent({
       const regionResult: any = await getRegionCodeList();
       regionList.value = regionResult;
     }
-    const getStreetList = async function(regionCode: string){
-      const streetResult: any = await getStreetCodeList(regionCode);
+    const getStreetList = async function(){
+      const streetResult: any = await getStreetCodeList(formData.dataModel.regionCode);
       streetList.value = streetResult;
     }
     const getSiteUserList = async function(){
@@ -134,15 +130,15 @@ export default defineComponent({
         formData.dataModel = result;
         console.log(formData.dataModel);
         if (formData.dataModel.regionCode != null){
-          getStreetList(formData.dataModel.regionCode);
+          getStreetList();
         }
       });
     }
 
-    const show = (id: any,method:string,ifDetail:boolean) => {
+    const show = (id: any,method:string,category:any) => {
       loadData(id);
       title.value ="工作日志管理-"+method;
-      isDetail.value = ifDetail;
+      opCategory.value = category;
       getRegionList();
       getLogTypeList();
       getSiteUserList();
@@ -182,7 +178,7 @@ export default defineComponent({
       ...toRefs(formData),
       formState,
       isAllowCommit,
-      isDetail,
+      opCategory,
       visible,
       title,
       confirmLoading,

vue/src/views/taskAndLog/dowork/index.vue

@@ -56,7 +56,7 @@
       </a-row>
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
-          <a-button type="primary" html-type="submit" @click='onOperates(null,"新增",false)'>新增</a-button>
+          <a-button type="primary" html-type="submit" @click='onOperates(null,"新增",1)'>新增</a-button>
           <BExportExcel :title="'导出'" :filename="'工作日志信息'" :url="'/doWork/export'" :params="{...searchParams, rows:100000}"></BExportExcel>
         </a-col>
       </a-row>
@@ -71,7 +71,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.doWorkID,"修改",false)'>编辑</a-button>
+              <a-button type="link" size="small" @click='onOperates(record.doWorkID,"修改",2)'>编辑</a-button>
               <a-button type="link" size="small" @click="onDel(record)">删除</a-button>
             </div>
           </template>
@@ -88,12 +88,13 @@ import {DownOutlined, ExclamationCircleOutlined, UpOutlined} from '@ant-design/i
 import type {FormInstance,SelectProps,TableColumnsType, TableProps} from 'ant-design-vue';
 import {getList,delWorkLog} from '@/api/taskAndLog/dowork';
 import {getRegionCodeList,getStreetCodeList} from '@/api/system/area/index';
+import {getSysDictionaryList} from "@/api/system/dictionary";
 import DoWorkEditForm from "@/views/taskAndLog/dowork/edit.vue";
 import BExportExcel from "@/components/basic/excel/exportExcel/exportExcel.vue";
 import {getPaginationTotalTitle} from "@/utils/common";
 import {message, Modal} from "ant-design-vue";
 import dayjs from 'dayjs';
-import {get} from "@/api/common";
+
 export default defineComponent({
   name: 'doTaskList',
   components: { DownOutlined, UpOutlined, BExportExcel,DoWorkEditForm},
@@ -149,9 +150,10 @@ export default defineComponent({
     const dataList = ref([]);
     const doWorkEditModelRef = ref();
 
-    get('system/dictionary/getDictionaryItemByCodeList',{code:'LogType'}).then(data=>{
-      logTypeList.value=data;
-    });
+    const getLogTypeList = async function(){
+      const logTypeResult :any = await getSysDictionaryList("LogType");
+      logTypeList.value = logTypeResult;
+    }
 
     const getRegionList = async function(){
       const regionResult: any = await getRegionCodeList();
@@ -232,8 +234,8 @@ export default defineComponent({
     const exportPost = () => {
       console.log('导出');
     }
-    const onOperates = (id: string,operation:string,isDetail:boolean) => {
-      doWorkEditModelRef.value.show(id,operation,isDetail);
+    const onOperates = (id: string,operation:string,opCategory:any) => {
+      doWorkEditModelRef.value.show(id,operation,opCategory);
     };
 
     return {
@@ -256,16 +258,19 @@ export default defineComponent({
       onDel,
       onRangeChange,
       loadData,
+      getLogTypeList,
       getRegionList,
       changeRegion
     };
   },
   created() {
+    this.getLogTypeList();
     this.getRegionList();
     this.loadData();
   },
   activated() {
     if (history.state.params?.reload)
+      this.getLogTypeList();
       this.getRegionList();
       this.loadData();
   }