diff --git a/src/views/enforce/comprehensiveAnalysis.vue b/src/views/enforce/comprehensiveAnalysis.vue index 2a9ebe0..1e622f9 100644 --- a/src/views/enforce/comprehensiveAnalysis.vue +++ b/src/views/enforce/comprehensiveAnalysis.vue @@ -83,9 +83,9 @@

执法类别

-
- - {{item.checkCategoryNumber}} +
+ + {{item.lawEnforceCategoryNumber}} {{item.percentage}}% -
@@ -168,6 +168,7 @@ const data = reactive({ checkCategoryList: [], companyOrgTypeList: [], complaintTypeList: [], + lawEnforceCategoryList:[] }), ontabClass1: true, ontabClass2: false, @@ -230,6 +231,7 @@ const getWhole = () => { data.whole.checkCategoryList = success.checkCategoryList; data.whole.companyOrgTypeList = success.companyOrgTypeList; data.whole.complaintTypeList = success.complaintTypeList; + data.whole.lawEnforceCategoryList=success.lawEnforceCategoryList; console.log(success.total); console.log(data.whole); }, diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index bf4d8a9..894ab3d 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -82,14 +82,24 @@
- + + + + @@ -368,7 +381,9 @@ showLawFieldPicker: false, lawFields: [], showCheckCategoryPicker: false, + lawEnforceCategoryPicker:false, checkCategorys: [], + lawEnforceCategory:[], checked: false, deptChecked: false, deptContent: '', @@ -440,6 +455,8 @@ lawFieldText: "", checkCategory: "", checkCategoryText: "", + lawEnforceCategory:"", + lawEnforceCategoryText:"", userId: useCommon.userId, deptTexts: "", deptObjs: [], @@ -551,9 +568,12 @@ // 行政执法领域 initlawField(); - // 行政执法类别 + // 任务来源 原执法类别 initCheckCategory(); + // 执法类别 + initlawEnforceCategory(); + // 数据填充 // dataFillIn(); @@ -712,7 +732,7 @@ } }); } - /** 行政执法类别 */ + /** 任务来源 */ const initCheckCategory = () => { data.checkCategorys = []; getDict({"dictType":"check_category"}, success => { @@ -726,6 +746,20 @@ }); } + /** 行政执法类别 */ + const initlawEnforceCategory = () => { + data.lawEnforceCategory = []; + getDict({"dictType":"law_enforce_category"}, success => { + if (success.success) { + for (var i=0; i { // getRegByUserIdAndZero(useCommon.userId,success =>{ getByUserIdAndEnterpriseNumber("add", useCommon.userId, submitData.enterpriseNumber, success => { @@ -1117,6 +1151,13 @@ data.showCheckCategoryPicker = false; } + const getCategory = (item) => { + var obj = item.selectedOptions[0]; + submitData.lawEnforceCategory = obj.value; + submitData.lawEnforceCategoryText=obj.text; + data.lawEnforceCategoryPicker = false; + } + const beforeRead = (file) => { if (file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/jpg') { // Toast('请上传图片格式'); diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue index 53ae864..618206b 100644 --- a/src/views/enterprise/registrationDetail.vue +++ b/src/views/enterprise/registrationDetail.vue @@ -48,10 +48,16 @@ readonly /> + + @@ -594,6 +600,7 @@ const submitData = reactive({ // authorization: 0, lawFieldText: "", checkCategoryText: "", + lawEnforceCategoryText: "", uniteCheck: "", // inspectionEfficiency: 0, // serviceExperience: 0, @@ -759,8 +766,10 @@ const queryRegById = () => { submitData.enforce = success.data.enforceReason; // 执法领域 submitData.lawFieldText = success.data.lawFieldText; - // 执法类别 + // 任务来源 submitData.checkCategoryText = success.data.checkCategoryText; + // 执法类别 + submitData.lawEnforceCategoryText=success.data.lawEnforceCategoryText; // 执法时间 submitData.enforcementTime = formattedTimeYYYYmmdd( success.data.enforcementTime @@ -987,6 +996,7 @@ const convertReg = (regs) => { } obj.lawFieldText = dt.lawFieldText; obj.checkCategoryText = dt.checkCategoryText; + obj.lawEnforceCategoryText = dt.lawEnforceCategoryText; obj.enforcementTime = formattedTimeYYYYmmdd(dt.enforcementTime); obj.lawEnforcementBasis = dt.lawEnforcementBasis; obj.lawEnforcementBasisText = dt.lawEnforcementBasisText; @@ -1093,6 +1103,7 @@ const convertLaw = (laws) => { } obj.lawFieldText = dt.lawFieldText; obj.checkCategoryText = dt.checkCategoryText; + obj.lawEnforceCategoryText = dt.lawEnforceCategoryText; obj.enforcementTime = formattedTimeYYYYmmdd(dt.checkTime); obj.lawEnforcementBasis = dt.lawEnforcementBasis; obj.lawEnforcementBasisText = dt.lawEnforcementBasisText; diff --git a/src/views/enterprise/registrationEdit.vue b/src/views/enterprise/registrationEdit.vue index 79c20cc..9635b2a 100644 --- a/src/views/enterprise/registrationEdit.vue +++ b/src/views/enterprise/registrationEdit.vue @@ -89,14 +89,25 @@ @click="showPopup2" :rules="[{ required: true, message: '请选择辅助人员' }]" /> --> + + @@ -322,6 +333,9 @@ + + + @@ -408,7 +422,9 @@ import {showFailToast, showSuccessToast} from 'vant'; lawField_columns: [], lawFieldText:"", showCheckCategoryPicker: false, + showlawEnforceCategoryPicker:false, checkCategorys: [], + lawEnforceCategorys:[], enforceReasonList: [], checked: false, deptChecked: false, @@ -493,6 +509,8 @@ import {showFailToast, showSuccessToast} from 'vant'; lawField:"", checkCategory: "", checkCategoryText: "", + lawEnforceCategory:"", + lawEnforceCategoryText:"", userId: useCommon.userId, deptTexts: "", deptObjs: [], @@ -627,6 +645,11 @@ import {showFailToast, showSuccessToast} from 'vant'; data.checkCategorys.push({"text":success.data[i].dictLabel, "value":success.data[i].dictValue}); } }); + getDict({"dictType":"law_enforce_category"}, success => { + for (var i=0; i { + var obj = item.selectedOptions[0]; + submitData.lawEnforceCategory = obj.value; + submitData.lawEnforceCategoryText = obj.text; + data.showlawEnforceCategoryPicker = false; + } + const beforeRead = (file) =>{ if (file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/jpg') { // Toast('请上传图片格式');