diff --git a/src/api/enterprise.js b/src/api/enterprise.js index 9b3751a..d9a6469 100644 --- a/src/api/enterprise.js +++ b/src/api/enterprise.js @@ -93,3 +93,11 @@ export const queryCFAJList = (enterpriseNumber, success, error) =>_get("/app/xzj export const checkIsExists = (enterpriseNumber, success, error) =>_get("/app/enterpriseInformation/checkIsExists/" + enterpriseNumber,null,success, error) +/** + * 保存企业对行政执法的评价 + * @param {*} enterpriseNumber 企业统一信用代码 + * @param {*} success + * @param {*} error + * @returns + */ +export const addEvaluateInfo = (params, success, error) =>_post("/app/evaluate/add",params,success, error) diff --git a/src/router/home.js b/src/router/home.js index b52d329..a0e47a9 100644 --- a/src/router/home.js +++ b/src/router/home.js @@ -107,6 +107,12 @@ const routes = [ name: "registrationEdit", component: () => import("@/views/enterprise/registrationEdit.vue"), }, + // 评价页面 + { + path: "/evaluate", + name: "evaluate", + component: () => import("@/views/enterprise/enterpriseEvaluate/evaluate.vue"), + }, ]; export { routes }; diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue index e2a7ebb..b3c056a 100644 --- a/src/views/enforce/enterpriseBaseInfo.vue +++ b/src/views/enforce/enterpriseBaseInfo.vue @@ -161,7 +161,7 @@ {{ item.c302002 }}

-

强制措施： {{ item.lawDate }}

+

强制措施： {{ item.c302001 }}

diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index cc3dd53..61cd92c 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -203,11 +203,21 @@ + @@ -303,6 +313,8 @@ const data = reactive({ showTimePicker: false, minDate:null, maxDate:null, + showBl:false, + showNom: false, }); var fileSize = 0; //保存参数 @@ -456,6 +468,24 @@ onMounted(() =>{ data.lawField_columns.push({ text: success.data[i].dictLabel, value: success.data[i].dictValue }) } },error=>{}); + + //TODO 限制指定时间实现 + var a = getBeforeDate(5,new Date()); + console.log(a); + var minDate = a.split("-"); + console.log(minDate); + data.minDate = ref(new Date(minDate[0],minDate[1] - 1 , minDate[2])); + var now = new Date(); + let year = now.getFullYear(); + let mon = now.getMonth() + 1; + let day = now.getDate(); + + mon = (mon < 10 ? ('0' + mon) : mon); + day = (day < 10 ? ('0' + day) : day); + data.maxDate = ref(new Date(year,mon -1,day)); + console.log(mon); + console.log(day); + data.showBl = true; }) // 返回 @@ -766,6 +796,32 @@ const beforeRead = (file) =>{ }); return true; } + const getBeforeDate = (num, time) =>{ + let n = num; + let d = ''; + if(time) { + d = new Date(time); + } else { + d = new Date(); + } + let year = d.getFullYear(); + let mon = d.getMonth() + 1; + let day = d.getDate(); + if(day <= n) { + if(mon > 1) { + mon = mon - 1; + } else { + year = year - 1; + mon = 12; + } + } + d.setDate(d.getDate() - n); + year = d.getFullYear(); + mon = d.getMonth() + 1; + day = d.getDate(); + let s = year + "-" + (mon < 10 ? ('0' + mon) : mon) + "-" + (day < 10 ? ('0' + day) : day); + return s; + } diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue index 4351485..75bfb91 100644 --- a/src/views/enterprise/registrationDetail.vue +++ b/src/views/enterprise/registrationDetail.vue @@ -99,13 +99,18 @@ -->
预览图片 -
+ + + + +
@@ -146,7 +151,7 @@ import { showSuccessToast,showImagePreview } from 'vant'; import {queryEnforcementRegistrationById, getAttr} from '../../api/enforce' -import { reactive, ref } from "vue"; +import { reactive, ref,nextTick } from "vue"; import {uploadFile} from "../../util/fileUpload"; import {getDict} from "../../api/Home"; import {queryLinkageById} from "../../api/linkage"; @@ -170,6 +175,8 @@ const data = reactive({ imgstr: "", lawList: [{ text:"", id:"" }], lawCer:[{ text:"", id:"" }], + imageList:[], + show: ref(false) }); //保存参数 const submitData = reactive({ @@ -217,12 +224,23 @@ const tapBad = () => { data.bad = "#7FFFD4"; submitData.reslut = 1; } -const imagePreview = (index) =>{ +const index = ref(0); +const imagePreview = (newIndex) =>{ var imgstrArr = data.imgstr.split(","); - showImagePreview({ - images:imgstrArr, - startPosition: index, +// showImagePreview({ +// images:data.imageList[index], +// startPosition: index, +// }); + +nextTick(() => { + // console.log(this.$refs.testRef) + // this.$refs.imagePre.change(newIndex) + // const imagePre = ref("imagePre"); + // imagePre.change(newIndex); }); +// index.value = newIndex; +data.show = ref(true); + } const setLinkageItem = (id) => { @@ -246,13 +264,25 @@ const setAttr = () =>{ } data.imgstr = data.imgstr.substring(0, data.imgstr.length - 1); } + data.imageList = success.data.filePreview.fileList; + success.data.filePreview.fileList; + for (const key in success.data.filePreview.fileList) { + console.log(success.data.filePreview.fileList[key]); + data.imageList[key] = "http://localhost:85" + success.data.filePreview.fileList[key]; + } + } },error=>{}); } +const onChange = (newIndex) => { + index.value = newIndex; +}; //3a0096181c184e5aa56f70923680856d$6e74ceda1463c165fd43eeeadce4f7cd //初始化参数，获取扫码的企业统一信用编码 onMounted(() =>{ + + //查询执法登记信息 queryEnforcementRegistrationById(route?.query?.id,success =>{ submitData.enterpriseName = success.data.enterpriseName; @@ -309,6 +339,7 @@ onMounted(() =>{ // setLinkageItem(submitData.lawEnforcementItem); // setLinkageGA(submitData.lawEnforcementBasis); + },error=>{ }) diff --git a/src/views/enterprise/registrationEdit.vue b/src/views/enterprise/registrationEdit.vue index c328b58..0d39484 100644 --- a/src/views/enterprise/registrationEdit.vue +++ b/src/views/enterprise/registrationEdit.vue @@ -434,6 +434,8 @@ data.lawField_columns.push({ text: success.data[i].dictLabel, value: success.data[i].dictValue }) } },error=>{}); + + }) // 返回 @@ -548,6 +550,15 @@ submitData.fileList = []; submitData.fileListObj = []; // showSuccessToast('保存成功'); + console.log(success.data.fileList); + //图片回显 + // submitData.fileListObj.push( + // { + // url: 'https://example.com/image.jpg', // 替换为你的图片地址 + // status: 'done', // 图片状态，'uploading'、'done'或者'failed' + // } + // ) + } },error=>{ console.log("保存失败") diff --git a/src/views/enterprise/registrationList.vue b/src/views/enterprise/registrationList.vue index b149453..27db390 100644 --- a/src/views/enterprise/registrationList.vue +++ b/src/views/enterprise/registrationList.vue @@ -79,6 +79,11 @@ type="primary" size="mini">投诉 + 评价 + @@ -251,11 +256,11 @@ }); } /** 企业评价页面 */ - const toComplaint = (id, checkItem) => { + const toEvaluate = (id, checkItem) => { + console.log(checkItem); router.push({ - path: "/enterprise/complaint", + path: "/evaluate", query: { - comOrOpi: 1, isSelect: false, id: id, lawEnforcementItemText: checkItem, @@ -513,6 +518,13 @@ right: 4%; height: 90%; } + .trbtn_e { + position: absolute; + top: 0; + right: 16%; + height: 90%; + color: antiquewhite + } /deep/ .van-hairline--bottom { margin: -1% 0 3% 0;