diff --git a/src/api/user.js b/src/api/user.js index 174645c..682be9a 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -3,3 +3,6 @@ import { _get, _post,_form,_delete } from "../http/index"; //查询用户列表 export const queryUsers = (params, success, error) => _get("/app/listApp",params,success,error) export const queryAUsers = (params, success, error) => _get("/app/listAApp",params,success,error) + +//查询部门列表 +export const queryDepts = (params, success, error) => _get("/app/listDeptApp",params,success,error) diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue index 9641334..6745453 100644 --- a/src/views/administrative/appointment.vue +++ b/src/views/administrative/appointment.vue @@ -95,8 +95,28 @@ show-word-limit /> + + + + + - + + 保存 提交 @@ -138,6 +158,9 @@ @cancel="gaCancel" /> + + @@ -158,6 +181,7 @@ import {uploadFile} from "../../util/fileUpload"; //用户筛选弹窗 import UserPopup from './userFilter.vue'; + import DeptPopup from './deptFilter.vue'; const {useCommon} = $globalStore; @@ -174,7 +198,10 @@ checkRequireText: "", ga_columns: [], item_columns: [], - currentDate: [] + currentDate: [], + checked: false, + deptChecked: false, + deptContent: '', }); //保存参数 const submitData = reactive({ @@ -216,7 +243,10 @@ lawEnforcerTwoId: "", /** 备注 */ remark: "", - userId: useCommon.userId + userId: useCommon.userId, + deptTexts: "", + deptObjs: [], + isUnite: 0, }) const currentDate =() => { @@ -247,6 +277,7 @@ } const closePopup = () => { data.popupVisible = false; + data.deptChecked = false; } const reciveVisible = (item) => { submitData.lawEnforcerTwo = item.userName @@ -256,6 +287,15 @@ submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo } + const reciveDept = (item) => { + submitData.deptTexts = ""; + submitData.deptObjs = []; + for (var i=0; i { data.checkRequireText = selectedOptions[0].text; @@ -308,6 +348,8 @@ const tmpSave = () => { // showSuccessToast('临时保存'); submitData.lawCertificateNum = null; + submitData.isUnite = 0; + if (data.checked) { submitData.isUnite = 1; } addEnterpriseLawEnforcement(submitData, success => { //跳转企业二维码地址 if (success.success) { @@ -325,6 +367,8 @@ const submit112 = () => { // showSuccessToast('登记成功'); submitData.lawCertificateNum = null; + submitData.isUnite = 0; + if (data.checked) { submitData.isUnite = 1; } editEnterpriseLawEnforcement(submitData, success => { //跳转企业二维码地址 if (success.success) { @@ -380,7 +424,7 @@ //初始化参数,获取扫码的企业统一信用编码 onMounted(() => { // 数据填充 - dataFillIn(); + // dataFillIn(); currentDate(); diff --git a/src/views/administrative/appointmentEdit.vue b/src/views/administrative/appointmentEdit.vue index 1167b8b..c82b49a 100644 --- a/src/views/administrative/appointmentEdit.vue +++ b/src/views/administrative/appointmentEdit.vue @@ -90,6 +90,25 @@ show-word-limit /> + + + + +
保存 @@ -131,6 +150,9 @@ @cancel="gaCancel" /> + +
@@ -147,6 +169,7 @@ import {uploadFile} from "../../util/fileUpload"; //用户筛选弹窗 import UserPopup from './userFilter.vue'; + import DeptPopup from './deptFilter.vue'; const router = useRouter(); //路由参数 const route = useRoute(); @@ -164,6 +187,10 @@ checkRequireText: "", ga_columns: [], item_columns: [], + currentDate: [], + checked: false, + deptChecked: false, + deptContent: '', }); //保存参数 const submitData = reactive({ @@ -205,6 +232,10 @@ lawEnforcerTwoId:"", /** 备注 */ remark:"", + deptTexts: "", + deptObjs: [], + isUnite: 0, + uniteCheck:"", }) @@ -229,6 +260,7 @@ } const closePopup = () =>{ data.popupVisible = false; + data.deptChecked = false; } const reciveVisible = (item) =>{ submitData.lawEnforcerTwo = item.userName @@ -238,6 +270,15 @@ submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo } + const reciveDept = (item) => { + submitData.deptTexts = ""; + submitData.deptObjs = []; + for (var i=0; i { data.checkRequireText = selectedOptions[0].text; @@ -271,6 +312,7 @@ const dataFillIn = (id) => { getByIdToDataFillIn(id,success =>{ + console.log(success); //跳转企业二维码地址 if(success.success){ Object.keys(submitData).forEach((item) => { @@ -280,6 +322,16 @@ data.checkRequireText =success.data['params'].checkRequireText; submitData.lawEnforcerText =success.data['lawEnforcer']; submitData.lawEnforcerTextTwo =success.data['lawEnforcerTwo']; + + if (success.data.deptObjs.length > 1) { + data.checked = true; + } + submitData.deptTexts = ""; + submitData.deptObjs = []; + for (var i=0; i{ @@ -289,6 +341,13 @@ const tmpSave = () => { showSuccessToast('临时保存'); + submitData.isUnite = 0; + if (data.checked) { + submitData.isUnite = 1; + } else { + submitData.deptTexts = ""; + submitData.deptObjs = []; + } addEnterpriseLawEnforcement(submitData,success =>{ //跳转企业二维码地址 if(success.success){ @@ -305,6 +364,13 @@ const submit112 = () =>{ showSuccessToast('登记成功'); + submitData.isUnite = 0; + if (data.checked) { + submitData.isUnite = 1; + } else { + submitData.deptTexts = ""; + submitData.deptObjs = []; + } editEnterpriseLawEnforcement(submitData,success =>{ //跳转企业二维码地址 if(success.success){ diff --git a/src/views/administrative/deptFilter.vue b/src/views/administrative/deptFilter.vue new file mode 100644 index 0000000..2705f7b --- /dev/null +++ b/src/views/administrative/deptFilter.vue @@ -0,0 +1,256 @@ + + + + + \ No newline at end of file diff --git a/src/views/enforce/lawFilter.vue b/src/views/enforce/lawFilter.vue new file mode 100644 index 0000000..7b9503b --- /dev/null +++ b/src/views/enforce/lawFilter.vue @@ -0,0 +1,248 @@ + + + + + \ No newline at end of file diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index 0178f8c..de21190 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -75,8 +75,8 @@ v-model="data.lawEnforcementBasisText" required readonly - label="检查依据" :rules="[{ required: true, message: '必填项' }]" + label="检查依据" placeholder="必填 执法依据" @click="showPopupqz" type="textarea" @@ -108,6 +108,17 @@ show-word-limit /> + +
@@ -144,7 +155,7 @@ - 保存 + 提交 @@ -170,6 +181,9 @@ + +
@@ -185,6 +199,7 @@ import {formattedTime} from "@/util/util"; import Compressor from 'compressorjs' //用户筛选弹窗 import Popup from './userFilter.vue'; +import LawPopup from './lawFilter.vue'; import PopupA from './assistUserFilter.vue'; import Popupzq from './zqyjjdmFilter.vue'; import {getDict} from "../../api/Home"; @@ -216,6 +231,8 @@ const data = reactive({ ga_columns: [], item_columns: [], isNoScan: false, + lawChecked: false, + lawContent: "", }); var fileSize = 0; //保存参数 @@ -258,6 +275,9 @@ const submitData = reactive({ fileListObj:[], // 数据保存或提交 0 保存 1提交 isSubmit: 0, + lawId: "", + lawText: "", + uniteCheck: "", }) const tapGood = () => { @@ -313,6 +333,7 @@ onMounted(() =>{ // dataFillIn(); submitData.enforce = route?.query?.reason; data.isNoScan = route?.query?.isNoScan; + submitData.enterpriseNumber = route?.query?.enterpriseNumber; console.log(data.isNoScan) //查询企业信息 @@ -473,6 +494,7 @@ const closePopup = () =>{ data.popupVisible = false; data.popupVisible2 = false; data.popupVisibleqz = false; + data.lawChecked = false; } const reciveData = (item) =>{ submitData.lawEnforcerTwo = item.userName; @@ -492,6 +514,11 @@ const reciveDataqz = (item) =>{ // submitData.subsidiaryerText = item.userName + " " + item.lawCertificateNum; data.lawEnforcementBasisText = item.lawName; } +const reciveLaw = (item) => { + submitData.lawId = item.id; + submitData.lawText = item.checkItem; + submitData.uniteCheck = item.uniteCheck; +} const beforeRead = (file) =>{ if (file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/jpg') { diff --git a/src/views/enterprise/enterpriseInspectionDetail.vue b/src/views/enterprise/enterpriseInspectionDetail.vue index 77792a1..26d8a42 100644 --- a/src/views/enterprise/enterpriseInspectionDetail.vue +++ b/src/views/enterprise/enterpriseInspectionDetail.vue @@ -73,9 +73,6 @@ rows="2" autosize type="textarea" - maxlength="" - placeholder="" - show-word-limit readonly /> @@ -194,7 +191,6 @@ onMounted(() =>{ submitData.linkMan = success.data.linkMan; submitData.linkTel = success.data.linkTel; submitData.checkTime = formattedTimeYYYYmmdd(success.data.checkTime); - submitData.remark = success.data.remark; setLinkageItem(submitData.checkItem);