chenrui
/
zdxtLawEnforcementCodeView
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改任务来源 新增执法类别

v4
Chendy 1 year ago
parent
ced5622701
commit
42544037fa
4 changed files with 97 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/views/enforce/comprehensiveAnalysis.vue
  2. 49
      src/views/enforce/sign.vue
  3. 15
      src/views/enterprise/registrationDetail.vue
  4. 36
      src/views/enterprise/registrationEdit.vue

8
src/views/enforce/comprehensiveAnalysis.vue
View File

@ -83,9 +83,9 @@
</div> </div>
<h3 class="card_tit">执法类别</h3> <h3 class="card_tit">执法类别</h3>
<div class="count_wrap"> <div class="count_wrap">
<div class="count_item" v-for="item in data.whole.checkCategoryList"> <div class="count_item" v-for="item in data.whole.lawEnforceCategoryList">
<label>{{ item.checkCategory }}</label> <label>{{ item.lawEnforceCategory }}</label>
<span class="number_count">{{item.checkCategoryNumber}}</span> <span class="number_count">{{item.lawEnforceCategoryNumber}}</span>
<span class="number_percent" v-if="item.percentage!=null&&item.percentage!=0">{{item.percentage}}<i>%</i></span> <span class="number_percent" v-if="item.percentage!=null&&item.percentage!=0">{{item.percentage}}<i>%</i></span>
<span class="number_percent" v-else>-</span> <span class="number_percent" v-else>-</span>
</div> </div>
@ -168,6 +168,7 @@ const data = reactive({
checkCategoryList: [], checkCategoryList: [],
companyOrgTypeList: [], companyOrgTypeList: [],
complaintTypeList: [], complaintTypeList: [],
lawEnforceCategoryList:[]
}), }),
ontabClass1: true, ontabClass1: true,
ontabClass2: false, ontabClass2: false,
@ -230,6 +231,7 @@ const getWhole = () => {
data.whole.checkCategoryList = success.checkCategoryList; data.whole.checkCategoryList = success.checkCategoryList;
data.whole.companyOrgTypeList = success.companyOrgTypeList; data.whole.companyOrgTypeList = success.companyOrgTypeList;
data.whole.complaintTypeList = success.complaintTypeList; data.whole.complaintTypeList = success.complaintTypeList;
data.whole.lawEnforceCategoryList=success.lawEnforceCategoryList;
console.log(success.total); console.log(success.total);
console.log(data.whole); console.log(data.whole);
}, },

49
src/views/enforce/sign.vue
View File

@ -82,14 +82,24 @@
</div> </div>
<!-- <div class="addbtn" @click.stop="addLawCer"><van-icon name="add-o" /></div> --> <!-- <div class="addbtn" @click.stop="addLawCer"><van-icon name="add-o" /></div> -->
</div> </div>
<van-field <van-field
v-model="submitData.checkCategoryText" v-model="submitData.lawEnforceCategoryText"
label="执法类别" label="执法类别"
placeholder="请选择" placeholder="请选择"
is-link is-link
readonly readonly
required required
:rules="[{ required: true, message: '请选择执法类别' }]" :rules="[{ required: true, message: '请选择执法类别' }]"
@click="data.lawEnforceCategoryPicker = true"
/>
<van-field
v-model="submitData.checkCategoryText"
label="任务来源"
placeholder="请选择"
is-link
readonly
required
:rules="[{ required: true, message: '请选择任务来源' }]"
@click="data.showCheckCategoryPicker = true" @click="data.showCheckCategoryPicker = true"
/> />
<van-field <van-field
@ -271,6 +281,9 @@
<van-popup v-model:show="data.showCheckCategoryPicker" round position="bottom"> <van-popup v-model:show="data.showCheckCategoryPicker" round position="bottom">
<van-picker :columns="data.checkCategorys" @cancel="data.showCheckCategoryPicker = false" @confirm="onConfirmCheckCategory" /> <van-picker :columns="data.checkCategorys" @cancel="data.showCheckCategoryPicker = false" @confirm="onConfirmCheckCategory" />
</van-popup> </van-popup>
<van-popup v-model:show="data.lawEnforceCategoryPicker" round position="bottom">
<van-picker :columns="data.lawEnforceCategory" @cancel="data.lawEnforceCategoryPicker = false" @confirm="getCategory" />
</van-popup>
<popupcp :visible="data.popupCp" :content="data.popupCpContent" @close="closePopup" <popupcp :visible="data.popupCp" :content="data.popupCpContent" @close="closePopup"
@reciveData="reciveDataCp"/> @reciveData="reciveDataCp"/>
@ -368,7 +381,9 @@
showLawFieldPicker: false, showLawFieldPicker: false,
lawFields: [], lawFields: [],
showCheckCategoryPicker: false, showCheckCategoryPicker: false,
lawEnforceCategoryPicker:false,
checkCategorys: [], checkCategorys: [],
lawEnforceCategory:[],
checked: false, checked: false,
deptChecked: false, deptChecked: false,
deptContent: '', deptContent: '',
@ -440,6 +455,8 @@
lawFieldText: "", lawFieldText: "",
checkCategory: "", checkCategory: "",
checkCategoryText: "", checkCategoryText: "",
lawEnforceCategory:"",
lawEnforceCategoryText:"",
userId: useCommon.userId, userId: useCommon.userId,
deptTexts: "", deptTexts: "",
deptObjs: [], deptObjs: [],
@ -551,9 +568,12 @@
// 行政执法领域 // 行政执法领域
initlawField(); initlawField();
// 行政执法类别 // 任务来源 原执法类别
initCheckCategory(); initCheckCategory();
// 执法类别
initlawEnforceCategory();
// 数据填充 // 数据填充
// dataFillIn(); // dataFillIn();
@ -712,7 +732,7 @@
} }
}); });
} }
/** 行政执法类别 */ /** 任务来源 */
const initCheckCategory = () => { const initCheckCategory = () => {
data.checkCategorys = []; data.checkCategorys = [];
getDict({"dictType":"check_category"}, success => { 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<success.data.length; i++) {
data.lawEnforceCategory.push(
{"text":success.data[i].dictLabel, "value":success.data[i].dictValue}
);
}
}
});
}
const dataFillIn = () => { const dataFillIn = () => {
// getRegByUserIdAndZero(useCommon.userId,success =>{ // getRegByUserIdAndZero(useCommon.userId,success =>{
getByUserIdAndEnterpriseNumber("add", useCommon.userId, submitData.enterpriseNumber, success => { getByUserIdAndEnterpriseNumber("add", useCommon.userId, submitData.enterpriseNumber, success => {
@ -1117,6 +1151,13 @@
data.showCheckCategoryPicker = false; 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) => { const beforeRead = (file) => {
if (file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/jpg') { if (file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/jpg') {
// Toast('请上传图片格式'); // Toast('请上传图片格式');

15
src/views/enterprise/registrationDetail.vue
View File

@ -48,10 +48,16 @@
readonly readonly
/> />
</div> </div>
<van-field
v-model="item.lawEnforceCategoryText"
label="执法类别"
readonly
/>
<van-field <van-field
v-if="item.checkCategoryText" v-if="item.checkCategoryText"
v-model="item.checkCategoryText" v-model="item.checkCategoryText"
label="执法类别" label="任务来源"
readonly readonly
/> />
@ -594,6 +600,7 @@ const submitData = reactive({
// authorization: 0, // authorization: 0,
lawFieldText: "", lawFieldText: "",
checkCategoryText: "", checkCategoryText: "",
lawEnforceCategoryText: "",
uniteCheck: "", uniteCheck: "",
// inspectionEfficiency: 0, // inspectionEfficiency: 0,
// serviceExperience: 0, // serviceExperience: 0,
@ -759,8 +766,10 @@ const queryRegById = () => {
submitData.enforce = success.data.enforceReason; submitData.enforce = success.data.enforceReason;
// 执法领域 // 执法领域
submitData.lawFieldText = success.data.lawFieldText; submitData.lawFieldText = success.data.lawFieldText;
// 执法类别 // 任务来源
submitData.checkCategoryText = success.data.checkCategoryText; submitData.checkCategoryText = success.data.checkCategoryText;
// 执法类别
submitData.lawEnforceCategoryText=success.data.lawEnforceCategoryText;
// 执法时间 // 执法时间
submitData.enforcementTime = formattedTimeYYYYmmdd( submitData.enforcementTime = formattedTimeYYYYmmdd(
success.data.enforcementTime success.data.enforcementTime
@ -987,6 +996,7 @@ const convertReg = (regs) => {
} }
obj.lawFieldText = dt.lawFieldText; obj.lawFieldText = dt.lawFieldText;
obj.checkCategoryText = dt.checkCategoryText; obj.checkCategoryText = dt.checkCategoryText;
obj.lawEnforceCategoryText = dt.lawEnforceCategoryText;
obj.enforcementTime = formattedTimeYYYYmmdd(dt.enforcementTime); obj.enforcementTime = formattedTimeYYYYmmdd(dt.enforcementTime);
obj.lawEnforcementBasis = dt.lawEnforcementBasis; obj.lawEnforcementBasis = dt.lawEnforcementBasis;
obj.lawEnforcementBasisText = dt.lawEnforcementBasisText; obj.lawEnforcementBasisText = dt.lawEnforcementBasisText;
@ -1093,6 +1103,7 @@ const convertLaw = (laws) => {
} }
obj.lawFieldText = dt.lawFieldText; obj.lawFieldText = dt.lawFieldText;
obj.checkCategoryText = dt.checkCategoryText; obj.checkCategoryText = dt.checkCategoryText;
obj.lawEnforceCategoryText = dt.lawEnforceCategoryText;
obj.enforcementTime = formattedTimeYYYYmmdd(dt.checkTime); obj.enforcementTime = formattedTimeYYYYmmdd(dt.checkTime);
obj.lawEnforcementBasis = dt.lawEnforcementBasis; obj.lawEnforcementBasis = dt.lawEnforcementBasis;
obj.lawEnforcementBasisText = dt.lawEnforcementBasisText; obj.lawEnforcementBasisText = dt.lawEnforcementBasisText;

36
src/views/enterprise/registrationEdit.vue
View File

@ -89,14 +89,25 @@
@click="showPopup2" @click="showPopup2"
:rules="[{ required: true, message: '请选择辅助人员' }]" :rules="[{ required: true, message: '请选择辅助人员' }]"
/> --> /> -->
<van-field <van-field
v-model="submitData.checkCategoryText" v-model="submitData.lawEnforceCategoryText"
label="执法类别" label="执法类别"
placeholder="请选择" placeholder="请选择"
is-link is-link
readonly readonly
required required
:rules="[{ required: true, message: '请选择执法类别' }]" :rules="[{ required: true, message: '请选择执法类别' }]"
@click="data.showlawEnforceCategoryPicker = true"
/>
<van-field
v-model="submitData.checkCategoryText"
label="任务来源"
placeholder="请选择"
is-link
readonly
required
:rules="[{ required: true, message: '请选择任务来源' }]"
@click="data.showCheckCategoryPicker = true" @click="data.showCheckCategoryPicker = true"
/> />
<!-- <view v-if="data.isNoScan == 'true'">--> <!-- <view v-if="data.isNoScan == 'true'">-->
@ -322,6 +333,9 @@
</van-popup> </van-popup>
<van-popup v-model:show="data.showCheckCategoryPicker" round position="bottom"> <van-popup v-model:show="data.showCheckCategoryPicker" round position="bottom">
<van-picker :columns="data.checkCategorys" @cancel="data.showCheckCategoryPicker = false" @confirm="onConfirmCheckCategory" /> <van-picker :columns="data.checkCategorys" @cancel="data.showCheckCategoryPicker = false" @confirm="onConfirmCheckCategory" />
</van-popup>
<van-popup v-model:show="data.showlawEnforceCategoryPicker" round position="bottom">
<van-picker :columns="data.lawEnforceCategorys" @cancel="data.showlawEnforceCategoryPicker = false" @confirm="onConfirmlawEnforceCategory" />
</van-popup> </van-popup>
<Popupzq :visible="data.popupVisibleqz" :content="data.popupContentqz" @close="closePopup" @reciveData="reciveDataqz" /> <Popupzq :visible="data.popupVisibleqz" :content="data.popupContentqz" @close="closePopup" @reciveData="reciveDataqz" />
<!-- <van-popup v-model:show="data.showGA" position="bottom" :style="{ height: '30%' }">--> <!-- <van-popup v-model:show="data.showGA" position="bottom" :style="{ height: '30%' }">-->
@ -408,7 +422,9 @@ import {showFailToast, showSuccessToast} from 'vant';
lawField_columns: [], lawField_columns: [],
lawFieldText:"", lawFieldText:"",
showCheckCategoryPicker: false, showCheckCategoryPicker: false,
showlawEnforceCategoryPicker:false,
checkCategorys: [], checkCategorys: [],
lawEnforceCategorys:[],
enforceReasonList: [], enforceReasonList: [],
checked: false, checked: false,
deptChecked: false, deptChecked: false,
@ -493,6 +509,8 @@ import {showFailToast, showSuccessToast} from 'vant';
lawField:"", lawField:"",
checkCategory: "", checkCategory: "",
checkCategoryText: "", checkCategoryText: "",
lawEnforceCategory:"",
lawEnforceCategoryText:"",
userId: useCommon.userId, userId: useCommon.userId,
deptTexts: "", deptTexts: "",
deptObjs: [], deptObjs: [],
@ -627,6 +645,11 @@ import {showFailToast, showSuccessToast} from 'vant';
data.checkCategorys.push({"text":success.data[i].dictLabel, "value":success.data[i].dictValue}); data.checkCategorys.push({"text":success.data[i].dictLabel, "value":success.data[i].dictValue});
} }
}); });
getDict({"dictType":"law_enforce_category"}, success => {
for (var i=0; i<success.data.length; i++) {
data.lawEnforceCategorys.push({"text":success.data[i].dictLabel, "value":success.data[i].dictValue});
}
});
@ -722,8 +745,10 @@ import {showFailToast, showSuccessToast} from 'vant';
submitData.enforceReason = success.data.enforceReason; submitData.enforceReason = success.data.enforceReason;
// 执法领域 // 执法领域
submitData.lawFieldText = success.data.lawFieldText; submitData.lawFieldText = success.data.lawFieldText;
// 执法类别 // 任务来源
submitData.checkCategoryText = success.data.checkCategoryText; submitData.checkCategoryText = success.data.checkCategoryText;
// 执法类别
submitData.lawEnforceCategoryText=success.data.lawEnforceCategoryText;
// 执法时间 // 执法时间
// submitData.enforcementTime = formattedTimeYYYYmmdd(success.data.enforcementTime); // submitData.enforcementTime = formattedTimeYYYYmmdd(success.data.enforcementTime);
submitData.enforcementTime = success.data.enforcementTime; submitData.enforcementTime = success.data.enforcementTime;
@ -1241,6 +1266,13 @@ import {showFailToast, showSuccessToast} from 'vant';
data.showCheckCategoryPicker = false; data.showCheckCategoryPicker = false;
} }
const onConfirmlawEnforceCategory= (item) => {
var obj = item.selectedOptions[0];
submitData.lawEnforceCategory = obj.value;
submitData.lawEnforceCategoryText = obj.text;
data.showlawEnforceCategoryPicker = false;
}
const beforeRead = (file) =>{ const beforeRead = (file) =>{
if (file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/jpg') { if (file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/jpg') {
// Toast('请上传图片格式'); // Toast('请上传图片格式');

Write Preview
Loading…
Cancel
Save