chenrui
/
zdxtLawEnforcementCodeView
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

登记保存, 企业端详情出现取消按钮问题

v2
蟑螂恶霸 2 years ago
parent
0617017136
commit
e3adbaee73
4 changed files with 61 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/api/enforce.js
  2. 74
      src/views/enforce/enforcementPlanAdd.vue
  3. 11
      src/views/enforce/sign.vue
  4. 2
      src/views/enterprise/enterpriseInspectionDetail.vue

1
src/api/enforce.js
View File

@ -32,6 +32,7 @@ export const addEnforcementInspectionProgram = (params, success, error) =>_post(
export const addEnforcementRegistration = (params, success, error) => _post("/app/code/registration/add",params,success,error) export const addEnforcementRegistration = (params, success, error) => _post("/app/code/registration/add",params,success,error)
export const editEnforcementRegistration = (params, success, error) => _post("/app/code/registration/edit",params,success,error) export const editEnforcementRegistration = (params, success, error) => _post("/app/code/registration/edit",params,success,error)
export const getRegByUserIdAndZero = (userId, success, error) => _get("/app/code/registration/getByUserIdAndZero/"+ userId,null,success,error) export const getRegByUserIdAndZero = (userId, success, error) => _get("/app/code/registration/getByUserIdAndZero/"+ userId,null,success,error)
export const getByUserIdAndEnterpriseNumber = (userId, enterpriseNumber, success, error) => _get("/app/code/registration/getByUserIdAndEnterpriseNumber/"+ userId +"/"+ enterpriseNumber,null,success,error)
export const getByIdToDataFillIn = (id, success, error) => _get("/app/code/registration/getByIdToDataFillIn/" + id,null,success,error) export const getByIdToDataFillIn = (id, success, error) => _get("/app/code/registration/getByIdToDataFillIn/" + id,null,success,error)
//查询历史检查信息 //查询历史检查信息

74
src/views/enforce/enforcementPlanAdd.vue
View File

@ -13,15 +13,15 @@
<div class="warp_body"> <div class="warp_body">
<van-form @failed="onFailed" @submit="submit"> <van-form @failed="onFailed" @submit="submit">
<van-cell-group> <van-cell-group>
<van-field <!-- <van-field-->
v-model="submitData.planYear" <!-- v-model="submitData.planYear"-->
required <!-- required-->
label="计划年度" <!-- label="计划年度"-->
placeholder="必填" <!-- placeholder="必填"-->
readonly <!-- readonly-->
:rules="[{ required: true, message: '请选择年度计划' }]" <!-- :rules="[{ required: true, message: '请选择年度计划' }]"-->
@click="selectDate" <!-- @click="selectDate"-->
/> <!-- />-->
<van-popup v-model:show="data.showDatePicker" position="bottom"> <van-popup v-model:show="data.showDatePicker" position="bottom">
<van-date-picker <van-date-picker
title="选择日期" title="选择日期"
@ -33,13 +33,34 @@
@cancel="cancelSelectDate" @cancel="cancelSelectDate"
/> />
</van-popup> </van-popup>
<!-- <van-field--> <div style="display: flex; justify-content: space-between; width: 100%">
<!-- v-model="submitData.planName"--> <div style="width: 50%">
<!-- label="计划名称"--> <van-field
<!-- placeholder="请输入"--> v-model="submitData.planName"
<!-- required--> label="计划名称"
<!-- :rules="[{ required: true, message: '请输入计划名称' }]"--> placeholder="请输入"
<!-- />--> required
:rules="[{ required: true, message: '请输入计划名称' }]"
/>
</div>
<div style="width: 30%;">
<van-field
v-model="data.fieldValue"
is-link
readonly
placeholder="选择日期"
@click="data.dateShowPicker = true"
/>
</div>
<div style="width: 30%;"><label style="font-size: 0.4rem;">行政检查计划</label></div>
</div>
<van-popup v-model:show="data.dateShowPicker" round position="bottom">
<van-picker
:columns="data.dateColumns"
@cancel="data.dateShowPicker = false"
@confirm="dateOnConfirm"
/>
</van-popup>
<van-field <van-field
v-model="submitData.enforcementDepartment" v-model="submitData.enforcementDepartment"
label="执法部门" label="执法部门"
@ -100,7 +121,7 @@
<script setup name="register"> <script setup name="register">
import {showSuccessToast, showLoadingToast, closeToast} from 'vant'; import {showToast, showSuccessToast, showLoadingToast, closeToast} from 'vant';
import {addEnforcementInspectionProgram, queryUserInfo} from '@/api/enforce' import {addEnforcementInspectionProgram, queryUserInfo} from '@/api/enforce'
import {getDict} from '../../api/Home' import {getDict} from '../../api/Home'
import {uploadFile} from '../../util/fileUpload' import {uploadFile} from '../../util/fileUpload'
@ -126,6 +147,13 @@
currentDate1: ref(['2024', '03', '01']), currentDate1: ref(['2024', '03', '01']),
//vant组件上传照片列表 //vant组件上传照片列表
fileListObj: [], fileListObj: [],
dateShowPicker: false,
fieldValue: "年度",
dateColumns: [
{ text: '年度', value: 'year' },
{ text: '月度', value: 'month' },
{ text: '季度', value: 'quarter' },
],
}); });
//保存参数 //保存参数
const submitData = reactive({ const submitData = reactive({
@ -159,10 +187,8 @@
}; };
const submit = () => { const submit = () => {
showConfirmDialog({ submitData.planName = submitData.planName + data.fieldValue +"行政检查计划"
title: '公布执法计划', showConfirmDialog(submitData).then(() => {
message: '对外公布本部门年度执法计划',
}).then(() => {
console.log(1) console.log(1)
submitData.isPublish = 1 submitData.isPublish = 1
addEnforcementInspectionProgram(submitData, success => { addEnforcementInspectionProgram(submitData, success => {
@ -314,6 +340,12 @@
data.showPicker = false; data.showPicker = false;
} }
const dateOnConfirm = ({ selectedOptions }) => {
data.dateShowPicker = false;
data.fieldValue = selectedOptions[0].text;
};
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

11
src/views/enforce/sign.vue
View File

@ -163,7 +163,7 @@
</van-cell-group> </van-cell-group>
<van-action-bar> <van-action-bar>
<!-- <van-button round block type="info" native-type="submit" @click="tmpSave">保存</van-button>--> <van-button round block type="info" native-type="submit" @click="tmpSave">保存</van-button>
<van-button round block type="info" native-type="submit" @click="submit(1)">提交</van-button> <van-button round block type="info" native-type="submit" @click="submit(1)">提交</van-button>
</van-action-bar> </van-action-bar>
</van-form> </van-form>
@ -199,7 +199,7 @@
import { showSuccessToast } from 'vant'; import { showSuccessToast } from 'vant';
import 'vant/es/toast/style'; import 'vant/es/toast/style';
import {addEnforcementRegistration, editEnforcementRegistration, getRegByUserIdAndZero, queryUserInfo} from '../../api/enforce' import {addEnforcementRegistration, editEnforcementRegistration, getRegByUserIdAndZero, getByUserIdAndEnterpriseNumber, queryUserInfo} from '../../api/enforce'
import {getEnterpriseInformation} from '../../api/enterprise' import {getEnterpriseInformation} from '../../api/enterprise'
import { reactive, ref } from "vue"; import { reactive, ref } from "vue";
import {uploadFile} from "../../util/fileUpload"; import {uploadFile} from "../../util/fileUpload";
@ -338,11 +338,11 @@ const getLinkageByParentIdToGA = (parentId) => {
//3a0096181c184e5aa56f70923680856d$6e74ceda1463c165fd43eeeadce4f7cd //3a0096181c184e5aa56f70923680856d$6e74ceda1463c165fd43eeeadce4f7cd
//初始化参数，获取扫码的企业统一信用编码 //初始化参数，获取扫码的企业统一信用编码
onMounted(() =>{ onMounted(() =>{
submitData.enterpriseNumber = route?.query?.enterpriseNumber;
// 数据填充 // 数据填充
// dataFillIn(); dataFillIn();
submitData.enforce = route?.query?.reason; submitData.enforce = route?.query?.reason;
data.isNoScan = route?.query?.isNoScan; data.isNoScan = route?.query?.isNoScan;
submitData.enterpriseNumber = route?.query?.enterpriseNumber;
console.log(data.isNoScan) console.log(data.isNoScan)
//查询企业信息 //查询企业信息
@ -434,7 +434,8 @@ const gaCancel = () => {
/* 检查要求 end */ /* 检查要求 end */
const dataFillIn = () => { const dataFillIn = () => {
getRegByUserIdAndZero(useCommon.userId,success =>{ // getRegByUserIdAndZero(useCommon.userId,success =>{
getByUserIdAndEnterpriseNumber(useCommon.userId, submitData.enterpriseNumber,success =>{
//跳转企业二维码地址 //跳转企业二维码地址
if(success.success){ if(success.success){
Object.keys(submitData).forEach((item) => { Object.keys(submitData).forEach((item) => {

2
src/views/enterprise/enterpriseInspectionDetail.vue
View File

@ -79,7 +79,7 @@
readonly readonly
/> />
<van-action-bar v-if="submitData.isReg != 1 && submitData.status != 1 && submitData.status != 3"> <van-action-bar v-if="!data.isEnterprise && submitData.isReg != 1 && submitData.status != 1 && submitData.status != 3">
<van-button round block type="info" native-type="submit" @click="cancel">取消</van-button> <van-button round block type="info" native-type="submit" @click="cancel">取消</van-button>
</van-action-bar> </van-action-bar>
</van-form> </van-form>

Write Preview
Loading…
Cancel
Save