|
@@ -277,13 +277,14 @@
|
|
|
placement="top-start"
|
|
|
trigger="hover"
|
|
|
:content="item.Type">
|
|
|
+
|
|
|
<span slot="reference" v-if="(item.state == '1' && item.Type != '开栓')"
|
|
|
style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>
|
|
|
<span slot="reference" v-if="item.state == '0' && item.Type != '开栓'"
|
|
|
style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639;"></span>
|
|
|
- <span slot="reference" v-if="(item.state == '0' || item.state == '2') && item.Type == '开栓'"
|
|
|
+ <span slot="reference" v-if="(item.state == '0' || item.state == '2') && item.Type == '开栓'" @click="gotoOpenGas(scope.row)"
|
|
|
style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #ffff00;"></span>
|
|
|
- <span slot="reference" v-if="item.state == '1' && item.Type == '开栓'"
|
|
|
+ <span slot="reference" v-if="item.state == '1' && item.Type == '开栓'" @click="gotoOpenGas(scope.row)"
|
|
|
style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #6998e0;"></span>
|
|
|
</el-popover>
|
|
|
</div>
|
|
@@ -811,6 +812,7 @@
|
|
|
</el-dialog>
|
|
|
<!-- 顶管工程新增 -->
|
|
|
<EngineePipe ref="enginPipe"/>
|
|
|
+ <engineeringGasOpening ref="engineeringGasOpening" v-if="engineeringGasOpeningShow"/>
|
|
|
|
|
|
</div>
|
|
|
</template>
|
|
@@ -847,6 +849,12 @@ 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";
|
|
|
+import {
|
|
|
+ getEngineeGasOpeningList,
|
|
|
+ putEngineeGasOpening,
|
|
|
+ queryPageListAndGetByCivi
|
|
|
+} from "@/api/zdsz/engineeringGasOpening";
|
|
|
+import engineeringGasOpening from '@/views/zdsz/engineeringGasOpening/indexCivi.vue';
|
|
|
|
|
|
function formatDate(date) {
|
|
|
const days = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
|
|
@@ -869,6 +877,7 @@ export default {
|
|
|
EnginNodeInfo,
|
|
|
EnginNodeInfoTYG,
|
|
|
ConstructionDetailsGY,
|
|
|
+ engineeringGasOpening,
|
|
|
EngineePipe
|
|
|
},
|
|
|
|
|
@@ -895,6 +904,7 @@ export default {
|
|
|
currentCollapses: [],
|
|
|
enginId: undefined,
|
|
|
checkingsVisible: false,
|
|
|
+ engineeringGasOpeningShow: false,
|
|
|
batchVisible: false,
|
|
|
updateOption: [],
|
|
|
batchFormRules: {
|
|
@@ -1434,7 +1444,6 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
- this.getList();
|
|
|
this.getAreaList();
|
|
|
},
|
|
|
mounted() {
|
|
@@ -2078,6 +2087,21 @@ export default {
|
|
|
this.open = true;
|
|
|
this.title = "添加民用工程";
|
|
|
},
|
|
|
+ refresh(value){
|
|
|
+ this.engineeringGasOpeningShow=true
|
|
|
+ },
|
|
|
+ async gotoOpenGas(entity){
|
|
|
+ entity.pageNum = 1;
|
|
|
+ entity.pageSize = 10;
|
|
|
+ const { district, areaId, buildingId, unitId, houseId ,pageNum , pageSize} = entity;
|
|
|
+ const response = await queryPageListAndGetByCivi({ district, areaId, buildingId, unitId, houseId ,pageNum , pageSize});
|
|
|
+ if (response!=null){
|
|
|
+ this.engineeringGasOpeningShow=true
|
|
|
+ this.$nextTick(()=>{
|
|
|
+ this.$refs.engineeringGasOpening.handleview(response);
|
|
|
+ })
|
|
|
+ }
|
|
|
+ },
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
|
let that = this
|