|
|
@@ -522,7 +522,20 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
+ <EnginNodeInfoTYG
|
|
|
+ v-if="title=='添加用料'"
|
|
|
+ v-for="(e,idx) in currentCheckList"
|
|
|
+ :key="idx"
|
|
|
+ :name="e"
|
|
|
+ :ref="'EnginNodeInfo'+idx"
|
|
|
+ :flag="'gy_tyg'"
|
|
|
+ :types="currentCheckList"
|
|
|
+ :currentContain="currentCheckList"
|
|
|
+ :enginType="'工业工程'"
|
|
|
+ :enginSort="queryParams.enginType"
|
|
|
+ />
|
|
|
<EnginNodeInfo
|
|
|
+ v-else
|
|
|
v-for="(e,idx) in currentCheckList"
|
|
|
:key="idx"
|
|
|
:name="e"
|
|
|
@@ -558,7 +571,6 @@
|
|
|
:zEngineeringNodeBo="zEngineeringNodeBo"
|
|
|
enginType="民用工程"
|
|
|
/>
|
|
|
-
|
|
|
<!-- 批量审核 -->
|
|
|
<el-dialog
|
|
|
ref="checkingAllForm"
|
|
|
@@ -828,8 +840,10 @@ import {getUnits} from "@/api/zdsz/unit";
|
|
|
import {getHouses} from "@/api/zdsz/house";
|
|
|
import {getDicts} from "@/api/system/dict/data";
|
|
|
import EnginNodeInfo from "@/components/EnginNodeInfo/index";
|
|
|
+import EnginNodeInfoTYG from "@/components/EnginNodeInfo/indexGY.vue";
|
|
|
import EngineePipe from '@/components/EngineePipe'
|
|
|
import ConstructionDetails from "@/components/ConstructionDetails/index.vue";
|
|
|
+import ConstructionDetailsGY from "@/components/ConstructionDetails/indexGY.vue";
|
|
|
import {listAll} from "@/api/system/user";
|
|
|
|
|
|
function formatDate(date) {
|
|
|
@@ -851,6 +865,8 @@ export default {
|
|
|
components: {
|
|
|
ConstructionDetails,
|
|
|
EnginNodeInfo,
|
|
|
+ EnginNodeInfoTYG,
|
|
|
+ ConstructionDetailsGY,
|
|
|
EngineePipe
|
|
|
},
|
|
|
|
|
|
@@ -873,6 +889,7 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
nodeDetailType: null,
|
|
|
+ enginClassification: null,
|
|
|
currentCollapses: [],
|
|
|
enginId: undefined,
|
|
|
checkingsVisible: false,
|
|
|
@@ -1193,7 +1210,6 @@ export default {
|
|
|
currentCheckList: [],
|
|
|
enginType: '',
|
|
|
enginClassificationinfo: '',
|
|
|
- enginClassification: '',
|
|
|
enginClassificationOption: [],
|
|
|
enginTypeOption: [
|
|
|
{
|
|
|
@@ -1561,6 +1577,9 @@ export default {
|
|
|
this.status = 'put'
|
|
|
let title = e.areaName + "-" + e.buildingName + "-" + e.unitName + "-" + e.houseName + " [" + (e.enginType == 'new_built' ? "新建" : '旧改') + "-" + e.enginClassificationName + "]"
|
|
|
let val = e.enginType + "_" + e.enginClassification
|
|
|
+ if (e.enginClassification=='pressure_regulating'){
|
|
|
+ val = 'gy_tyg'
|
|
|
+ }
|
|
|
getDicts(val).then(res => {
|
|
|
let dict = []
|
|
|
for (let i = 0; i < res.data.length; i++) {
|
|
|
@@ -1597,11 +1616,15 @@ export default {
|
|
|
},
|
|
|
// 查看历史
|
|
|
viewSource(e, type = null) {
|
|
|
+ this.enginClassification = e.enginClassification
|
|
|
console.log("viewSource(e, type = null)", e)
|
|
|
let title = e.areaName + "-" + e.buildingName + "-" + e.unitName + "-" + e.houseName + " [" + (e.enginType == 'new_built' ? "新建" : '旧改') + "-" + e.enginClassificationName + "]"
|
|
|
console.log("viewSource(e, type = null)", title)
|
|
|
this.enginId = e.id
|
|
|
let val = e.enginType + "_" + e.enginClassification
|
|
|
+ if (e.enginClassification=='pressure_regulating'){
|
|
|
+ val = 'gy_tyg'
|
|
|
+ }
|
|
|
getDicts(val).then(res => {
|
|
|
let dict = []
|
|
|
for (let i = 0; i < res.data.length; i++) {
|
|
|
@@ -1611,7 +1634,6 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
this.zEngineeringNodeBo = e
|
|
|
- console.log(this.zEngineeringNodeBo)
|
|
|
this.$refs.ConstructionDetails.open(dict, _, type, '民用', title, this.zEngineeringNodeBo.enginClassification, this.enginType)
|
|
|
this.status = 'read-only'
|
|
|
})
|
|
|
@@ -1661,6 +1683,9 @@ export default {
|
|
|
this.enginTypeHasChanged(newData.enginType)
|
|
|
let val = newData.enginType + "_" + newData.enginClassification
|
|
|
this.currentCheckList = []
|
|
|
+ if (newData.enginClassification=='pressure_regulating'){
|
|
|
+ val = 'gy_tyg'
|
|
|
+ }
|
|
|
getDicts(val).then(res => {
|
|
|
this.checkList = res.data
|
|
|
console.log(this.checkList)
|
|
|
@@ -1684,6 +1709,9 @@ export default {
|
|
|
)
|
|
|
return
|
|
|
let val = this.queryParams.enginType + "_" + this.queryParams.enginClassification
|
|
|
+ if (this.queryParams.enginClassification=='pressure_regulating'){
|
|
|
+ val = 'gy_tyg';
|
|
|
+ }
|
|
|
getDicts(val).then(res => {
|
|
|
this.checkList = res.data
|
|
|
})
|
|
|
@@ -1695,6 +1723,9 @@ export default {
|
|
|
)
|
|
|
return
|
|
|
let val = this.checkingForm.enginType + "_" + this.checkingForm.enginClassification
|
|
|
+ if (this.checkingForm.enginClassification=='pressure_regulating'){
|
|
|
+ val = 'gy_tyg';
|
|
|
+ }
|
|
|
getDicts(val).then(res => {
|
|
|
this.checkingAllList = res.data
|
|
|
})
|
|
|
@@ -1706,6 +1737,9 @@ export default {
|
|
|
)
|
|
|
return
|
|
|
let val = this.batchForm.enginType + "_" + this.batchForm.enginClassification
|
|
|
+ if (this.batchForm.enginClassification=='pressure_regulating'){
|
|
|
+ val = 'gy_tyg';
|
|
|
+ }
|
|
|
getDicts(val).then(res => {
|
|
|
this.checkingAllList = res.data
|
|
|
})
|
|
|
@@ -1765,7 +1799,11 @@ export default {
|
|
|
this.currentCheckList = []
|
|
|
this.queryParams1.type = ''
|
|
|
this.currentEnginTypeChangeOptions2 = []
|
|
|
- getDicts(enginType && enginClassification || this.queryParams1.enginType + '_' + this.queryParams1.enginClassification).then(res => {
|
|
|
+ let params = enginType && enginClassification || this.queryParams1.enginType + '_' + this.queryParams1.enginClassification
|
|
|
+ if (this.queryParams1.enginClassification=='pressure_regulating'){
|
|
|
+ params = 'gy_tyg'
|
|
|
+ }
|
|
|
+ getDicts(params).then(res => {
|
|
|
this.currentEnginTypeChangeOptions2 = res.data
|
|
|
})
|
|
|
},
|
qinhouyu