diff --git a/src/common/globalRouter.js b/src/common/globalRouter.js index fe192c7..308fca6 100644 --- a/src/common/globalRouter.js +++ b/src/common/globalRouter.js @@ -4,7 +4,8 @@ let routes = [ { path: "/", // redirect: "/home", - redirect: "/enforceHome", + // redirect: "/enforceHome", + redirect: "/login", name: "App", }, { diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index 7186496..9102c50 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -100,18 +100,28 @@ - + + + + + + + + + + + + + @@ -251,6 +261,8 @@ const data = reactive({ isNoScan: false, lawChecked: false, lawContent: "", + lawList: [{text:"", id:""}], + lawCliekFlag: 0, }); var fileSize = 0; //保存参数 @@ -278,6 +290,7 @@ const submitData = reactive({ lawEnforcementItemText:"", //执法依据 lawEnforcementBasis:"", + lawEnforcementBasisText:"", //执法结果 reslut:0, //备注 @@ -451,6 +464,7 @@ const gaCancel = () => { const dataFillIn = () => { // getRegByUserIdAndZero(useCommon.userId,success =>{ getByUserIdAndEnterpriseNumber(useCommon.userId, submitData.enterpriseNumber,success =>{ + console.log("========> : ", success); //跳转企业二维码地址 if(success.success){ Object.keys(submitData).forEach((item) => { @@ -463,6 +477,16 @@ const dataFillIn = () => { // submitData.lawCertificateNumText =success.data['lawEnforcer']; submitData.lawCertificateNumTwoText =success.data['lawEnforcerTwo']; submitData.subsidiaryerText =success.data['subsidiaryer']; + submitData.lawEnforcementBasis = success.data['lawEnforcementBasis']; + submitData.lawEnforcementBasisText = success.data['lawEnforcementBasisText']; + var tmpBasis = submitData.lawEnforcementBasis.split(','); + var tmpBasisText = submitData.lawEnforcementBasisText.split(','); + data.lawList = []; + for (var i=0; i { } submitData.fileList = []; submitData.fileListObj = []; - showSuccessToast('保存成功'); } },error=>{ console.log("保存失败") @@ -480,6 +503,14 @@ const dataFillIn = () => { const tmpSave = () => { showSuccessToast('临时保存'); submitData.userId = useCommon.userId; + submitData.lawEnforcementBasis = ""; + submitData.lawEnforcementBasisText = ""; + for (var i=0; i{ //跳转企业二维码地址 if(success.success){ @@ -494,6 +525,14 @@ const tmpSave = () => { const submit = (type) =>{ submitData.isSubmit = type; submitData.userId = useCommon.userId; + submitData.lawEnforcementBasis = ""; + submitData.lawEnforcementBasisText = ""; + for (var i=0; i { editEnforcementRegistration(submitData, success => { //跳转首页 @@ -513,9 +552,13 @@ const showPopup = () =>{ const showPopup2 = () =>{ data.popupVisible2 = true; } -const showPopupqz = () =>{ +const showPopupqz = (flag) =>{ + data.lawCliekFlag = flag; data.popupVisibleqz = true; } +const addField = () =>{ + data.lawList.push({ text:"", id:"" }); +} const closePopup = () =>{ data.popupVisible = false; data.popupVisible2 = false; @@ -535,10 +578,11 @@ const reciveData2 = (item) =>{ submitData.subsidiaryerText = item.userName; } const reciveDataqz = (item) =>{ - console.log(item); - submitData.lawEnforcementBasis = item.id; + data.lawList[data.lawCliekFlag].id = item.id; + data.lawList[data.lawCliekFlag].text = item.lawName; + // submitData.lawEnforcementBasis = item.id; // submitData.subsidiaryerText = item.userName + " " + item.lawCertificateNum; - data.lawEnforcementBasisText = item.lawName; + // data.lawEnforcementBasisText = item.lawName; } const reciveLaw = (item) => { submitData.lawId = item.id; diff --git a/src/views/enforce/zqyjjdmFilter.vue b/src/views/enforce/zqyjjdmFilter.vue index 62bc5c1..cf181ff 100644 --- a/src/views/enforce/zqyjjdmFilter.vue +++ b/src/views/enforce/zqyjjdmFilter.vue @@ -18,7 +18,7 @@
法律名称:{{ item.lawName }}
-
内容:{{ item.content }}
+
diff --git a/src/views/login.vue b/src/views/login.vue index 76dcb3a..c69ab2c 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -1,67 +1,70 @@