WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

Browse Source
This commit is contained in:
CD
2022-10-25 14:08:22 +08:00
parent 7978d74b75 8ee8a95b04
commit ab14307b5d
3 changed files with 129 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/tableCollection/index.vue
+63 -31
View File
@@ -19,12 +19,16 @@
<span slot="titleName" slot-scope="text,record" :title="text"> <span slot="titleName" slot-scope="text,record" :title="text">
{{ text }} {{ text }}
</span> </span>
<span slot="paramsName" slot-scope="text,record">
<span class="textName" :title="text">{{text}}</span>
</span>
<div :slot="'titleName'+(index+1)" v-for="(item,index) in content"> <div :slot="'titleName'+(index+1)" v-for="(item,index) in content">
<span v-if='item.isLock == 1' style='padding-right: 20px'><a-icon type="lock" theme="twoTone" two-tone-color="#00B3BE" /></span> <span v-if='item.isLock == 1' style='padding-right: 20px'><a-icon type="lock" theme="twoTone"
two-tone-color="#00B3BE"/></span>
<span style='padding-right: 10px'>{{ item.db_field_txt }} </span> <span style='padding-right: 10px'>{{ item.db_field_txt }} </span>
<a-button @click='onClickSee(item)'>{{$t('See')}}</a-button> <a-button @click='onClickSee(item)'>{{$t('See')}}</a-button>
</div> </div>
<!-- {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }}--> <!-- {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }}-->
<span slot="ParameterDescription" slot-scope="text,record" :title="text"> <span slot="ParameterDescription" slot-scope="text,record" :title="text">
<a-button @click='onClickTitle(record)'>{{$t('See')}}</a-button> <a-button @click='onClickTitle(record)'>{{$t('See')}}</a-button>
@@ -55,7 +59,7 @@
<span <span
v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "To be collected" || record.state == "Rejected by eng. interface"'> v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "To be collected" || record.state == "Rejected by eng. interface"'>
<span :title='record.dataValue' <span :title='record.dataValue'
@click='ondataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}</span> @click='ondataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}</span>
</span> </span>
<span v-else> <span v-else>
<span :title='record.dataValue' @click='dataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}</span> <span :title='record.dataValue' @click='dataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}</span>
@@ -135,14 +139,14 @@
<a-row :gutter='24'> <a-row :gutter='24'>
<a-col :span='24'> <a-col :span='24'>
<a-form-model-item ref='region' :label="$t('areaOfResponsibility')" prop='queryzr'> <a-form-model-item ref='region' :label="$t('areaOfResponsibility')" prop='queryzr'>
<!-- <a-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"--> <!-- <a-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"-->
<!-- v-model="Dateline.querySdt">--> <!-- v-model="Dateline.querySdt">-->
<!-- <a-select-option v-for="(item, key) in querySdtList" :key="key" :value="item.value">--> <!-- <a-select-option v-for="(item, key) in querySdtList" :key="key" :value="item.value">-->
<!-- <span style="display: inline-block;width: 100%" :title=" item.label ">--> <!-- <span style="display: inline-block;width: 100%" :title=" item.label ">-->
<!-- {{ item.label }}--> <!-- {{ item.label }}-->
<!-- </span>--> <!-- </span>-->
<!-- </a-select-option>--> <!-- </a-select-option>-->
<!-- </a-select>--> <!-- </a-select>-->
<j-dict-select-tag class="box-input" v-model="Dateline.queryzr" <j-dict-select-tag class="box-input" v-model="Dateline.queryzr"
@input="handleInput('queryzr')" @input="handleInput('queryzr')"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')" :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
@@ -155,7 +159,8 @@
<div class="imports-footer"> <div class="imports-footer">
<div class="imports-footer-wrap"> <div class="imports-footer-wrap">
<a-button class="imports-btn imports-sub" :loading="confirmLoading" type="primary" @click="handleSubmitzr">{{$t('preservation')}} <a-button class="imports-btn imports-sub" :loading="confirmLoading" type="primary" @click="handleSubmitzr">
{{$t('preservation')}}
</a-button> </a-button>
<a-button class="imports-btn" type="primary" @click="cancel">{{$t('cancel')}}</a-button> <a-button class="imports-btn" type="primary" @click="cancel">{{$t('cancel')}}</a-button>
</div> </div>
@@ -235,7 +240,7 @@
default: {}, default: {},
require: true require: true
}, },
description:'', description: '',
formInline: { formInline: {
type: Object, type: Object,
default: true default: true
@@ -300,7 +305,7 @@
indeterminate: false, indeterminate: false,
columns: [], columns: [],
content: [], content: [],
confirmLoading:false, confirmLoading: false,
selectedRowKeys: [], selectedRowKeys: [],
selectedRowrowValue: [], selectedRowrowValue: [],
dataSource: [], dataSource: [],
@@ -316,7 +321,7 @@
sdt: 0, // 工程接口人 sdt: 0, // 工程接口人
dre: 0, // 填写人 dre: 0, // 填写人
areaVisible: false, areaVisible: false,
areaVisiblezr:false, areaVisiblezr: false,
form: {}, form: {},
rules: { rules: {
querySdt: [ querySdt: [
@@ -342,13 +347,13 @@
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 7 } sm: { span: 7 }
}, },
queryParamQuery:{}, queryParamQuery: {},
queryParam:{}, queryParam: {},
querySdtList: [], // 工程接口人 querySdtList: [], // 工程接口人
Dateline: {}, Dateline: {},
getquerySdtId: '', // 当前工程接口人的id getquerySdtId: '', // 当前工程接口人的id
areaVisibleView: false, // 查看配置得弹框 areaVisibleView: false, // 查看配置得弹框
seeVisibleView:false, seeVisibleView: false,
configDetail: {} // 查看配置得详细信息 configDetail: {} // 查看配置得详细信息
} }
}, },
@@ -394,7 +399,7 @@
this.$emit('handlePreservation') this.$emit('handlePreservation')
this.getTableList() this.getTableList()
}, },
onClickTitle(val){ onClickTitle(val) {
console.log(val) console.log(val)
this.description = val.description this.description = val.description
this.seeVisibleView = true this.seeVisibleView = true
@@ -455,7 +460,11 @@
// 责任领域 保存 // 责任领域 保存
handleSubmitzr(record) { handleSubmitzr(record) {
let _this = this let _this = this
let param = { dutyTerritory: this.Dateline.queryzr, ids: this.getquerySdtId,paramsManifestId: this.$route.query.id, } let param = {
dutyTerritory: this.Dateline.queryzr,
ids: this.getquerySdtId,
paramsManifestId: this.$route.query.id
}
this.$refs.ruleFormOne.validate(valid => { this.$refs.ruleFormOne.validate(valid => {
if (valid) { if (valid) {
this.confirmLoading = true this.confirmLoading = true
@@ -538,7 +547,7 @@
this.areaVisible = false this.areaVisible = false
this.$refs['ruleForm'].resetFields() this.$refs['ruleForm'].resetFields()
}, },
cancel(){ cancel() {
this.areaVisiblezr = false this.areaVisiblezr = false
this.$refs['ruleFormOne'].resetFields() this.$refs['ruleFormOne'].resetFields()
}, },
@@ -597,7 +606,7 @@
} }
getAction('/params/userTypeLog/queryCurrentType', query).then((res) => { getAction('/params/userTypeLog/queryCurrentType', query).then((res) => {
if (res.success) { if (res.success) {
this.queryParamQuery = {...this.queryParamQuery} this.queryParamQuery = { ...this.queryParamQuery }
if (res.result && res.result.userType) { if (res.result && res.result.userType) {
if (!(result.some(val => val.value == res.result.userType))) { if (!(result.some(val => val.value == res.result.userType))) {
@@ -631,7 +640,7 @@
let params = { let params = {
paramsManifestId: paramsManifestid, paramsManifestId: paramsManifestid,
flag: '7', flag: '7',
userType:userType, userType: userType
} }
getAction(url, params).then((res) => { getAction(url, params).then((res) => {
if (res.success) { if (res.success) {
@@ -662,25 +671,27 @@
dataIndex: res.db_field_name, dataIndex: res.db_field_name,
align: 'center', align: 'center',
// ellipsis: true, // ellipsis: true,
fixed: res.click5?'left':'', fixed: res.click5 ? 'left' : '',
sorter: res.sort, sorter: res.sort,
width: 160 width: 160
}) })
console.log(res)
this.columns[index].scopedSlots = { this.columns[index].scopedSlots = {
customRender: 'titleName' customRender: 'titleName'
} }
if(res.click1){ if (res.db_field_name == 'nioNumber') {
this.columns[index].width = 100
}
if (res.click1) {
this.columns[index].scopedSlots = { this.columns[index].scopedSlots = {
customRender: 'operationzr' customRender: 'operationzr'
} }
} }
if(res.click2){ if (res.click2) {
this.columns[index].scopedSlots = { this.columns[index].scopedSlots = {
customRender: 'ParameterDescription' customRender: 'ParameterDescription'
} }
} }
if(res.click3){ if (res.click3) {
this.columns[index].scopedSlots = { this.columns[index].scopedSlots = {
customRender: 'paramsNameDescription' customRender: 'paramsNameDescription'
} }
@@ -691,6 +702,12 @@
customRender: 'operationbtn' customRender: 'operationbtn'
} }
} }
if (res.db_field_name == 'paramsName') {
this.columns[index].width = 200
this.columns[index].scopedSlots = {
customRender: 'paramsName'
}
}
} }
}) })
this.columns = [...this.columns] this.columns = [...this.columns]
@@ -707,7 +724,7 @@
let params = { let params = {
paramsManifestId: this.$route.query.id, paramsManifestId: this.$route.query.id,
pageNo: this.pageNo, pageNo: this.pageNo,
pageSize: this.pageSize, pageSize: this.pageSize
// userTypes: this.currentPersonRole // userTypes: this.currentPersonRole
} }
let url let url
@@ -812,7 +829,7 @@
// }) // })
let tt = [] let tt = []
if (this.currentPersonRole !== 'dre') { if (this.currentPersonRole !== 'dre') {
console.log(res.result.records,'res.result.records') console.log(res.result.records, 'res.result.records')
res.result.records.forEach((Obj) => { res.result.records.forEach((Obj) => {
Object.keys(Obj).forEach((item) => { Object.keys(Obj).forEach((item) => {
if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
@@ -912,6 +929,7 @@
border: none !important; border: none !important;
padding: 0 !important; padding: 0 !important;
} }
//::v-deep .ant-table-row:first-child { //::v-deep .ant-table-row:first-child {
// background: #fff!important; // background: #fff!important;
// /*opacity: 0.9;*/ // /*opacity: 0.9;*/
@@ -952,6 +970,7 @@
font-weight: 400; font-weight: 400;
} }
} }
.textfield { .textfield {
width: 100%; width: 100%;
margin-bottom: 8px; margin-bottom: 8px;
@@ -981,6 +1000,19 @@
} }
} }
} }
.textName {
width: 100%;
overflow: hidden;
display: -webkit-box;
text-overflow: ellipsis;
/*! autoprefixer: off */
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
/*! autoprefixer: on;*/
text-justify: inter-ideograph;
word-break: break-all
}
</style> </style>
<style> <style>
.resize-table-th { .resize-table-th {
@@ -1001,7 +1033,7 @@
} }
.rowClassRed { .rowClassRed {
background: #f3d9de ; background: #f3d9de;
} }
.rowClassRedYellow { .rowClassRedYellow {
jero-web/src/components/tableCollection/index1.vue
+55 -25
View File
@@ -28,22 +28,25 @@
<a-button @click='onClickTitle(record)'>{{$t('See')}}</a-button> <a-button @click='onClickTitle(record)'>{{$t('See')}}</a-button>
</span> </span>
<!-- <span slot="operationbtn" slot-scope="record">--> <span slot="paramsName" slot-scope="text,record">
<!-- <span v-if='currentPersonRole === "homo"'>--> <span class="textName" :title="text">{{text}}</span>
<!--&lt;!&ndash; 认证工程师 &ndash;&gt;--> </span>
<!-- <span--> <!-- <span slot="operationbtn" slot-scope="record">-->
<!-- v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "Wait Collect" || record.state == "Sdt Back" || record.state == "Change"'>--> <!-- <span v-if='currentPersonRole === "homo"'>-->
<!--&lt;!&ndash; <span&ndash;&gt;--> <!--&lt;!&ndash; 认证工程师 &ndash;&gt;-->
<!--&lt;!&ndash; @click='ondataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>&ndash;&gt;--> <!-- <span-->
<!-- </span>--> <!-- v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "Wait Collect" || record.state == "Sdt Back" || record.state == "Change"'>-->
<!-- <span v-else>--> <!--&lt;!&ndash; <span&ndash;&gt;-->
<!-- <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>--> <!--&lt;!&ndash; @click='ondataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>&ndash;&gt;-->
<!-- </span>--> <!-- </span>-->
<!-- </span>--> <!-- <span v-else>-->
<!-- <span v-else>--> <!-- <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>-->
<!-- <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>--> <!-- </span>-->
<!-- </span>--> <!-- </span>-->
<!-- </span>--> <!-- <span v-else>-->
<!-- <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>-->
<!-- </span>-->
<!-- </span>-->
<span slot="detailClick" slot-scope="text,record"> <span slot="detailClick" slot-scope="text,record">
<collection-type :detailDate='text'/> <collection-type :detailDate='text'/>
</span> </span>
@@ -99,7 +102,8 @@
</div> </div>
</a-modal> </a-modal>
<!-- 配置信息---> <!-- 配置信息--->
<a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null" @cancel="hideModal"> <a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null"
@cancel="hideModal">
<div class="content-text"> <div class="content-text">
<div class="text-field"> <div class="text-field">
<span class="text-field-left" :title="$t('configurationName')">{{$t('configurationName')}}:</span> <span class="text-field-left" :title="$t('configurationName')">{{$t('configurationName')}}:</span>
@@ -246,7 +250,7 @@
sdt: 0, // 工程接口人 sdt: 0, // 工程接口人
dre: 0, // 填写人 dre: 0, // 填写人
areaVisible: false, areaVisible: false,
seeVisibleView:false, seeVisibleView: false,
form: {}, form: {},
rules: { rules: {
querySdt: [ querySdt: [
@@ -293,7 +297,7 @@
return 'rowClassRed' return 'rowClassRed'
} }
}, },
onClickTitle(val){ onClickTitle(val) {
console.log(val) console.log(val)
this.description = val.description this.description = val.description
this.seeVisibleView = true this.seeVisibleView = true
@@ -310,7 +314,7 @@
// this.$emit('handlePreservation') // this.$emit('handlePreservation')
this.getTableList() this.getTableList()
}, },
hideModal(){ hideModal() {
this.areaVisibleView = false this.areaVisibleView = false
}, },
// 查看配置详细信息 // 查看配置详细信息
@@ -507,17 +511,27 @@
this.columns[index].scopedSlots = { this.columns[index].scopedSlots = {
customRender: 'titleName' customRender: 'titleName'
} }
if (res.db_field_name == 'nioNumber') {
this.columns[index].width = 100
}
if (res.click) { if (res.click) {
// 工程接口人列表修改 // 工程接口人列表修改
this.columns[index].scopedSlots = { this.columns[index].scopedSlots = {
customRender: 'operationbtn' customRender: 'operationbtn'
} }
} }
if(res.click2){ if (res.click2) {
this.columns[index].scopedSlots = { this.columns[index].scopedSlots = {
customRender: 'ParameterDescription' customRender: 'ParameterDescription'
} }
} }
if (res.db_field_name == 'paramsName') {
this.columns[index].width = 200
this.columns[index].ellipsis = false
this.columns[index].scopedSlots = {
customRender: 'paramsName'
}
}
} }
}) })
this.columns = [...this.columns] this.columns = [...this.columns]
@@ -532,8 +546,8 @@
let params = { let params = {
paramsManifestId: this.$route.query.id, paramsManifestId: this.$route.query.id,
userTypes: this.currentPersonRole, userTypes: this.currentPersonRole,
pageNo:this.pageNo, pageNo: this.pageNo,
pageSize:this.pageSize pageSize: this.pageSize
} }
this.loading = true this.loading = true
this.$emit('listReset', '') this.$emit('listReset', '')
@@ -723,14 +737,16 @@
border: none !important; border: none !important;
padding: 0 !important; padding: 0 !important;
} }
::v-deep .ant-table-row:first-child { ::v-deep .ant-table-row:first-child {
background: #fff!important; background: #fff !important;
opacity: 0.9; opacity: 0.9;
} }
::v-deep .ant-table-body { ::v-deep .ant-table-body {
background: transparent!important; background: transparent !important;
} }
.textfield { .textfield {
width: 100%; width: 100%;
margin-bottom: 8px; margin-bottom: 8px;
@@ -759,6 +775,7 @@
font-weight: 400; font-weight: 400;
} }
} }
.content-text { .content-text {
width: 100%; width: 100%;
display: flex; display: flex;
@@ -791,6 +808,19 @@
} }
} }
} }
.textName {
width: 100%;
overflow: hidden;
display: -webkit-box;
text-overflow: ellipsis;
/*! autoprefixer: off */
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
/*! autoprefixer: on;*/
text-justify: inter-ideograph;
word-break: break-all
}
</style> </style>
<style> <style>
.resize-table-th { .resize-table-th {
jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue
+11 -4
View File
@@ -60,7 +60,9 @@
<span style="cursor: pointer" <span style="cursor: pointer"
@click="fileClick(resultData.fileNameRight,resultData.fileIdRight)">{{resultData.fileNameRight}}</span> @click="fileClick(resultData.fileNameRight,resultData.fileIdRight)">{{resultData.fileNameRight}}</span>
</div> </div>
<div class="detail-content-header-content-rightOne" :title="$t('comparisonDifferenceComment')"> <div class="detail-content-header-content-rightOne"
:class="{'detail-content-header-content-rightOne-active':isDisplay}"
:title="$t('comparisonDifferenceComment')">
{{$t('comparisonDifferenceComment')}} {{$t('comparisonDifferenceComment')}}
</div> </div>
<div class="detail-content-header-content-right" v-if="!isDisplay"> <div class="detail-content-header-content-right" v-if="!isDisplay">
@@ -567,6 +569,10 @@
white-space: nowrap; white-space: nowrap;
} }
.detail-content-header-content-rightOne-active {
border-right: none;
}
.detail-content-header-content-right { .detail-content-header-content-right {
width: 128px; width: 128px;
display: inline-block; display: inline-block;
@@ -751,7 +757,7 @@
} }
.detail-content-header-content-left-active { .detail-content-header-content-left-active {
width: 50% !important; width: calc(50% - 130px) !important;
} }
.detail-content-bottom-left-text { .detail-content-bottom-left-text {
@@ -761,7 +767,8 @@
.detail-content-bottom-right-text { .detail-content-bottom-right-text {
width: calc(50% - 256px); width: calc(50% - 256px);
} }
.operator-text-text-text{
color: #00B3BE!important; .operator-text-text-text {
color: #00B3BE !important;
} }
</style> </style>