Browse Source

名字(二与三对齐)/日期选择(五个自然日内)

v3
zouyx 2 years ago
parent
commit
1b4ae54d62
  1. 19
      src/util/fileUpload.js
  2. 10
      src/views/administrative/appointment.vue
  3. 11
      src/views/administrative/appointmentDetail.vue
  4. 13
      src/views/administrative/appointmentEdit.vue
  5. 4
      src/views/enforce/enterpriseBaseInfo.vue
  6. 7
      src/views/enforce/historyCheck.vue
  7. 14
      src/views/enforce/sign.vue
  8. 7
      src/views/enterprise/compaint/registrationListView.vue
  9. 5
      src/views/enterprise/complaintDetailView.vue
  10. 34
      src/views/enterprise/complaintNoScan.vue
  11. 4
      src/views/enterprise/register.vue
  12. 7
      src/views/enterprise/registrationDetail.vue
  13. 10
      src/views/enterprise/registrationEdit.vue
  14. 7
      src/views/enterprise/registrationList.vue

19
src/util/fileUpload.js

@ -37,4 +37,21 @@ const uploadFile = (files,callback) => {
} }
export{uploadFile}; const nameCorrect=(name)=>{
//筛选出两个字人名
let name1=[{}];
name1=String(name).split(" ");
console.log(name1);
if(name1[0].length==2){
if(name1.length>1){
return (String(name1[0]).substr(0,1)+"\u3000"+String(name1[0]).substr(1)+" "+name1[1]);
}else{
return (String(name1[0]).substr(0,1)+"\u3000"+String(name1[0]).substr(1));
}
}else{
return name;
}
}
export{uploadFile,nameCorrect};

10
src/views/administrative/appointment.vue

@ -204,7 +204,7 @@
<div class="add-inspect" v-if="data.checked"> <div class="add-inspect" v-if="data.checked">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p> <p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p>
<p v-for="(item, index) in submitData.userObjs" :key="index"> <p v-for="(item, index) in submitData.userObjs" :key="index">
<span class="add-dept">{{item.deptName}}</span><span class="add-name">{{item.userName}}</span> <span class="add-dept">{{item.deptName}}</span><span class="add-name">{{nameCorrect(item.userName)}}</span>
</p> </p>
<div class="addbtn" @click.stop="data.deptChecked=true"><van-icon name="add-o" /></div> <div class="addbtn" @click.stop="data.deptChecked=true"><van-icon name="add-o" /></div>
</div> </div>
@ -283,7 +283,7 @@
</template> </template>
<script setup name="register"> <script setup name="register">
import {nameCorrect} from'@/util/fileUpload';
import {showSuccessToast} from 'vant'; import {showSuccessToast} from 'vant';
import 'vant/es/toast/style'; import 'vant/es/toast/style';
import { import {
@ -474,7 +474,7 @@
data.lawCer[data.lawCerFlag].id = item.userId; data.lawCer[data.lawCerFlag].id = item.userId;
data.lawCer[data.lawCerFlag].text = item.userName; data.lawCer[data.lawCerFlag].text = item.userName;
data.lawCer[data.lawCerFlag].num = item.lawCertificateNum; data.lawCer[data.lawCerFlag].num = item.lawCertificateNum;
data.lawCer[data.lawCerFlag].show = item.userName + " " + item.lawCertificateNum; data.lawCer[data.lawCerFlag].show = nameCorrect(item.userName + " " + item.lawCertificateNum);
// submitData.lawEnforcerTwo = item.userName // submitData.lawEnforcerTwo = item.userName
// submitData.lawCertificateNumTwo = item.lawCertificateNum; // submitData.lawCertificateNumTwo = item.lawCertificateNum;
@ -684,7 +684,7 @@
console.log(success.data) console.log(success.data)
submitData.lawEnforcer = success.data.userName; submitData.lawEnforcer = success.data.userName;
submitData.lawCertificateNum = success.data.lawCertificateNum submitData.lawCertificateNum = success.data.lawCertificateNum
submitData.lawEnforcerText = submitData.lawEnforcer +" "+ submitData.lawCertificateNum submitData.lawEnforcerText = nameCorrect(submitData.lawEnforcer +" "+ submitData.lawCertificateNum)
// submitData.lawEnforcerText = submitData.lawEnforcer // submitData.lawEnforcerText = submitData.lawEnforcer
submitData.lawEnforcerId = success.data.userId; submitData.lawEnforcerId = success.data.userId;
submitData.lawEnforcement = success.data.dept.deptName; submitData.lawEnforcement = success.data.dept.deptName;
@ -715,7 +715,7 @@
const reciveData = (item) => { const reciveData = (item) => {
submitData.enterpriseName = item.enterpriseName; submitData.enterpriseName = item.enterpriseName;
submitData.linkTel = item.enterpriseTel; submitData.linkTel = item.enterpriseTel;
submitData.linkMan = item.legalPerson; submitData.linkMan = nameCorrect(item.legalPerson);
submitData.enterpriseNumber = item.enterpriseNumber; submitData.enterpriseNumber = item.enterpriseNumber;
// 查询设定的检查时间是否有别的企业对该部门进行检查, 如果有这提示可进行联合执法 // 查询设定的检查时间是否有别的企业对该部门进行检查, 如果有这提示可进行联合执法

11
src/views/administrative/appointmentDetail.vue

@ -102,7 +102,7 @@
<div class="add-inspect"> <div class="add-inspect">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p> <p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p>
<p v-for="(item, index) in submitData.userObjs" :key="index"> <p v-for="(item, index) in submitData.userObjs" :key="index">
<span class="add-dept">{{item.deptName}}</span><span class="add-name">{{item.userName}}</span> <span class="add-dept">{{item.deptName}}</span><span class="add-name">{{nameCorrect(item.userName)}}</span>
</p> </p>
</div> </div>
@ -153,7 +153,7 @@
</template> </template>
<script setup name="register"> <script setup name="register">
import {nameCorrect} from'@/util/fileUpload';
import { showSuccessToast } from 'vant'; import { showSuccessToast } from 'vant';
import 'vant/es/toast/style'; import 'vant/es/toast/style';
import { import {
@ -375,7 +375,7 @@
submitData.isSubmit =success.data['isSubmit']; submitData.isSubmit =success.data['isSubmit'];
submitData.isReg = success.data['isReg']; submitData.isReg = success.data['isReg'];
submitData.status = success.data['status']; submitData.status = success.data['status'];
submitData.linkMan=nameCorrect(submitData['linkMan']);
// 是否联合执法 // 是否联合执法
if (success.data.userObjs.length > 1) { if (success.data.userObjs.length > 1) {
data.checked = true; data.checked = true;
@ -402,7 +402,7 @@
var lawEnforcer2Show = lawEnforcer2ShowStr.split(','); var lawEnforcer2Show = lawEnforcer2ShowStr.split(',');
data.lawCer = []; data.lawCer = [];
for (var i = 0; i < tmpEnforceId.length; i++) { for (var i = 0; i < tmpEnforceId.length; i++) {
data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: lawEnforcer2Show[i]}); data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: nameCorrect(lawEnforcer2Show[i])});
} }
} }
@ -412,7 +412,7 @@
console.log("queryUserInfo : ", success.data) console.log("queryUserInfo : ", success.data)
submitData.lawEnforcer = success.data.userName; submitData.lawEnforcer = success.data.userName;
submitData.lawCertificateNum = success.data.lawCertificateNum submitData.lawCertificateNum = success.data.lawCertificateNum
submitData.lawEnforcerText = submitData.lawEnforcer +" "+ submitData.lawCertificateNum submitData.lawEnforcerText = nameCorrect(submitData.lawEnforcer +" "+ submitData.lawCertificateNum)
// submitData.lawEnforcerText = submitData.lawEnforcer // submitData.lawEnforcerText = submitData.lawEnforcer
submitData.lawEnforcerId = success.data.userId; submitData.lawEnforcerId = success.data.userId;
submitData.lawEnforcement = success.data.dept.deptName; submitData.lawEnforcement = success.data.dept.deptName;
@ -557,6 +557,7 @@
//初始化参数,获取扫码的企业统一信用编码 //初始化参数,获取扫码的企业统一信用编码
onMounted(() =>{ onMounted(() =>{
nameCorrect();
// 数据填充 // 数据填充
dataFillIn(route?.query?.id); dataFillIn(route?.query?.id);

13
src/views/administrative/appointmentEdit.vue

@ -167,7 +167,7 @@
<div class="add-inspect" v-if="data.checked || submitData.isSubmit == 1"> <div class="add-inspect" v-if="data.checked || submitData.isSubmit == 1">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p> <p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p>
<p v-for="(item, index) in submitData.userObjs" :key="index"> <p v-for="(item, index) in submitData.userObjs" :key="index">
<span class="add-dept">{{item.deptName}}</span><span class="add-name">{{item.userName}}</span> <span class="add-dept">{{item.deptName}}</span><span class="add-name">{{nameCorrect(item.userName)}}</span>
</p> </p>
</div> </div>
</van-cell-group> </van-cell-group>
@ -238,6 +238,7 @@
//用户筛选弹窗 //用户筛选弹窗
import UserPopup from './userFilter.vue'; import UserPopup from './userFilter.vue';
import DeptPopup from './deptFilter.vue'; import DeptPopup from './deptFilter.vue';
import {nameCorrect} from'@/util/fileUpload'
const router = useRouter(); const router = useRouter();
//路由参数 //路由参数
const route = useRoute(); const route = useRoute();
@ -345,7 +346,7 @@
data.lawCer[data.lawCerFlag].id = item.userId; data.lawCer[data.lawCerFlag].id = item.userId;
data.lawCer[data.lawCerFlag].text = item.userName; data.lawCer[data.lawCerFlag].text = item.userName;
data.lawCer[data.lawCerFlag].num = item.lawCertificateNum; data.lawCer[data.lawCerFlag].num = item.lawCertificateNum;
data.lawCer[data.lawCerFlag].show = item.userName + " " + item.lawCertificateNum; data.lawCer[data.lawCerFlag].show = nameCorrect(item.userName + " " + item.lawCertificateNum);
// submitData.lawEnforcerTwo = item.userName // submitData.lawEnforcerTwo = item.userName
// submitData.lawCertificateNumTwo = item.lawCertificateNum; // submitData.lawCertificateNumTwo = item.lawCertificateNum;
@ -425,6 +426,7 @@
submitData.lawEnforcerTextTwo =success.data['lawEnforcerTwo']; submitData.lawEnforcerTextTwo =success.data['lawEnforcerTwo'];
submitData.isSubmit =success.data['isSubmit']; submitData.isSubmit =success.data['isSubmit'];
submitData.bureauDeptName = success.data['bureauDeptName']; submitData.bureauDeptName = success.data['bureauDeptName'];
submitData.linkMan=nameCorrect(submitData['linkMan']);
// 是否联合执法 // 是否联合执法
if (success.data.userObjs.length > 1) { if (success.data.userObjs.length > 1) {
@ -452,7 +454,7 @@
var lawEnforcer2Show = lawEnforcer2ShowStr.split(','); var lawEnforcer2Show = lawEnforcer2ShowStr.split(',');
data.lawCer = []; data.lawCer = [];
for (var i = 0; i < tmpEnforceId.length; i++) { for (var i = 0; i < tmpEnforceId.length; i++) {
data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: lawEnforcer2Show[i]}); data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: nameCorrect(lawEnforcer2Show[i])});
} }
} }
@ -462,7 +464,7 @@
console.log("queryUserInfo : ", success.data) console.log("queryUserInfo : ", success.data)
submitData.lawEnforcer = success.data.userName; submitData.lawEnforcer = success.data.userName;
submitData.lawCertificateNum = success.data.lawCertificateNum submitData.lawCertificateNum = success.data.lawCertificateNum
submitData.lawEnforcerText = submitData.lawEnforcer +" "+ submitData.lawCertificateNum submitData.lawEnforcerText = nameCorrect(submitData.lawEnforcer +" "+ submitData.lawCertificateNum)
// submitData.lawEnforcerText = submitData.lawEnforcer // submitData.lawEnforcerText = submitData.lawEnforcer
submitData.lawEnforcerId = success.data.userId; submitData.lawEnforcerId = success.data.userId;
submitData.lawEnforcement = success.data.dept.deptName; submitData.lawEnforcement = success.data.dept.deptName;
@ -633,6 +635,7 @@
//初始化参数,获取扫码的企业统一信用编码 //初始化参数,获取扫码的企业统一信用编码
onMounted(() =>{ onMounted(() =>{
nameCorrect();
// 数据填充 // 数据填充
dataFillIn(route?.query?.id); dataFillIn(route?.query?.id);
@ -658,7 +661,7 @@
const reciveData = (item) =>{ const reciveData = (item) =>{
submitData.enterpriseName = item.enterpriseName; submitData.enterpriseName = item.enterpriseName;
submitData.linkTel = item.enterpriseTel; submitData.linkTel = item.enterpriseTel;
submitData.linkMan = item.legalPerson; submitData.linkMan = nameCorrect(item.legalPerson);
submitData.enterpriseNumber = item.enterpriseNumber; submitData.enterpriseNumber = item.enterpriseNumber;
} }
</script> </script>

4
src/views/enforce/enterpriseBaseInfo.vue

@ -191,6 +191,7 @@
import {uploadFile} from "@/util/fileUpload"; import {uploadFile} from "@/util/fileUpload";
//用户筛选弹窗 //用户筛选弹窗
import Popup from './userFilter.vue'; import Popup from './userFilter.vue';
import {nameCorrect}from'../../util/fileUpload'
const {useMy} = $globalStore const {useMy} = $globalStore
@ -275,6 +276,7 @@
//3a0096181c184e5aa56f70923680856d$6e74ceda1463c165fd43eeeadce4f7cd //3a0096181c184e5aa56f70923680856d$6e74ceda1463c165fd43eeeadce4f7cd
//初始化参数,获取扫码的企业统一信用编码 //初始化参数,获取扫码的企业统一信用编码
onMounted(() => { onMounted(() => {
nameCorrect();
//查询企业信息 //查询企业信息
getEnterpriseInformation(route?.query?.enterpriseNumber, success => { getEnterpriseInformation(route?.query?.enterpriseNumber, success => {
// getEnterpriseInformation(props?.enterpriseNumber,success =>{ // getEnterpriseInformation(props?.enterpriseNumber,success =>{
@ -284,7 +286,7 @@
data.enterpriseInfo.enterpriseNumber = success.data.enterpriseNumber data.enterpriseInfo.enterpriseNumber = success.data.enterpriseNumber
data.enterpriseInfo.enterpriseType = success.data.companyOrgType data.enterpriseInfo.enterpriseType = success.data.companyOrgType
data.enterpriseInfo.enterpriseAddress = success.data.enterpriseAddress data.enterpriseInfo.enterpriseAddress = success.data.enterpriseAddress
data.enterpriseInfo.legalPerson = success.data.legalPerson data.enterpriseInfo.legalPerson = nameCorrect(success.data.legalPerson)
// data.enterpriseInfo.registeredCapital = success.data.registeredCapital +' (人民币/元)' // data.enterpriseInfo.registeredCapital = success.data.registeredCapital +' (人民币/元)'
var amount = 0.00; var amount = 0.00;
if (null != success.data.registeredCapital) { if (null != success.data.registeredCapital) {

7
src/views/enforce/historyCheck.vue

@ -80,8 +80,8 @@
<p> <p>
<label class="card_box_label">执法人员:</label> <label class="card_box_label">执法人员:</label>
<div> <div>
<div>{{ item.lawEnforcer }}</div> <div>{{ nameCorrect(item.lawEnforcer) }}</div>
<div v-for="(item, index) in item.lawEnforcer2List">{{ item }}</div> <div v-for="(item, index) in item.lawEnforcer2List">{{ nameCorrect(item) }}</div>
</div> </div>
</p> </p>
</div> </div>
@ -120,7 +120,7 @@
<script setup name="registrationList"> <script setup name="registrationList">
import {queryRegistrationList, getAttr} from '../../api/enforce'; import {queryRegistrationList, getAttr} from '../../api/enforce';
import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage"; import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage";
import {nameCorrect} from'@/util/fileUpload';
const {useCommon, useShopCard} = $globalStore; const {useCommon, useShopCard} = $globalStore;
const router = useRouter(); const router = useRouter();
@ -182,6 +182,7 @@
// 设置初始值为当前时间 // 设置初始值为当前时间
onMounted(async () => { onMounted(async () => {
nameCorrect();
// getCard(); // getCard();
searchParam.lawEnforcerId = useCommon.userId; searchParam.lawEnforcerId = useCommon.userId;
// queryList(); // queryList();

14
src/views/enforce/sign.vue

@ -150,7 +150,7 @@
<div class="add-inspect" v-if="data.checked"> <div class="add-inspect" v-if="data.checked">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p> <p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p>
<p v-for="(item, index) in submitData.userObjs" :key="index"> <p v-for="(item, index) in submitData.userObjs" :key="index">
<span class="add-dept">{{item.deptName}}</span><span class="add-name">{{item.userName}}</span> <span class="add-dept">{{item.deptName}}</span><span class="add-name">{{nameCorrect(item.userName)}}</span>
</p> </p>
<div class="addbtn" @click.stop="data.deptChecked=true"><van-icon name="add-o" /></div> <div class="addbtn" @click.stop="data.deptChecked=true"><van-icon name="add-o" /></div>
</div> </div>
@ -247,7 +247,7 @@
</template> </template>
<script setup name="register"> <script setup name="register">
import {nameCorrect} from'@/util/fileUpload';
import {showSuccessToast} from 'vant'; import {showSuccessToast} from 'vant';
import 'vant/es/toast/style'; import 'vant/es/toast/style';
import { import {
@ -468,6 +468,7 @@
//3a0096181c184e5aa56f70923680856d$6e74ceda1463c165fd43eeeadce4f7cd //3a0096181c184e5aa56f70923680856d$6e74ceda1463c165fd43eeeadce4f7cd
//初始化参数,获取扫码的企业统一信用编码 //初始化参数,获取扫码的企业统一信用编码
onMounted(() => { onMounted(() => {
nameCorrect();
submitData.enterpriseNumber = route?.query?.enterpriseNumber; submitData.enterpriseNumber = route?.query?.enterpriseNumber;
submitData.enforce = route?.query?.reason; submitData.enforce = route?.query?.reason;
submitData.checkCss = route?.query?.checkCss; submitData.checkCss = route?.query?.checkCss;
@ -497,7 +498,8 @@
queryUserInfo(useCommon.userId, success => { queryUserInfo(useCommon.userId, success => {
if (null != success.data) { if (null != success.data) {
submitData.lawEnforcer = success.data.userName submitData.lawEnforcer = success.data.userName
submitData.lawCertificateNumText = success.data.userName + " " + success.data.lawCertificateNum submitData.lawCertificateNumText =nameCorrect(success.data.userName + " " + success.data.lawCertificateNum);
// submitData.lawCertificateNumText = success.data.userName // submitData.lawCertificateNumText = success.data.userName
submitData.lawEnforcerId = success.data.userId submitData.lawEnforcerId = success.data.userId
submitData.lawEnforcement = success.data.dept.deptName; submitData.lawEnforcement = success.data.dept.deptName;
@ -681,7 +683,7 @@
var lawEnforcer2Show = lawEnforcer2ShowStr.split(','); var lawEnforcer2Show = lawEnforcer2ShowStr.split(',');
data.lawCer = []; data.lawCer = [];
for (var i = 0; i < tmpEnforceId.length; i++) { for (var i = 0; i < tmpEnforceId.length; i++) {
data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: lawEnforcer2Show[i]}); data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: nameCorrect(lawEnforcer2Show[i])});
} }
} }
@ -907,7 +909,7 @@
const reciveData = (item) => { const reciveData = (item) => {
data.lawCer[data.lawCerFlag].id = item.userId; data.lawCer[data.lawCerFlag].id = item.userId;
data.lawCer[data.lawCerFlag].text = item.userName; data.lawCer[data.lawCerFlag].text = item.userName;
data.lawCer[data.lawCerFlag].show = item.userName + " " + (null == item.lawCertificateNum ? "" : item.lawCertificateNum); data.lawCer[data.lawCerFlag].show = nameCorrect(item.userName + " " + (null == item.lawCertificateNum ? "" : item.lawCertificateNum));
// submitData.lawEnforcerTwo = item.userName; // submitData.lawEnforcerTwo = item.userName;
// submitData.lawCertificateNumTwoText = item.userName + " " + item.lawCertificateNum // submitData.lawCertificateNumTwoText = item.userName + " " + item.lawCertificateNum
@ -972,7 +974,7 @@
var lawEnforcer2Show = lawEnforcer2ShowStr.split(','); var lawEnforcer2Show = lawEnforcer2ShowStr.split(',');
data.lawCer = []; data.lawCer = [];
for (var i = 0; i < tmpEnforceId.length; i++) { for (var i = 0; i < tmpEnforceId.length; i++) {
data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: lawEnforcer2Show[i]}); data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: nameCorrect(lawEnforcer2Show[i])});
} }
} }
} }

7
src/views/enterprise/compaint/registrationListView.vue

@ -78,8 +78,8 @@
<p> <p>
<label class="card_box_label">执法人员:</label> <label class="card_box_label">执法人员:</label>
<div> <div>
<div>{{ item.lawEnforcer }}</div> <div>{{ nameCorrect(item.lawEnforcer) }}</div>
<div v-for="(item, index) in item.lawEnforcer2List">{{ item }}</div> <div v-for="(item, index) in item.lawEnforcer2List">{{ nameCorrect(item) }}</div>
</div> </div>
</p> </p>
</div> </div>
@ -117,6 +117,8 @@
import { queryListWithFiveDay } from '@/api/enterprise'; import { queryListWithFiveDay } from '@/api/enterprise';
import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage"; import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage";
import {setGoodsNum} from "@/util/util"; import {setGoodsNum} from "@/util/util";
import {nameCorrect} from'@/util/fileUpload';
const {useCommon, useShopCard} = $globalStore; const {useCommon, useShopCard} = $globalStore;
@ -169,6 +171,7 @@
// 设置初始值为当前时间 // 设置初始值为当前时间
onMounted(() => { onMounted(() => {
nameCorrect();
// getCard(); // getCard();
searchParam.enterpriseNumber = useCommon.enterpriseNumber; searchParam.enterpriseNumber = useCommon.enterpriseNumber;
// queryList(); // queryList();

5
src/views/enterprise/complaintDetailView.vue

@ -135,6 +135,7 @@
import {uploadFile} from '../../util/fileUpload' import {uploadFile} from '../../util/fileUpload'
import {reactive, ref} from "vue"; import {reactive, ref} from "vue";
import * as w6s from 'szient-js-sdk'; import * as w6s from 'szient-js-sdk';
import {nameCorrect} from'@/util/fileUpload';
const {useCommon, useMy} = $globalStore const {useCommon, useMy} = $globalStore
@ -276,6 +277,7 @@
return true; return true;
} }
onMounted(() => { onMounted(() => {
nameCorrect();
console.log(props.id); console.log(props.id);
submitData.relId = route?.query?.id; submitData.relId = route?.query?.id;
submitData.lawEnforcementIncidentText = route?.query?.lawEnforcementItemText; submitData.lawEnforcementIncidentText = route?.query?.lawEnforcementItemText;
@ -287,7 +289,8 @@
submitData.problemDescription = success.data.problemDescription; submitData.problemDescription = success.data.problemDescription;
submitData.lawEnforcementIncidentText = success.data.lawEnforcementIncident; submitData.lawEnforcementIncidentText = success.data.lawEnforcementIncident;
submitData.enterpriseAddress = success.data.enterpriseAddress; submitData.enterpriseAddress = success.data.enterpriseAddress;
submitData.linkman = success.data.linkman; submitData.linkman = nameCorrect(success.data.linkman);
console.log(submitData.linkman)
submitData.linkmanTel = success.data.linkmanTel; submitData.linkmanTel = success.data.linkmanTel;
submitData.bureauDeptName = success.data.bureauDeptName; submitData.bureauDeptName = success.data.bureauDeptName;
// 判断是否入企不扫码 // 判断是否入企不扫码

34
src/views/enterprise/complaintNoScan.vue

@ -64,6 +64,8 @@
<van-date-picker <van-date-picker
type="time" type="time"
v-model="data.currentDate" v-model="data.currentDate"
:min-date="addDate()"
:max-date="new Date()"
@confirm="onConfirm" @confirm="onConfirm"
@cancel="data.showTimePicker = false" @cancel="data.showTimePicker = false"
/> />
@ -170,6 +172,7 @@
import {uploadFile} from '../../util/fileUpload' import {uploadFile} from '../../util/fileUpload'
import {reactive, ref,defineProps} from "vue"; import {reactive, ref,defineProps} from "vue";
import DeptPopup from '@/views/enterprise/compaint/selectDeptFilter.vue'; import DeptPopup from '@/views/enterprise/compaint/selectDeptFilter.vue';
import {formattedTimeYYYYmmdd} from "@/util/util";
const {useCommon, useMy} = $globalStore; const {useCommon, useMy} = $globalStore;
const props = defineProps({ const props = defineProps({
@ -233,6 +236,7 @@
}) })
// 返回 // 返回
const goBack = () => { const goBack = () => {
// router.go(-1); // router.go(-1);
@ -312,8 +316,37 @@
const selectTime = () =>{ const selectTime = () =>{
data.showTimePicker = true; data.showTimePicker = true;
} }
//五个自然工作日内最小值日期
const addDate=()=>{
//()mm都从0开始取
let nowdate=new Date();
let yy=nowdate.getFullYear();
let mm=nowdate.getMonth()+1;
let dd=nowdate.getDate();
console.log(nowdate,yy,mm,dd)
if(dd>5){
console.log(yy,mm,dd-5);
return new Date(yy,mm-1,dd-4);
}else{
if(mm==1){
return new Date(yy-1,11,30+dd-4);
}else{
if(mm-1==2){
dd=(yy%4==0?29:28)+dd-4;
return new Date(yy,mm-2,dd)
}else if(mm-1==4||mm-1==6||mm-1==9||mm-1==11){
dd=30+dd-5;
return new Date(yy,mm-2,dd);
}else{
dd=31+dd-5;
return new Date(yy,mm-2,dd);
}
}
}
}
const selectCh = (val) => { const selectCh = (val) => {
submitData.authorization = val; submitData.authorization = val;
if (val == 0) { if (val == 0) {
@ -394,6 +427,7 @@
const closePopup = () =>{ const closePopup = () =>{
data.popupVisible = false; data.popupVisible = false;
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

4
src/views/enterprise/register.vue

@ -136,7 +136,7 @@
</template> </template>
<script setup name="register"> <script setup name="register">
import {nameCorrect} from'@/util/fileUpload'
import { showSuccessToast } from 'vant'; import { showSuccessToast } from 'vant';
import 'vant/es/toast/style'; import 'vant/es/toast/style';
import {addEnterpriseInformation} from '../../api/enterprise' import {addEnterpriseInformation} from '../../api/enterprise'
@ -285,7 +285,7 @@ const reciveData = (item) =>{
console.log(item.establishmentTime); console.log(item.establishmentTime);
submitData.enterpriseName = item.enterpriseName; submitData.enterpriseName = item.enterpriseName;
submitData.enterpriseNumber = item.enterpriseNumber; submitData.enterpriseNumber = item.enterpriseNumber;
submitData.legalPerson = item.legalPerson; submitData.legalPerson = nameCorrect(item.legalPerson);
submitData.enterpriseType = item.enterpriseType; submitData.enterpriseType = item.enterpriseType;
submitData.enterpriseAddress = item.enterpriseAddress; submitData.enterpriseAddress = item.enterpriseAddress;
submitData.registeredCapital = item.registeredCapital; submitData.registeredCapital = item.registeredCapital;

7
src/views/enterprise/registrationDetail.vue

@ -219,6 +219,7 @@ import { reactive, ref,nextTick } from "vue";
import {uploadFile} from "../../util/fileUpload"; import {uploadFile} from "../../util/fileUpload";
import {getDict} from "../../api/Home"; import {getDict} from "../../api/Home";
import {queryLinkageById} from "../../api/linkage"; import {queryLinkageById} from "../../api/linkage";
import {nameCorrect} from'../../util/fileUpload'
//用户筛选弹窗 //用户筛选弹窗
// import Popup from './userFilter.vue'; // import Popup from './userFilter.vue';
@ -355,7 +356,7 @@ const onChange = (newIndex) => {
//初始化参数,获取扫码的企业统一信用编码 //初始化参数,获取扫码的企业统一信用编码
onMounted(() =>{ onMounted(() =>{
nameCorrect();
//查询执法登记信息 //查询执法登记信息
queryEnforcementRegistrationById(route?.query?.id,success =>{ queryEnforcementRegistrationById(route?.query?.id,success =>{
submitData.enterpriseName = success.data.enterpriseName; submitData.enterpriseName = success.data.enterpriseName;
@ -371,7 +372,7 @@ onMounted(() =>{
// submitData.lawEnforcementBasis = success.data.lawEnforcementBasis; // submitData.lawEnforcementBasis = success.data.lawEnforcementBasis;
// submitData.lawEnforcementBasisText = success.data.lawEnforcementBasisText; // submitData.lawEnforcementBasisText = success.data.lawEnforcementBasisText;
// submitData.lawEnforcerIdTwo = success.data.lawEnforcerIdTwo; // submitData.lawEnforcerIdTwo = success.data.lawEnforcerIdTwo;
submitData.lawEnforcer = success.data.lawEnforcer; submitData.lawEnforcer = nameCorrect(success.data.lawEnforcer);
submitData.remark = success.data.remark; submitData.remark = success.data.remark;
submitData.enforce = success.data.enforce; submitData.enforce = success.data.enforce;
// 执法领域 // 执法领域
@ -421,7 +422,7 @@ onMounted(() =>{
var lawEnforcer2Show = lawEnforcer2ShowStr.split(','); var lawEnforcer2Show = lawEnforcer2ShowStr.split(',');
data.lawCer = []; data.lawCer = [];
for (var i = 0; i < tmpEnforceId.length; i++) { for (var i = 0; i < tmpEnforceId.length; i++) {
data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: lawEnforcer2Show[i]}); data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: nameCorrect(lawEnforcer2Show[i])});
} }
} }

10
src/views/enterprise/registrationEdit.vue

@ -234,7 +234,7 @@
<div class="add-inspect" v-if="data.checked"> <div class="add-inspect" v-if="data.checked">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p> <p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p>
<p v-for="(item, index) in submitData.userObjs" :key="index"> <p v-for="(item, index) in submitData.userObjs" :key="index">
<span class="add-dept">{{item.deptName}}</span><span class="add-name">{{item.userName}}</span> <span class="add-dept">{{item.deptName}}</span><span class="add-name">{{nameCorrect(item.userName)}}</span>
</p> </p>
<div class="addbtn" @click.stop="data.deptChecked=true"><van-icon name="add-o" /></div> <div class="addbtn" @click.stop="data.deptChecked=true"><van-icon name="add-o" /></div>
</div> </div>
@ -310,7 +310,7 @@
import {addEnforcementRegistration, editEnforcementRegistration, getRegByUserIdAndZero, getByUserIdAndEnterpriseNumber, 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 {nameCorrect, uploadFile} from "../../util/fileUpload";
import {formattedTime} from "@/util/util"; import {formattedTime} from "@/util/util";
import Compressor from 'compressorjs' import Compressor from 'compressorjs'
//用户筛选弹窗 //用户筛选弹窗
@ -515,7 +515,7 @@
queryUserInfo(useCommon.userId,success =>{ queryUserInfo(useCommon.userId,success =>{
if (null != success.data) { if (null != success.data) {
submitData.lawEnforcer = success.data.userName submitData.lawEnforcer = success.data.userName
submitData.lawCertificateNumText = success.data.userName + " " + success.data.lawCertificateNum submitData.lawCertificateNumText = nameCorrect(success.data.userName + " " + success.data.lawCertificateNum)
// submitData.lawCertificateNumText = success.data.userName // submitData.lawCertificateNumText = success.data.userName
submitData.lawEnforcerId = success.data.userId submitData.lawEnforcerId = success.data.userId
submitData.lawEnforcement = success.data.dept.deptName; submitData.lawEnforcement = success.data.dept.deptName;
@ -645,7 +645,7 @@
var lawEnforcer2Show = lawEnforcer2ShowStr.split(','); var lawEnforcer2Show = lawEnforcer2ShowStr.split(',');
data.lawCer = []; data.lawCer = [];
for (var i = 0; i < tmpEnforceId.length; i++) { for (var i = 0; i < tmpEnforceId.length; i++) {
data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: lawEnforcer2Show[i]}); data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: nameCorrect(lawEnforcer2Show[i])});
} }
} }
@ -850,7 +850,7 @@
const reciveData = (item) =>{ const reciveData = (item) =>{
data.lawCer[data.lawCerFlag].id = item.userId; data.lawCer[data.lawCerFlag].id = item.userId;
data.lawCer[data.lawCerFlag].text = item.userName; data.lawCer[data.lawCerFlag].text = item.userName;
data.lawCer[data.lawCerFlag].show = item.userName + " " + item.lawCertificateNum; data.lawCer[data.lawCerFlag].show = nameCorrect(item.userName + " " + item.lawCertificateNum);
// submitData.lawEnforcerTwo = item.userName; // submitData.lawEnforcerTwo = item.userName;
// submitData.lawCertificateNumTwoText = item.userName + " " + item.lawCertificateNum // submitData.lawCertificateNumTwoText = item.userName + " " + item.lawCertificateNum

7
src/views/enterprise/registrationList.vue

@ -100,8 +100,8 @@
<p> <p>
<label class="card_box_label">执法人员:</label> <label class="card_box_label">执法人员:</label>
<div> <div>
<div>{{ item.lawEnforcer }}</div> <div>{{ nameCorrect(item.lawEnforcer) }}</div>
<div v-for="(item, index) in item.lawEnforcer2List">{{ item }}</div> <div v-for="(item, index) in item.lawEnforcer2List">{{ nameCorrect(item)}}</div>
</div> </div>
</p> </p>
</div> </div>
@ -141,6 +141,7 @@
import {queryEnterpriseList} from '@/api/enterprise'; import {queryEnterpriseList} from '@/api/enterprise';
import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage"; import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage";
import {setGoodsNum} from "@/util/util"; import {setGoodsNum} from "@/util/util";
import {nameCorrect} from'@/util/fileUpload';
const {useCommon, useShopCard} = $globalStore; const {useCommon, useShopCard} = $globalStore;
@ -189,6 +190,7 @@
finished: false, finished: false,
refreshing: false, refreshing: false,
curPage: 1, curPage: 1,
name:""
}); });
// 设置初始值为当前时间 // 设置初始值为当前时间
@ -201,6 +203,7 @@
// getLinkageByParentIdToItem(success.id) // getLinkageByParentIdToItem(success.id)
// }, error => { // }, error => {
// }); // });
nameCorrect();
}); });
const getLinkageByParentIdToItem = (parentId) => { const getLinkageByParentIdToItem = (parentId) => {
// 查询检查要求字典信息 // 查询检查要求字典信息

Loading…
Cancel
Save