Browse Source

联合执法, 和 检查次数 布局修改

v4
蟑螂恶霸 1 year ago
parent
commit
8e1f9ba673
  1. 2
      src/api/enforce.js
  2. 9
      src/views/enforce/earlyWarning.vue
  3. 5
      src/views/enforce/enterpriseWarningInfo.vue
  4. 3
      src/views/enforce/historyCheck.vue
  5. 32
      src/views/enforce/sign.vue
  6. 10
      src/views/enforceHome.vue

2
src/api/enforce.js

@ -182,4 +182,4 @@ export const whole = (params,success,error) =>_get("/app/appComprehensiveAnalysi
* @param {*} error * @param {*} error
* @returns * @returns
*/ */
export const queryUnionByHour = (enterpriseNumber, success, error) => _get("/app/code/registration/queryUnionByHour/"+enterpriseNumber, null,success,error) export const queryUnionByHour = (enterpriseNumber, reason, success, error) => _get("/app/code/registration/queryUnionByHour/"+enterpriseNumber+"/"+reason, null,success,error)

9
src/views/enforce/earlyWarning.vue

@ -91,7 +91,7 @@
</van-popup> </van-popup>
</div> </div>
<div class="warning-rule" style="margin-top: -8px"> <div class="warning-rule" style="margin-top: -8px">
<span><van-icon name="warning-o"/></span><span>由于企业过多,请输入关键字搜索。</span> <span><van-icon name="warning-o"/></span><span>请输入关键字搜索。</span>
</div> </div>
<!-- 中间 --> <!-- 中间 -->
@ -129,8 +129,9 @@
<div :class="item.show? 'new_detail' : 'work_detail'"> <div :class="item.show? 'new_detail' : 'work_detail'">
<div class="timbox"> <div class="timbox">
<div :class="'progress-box level-0'" v-for="(t,index) in warnListInfoList" :key="index"> <div :class="'progress-box level-0'" v-for="(t,index) in warnListInfoList" :key="index">
<div class="timtit">{{ t.lawEnforcementItemText }}</div> <!-- <div class="timtit">{{ t.lawEnforcementItemText }}</div> -->
<div class="prolist"><label>检查时间:</label><span>{{ t.createTime }}</span></div> <div class="timtit">{{ t.createTime }}</div>
<!-- <div class="prolist"><label>检查时间:</label><span>{{ t.createTime }}</span></div> -->
<div class="prolist"><label>检查部门:</label><span>{{ t.lawEnforcement }}</span></div> <div class="prolist"><label>检查部门:</label><span>{{ t.lawEnforcement }}</span></div>
</div> </div>
</div> </div>
@ -248,6 +249,7 @@
} }
searchParam.pageNum = (data.curPage-1)*searchParam.pageSize; searchParam.pageNum = (data.curPage-1)*searchParam.pageSize;
if (null!=searchParam && searchParam.length>0) {
queryRegistrationListNew(searchParam, success => { queryRegistrationListNew(searchParam, success => {
data.curPage++; data.curPage++;
data.loading = false; // 查4出结果停止加载 data.loading = false; // 查4出结果停止加载
@ -266,6 +268,7 @@
}) })
} }
}
const onSearch = (val) => { const onSearch = (val) => {
queryRegistrationListNew( queryRegistrationListNew(

5
src/views/enforce/enterpriseWarningInfo.vue

@ -35,8 +35,9 @@
<div :class="item.show? 'new_detail' : 'work_detail'"> <div :class="item.show? 'new_detail' : 'work_detail'">
<div class="timbox"> <div class="timbox">
<div :class="'progress-box level-0'" v-for="(t,index) in warnListInfoList" :key="index" > <div :class="'progress-box level-0'" v-for="(t,index) in warnListInfoList" :key="index" >
<div class="timtit">{{ t.lawEnforcementItemText }}</div> <!-- <div class="timtit">{{ t.lawEnforcementItemText }}</div> -->
<div class="prolist"><label>检查时间:</label><span>{{ t.createTime }}</span></div> <div class="timtit">{{ t.createTime }}</div>
<!-- <div class="prolist"><label>检查时间:</label><span>{{ t.createTime }}</span></div> -->
<div class="prolist"><label>检查部门:</label><span>{{ t.lawEnforcement }}</span></div> <div class="prolist"><label>检查部门:</label><span>{{ t.lawEnforcement }}</span></div>
</div> </div>
</div> </div>

3
src/views/enforce/historyCheck.vue

@ -60,7 +60,8 @@
<p>检查时间:{{ formattedTimeYYYYmmdd(item.enforcementTime) }}</p> <p>检查时间:{{ formattedTimeYYYYmmdd(item.enforcementTime) }}</p>
<div class="act-btn"> <div class="act-btn">
<span v-if="item.enforceReason != '' && enforceReason != null" class="remsty">未扫码</span> <span v-if="item.enforceReason != '' && enforceReason != null" class="remsty">未扫码</span>
<span v-if="item.uniteCheck != '' && item.uniteCheck != null" class="joint-mark">联</span> <!-- <span v-if="item.uniteCheck != '' && item.uniteCheck != null" class="joint-mark">联</span> -->
<span v-if="item.hasUnion != '' && item.hasUnion != null" class="joint-mark">联</span>
</div> </div>
</div> </div>
<!-- <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" />--> <!-- <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" />-->

32
src/views/enforce/sign.vue

@ -153,13 +153,17 @@
<van-divider class="divdsty" /> <van-divider class="divdsty" />
<van-cell center title="是否联合检查"> <van-cell center title="联合检查" required>
<template #right-icon> <template #right-icon>
<van-switch v-model="data.union_checked" @click="!data.union_checked"/> <van-radio-group v-model="data.union_checked" shape="square" direction="horizontal">
<van-radio name="0">否</van-radio>
<van-radio name="1">是</van-radio>
</van-radio-group>
<!-- <van-switch v-model="data.union_checked" @click="!data.union_checked"/> -->
</template> </template>
</van-cell> </van-cell>
<div class="add-inspect" v-if="data.union_checked"> <div class="add-inspect" v-if="data.union_checked==1">
<div v-for="(item, index) in data.union_datas" :key="index" ref="radio_fales" @click="check_radio(Object.values(item)[0].unionNo, index)" class="item-inspect"> <div v-for="(item, index) in data.union_datas" :key="index" ref="radio_fales" @click="check_radio(Object.values(item)[0].unionNo, index)" class="item-inspect">
<van-icon name="circle" /> <van-icon name="circle" />
<div class="dept-inspect"> <div class="dept-inspect">
@ -169,12 +173,12 @@
<div class="item-inspect" @click="check_radio(null, null)"> <div class="item-inspect" @click="check_radio(null, null)">
<van-icon :name="data.allNo" /> <van-icon :name="data.allNo" />
<div class="dept-inspect no-inspect"> <div class="dept-inspect no-inspect">
<p>以上皆不是</p> <p>开启新的联合检查</p>
</div> </div>
</div> </div>
</div> </div>
<van-cell center title="是否委托检查"> <van-cell center title="委托执法">
<template #right-icon> <template #right-icon>
<van-switch v-model="data.auth_checked" @click="!data.auth_checked"/> <van-switch v-model="data.auth_checked" @click="!data.auth_checked"/>
</template> </template>
@ -374,7 +378,7 @@
deptChecked: false, deptChecked: false,
deptContent: '', deptContent: '',
allNo: 'circle', allNo: 'circle',
union_checked: false, // 联合检查选择 union_checked: '0', // 联合检查选择
auth_checked: false, // 委托执法选择 auth_checked: false, // 委托执法选择
union_datas: [], // 联合检查用的分组list union_datas: [], // 联合检查用的分组list
check_union_no: '', // 选中的联合检查编号 check_union_no: '', // 选中的联合检查编号
@ -563,7 +567,9 @@
submitData.enterpriseName = success.data.enterpriseName submitData.enterpriseName = success.data.enterpriseName
submitData.enterpriseNumber = success.data.enterpriseNumber submitData.enterpriseNumber = success.data.enterpriseNumber
// 查询是否有关联的执法记录 // 查询是否有关联的执法记录
getUnionByHour(submitData.enterpriseNumber); if (null != submitData.enterpriseName) {
getUnionByHour(submitData.enterpriseNumber, submitData.checkCss);
}
} }
}, error => { }, error => {
@ -617,10 +623,9 @@
data.showBl = true; data.showBl = true;
}) })
const getUnionByHour = (enterpriseNumber) => { const getUnionByHour = (enterpriseNumber, checkCss) => {
data.union_datas = // data.union_datas =
console.log('----------> start : getUnionByHour: '+ enterpriseNumber) queryUnionByHour(enterpriseNumber, checkCss, success => {
queryUnionByHour(enterpriseNumber, success => {
if(success.success) { if(success.success) {
data.union_datas = success.data; data.union_datas = success.data;
} }
@ -798,7 +803,7 @@
submitData.isUnite = 0; submitData.isUnite = 0;
// if (data.checked) { submitData.isUnite = 1; } // 原来的联合检查, 忘记咋用了, 就没用了. // if (data.checked) { submitData.isUnite = 1; } // 原来的联合检查, 忘记咋用了, 就没用了.
//联合检查 //联合检查
if (data.union_checked) {submitData.isUnite = 1;} if (data.union_checked == 1) {submitData.isUnite = 1;}
// 是否委托检查 // 是否委托检查
if (data.auth_checked) {submitData.hasAuto = 1;} if (data.auth_checked) {submitData.hasAuto = 1;}
@ -855,7 +860,7 @@
submitData.isUnite = 0; submitData.isUnite = 0;
// if (data.checked) { submitData.isUnite = 1; } // 原来的联合检查, 忘记咋用了, 就没用了. // if (data.checked) { submitData.isUnite = 1; } // 原来的联合检查, 忘记咋用了, 就没用了.
//联合检查 //联合检查
if (data.union_checked) {submitData.hasUnion = 1;} if (data.union_checked == 1) {submitData.hasUnion = 1;}
// 是否委托检查 // 是否委托检查
if (data.auth_checked) {submitData.hasAuto = 1;} if (data.auth_checked) {submitData.hasAuto = 1;}
@ -1050,6 +1055,7 @@
const reciveDataCp = (item) => { const reciveDataCp = (item) => {
submitData.enterpriseName = item.enterpriseName; submitData.enterpriseName = item.enterpriseName;
submitData.enterpriseNumber = item.enterpriseNumber; submitData.enterpriseNumber = item.enterpriseNumber;
getUnionByHour(submitData.enterpriseNumber, submitData.checkCss);
// 填充数据 // 填充数据
// dataFillIn('bulu'); // dataFillIn('bulu');
} }

10
src/views/enforceHome.vue

@ -1,7 +1,7 @@
<template> <template>
<!-- <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>--> <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>
<!-- <div class="home app_content" v-if="!isLoading">--> <div class="home app_content" v-if="!isLoading">
<div class="home app_content"> <!-- <div class="home app_content"> -->
<!-- 导航栏 --> <!-- 导航栏 -->
<!-- <div class="header_body"> <!-- <div class="header_body">
<header-nav :leftArrow="false" titelText="执法监督码"></header-nav> <header-nav :leftArrow="false" titelText="执法监督码"></header-nav>
@ -26,6 +26,9 @@
<!-- <van-cell :border="false" title="精品" /> --> <!-- <van-cell :border="false" title="精品" /> -->
<div class="boutique_body"> <div class="boutique_body">
<!-- <goodsCard :goodsList="boutique" :cardAttr="boutiqueAttr"></goodsCard> --> <!-- <goodsCard :goodsList="boutique" :cardAttr="boutiqueAttr"></goodsCard> -->
<!-- <div class="box-qr-code" @click="toScanCodeView">
<span class="box-qr-code-text">扫码入企</span>
</div> -->
<div class="box-qr-code"> <div class="box-qr-code">
<span class="box-qr-code-text">扫码入企</span> <span class="box-qr-code-text">扫码入企</span>
<div class="link-text"><span @click="toScanCodeView">行政检查<van-icon name="arrow" /></span><span>非行政检查<van-icon name="arrow" /></span></div> <div class="link-text"><span @click="toScanCodeView">行政检查<van-icon name="arrow" /></span><span>非行政检查<van-icon name="arrow" /></span></div>
@ -726,7 +729,6 @@
transition: all 0.5s; transition: all 0.5s;
margin-top: -30px; margin-top: -30px;
} }
.link-text { .link-text {
position: absolute; position: absolute;
z-index: 10; z-index: 10;

Loading…
Cancel
Save