guoyuepeng
/
qa-regulatory-gwj-vue
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into yhkp 

# Conflicts:
#	src/views/keyprojects/hidden/index.vue
main
dearlin 2023-11-14 16:59:19 +08:00
parent e7cf0f445e 51e543b842
commit ca915c44f0
5 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/views/corpInfo/info/components/indexAdd.vue
View File

@ -271,7 +271,7 @@ export default {
CORP_NAME: [{ required: true, message: '分公司名称不能为空', trigger: 'blur' }],
shudi: [{ required: true, message: '属地不能为空', trigger: 'blur' }],
// POSTAL_CODE: [{ required: true, message: '邮政编码不能为空', trigger: 'blur' }],
CODE: [{ required: true, message: '统一社会信用代码不能为空', trigger: 'blur' }],
CODE: [{ required: false, message: '统一社会信用代码不能为空', trigger: 'blur' }],
INDUSTRY: [{ required: true, message: '所属行业不能为空', trigger: 'blur' }],
ECO_TYPE: [{ required: true, message: '经济类型不能为空', trigger: 'blur' }],
// ADDRESS_BUSINESS: [{ required: true, message: '企事业单位经营地址不能为空', trigger: 'blur' }],
@ -509,31 +509,37 @@ export default {
},
// 保存
confirm() {
this.$refs.form.validate(valid => {
if (valid) {
if (this.form.INDUSTRYALL && this.form.INDUSTRYALL.length > 0) {
this.form.CORP_TYPE = this.form.INDUSTRYALL[0] || ''
this.form.CORP_TYPE2 = this.form.INDUSTRYALL[1] || ''
this.form.CORP_TYPE3 = this.form.INDUSTRYALL[2] || ''
this.form.CORP_TYPE4 = this.form.INDUSTRYALL[3] || ''
}
requestFN(
this.$parent.indexVal ? '/corpinfo/edit' : '/corpinfo/add',
{
...this.form,
PROVINCE: this.form.shudi[0],
CITY: this.form.shudi[1],
COUNTRY: this.form.shudi[2],
ISDELETE: Number(this.form.ISDELETE)
this.$confirm('此操作将会修改企业登录密码为Aa@123456789是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$refs.form.validate(valid => {
if (valid) {
if (this.form.INDUSTRYALL && this.form.INDUSTRYALL.length > 0) {
this.form.CORP_TYPE = this.form.INDUSTRYALL[0] || ''
this.form.CORP_TYPE2 = this.form.INDUSTRYALL[1] || ''
this.form.CORP_TYPE3 = this.form.INDUSTRYALL[2] || ''
this.form.CORP_TYPE4 = this.form.INDUSTRYALL[3] || ''
}
).then((data) => {
this.uploadImg()
this.$message.success('新建成功')
this.goBack()
}).catch((e) => { })
} else {
return false
}
requestFN(
this.$parent.indexVal ? '/corpinfo/edit' : '/corpinfo/add',
{
...this.form,
PROVINCE: this.form.shudi[0],
CITY: this.form.shudi[1],
COUNTRY: this.form.shudi[2],
ISDELETE: Number(this.form.ISDELETE)
}
).then((data) => {
this.uploadImg()
this.$message.success('新建成功')
this.goBack()
}).catch((e) => { })
} else {
return false
}
})
})
},
@ -607,7 +613,7 @@ export default {
}
this.form.jinweidu = data.pd.LONGITUDE + ' , ' + data.pd.LATITUDE
this.form.shudi = [data.pd.PROVINCE, data.pd.CITY, data.pd.COUNTRY]
this.shudiPlaceholder = data.pd.PROVINCE_VAL + "-" + data.pd.CITY_VAL + "-" + data.pd.COUNTRY_VAL
this.shudiPlaceholder = data.pd.PROVINCE_VAL + '-' + data.pd.CITY_VAL + '-' + data.pd.COUNTRY_VAL
this.hImgs = data.hImgs
this.$forceUpdate()
this.listLoading = false

5
src/views/keyprojects/hidden/components/list.vue
View File

@ -102,7 +102,7 @@
</el-table-column>
<el-table-column label="是否处罚">
<template slot-scope="{row}">
{{ row.ISPUNISH && (row.ISPUNISH === "1" ? "是" : "否") }}
{{ row.ISPUNISH === "1" ? "是" : row.ISPUNISH === "2" ?"否":"处罚人未处理" }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100">
@ -146,7 +146,8 @@ export default {
// { ID: '1', NAME: '申请中' },
// { ID: '2', NAME: '已完成' }
{ ID: '1', NAME: '是' },
{ ID: '2', NAME: '否' }
{ ID: '2', NAME: '否' },
{ ID: '3', NAME: '处罚人未处理' }
],
sourceState: {
1: 'AI报警',

3
src/views/keyprojects/inspection/components/list.vue
View File

@ -11,7 +11,7 @@
<!-- </el-col>-->
<el-col :span="5">
<el-form-item label="重点工程名称">
<el-input v-model="OUTSOURCED_NAME" placeholder="搜索重点工程名称" />
<el-input v-model="KEYWORDS" placeholder="搜索重点工程名称" />
</el-form-item>
</el-col>
<el-col :span="5">
@ -134,7 +134,6 @@ export default {
'/outsourced/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
KEYWORDS: this.KEYWORDS,
OUTSOURCED_NAME: this.OUTSOURCED_NAME,
CORPINFO_ID: this.$parent.CORPINFO_ID,
STATE: this.STATE
}

8
src/views/keyprojects/punish/components/list.vue
View File

@ -9,14 +9,6 @@
<el-input v-model="KEYWORDS" placeholder="搜索关键字"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="处罚状态">
<el-select v-model="HANDLED">
<el-option value="1" label="待反馈处罚"/>
<el-option value="2" label="已完成处罚"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label-width="10px">
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">

4
src/views/keyprojects/punish/components/list2.vue
View File

@ -10,8 +10,8 @@
<el-col :span="4">
<el-form-item label="处罚状态">
<el-select v-model="HANDLED">
<el-option value="1" label="待反馈处罚"/>
<el-option value="2" label="已完成处罚"/>
<el-option value="0" label="待反馈处罚"/>
<el-option value="1" label="已完成处罚"/>
</el-select>
</el-form-item>
</el-col>