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

Merge remote-tracking branch 'origin/dev' into lmy20231113

cmt1.0
limingyu 2023-12-14 18:29:52 +08:00
parent 5af8544c54 5c20be35f6
commit 06b03de0cd
9 changed files with 131 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/index.js
View File

@ -11,7 +11,7 @@ module.exports = {
assetsPublicPath: '/',
proxyTable: {
'/api': {
target: 'http://192.168.0.45:8091/',
target: 'http://192.168.0.79:8091/',
changeOrigin: true,
pathRewrite: {
'^/api': ''

61
src/views/corpInfo/information/info/components/corpEdit.vue
View File

@ -496,27 +496,27 @@ import { upload } from '@/utils/upload'
export default {
components: { SelectTree },
data() {
var hasCode = (rule, value, callback) => {
if (value) {
requestFN(
'/corpinfo/hasCode',
{
CODE: value,
CORPINFO_ID: this.form.CORPINFO_ID
}
).then((data) => {
if (!data.pd) {
callback()
} else {
callback(new Error('统一社会信用代码重复'))
}
}).catch((e) => {
})
} else {
callback()
}
}
// var hasCode = (rule, value, callback) => {
// if (value) {
// requestFN(
// '/corpinfo/hasCode',
// {
// CODE: value,
// CORPINFO_ID: this.form.CORPINFO_ID
// }
// ).then((data) => {
// if (!data.pd) {
// callback()
// } else {
// callback(new Error('统一社会信用代码重复'))
// }
// }).catch((e) => {
//
// })
// } else {
// callback()
// }
// }
return {
config: config,
dialogMap: false,
@ -569,12 +569,12 @@ export default {
{ required: true, message: '企业名称不能为空', trigger: 'blur' }
],
CODE: [
{ required: true, message: '统一社会信用代码不能为空', trigger: 'blur' },
{
pattern: /^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/,
message: '请输入正确的统一社会信用代码'
},
{ validator: hasCode, trigger: 'blur' }
{ required: false, message: '统一社会信用代码不能为空', trigger: 'blur' }
// , {
// pattern: /^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/,
// message: '请输入正确的统一社会信用代码'
// },
// { validator: hasCode, trigger: 'blur' }
],
PROVINCE: [
{ required: true, message: '省不能为空', trigger: 'blur' }
@ -748,6 +748,11 @@ export default {
})
},
confirm() {
this.$confirm('此操作将会修改企业登录密码为Aa@123456789是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$refs.form.validate(valid => {
if (valid) {
const loading = this.$loading({
@ -809,6 +814,8 @@ export default {
})
}
})
}).catch(() => {
})
},
// 下线

4
src/views/corpInfo/user/components/edit.vue
View File

@ -63,6 +63,9 @@
<el-button v-if="form.PERSON_TYPE == '主要负责人' || form.PERSON_TYPE == '安全管理人员' || form.PERSON_TYPE == '特种作业人员'" plain type="success" @click="changePersonType">补充证照信息</el-button>
</div>
</el-form-item>
<el-form-item label="定位卡号" prop="CARDNO">
<el-input v-model="form.CARDNO" placeholder="这里输入定位卡号..."/>
</el-form-item>
<el-form-item label="是否为隐患确认人" prop="IS_HAZARDCONFIRMER">
<el-radio-group v-model="form.IS_HAZARDCONFIRMER">
<el-radio :label="0" value="0">否</el-radio>
@ -814,6 +817,7 @@ export default {
form: {
IS_HAZARDCONFIRMER: 0,
INFORPOST: '',
CARDNO: '',
INFORTITLE: '',
INFORTITLEValue: '',
infortitleType: 'select',

12
src/views/firefighting/record/components/recordInfo.vue
View File

@ -76,7 +76,7 @@
<th>消防设备编号</th>
<th>检查情况</th>
<th>点位检查照片</th>
<th>点位合格照片</th>
<!-- <th>点位合格照片</th>-->
</tr>
<template v-if="varList.length !== 0">
<tr v-for="(data,index) in varList" :key="index">
@ -108,11 +108,11 @@
<a style="text-decoration: underline" @click="qualified(data.EQUIPMENT_POINT_ID,14)">点位检查照片</a>
</td>
</template>
<template>
<td v-if="data.INDEX_F == '1'" :rowspan="data.ROWSPAN" class="text-center">
<a style="text-decoration: underline" @click="qualified(data.QUALIFIED_PHOTOS_ID,115)">点位合格照片</a>
</td>
</template>
<!-- <template>-->
<!-- <td v-if="data.INDEX_F == '1'" :rowspan="data.ROWSPAN" class="text-center">-->
<!-- <a style="text-decoration: underline" @click="qualified(data.QUALIFIED_PHOTOS_ID,115)">点位合格照片</a>-->
<!-- </td>-->
<!-- </template>-->
</tr>
</template>
<template v-else>

7
src/views/keyprojects/outsourced/components/list.vue
View File

@ -129,7 +129,12 @@
<span v-else>{{ row.DEPARTMENT_NAME }}</span>
</template>
</el-table-column>
<el-table-column prop="MANAGE_CORPS_NAME" label="监理单位" show-overflow-tooltip />
<el-table-column label="监理单位" show-overflow-tooltip>
<template slot-scope="{row}">
<span v-if="row.MANAGE_CORPS_NAME"> {{ row.MANAGE_CORPS_NAME }} </span>
<span v-else>无</span>
</template>
</el-table-column>
<el-table-column prop="STATE" label="状态" width="100" >
<template slot-scope="{row}">
<span v-if="row.STATE == 1">进行中</span>

8
src/views/keyprojects/personnelmanagement/index.vue
View File

@ -67,12 +67,12 @@
</template>
</el-table-column>
<!-- <el-table-column prop="PTYPE" label="人员类型" />-->
<el-table-column prop="JOBTYPE" label="作业类别" />
<el-table-column prop="OPERATIONITEM" label="操作项目" />
<!--<el-table-column prop="JOBTYPE" label="作业类别" />
<el-table-column prop="OPERATIONITEM" label="操作项目" />-->
<el-table-column prop="NAME" label="姓名" width="100" />
<el-table-column prop="SEX" label="性别" width="50" />
<!--<el-table-column prop="SEX" label="性别" width="50" />
<el-table-column prop="CERTIFICATE_NUM" label="作业证书编号" />
<el-table-column prop="REVIEWTIME" label="复审时间" width="120" />
<el-table-column prop="REVIEWTIME" label="复审时间" width="120" />-->
<el-table-column label="操作" align="left" width="400">
<template slot-scope="{row}">
<el-button v-show="edit" type="success" icon="el-icon-edit" size="mini" @click="resetPwd(row.PERSONNELMANAGEMENT_ID,row.NAME)">重置密码</el-button>

2
src/views/keyprojects/units/components/list.vue
View File

@ -48,7 +48,7 @@
align="center"/>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="UNITS_NAME" label="相关方单位名称" show-overflow-tooltip />
<el-table-column prop="CODE" label="统一社会信用代码" width="200" />
<!--<el-table-column prop="CODE" label="统一社会信用代码" width="200" />-->
<el-table-column prop="CONTACTS" label="联系人" width="150" show-overflow-tooltip />
<el-table-column prop="CONTACTS_PHONE" label="联系人电话" width="100" />
<el-table-column prop="CORP_NAME" label="创建单位" show-overflow-tooltip />

20
src/views/xgf/audit/components/edit.vue
View File

@ -47,6 +47,11 @@
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="集团单位" prop="corpTypeName">
<el-input id="corpTypeName" ref="corpTypeName" v-model="dataForm.corpTypeName" disabled maxlength="255" placeholder="这里输入开户人..." title="开户人"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="开户人" prop="CREATOR">
<el-input id="CREATOR" ref="CREATOR" v-model="dataForm.USER_NAME" disabled maxlength="255" placeholder="这里输入开户人..." title="开户人"/>
@ -351,7 +356,7 @@ export default {
COMPANY_AREA: '',
dataForm: {
MAIN_DEPARTMENT: '',
businessLicenseDate: '',
businessLicenseDate: [],
SUPERVISE_CORPINFO_DEPT_NAME: '',
COMPETENT_DEPT_NAME: '',
MANAGER_DEPARTMENT_NAME: '',
@ -381,7 +386,6 @@ export default {
enterpriseSizeList: [], // 企业规模数据
industryList: [], // 行业类型数据
treeData: [], // 主管部门
businessLicenseImgs: [],
config: config,
corpStateList: [], // 企业经营状态
hylxList: [], // 国民经济行业分类 (GB-T4754-2017)
@ -472,6 +476,7 @@ export default {
ECO_TYPE: '',
ecoArr: [],
ecoNameArr: [],
businessLicenseImgs: [],
INDUSTRY: '',
// imgUrl: require('@/assets/images/map.png'),
rules: {
@ -639,6 +644,12 @@ export default {
tm: new Date().getTime()
}
).then((data) => {
this.businessLicenseImgs = []
if (data.licenseImgs) {
data.licenseImgs.forEach(item => {
this.businessLicenseImgs.push(this.config.fileUrl + item.FILEPATH)
})
}
data.pd.SELECT_FORM = data.pd.SELECT_FORM.split(',')
this.businessLicenseImgs = []
@ -662,6 +673,11 @@ export default {
if (this.dataForm.COMPANY_AREA) {
this.COMPANY_AREA = this.dataForm.COMPANY_AREA.replaceAll(',', ' / ')
}
this.dataForm.businessLicenseDate = []
this.dataForm.businessLicenseDate.push(this.dataForm.LICENSE_START)
this.dataForm.businessLicenseDate.push(this.dataForm.LICENSE_END)
resolve()
}).catch((e) => {
this.$message({

3
static/qrcode/views/bsbw/point_list.html
View File

@ -96,7 +96,8 @@
</div>
</div>
</div>
<div class="dy-card-content">
<!--点位检查合格标准照片-->
<div class="dy-card-content" v-if="false">
<div v-if="images.length > 0 " class="dy-card-content-item">
<div class="title">
<span class="l"></span>