From 2fd4b6581d5b378a5b5ea56b00a02f340e0418c4 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Sat, 14 Sep 2024 16:41:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=BD=95,=20=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E7=99=BB=E8=AE=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/enforce.js | 1 + src/views/enforce/enforcementPlanAdd.vue | 40 ++++ src/views/enforce/historyCheck.vue | 1 + src/views/enforce/noScanFilter.vue | 2 +- src/views/enforce/scanQrCode.vue | 14 +- src/views/enforce/sign.vue | 54 ++++-- src/views/enterprise/registrationDetail.vue | 4 +- src/views/enterprise/registrationEdit.vue | 194 +++++++++++++++++--- 8 files changed, 262 insertions(+), 48 deletions(-) diff --git a/src/api/enforce.js b/src/api/enforce.js index ec021c3..54055a1 100644 --- a/src/api/enforce.js +++ b/src/api/enforce.js @@ -55,6 +55,7 @@ export const editEnforcementInspectionProgram = (params, success, error) =>_post //保存执法信息登记 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 editEnforcementRegistration2 = (params, success, error) => _post("/app/code/registration/edit2",params,success,error) export const getRegByUserIdAndZero = (userId, success, error) => _get("/app/code/registration/getByUserIdAndZero/"+ userId,null,success,error) export const getByUserIdAndEnterpriseNumber = (modth, userId, enterpriseNumber, success, error) => _get("/app/code/registration/getByUserIdAndEnterpriseNumber/"+ modth +"/"+ userId +"/"+ enterpriseNumber,null,success,error) export const getByIdToDataFillIn = (id, success, error) => _get("/app/code/registration/getByIdToDataFillIn/" + id,null,success,error) diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue index bb4d022..738a894 100644 --- a/src/views/enforce/enforcementPlanAdd.vue +++ b/src/views/enforce/enforcementPlanAdd.vue @@ -171,6 +171,7 @@
仅支持上传50MB以下的PDF格式文档 + 模板下载
@@ -205,6 +206,9 @@ import {getYear,getMouth} from "@/util/timeUtil"; import {reactive, ref} from "vue"; import {showConfirmDialog} from 'vant'; + import sha1 from "crypto-js/sha1"; + import wx from "weixin-js-sdk"; + import {szyptGetToken} from "../../api/Home"; const {useCommon, useMy} = $globalStore; @@ -379,6 +383,42 @@ // console.log(data) } + const downloadFile = async () => { + var url = 'http://192.168.110.41:3301/#/pdfView?url=/profile/upload/2024/09/09/df8d2b5a9615603bdff8cf7fe0e2d836.pdf'; + console.log(url); + szyptGetToken(param, success => { + let resMsg = success.data; + console.log(resMsg); + wx.config({ + // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。 + debug: false, + // 必填，公众号的唯一标识 + appId: resMsg.corpid, + // 必填，生成签名的时间戳 + timestamp: resMsg.timestamp, + // 必填，生成签名的随机串 + nonceStr: resMsg.nonceStr, + // 必填，签名，见附录1 + signature: resMsg.signature, + // 必填，需要使用的JS接口列表，所有JS接口列表见附录2 + jsApiList: ["scanQRCode"], + }); + wx.ready(() => { + //微信扫一扫请求操作 + wx.downloadImage({ + serverId: '', // 需要下载的图片的服务器端ID，由uploadImage接口获得 + isShowProgressTips: 1, // 默认为1，显示进度提示 + success: function (res) { + var localId = res.localId; // 返回图片下载后的本地ID + } + }); + }); + wx.error((res) => { + console.log("获取失败"); + }); + }, error => { + }); + } const uploadFiles = (file) => { uploadFile(file, (res) => { console.log(file.fileName); diff --git a/src/views/enforce/historyCheck.vue b/src/views/enforce/historyCheck.vue index 1979346..33e46ab 100644 --- a/src/views/enforce/historyCheck.vue +++ b/src/views/enforce/historyCheck.vue @@ -260,6 +260,7 @@ { path: "/registrationEdit", query: { + id: item.id, enterpriseNumber: item.enterpriseNumber, reason: item.enforce, checkCss: item.checkCss, diff --git a/src/views/enforce/noScanFilter.vue b/src/views/enforce/noScanFilter.vue index f3c94b3..914e53b 100644 --- a/src/views/enforce/noScanFilter.vue +++ b/src/views/enforce/noScanFilter.vue @@ -85,7 +85,7 @@ const props = defineProps( { const refreshing = ref(false); const curPage = ref(false); const dicts = ref([]); - const reason = ref(""); + const reason = ref("其它无法出示情况"); const checkCss = ref(0); // watch: { // 'searchParam.enterpriseName': { diff --git a/src/views/enforce/scanQrCode.vue b/src/views/enforce/scanQrCode.vue index bf569b7..697f2b3 100644 --- a/src/views/enforce/scanQrCode.vue +++ b/src/views/enforce/scanQrCode.vue @@ -51,7 +51,7 @@ -
仅限因特殊情形，需先检查，后登记相关检查信息，补录 >>
+
仅限因特殊情形，需先检查，后登记相关检查信息，补录 >>
- + - + + + @@ -270,6 +281,7 @@ import LawPopup from './lawFilter.vue'; import PopupA from './assistUserFilter.vue'; import Popupzq from './zqyjjdmFilter.vue'; + import popupcp from '../enterprise/companyFilter.vue'; import {getDict} from "../../api/Home"; import {queryLinkage, queryLinkageDictByValueAndParentId} from "../../api/linkage"; import { @@ -296,6 +308,8 @@ popupContent: '', popupVisible2: false, popupVisibleqz: false, + popupCp: false, + popupCpContent: '', popupContent2: '', popupContentqz: '', showGA: false, @@ -472,9 +486,9 @@ onMounted(() => { nameCorrect(); submitData.enterpriseNumber = route?.query?.enterpriseNumber; - submitData.enforce = route?.query?.reason; - submitData.checkCss = route?.query?.checkCss; - data.isNoScan = route?.query?.isNoScan; + submitData.enforceReason = route?.query?.reason; + submitData.checkCss = eval(route?.query?.checkCss); + data.isNoScan = eval(route?.query?.isNoScan); // let dateLimit = new Date(); // data.maxDate = new Date(this.$moment(dateLimit).format('YYYY/MM/DD')); @@ -485,7 +499,8 @@ initCheckCategory(); // 数据填充 - dataFillIn(); + // if (!data.isNoScan) { dataFillIn('add'); } + //查询企业信息 getEnterpriseInformation(route?.query?.enterpriseNumber, success => { @@ -632,9 +647,9 @@ }); } - const dataFillIn = () => { + const dataFillIn = (modth) => { // getRegByUserIdAndZero(useCommon.userId,success =>{ - getByUserIdAndEnterpriseNumber("add", useCommon.userId, submitData.enterpriseNumber, success => { + getByUserIdAndEnterpriseNumber(modth, useCommon.userId, submitData.enterpriseNumber, success => { //跳转企业二维码地址 if (success.success) { console.log("============> : ", success.data); @@ -904,10 +919,18 @@ data.popupVisible = false; data.popupVisible2 = false; data.popupVisibleqz = false; + data.popupCp = false; data.lawChecked = false; data.deptChecked = false; } + const reciveVisible = (item) => { + data.lawCer[data.lawCerFlag].id = item.userId; + data.lawCer[data.lawCerFlag].text = item.userName; + data.lawCer[data.lawCerFlag].num = item.lawCertificateNum; + data.lawCer[data.lawCerFlag].show = nameCorrect(item.userName + " " + item.lawCertificateNum); + } + const reciveData = (item) => { data.lawCer[data.lawCerFlag].id = item.userId; data.lawCer[data.lawCerFlag].text = item.userName; @@ -951,6 +974,12 @@ // submitData.subsidiaryerText = item.userName + " " + item.lawCertificateNum; // data.lawEnforcementBasisText = item.lawName; } + const reciveDataCp = (item) => { + submitData.enterpriseName = item.enterpriseName; + submitData.enterpriseNumber = item.enterpriseNumber; + // 填充数据 + // dataFillIn('bulu'); + } const reciveLaw = (item) => { submitData.lawId = item.id; // submitData.lawText = item.checkItem; @@ -1061,7 +1090,6 @@ return s; } -