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

[update] 54751

Browse Source
This commit is contained in:
zhaomeijing
2022-06-22 15:08:28 +08:00
parent 159d755474
commit 92c74ba970
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/tableCollection/index.vue
+1 -1
View File
@@ -26,7 +26,7 @@
<span slot="operationbtn" slot-scope="record">
<span v-if='currentPersonRole === "homo"'>
<!-- 认证工程师 -->
<span v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更"'>
<span v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "Wait Collect" || record.state == "Sdt Back" || record.state == "Change"'>
<span
@click='ondataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
</span>
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+14 -14
View File
@@ -276,7 +276,7 @@
</div>
<!-- 认证工程师-提示-->
<div style='font-size: 16px;color: red;display: flex;justify-content: center' v-if='NoEngineer === 1'>
{{ currentPersonRole =='homo'? '认证工程师': (currentPersonRole =='sdt'? '工程接口人': '填写人') }}{{$t('Datastatusis')}}
{{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'? $t('engineeringInterfacePerson'): $t('completedBy')) }}{{$t('Datastatusis')}}
<!-- 下发收集时-->
<span v-if='jurisdiction === "HOMOZFSJ"'>
'{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}'
@@ -519,7 +519,7 @@ export default {
} else {
this.selectedRowKeysValue.forEach((item, index) => {
// 状态不符合，不能下发收集
if(item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更') {
if(item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更' && item.state !== 'Wait Collect' && item.state !== 'Sdt Back' && item.state !== 'Change') {
this.NotSelectedRowKeysValue.push(item)
flag = 0
}
@@ -546,7 +546,7 @@ export default {
this.$message.warning(this.$t('selectLeastOne'))
} else {
this.selectedRowKeysValue.forEach((item, index) => {
if(item.state !== '已提交') {
if(item.state !== '已提交'&& item.state !== 'Submit') {
this.NotSelectedRowKeysValue.push(item)
this.jurisdiction = 'homoTH'
flag = 0
@@ -564,7 +564,7 @@ export default {
this.$message.warning(this.$t('selectLeastOne'))
} else {
this.selectedRowKeysValue.forEach((item, index) => {
if(item.state !== '待工程接口人处理' && item.state !== '填写人退回') {
if(item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'Wait Sdt' && item.state !== 'Dre Back') {
this.NotSelectedRowKeysValue.push(item)
this.jurisdiction = 'sdtTH'
flag = 0
@@ -582,7 +582,7 @@ export default {
this.$message.warning(this.$t('selectLeastOne'))
} else {
this.selectedRowKeysValue.forEach((item, index) => {
if(item.state !== '待填写' && item.state !== '认证工程师退回') {
if(item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'Wait Fill' && item.state !== 'Cert Back') {
this.NotSelectedRowKeysValue.push(item)
this.jurisdiction = 'dreTH'
flag = 0
@@ -603,7 +603,7 @@ export default {
this.$message.warning(this.$t('selectLeastOne'))
} else {
this.selectedRowKeysValue.forEach((item, index) => {
if(item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更') {
if(item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更' && item.state !== 'Wait Collect' && item.state !== 'Sdt Back' && item.state !== 'Change') {
this.NotSelectedRowKeysValue.push(item)
flag = 0
}
@@ -622,7 +622,7 @@ export default {
this.$message.warning(this.$t('selectLeastOne'))
} else {
this.selectedRowKeysValue.forEach((item, index) => {
if(item.state !== '已提交' && item.state !== '变更') {
if(item.state !== '已提交' && item.state !== '变更'&& item.state !== 'Submit' && item.state !== 'Change') {
this.NotSelectedRowKeysValue.push(item)
flag = 0
}
@@ -641,7 +641,7 @@ export default {
this.$message.warning(this.$t('selectLeastOne'))
} else {
this.selectedRowKeysValue.forEach((item, index) => {
if(item.state !== '待发起收集') {
if(item.state !== '待发起收集'&& item.state !== 'Wait Collect') {
this.NotSelectedRowKeysValue.push(item)
flag = 0
}
@@ -662,7 +662,7 @@ export default {
this.$message.warning(this.$t('selectLeastOne'))
} else {
this.selectedRowKeysValue.forEach((item, index) => {
if(item.state !== '待工程接口人处理' && item.state !== '填写人退回') {
if(item.state !== '待工程接口人处理' && item.state !== '填写人退回'&&item.state !== 'Wait Sdt' && item.state !== 'Dre Back') {
this.NotSelectedRowKeysValue.push(item)
this.jurisdiction = 'homoQZTH'
flag = 0
@@ -681,7 +681,7 @@ export default {
this.$message.warning(this.$t('selectLeastOne'))
} else {
this.selectedRowKeysValue.forEach((item, index) => {
if(item.state !== '待填写') {
if(item.state !== '待填写'&&item.state !== 'Wait Fill') {
this.NotSelectedRowKeysValue.push(item)
this.jurisdiction = 'sdtQZTH'
flag = 0
@@ -699,7 +699,7 @@ export default {
this.$message.warning(this.$t('selectLeastOne'))
} else {
this.selectedRowKeysValue.forEach((item, index) => {
if(item.state !== '已提交') {
if(item.state !== '已提交'&&item.state !== 'Submit') {
this.NotSelectedRowKeysValue.push(item)
this.jurisdiction = 'dreQZTH'
flag = 0
@@ -720,7 +720,7 @@ export default {
this.$message.warning(this.$t('selectLeastOne'))
} else {
this.selectedRowKeysValue.forEach((item, index) => {
if(item.state !== '待工程接口人处理' && item.state !== '填写人退回') {
if(item.state !== '待工程接口人处理' && item.state !== '填写人退回'&&item.state !== 'Wait Sdt' && item.state !== 'Dre Back') {
this.NotSelectedRowKeysValue.push(item)
flag = 0
}
@@ -739,7 +739,7 @@ export default {
this.$message.warning(this.$t('selectLeastOne'))
} else {
this.selectedRowKeysValue.forEach((item, index) => {
if(item.state !== '待填写' && item.state !== '认证工程师退回') {
if(item.state !== '待填写' && item.state !== '认证工程师退回'&&item.state !== 'Wait Fill' && item.state !== 'Cert Back') {
this.NotSelectedRowKeysValue.push(item)
flag = 0
}
@@ -757,7 +757,7 @@ export default {
this.$message.warning(this.$t('selectLeastOne'))
} else {
this.selectedRowKeysValue.forEach((item, index) => {
if(item.state !== '待填写' && item.state !== '认证工程师退回') {
if(item.state !== '待填写' && item.state !== '认证工程师退回'&&item.state !== 'Wait Fill' && item.state !== 'Cert Back') {
this.NotSelectedRowKeysValue.push(item)
flag = 0
}