修改参数收集增加数据
This commit is contained in:
@@ -101,7 +101,8 @@
|
|||||||
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
||||||
<a-icon type="plus"/>
|
<a-icon type="plus"/>
|
||||||
</div>
|
</div>
|
||||||
<div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
<div @click="delconfig" class='delicon'
|
||||||
|
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
||||||
<a-icon type="minus"/>
|
<a-icon type="minus"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -135,7 +136,8 @@
|
|||||||
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
||||||
<a-icon type="plus"/>
|
<a-icon type="plus"/>
|
||||||
</div>
|
</div>
|
||||||
<div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
<div @click="delconfig" class='delicon'
|
||||||
|
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
||||||
<a-icon type="minus"/>
|
<a-icon type="minus"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -161,14 +163,16 @@
|
|||||||
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
||||||
<a-icon type="plus"/>
|
<a-icon type="plus"/>
|
||||||
</div>
|
</div>
|
||||||
<div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
<div @click="delconfig" class='delicon'
|
||||||
|
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
||||||
<a-icon type="minus"/>
|
<a-icon type="minus"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- 纯下拉多选-->
|
<!-- 纯下拉多选-->
|
||||||
<div v-else-if='detailDate.controlType === "3" && detailDate.paramsConfigData' class='add_flex'>
|
<div v-else-if='detailDate.controlType === "3" && detailDate.paramsConfigData' class='add_flex'>
|
||||||
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' style='flex: 1' class='add-width'>
|
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' style='flex: 1'
|
||||||
|
class='add-width'>
|
||||||
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
|
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
|
||||||
style="display: inline-block" class='valflex'>
|
style="display: inline-block" class='valflex'>
|
||||||
<div style='display: inline-block' v-if='itemval.type==="pull_more"'>
|
<div style='display: inline-block' v-if='itemval.type==="pull_more"'>
|
||||||
@@ -187,14 +191,16 @@
|
|||||||
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
||||||
<a-icon type="plus"/>
|
<a-icon type="plus"/>
|
||||||
</div>
|
</div>
|
||||||
<div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
<div @click="delconfig" class='delicon'
|
||||||
|
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
||||||
<a-icon type="minus"/>
|
<a-icon type="minus"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- 纯附件-->
|
<!-- 纯附件-->
|
||||||
<div v-else-if='detailDate.controlType === "4" && detailDate.paramsConfigData' class='add_flex'>
|
<div v-else-if='detailDate.controlType === "4" && detailDate.paramsConfigData' class='add_flex'>
|
||||||
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' style='flex: 1' class='add-width'>
|
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' style='flex: 1'
|
||||||
|
class='add-width'>
|
||||||
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
|
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
|
||||||
style="display: inline-block" class='valflex'>
|
style="display: inline-block" class='valflex'>
|
||||||
<div style='display: inline-block' v-if='itemval.type==="file"'>
|
<div style='display: inline-block' v-if='itemval.type==="file"'>
|
||||||
@@ -208,7 +214,8 @@
|
|||||||
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
||||||
<a-icon type="plus"/>
|
<a-icon type="plus"/>
|
||||||
</div>
|
</div>
|
||||||
<div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
<div @click="delconfig" class='delicon'
|
||||||
|
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
||||||
<a-icon type="minus"/>
|
<a-icon type="minus"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -325,7 +332,8 @@
|
|||||||
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
||||||
<a-icon type="plus"/>
|
<a-icon type="plus"/>
|
||||||
</div>
|
</div>
|
||||||
<div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
<div @click="delconfig" class='delicon'
|
||||||
|
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
||||||
<a-icon type="minus"/>
|
<a-icon type="minus"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -442,7 +450,8 @@
|
|||||||
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
||||||
<a-icon type="plus"/>
|
<a-icon type="plus"/>
|
||||||
</div>
|
</div>
|
||||||
<div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
<div @click="delconfig" class='delicon'
|
||||||
|
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
||||||
<a-icon type="minus"/>
|
<a-icon type="minus"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -554,7 +563,8 @@
|
|||||||
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
||||||
<a-icon type="plus"/>
|
<a-icon type="plus"/>
|
||||||
</div>
|
</div>
|
||||||
<div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
<div @click="delconfig" class='delicon'
|
||||||
|
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
||||||
<a-icon type="minus"/>
|
<a-icon type="minus"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -589,7 +599,8 @@
|
|||||||
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
||||||
<a-icon type="plus"/>
|
<a-icon type="plus"/>
|
||||||
</div>
|
</div>
|
||||||
<div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
<div @click="delconfig" class='delicon'
|
||||||
|
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
||||||
<a-icon type="minus"/>
|
<a-icon type="minus"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -624,7 +635,8 @@
|
|||||||
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
||||||
<a-icon type="plus"/>
|
<a-icon type="plus"/>
|
||||||
</div>
|
</div>
|
||||||
<div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
<div @click="delconfig(item)" class='delicon'
|
||||||
|
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
||||||
<a-icon type="minus"/>
|
<a-icon type="minus"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -750,7 +762,8 @@
|
|||||||
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
<div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
|
||||||
<a-icon type="plus"/>
|
<a-icon type="plus"/>
|
||||||
</div>
|
</div>
|
||||||
<div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
<div @click="delconfig" class='delicon'
|
||||||
|
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
|
||||||
<a-icon type="minus"/>
|
<a-icon type="minus"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -795,7 +808,8 @@
|
|||||||
formInline: {},
|
formInline: {},
|
||||||
visible: false,
|
visible: false,
|
||||||
detailDatetransformation: [],
|
detailDatetransformation: [],
|
||||||
detailDateList: []
|
detailDateList: [],
|
||||||
|
paramsConfigData: {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
@@ -803,6 +817,7 @@
|
|||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.detailDateList = []
|
this.detailDateList = []
|
||||||
|
this.paramsConfigData = this.detailDate.paramsConfigData
|
||||||
let name = []
|
let name = []
|
||||||
console.log(this.detailDate)
|
console.log(this.detailDate)
|
||||||
// this.columName.forEach(item => {
|
// this.columName.forEach(item => {
|
||||||
@@ -818,10 +833,10 @@
|
|||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
this.detailDateList = this.detailDate.paramsConfigData
|
// this.detailDateList = this.detailDate.paramsConfigData
|
||||||
// this.detailDateList.forEach((item) => {
|
// this.detailDateList.forEach((item) => {
|
||||||
Object.keys(this.detailDateList).forEach(res => {
|
Object.keys(this.detailDate.paramsConfigData).forEach(res => {
|
||||||
this.detailDateList[res].forEach(val => {
|
this.detailDate.paramsConfigData[res].forEach(val => {
|
||||||
if (val.type === 'pull_more' && !val.dataValue) {
|
if (val.type === 'pull_more' && !val.dataValue) {
|
||||||
val.dataValue = []
|
val.dataValue = []
|
||||||
}
|
}
|
||||||
@@ -889,27 +904,50 @@
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
addconfig() {
|
generateRandom() {
|
||||||
postAction('params/configData/add', {
|
return Math.random().toString(32)
|
||||||
paramsCollectManifestId: this.recordList.id,
|
|
||||||
paramsConfigId: this.detailDate.configId
|
|
||||||
}).then((res) => {
|
|
||||||
if (res.success) {
|
|
||||||
this.$emit('collectionForm')
|
|
||||||
} else {
|
|
||||||
}
|
|
||||||
})
|
|
||||||
},
|
},
|
||||||
delconfig() {
|
addconfig() {
|
||||||
for (const key in this.detailDate.paramsConfigData) {
|
let paramsConfigData = Object.keys(this.detailDate.paramsConfigData)
|
||||||
deleteAction('params/configData/delete', { id: key }).then((res) => {
|
for (let i = 0; i < paramsConfigData.length; i++) {
|
||||||
if (res.success) {
|
if (i == paramsConfigData.length - 1) {
|
||||||
this.$emit('collectionForm')
|
let name = paramsConfigData[i]
|
||||||
|
let generateRandom = this.generateRandom()
|
||||||
|
this.detailDate.paramsConfigData[generateRandom] = JSON.parse(JSON.stringify(this.detailDate.paramsConfigData[name]))
|
||||||
|
this.detailDate.paramsConfigData[generateRandom].forEach(res => {
|
||||||
|
if (res.type === 'pull_more') {
|
||||||
|
res.dataValue = []
|
||||||
}else{
|
}else{
|
||||||
|
res.dataValue = ''
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
this.detailDate.paramsConfigData = { ...this.detailDate.paramsConfigData }
|
||||||
|
this.$emit('consolidateData')
|
||||||
|
// postAction('params/configData/add', {
|
||||||
|
// paramsCollectManifestId: this.recordList.id,
|
||||||
|
// paramsConfigId: this.detailDate.configId
|
||||||
|
// }).then((res) => {
|
||||||
|
// if (res.success) {
|
||||||
|
// this.$emit('collectionForm')
|
||||||
|
// } else {
|
||||||
|
// }
|
||||||
|
// })
|
||||||
|
},
|
||||||
|
delconfig(item) {
|
||||||
|
delete this.detailDate.paramsConfigData[item]
|
||||||
|
this.detailDate.paramsConfigData = { ...this.detailDate.paramsConfigData }
|
||||||
|
this.$emit('consolidateData')
|
||||||
|
// for (const key in this.detailDate.paramsConfigData) {
|
||||||
|
// deleteAction('params/configData/delete', { id: key }).then((res) => {
|
||||||
|
// if (res.success) {
|
||||||
|
// this.$emit('collectionForm')
|
||||||
|
// } else {
|
||||||
|
// }
|
||||||
|
// })
|
||||||
|
// }
|
||||||
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
detailDate(newold, oldold) {
|
detailDate(newold, oldold) {
|
||||||
|
|||||||
@@ -74,7 +74,9 @@
|
|||||||
</span>
|
</span>
|
||||||
|
|
||||||
<span slot="detailClick" slot-scope="text,record">
|
<span slot="detailClick" slot-scope="text,record">
|
||||||
<collection-type :detailDate='text' :recordList = 'record' :columName='content' @collectionForm='collectionForm'/>
|
<collection-type :detailDate='text' :recordList = 'record' :columName='content'
|
||||||
|
@consolidateData="consolidateData"
|
||||||
|
@collectionForm='collectionForm'/>
|
||||||
</span>
|
</span>
|
||||||
</a-table>
|
</a-table>
|
||||||
</div>
|
</div>
|
||||||
@@ -719,6 +721,10 @@
|
|||||||
collectionForm(){
|
collectionForm(){
|
||||||
this.getTableList()
|
this.getTableList()
|
||||||
},
|
},
|
||||||
|
consolidateData(){
|
||||||
|
this.dataSource = [...this.dataSource]
|
||||||
|
console.log(this.dataSource)
|
||||||
|
},
|
||||||
getAndUserId(result) {
|
getAndUserId(result) {
|
||||||
let query = {
|
let query = {
|
||||||
paramsManifestId: this.$route.query.id,
|
paramsManifestId: this.$route.query.id,
|
||||||
|
|||||||
@@ -161,7 +161,8 @@
|
|||||||
{{$t('Updateparametercolumn')}}
|
{{$t('Updateparametercolumn')}}
|
||||||
</div>
|
</div>
|
||||||
<!-- 同步上报库 -->
|
<!-- 同步上报库 -->
|
||||||
<div @click="handleSynchronousReportLibraryJurisdiction" class="operator-text-title" v-if='currentPersonRole == "homo"'>
|
<div @click="handleSynchronousReportLibraryJurisdiction" class="operator-text-title"
|
||||||
|
v-if='currentPersonRole == "homo"'>
|
||||||
<a-icon type="sync"/>
|
<a-icon type="sync"/>
|
||||||
{{$t('SynchronousReportLibrary')}}
|
{{$t('SynchronousReportLibrary')}}
|
||||||
</div>
|
</div>
|
||||||
@@ -175,11 +176,13 @@
|
|||||||
<a-icon type="delete"/>
|
<a-icon type="delete"/>
|
||||||
{{$t('BatchDelete')}}
|
{{$t('BatchDelete')}}
|
||||||
</div>
|
</div>
|
||||||
<div @click="bringInTheProjectInterfaceClick" class="operator-text-title" v-if='currentPersonRole == "homo"'>
|
<div @click="bringInTheProjectInterfaceClick" class="operator-text-title"
|
||||||
|
v-if='currentPersonRole == "homo"'>
|
||||||
<a-icon type="user"/>
|
<a-icon type="user"/>
|
||||||
{{$t('bringInTheProjectInterface')}}
|
{{$t('bringInTheProjectInterface')}}
|
||||||
</div>
|
</div>
|
||||||
<div @click="AdjustareasofresponsibilityClick" class="operator-text-title" v-if='currentPersonRole == "homo"'>
|
<div @click="AdjustareasofresponsibilityClick" class="operator-text-title"
|
||||||
|
v-if='currentPersonRole == "homo"'>
|
||||||
<a-icon type="setting"/>
|
<a-icon type="setting"/>
|
||||||
{{$t('Adjustareasofresponsibility')}}
|
{{$t('Adjustareasofresponsibility')}}
|
||||||
</div>
|
</div>
|
||||||
@@ -190,12 +193,14 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<!-- @click='morepop'-->
|
<!-- @click='morepop'-->
|
||||||
<div class="operator-text" style="position: relative " v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
|
<div class="operator-text" style="position: relative "
|
||||||
|
v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
|
||||||
<span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
|
<span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
|
||||||
</div>
|
</div>
|
||||||
</a-popconfirm>
|
</a-popconfirm>
|
||||||
<!-- 下发收集 -->
|
<!-- 下发收集 -->
|
||||||
<div @click="distributionAndCollectionJurisdiction" class="operator-text" v-if='currentPersonRole == "homo"'>
|
<div @click="distributionAndCollectionJurisdiction" class="operator-text"
|
||||||
|
v-if='currentPersonRole == "homo"'>
|
||||||
<a-icon type="solution"/>
|
<a-icon type="solution"/>
|
||||||
{{$t('distributionAndCollection')}}
|
{{$t('distributionAndCollection')}}
|
||||||
</div>
|
</div>
|
||||||
@@ -233,7 +238,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<!-- 导入-->
|
<!-- 导入-->
|
||||||
<div class="operator-text" v-if='currentPersonRole == "dre"'>
|
<div class="operator-text" v-if='currentPersonRole == "dre"'>
|
||||||
<ImportFileOnlyList :url="url" :isTrue="false" :accept="'.zip'" :paramsManifestId='this.$route.query.id' @getList='getList'/>
|
<ImportFileOnlyList :url="url" :isTrue="false" :accept="'.zip'" :paramsManifestId='this.$route.query.id'
|
||||||
|
@getList='getList'/>
|
||||||
</div>
|
</div>
|
||||||
<!-- 填写人导出-->
|
<!-- 填写人导出-->
|
||||||
<div @click="handleExportDre" class="operator-text"
|
<div @click="handleExportDre" class="operator-text"
|
||||||
@@ -325,7 +331,8 @@
|
|||||||
<assigned-by-homo v-if='areaVisibleAssignedbyhomo' :selectedRowKeysArray='selectedRowKeysArray'
|
<assigned-by-homo v-if='areaVisibleAssignedbyhomo' :selectedRowKeysArray='selectedRowKeysArray'
|
||||||
@GetgetTableList='GetgetTableList'
|
@GetgetTableList='GetgetTableList'
|
||||||
@GetgetLoginUserType='GetgetLoginUserType'
|
@GetgetLoginUserType='GetgetLoginUserType'
|
||||||
@areaVisibleAssignedbyflaghomo='areaVisibleAssignedbyflaghomo' @areaVisible='areaVisibleAssignedbyhomo = false'/>
|
@areaVisibleAssignedbyflaghomo='areaVisibleAssignedbyflaghomo'
|
||||||
|
@areaVisible='areaVisibleAssignedbyhomo = false'/>
|
||||||
</a-modal>
|
</a-modal>
|
||||||
<!-- 下发收集--->
|
<!-- 下发收集--->
|
||||||
<!-- <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('distributionAndCollection')" width='400px' :footer="null">-->
|
<!-- <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('distributionAndCollection')" width='400px' :footer="null">-->
|
||||||
@@ -444,7 +451,8 @@
|
|||||||
<!-- 认证工程师-提示-->
|
<!-- 认证工程师-提示-->
|
||||||
<div style='font-size: 18px;text-align: center' v-if='NoEngineer === 1'>
|
<div style='font-size: 18px;text-align: center' v-if='NoEngineer === 1'>
|
||||||
{{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'?
|
{{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'?
|
||||||
$t('engineeringInterfacePerson'): $t('completedBy')) }}{{jurisdiction === "homoQZTH"? $t('Datastateexcept') : $t('Datastatusis')}}
|
$t('engineeringInterfacePerson'): $t('completedBy')) }}{{jurisdiction === 'homoQZTH'? $t('Datastateexcept')
|
||||||
|
: $t('Datastatusis')}}
|
||||||
<!-- 下发收集时-->
|
<!-- 下发收集时-->
|
||||||
<span v-if='jurisdiction === "HOMOZFSJ"' class="text-wraning">
|
<span v-if='jurisdiction === "HOMOZFSJ"' class="text-wraning">
|
||||||
'{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}'
|
'{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}'
|
||||||
@@ -550,47 +558,47 @@
|
|||||||
{
|
{
|
||||||
value: '1',
|
value: '1',
|
||||||
title: this.$t('CollectionInitiated'),
|
title: this.$t('CollectionInitiated'),
|
||||||
key:'1',
|
key: '1'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
value: '2',
|
value: '2',
|
||||||
title: this.$t('handledInterface'),
|
title: this.$t('handledInterface'),
|
||||||
key:'2',
|
key: '2'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
value: '3',
|
value: '3',
|
||||||
title: this.$t('ReturnedPerson'),
|
title: this.$t('ReturnedPerson'),
|
||||||
key:'3',
|
key: '3'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
value: '4',
|
value: '4',
|
||||||
title: this.$t('completed'),
|
title: this.$t('completed'),
|
||||||
key:'4',
|
key: '4'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
value: '5',
|
value: '5',
|
||||||
title: this.$t('Filledreturn'),
|
title: this.$t('Filledreturn'),
|
||||||
key:'5',
|
key: '5'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
value: '6',
|
value: '6',
|
||||||
title: this.$t('Submitted'),
|
title: this.$t('Submitted'),
|
||||||
key:'6',
|
key: '6'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
value: '7',
|
value: '7',
|
||||||
title: this.$t('ReturnedEngineer'),
|
title: this.$t('ReturnedEngineer'),
|
||||||
key:'7',
|
key: '7'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
value: '8',
|
value: '8',
|
||||||
title: this.$t('SynchronizedLibrary'),
|
title: this.$t('SynchronizedLibrary'),
|
||||||
key:'8',
|
key: '8'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
value: '9',
|
value: '9',
|
||||||
title: this.$t('alteration'),
|
title: this.$t('alteration'),
|
||||||
key:'9',
|
key: '9'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
return {
|
return {
|
||||||
@@ -682,7 +690,7 @@
|
|||||||
value: 'dre',
|
value: 'dre',
|
||||||
text: this.$t('dre'),
|
text: this.$t('dre'),
|
||||||
dictCode: 'dre'//只要 dictCode 有值,无论 type 是什么,都显示为字典下拉框
|
dictCode: 'dre'//只要 dictCode 有值,无论 type 是什么,都显示为字典下拉框
|
||||||
},
|
}
|
||||||
],
|
],
|
||||||
selectedRowKeys: [],
|
selectedRowKeys: [],
|
||||||
textLoading: false,
|
textLoading: false,
|
||||||
@@ -1545,38 +1553,58 @@
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
console.log(selectedRowKeysValue)
|
console.log(selectedRowKeysValue)
|
||||||
for (let i = 0; i < selectedRowKeysValue.length; i++) {
|
// for (let i = 0; i < selectedRowKeysValue.length; i++) {
|
||||||
let postDateobj = {}
|
// let postDateobj = {}
|
||||||
let itemIn = Object.keys(selectedRowKeysValue[i])
|
// let itemIn = Object.keys(selectedRowKeysValue[i])
|
||||||
for (let j = 0; j < itemIn.length; j++) {
|
// for (let j = 0; j < itemIn.length; j++) {
|
||||||
if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
|
// if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
|
||||||
if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
|
// if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
|
||||||
postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
|
// postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
|
||||||
for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
|
// for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
|
||||||
if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') {
|
// if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') {
|
||||||
selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',')
|
// selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',')
|
||||||
}
|
// }
|
||||||
if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) {
|
// if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) {
|
||||||
selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString()
|
// selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString()
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
postDateobj.id = selectedRowKeysValue[i].id
|
// postDateobj.id = selectedRowKeysValue[i].id
|
||||||
delete postDateobj.referencesCol
|
// delete postDateobj.referencesCol
|
||||||
postDate.push(postDateobj)
|
// postDate.push(postDateobj)
|
||||||
}
|
// }
|
||||||
console.log(postDate)
|
// console.log(postDate)
|
||||||
let configDataList = { configDataList: postDate }
|
|
||||||
if (selectedRowKeysValue && selectedRowKeysValue.length > 0) {
|
if (selectedRowKeysValue && selectedRowKeysValue.length > 0) {
|
||||||
if (num && num == 1) {
|
if (num && num == 1) {
|
||||||
this.textLoading = true
|
this.textLoading = true
|
||||||
}
|
}
|
||||||
|
let configDataList = []
|
||||||
|
for (let i = 0; i < selectedRowKeysValue.length; i++) {
|
||||||
|
configDataList.push({
|
||||||
|
id:selectedRowKeysValue[i].id
|
||||||
|
})
|
||||||
|
if (selectedRowKeysValue[i].configIds && selectedRowKeysValue[i].configIds.length > 0) {
|
||||||
|
for (let j = 0; j < selectedRowKeysValue[i].configIds.length; j++) {
|
||||||
|
let keyIndex = Object.keys(selectedRowKeysValue[i])
|
||||||
|
for (let k = 0; k < keyIndex.length; k++) {
|
||||||
|
if (keyIndex[k] == selectedRowKeysValue[i].configIds[j]) {
|
||||||
|
let keyName = keyIndex[k]
|
||||||
|
configDataList[i][keyName] = selectedRowKeysValue[i][keyName]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// return
|
||||||
let query = {
|
let query = {
|
||||||
...configDataList,
|
// ...configDataList,
|
||||||
|
configDataList: configDataList,
|
||||||
paramsManifestId: this.paramsManifest.id
|
paramsManifestId: this.paramsManifest.id
|
||||||
}
|
}
|
||||||
|
console.log(query)
|
||||||
|
return
|
||||||
postAction('/params/collectManifest/save', query).then((res) => {
|
postAction('/params/collectManifest/save', query).then((res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
if (num && num == 1) {
|
if (num && num == 1) {
|
||||||
@@ -1670,7 +1698,8 @@
|
|||||||
_array.push(item.id)
|
_array.push(item.id)
|
||||||
})
|
})
|
||||||
let _this = this
|
let _this = this
|
||||||
let param = { ids: _array.join(','),
|
let param = {
|
||||||
|
ids: _array.join(','),
|
||||||
currentPersonRole: this.currentPersonRole,
|
currentPersonRole: this.currentPersonRole,
|
||||||
paramsManifestId: this.$route.query.id
|
paramsManifestId: this.$route.query.id
|
||||||
}
|
}
|
||||||
@@ -1977,6 +2006,7 @@
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.operator-text-title {
|
.operator-text-title {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
margin-right: 22px;
|
margin-right: 22px;
|
||||||
@@ -2122,6 +2152,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.text-wraning {
|
.text-wraning {
|
||||||
word-break: break-word;
|
word-break: break-word;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user