Browse Source

同步下代码

v4
蟑螂恶霸 1 year ago
parent
commit
cc87023d8c
  1. 4
      src/views/enforce/scanQrCode.vue
  2. 8
      src/views/enforce/sign.vue
  3. 2
      src/views/enterprise/compaint/compaintFlowView.vue
  4. 13
      src/views/enterprise/companyFilter.vue
  5. 10
      src/views/enterprise/complaintList.vue
  6. 7
      src/views/enterprise/registrationEdit.vue

4
src/views/enforce/scanQrCode.vue

@ -278,8 +278,8 @@
query: { query: {
// enterpriseNumber: data.enterpriseNumber, // enterpriseNumber: data.enterpriseNumber,
reason: '补录', reason: '补录',
checkCss: 3, // checkCss: 3,
// checkCss: 9, checkCss: 9,
isNoScan: true, isNoScan: true,
} }
}); });

8
src/views/enforce/sign.vue

@ -12,14 +12,14 @@
<van-cell-group> <van-cell-group>
<div class="qy-name">企业信息</div> <div class="qy-name">企业信息</div>
<van-field v-if="submitData.checkCss != 3" <van-field v-if="submitData.checkCss != 9"
v-model="submitData.enterpriseName" v-model="submitData.enterpriseName"
label="企业名称" label="企业名称"
:rules="[{ required: true, message: '必填项' }]" :rules="[{ required: true, message: '必填项' }]"
placeholder="企业名称" placeholder="企业名称"
readonly="true" readonly="true"
/> />
<van-field v-if="submitData.checkCss == 3" <van-field v-if="submitData.checkCss == 9"
v-model="submitData.enterpriseName" v-model="submitData.enterpriseName"
label="企业名称" label="企业名称"
readonly readonly
@ -153,9 +153,9 @@
readonly="true" readonly="true"
/> />
</view> </view>
<van-field v-if="submitData.checkCss == 3" v-model="submitData.enforcementTime" label="执法时间" readonly placeholder="请选择 执法时间" :rules="[{ required: true, message: '必填项' }]" @click="data.showTimePicker = true" /> <van-field v-if="submitData.checkCss == 9" v-model="submitData.enforcementTime" label="执法时间" readonly placeholder="请选择 执法时间" :rules="[{ required: true, message: '必填项' }]" @click="data.showTimePicker = true" />
<!-- 又改成不可输入, 补录才可以 - 杨老板提的 --> <!-- 又改成不可输入, 补录才可以 - 杨老板提的 -->
<van-field v-if="submitData.checkCss != 3" v-model="submitData.enforcementTime" label="执法时间" readonly placeholder="请选择 执法时间" :rules="[{ required: true, message: '必填项' }]" /> <van-field v-if="submitData.checkCss != 9" v-model="submitData.enforcementTime" label="执法时间" readonly placeholder="请选择 执法时间" :rules="[{ required: true, message: '必填项' }]" />
<van-divider class="divdsty" /> <van-divider class="divdsty" />

2
src/views/enterprise/compaint/compaintFlowView.vue

@ -11,7 +11,7 @@
<h4 class="timtit" v-if="item.state == 20">已处理</h4> <h4 class="timtit" v-if="item.state == 20">已处理</h4>
<h4 class="timtit" v-if="item.state == 20">已办结</h4> --> <h4 class="timtit" v-if="item.state == 20">已办结</h4> -->
<div class="progress-box" v-for="(item,index) in result" :key="index"> <div class="progress-box" v-for="(item,index) in result" :key="index">
<div class="prolist"><label>处理部门:</label><span>{{ item.appOrgName }}</span></div> <div class="prolist"><label>处理单位:</label><span>{{ item.appOrgName }}</span></div>
<div class="prolist"><label>处理意见:</label><span>{{ item.approveContent }}</span></div> <div class="prolist"><label>处理意见:</label><span>{{ item.approveContent }}</span></div>
<div class="prolist"><label>处理时间:</label><span>{{ item.approveTime }}</span></div> <div class="prolist"><label>处理时间:</label><span>{{ item.approveTime }}</span></div>
</div> </div>

13
src/views/enterprise/companyFilter.vue

@ -62,6 +62,7 @@
finished: false, finished: false,
refreshing: false, refreshing: false,
curPage: 1, curPage: 1,
router: useRouter()
} }
}, },
created() { created() {
@ -115,6 +116,12 @@
this.$emit("reciveData", item); this.$emit("reciveData", item);
this.$emit('close'); this.$emit('close');
}, },
toRegister() {
this.router.push({
path: "/outsideRegister",
})
},
//下拉刷新 //下拉刷新
onRefresh() { onRefresh() {
@ -140,12 +147,6 @@
} }
} }
const toRegister = () => {
router.push({
path: "../enforce/outsideRegister",
});
};
</script> </script>
<style scoped> <style scoped>

10
src/views/enterprise/complaintList.vue

@ -80,12 +80,12 @@
<!-- <div class="card_box_span" v-if="item.enforceType != 3"> --> <!-- <div class="card_box_span" v-if="item.enforceType != 3"> -->
<div class="card_box_span" v-if="null == item.complaintDepartmentList || item.complaintDepartmentList.length <= 0"> <div class="card_box_span" v-if="null == item.complaintDepartmentList || item.complaintDepartmentList.length <= 0">
<!-- <p><label class="card_box_label">投诉对象:</label> <span>{{ item.lawEnforcementIncident }}</span> --> <!-- <p><label class="card_box_label">投诉对象:</label> <span>{{ item.lawEnforcementIncident }}</span> -->
<p><label class="card_box_label">投诉对象:</label> <span>{{ item.bureauDeptName }}</span> <p><label class="card_box_label">执法单位:</label> <span>{{ item.bureauDeptName }}</span>
</p> </p>
</div> </div>
<!-- <div class="card_box_span" v-if="item.enforceType == 3"> --> <!-- <div class="card_box_span" v-if="item.enforceType == 3"> -->
<div class="card_box_span" v-else> <div class="card_box_span" v-else>
<p><label class="card_box_label">投诉对象:</label> <p><label class="card_box_label">执法单位:</label>
<!-- {{ item.complaintDepartments }} --> <!-- {{ item.complaintDepartments }} -->
<div> <div>
<div v-for="(it, i) in item.complaintDepartmentList" :key="i"> <div v-for="(it, i) in item.complaintDepartmentList" :key="i">
@ -94,13 +94,17 @@
</div> </div>
</p> </p>
</div> </div>
<div class="card_box_span" v-if="item.enforceType == 3"> <!-- <div class="card_box_span" v-if="item.enforceType == 3">
<p><label class="card_box_label">执法事项:</label> <span>无</span> <p><label class="card_box_label">执法事项:</label> <span>无</span>
</p> </p>
</div> </div>
<div class="card_box_span" v-if="item.enforceType != 3"> <div class="card_box_span" v-if="item.enforceType != 3">
<p><label class="card_box_label">执法事项:</label> <span>{{ item.lawEnforcementIncident }}</span> <p><label class="card_box_label">执法事项:</label> <span>{{ item.lawEnforcementIncident }}</span>
</p> </p>
</div> -->
<div class="card_box_span">
<p><label class="card_box_label">投诉类型:</label> <span>{{ item.enforceTypeStr }}</span>
</p>
</div> </div>
<div class="card_box_span"> <div class="card_box_span">
<p><label class="card_box_label">投诉内容:</label> <span>{{ item.problemDescription }}</span> <p><label class="card_box_label">投诉内容:</label> <span>{{ item.problemDescription }}</span>

7
src/views/enterprise/registrationEdit.vue

@ -774,8 +774,10 @@ import {showFailToast, showSuccessToast} from 'vant';
// 执法领域 // 执法领域
submitData.lawFieldText = success.data.lawFieldText; submitData.lawFieldText = success.data.lawFieldText;
// 任务来源 // 任务来源
submitData.checkCategory = success.data.checkCategory;
submitData.checkCategoryText = success.data.checkCategoryText; submitData.checkCategoryText = success.data.checkCategoryText;
// 执法类别 // 执法类别
submitData.lawEnforceCategory=success.data.lawEnforceCategory;
submitData.lawEnforceCategoryText=success.data.lawEnforceCategoryText; submitData.lawEnforceCategoryText=success.data.lawEnforceCategoryText;
// 执法时间 // 执法时间
// submitData.enforcementTime = formattedTimeYYYYmmdd(success.data.enforcementTime); // submitData.enforcementTime = formattedTimeYYYYmmdd(success.data.enforcementTime);
@ -870,7 +872,6 @@ import {showFailToast, showSuccessToast} from 'vant';
if (null != submitData.enterpriseName) { if (null != submitData.enterpriseName) {
getUnionByHour(submitData.enterpriseNumber, 'edit', submitData.enforcementTime, submitData.unionNo); getUnionByHour(submitData.enterpriseNumber, 'edit', submitData.enforcementTime, submitData.unionNo);
} }
console.log(data.dataList)
// 限制指定时间实现 // 限制指定时间实现
var a = getBeforeDate(10, submitData.createTime); var a = getBeforeDate(10, submitData.createTime);
@ -929,7 +930,6 @@ import {showFailToast, showSuccessToast} from 'vant';
} }
const setUnionChecked = (id) => { const setUnionChecked = (id) => {
console.log("------------------->")
let tmp_flag = true; let tmp_flag = true;
for (let index = 0; index < data.union_datas.length; index++) { for (let index = 0; index < data.union_datas.length; index++) {
const rawObj = JSON.parse(JSON.stringify(data.union_datas[index])); const rawObj = JSON.parse(JSON.stringify(data.union_datas[index]));
@ -997,7 +997,6 @@ import {showFailToast, showSuccessToast} from 'vant';
submitData.fileList = []; submitData.fileList = [];
data.fileListObj = []; data.fileListObj = [];
// showSuccessToast('保存成功'); // showSuccessToast('保存成功');
console.log(success.data.fileList);
//图片回显 //图片回显
// data.fileListObj.push( // data.fileListObj.push(
// { // {
@ -1013,7 +1012,6 @@ import {showFailToast, showSuccessToast} from 'vant';
} }
const check_radio = (unio_no, index) => { const check_radio = (unio_no, index) => {
console.log('---> : ', radio_fales.value)
for(var i=0; i<radio_fales.value.length; i++) { for(var i=0; i<radio_fales.value.length; i++) {
radio_fales.value[i].querySelector('i').classList.remove("van-icon-checked") radio_fales.value[i].querySelector('i').classList.remove("van-icon-checked")
radio_fales.value[i].querySelector('i').classList.add("van-icon-circle") radio_fales.value[i].querySelector('i').classList.add("van-icon-circle")
@ -1319,7 +1317,6 @@ import {showFailToast, showSuccessToast} from 'vant';
console.log('图片大小2',file.size) console.log('图片大小2',file.size)
// Toast('请上传20M以下图片'); // Toast('请上传20M以下图片');
let that = this let that = this
console.log('aaaaaaaaaaaaaaaaaaaaaaa',file)
return new Promise((resolve) => { return new Promise((resolve) => {
// compressorjs 默认开启 checkOrientation 选项 // compressorjs 默认开启 checkOrientation 选项
// 会将图片修正为正确方向 // 会将图片修正为正确方向

Loading…
Cancel
Save