提交代码

src/views/zdsz/engineeringIndustry/index.vue

@@ -145,11 +145,11 @@
           >新增顶管工程
           </el-button>
           <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-circle-check"
-              @click="viewSource(scope.row,'check')"
-              v-hasPermi="['zdsz:engineeringIndustry:review']"
+            size="mini"
+            type="text"
+            icon="el-icon-circle-check"
+            @click="viewSource(scope.row,'check')"
+            v-hasPermi="['zdsz:engineeringIndustry:review']"
           >审核
           </el-button>
           <el-button
@@ -516,7 +516,7 @@ export default {
         enginClassification: null,   // 工程分类
       },
       currentType: null, // 附件组件类型 put修改 add新增
-      dictArr:[]
+      dictArr: []
     };
   },
   created() {
@@ -535,18 +535,20 @@ export default {
     });
   },
   methods: {
-    changName(val){
-     let obj =  this.dictArr.find(o=>o.dictValue==val)
-      return obj?obj.dictLabel:''
+    changName(val) {
+      if (this.form.type == '1')
+        return val;
+      let obj = this.dictArr.find(o => o.dictValue == val)
+      return obj ? obj.dictLabel : ''
     },
-    changeNames(){
-      getDicts('municipal_engineering_node').then(res=>{
-        this.dictArr=res.data
+    changeNames() {
+      getDicts('municipal_engineering_node').then(res => {
+        this.dictArr = res.data
       })
     },
     // 节点单项审核
-    checkWorking(checkingInfo){
-      console.log('checkingInfo===',checkingInfo)
+    checkWorking(checkingInfo) {
+      console.log('checkingInfo===', checkingInfo)
       let params = checkingInfo
       params.createTime = this.createTime
       insertReview(params).then(res => {
@@ -560,7 +562,7 @@ export default {
         }
       })
     },
-    filesUpload(url){
+    filesUpload(url) {
       console.log('upload successfully')
       this.form.files = url
       this.$refs.form.validate()
@@ -621,7 +623,7 @@ export default {
     },
     //添加用料信息
     async addzEngineeringMaterBo(row) {
-      console.log("添加用料信息",row)
+      console.log("添加用料信息", row)
       this.zEngineeringNodeBo = { // 工程节点
         type: '', // 节点类型
         zEngineeringInfoBo: { // 施工信息
@@ -660,7 +662,7 @@ export default {
           valid = false;
         }
 
-        if (typeof(this.form.enginClassification) != 'string' && this.form.enginClassification != [] && this.form.enginClassification.length>0) {
+        if (typeof (this.form.enginClassification) != 'string' && this.form.enginClassification != [] && this.form.enginClassification.length > 0) {
           this.form.enginClassification = this.form.enginClassification.join(',');
         }
         if (valid) {
@@ -719,11 +721,11 @@ export default {
         this.form.type = type;
         this.form.zEngineeringNodeBo.type = (type === '1' ? "工业工程" : "市政工程")
         this.EngineepipeType = (type === '1' ? [
-          {value: '小微商服', label: '小微商服'},
-          {value: '新建工业',label: '新建工业'},
-          {value: '改造工业', label: '改造工业'},
-          {value: '民用(庭院)', label: '民用(庭院)'}
-          ]: [
+            {value: '小微商服', label: '小微商服'},
+            {value: '新建工业', label: '新建工业'},
+            {value: '改造工业', label: '改造工业'},
+            {value: '民用(庭院)', label: '民用(庭院)'}
+          ] : [
             {value: '气源', label: '气源'}, {value: '排迁', label: '排迁'}
           ]
         )
@@ -753,12 +755,12 @@ export default {
           })
         }
         // 市政工程功能已完成 工业工程请根据自己需求酌情修改此处代码
-        this.$refs.ConstructionDetails.open(this.form.type==2?dict:[
+        this.$refs.ConstructionDetails.open(this.form.type == 2 ? dict : [
           {
             value: "历史数据",
             label: "历史数据"
           }
-        ], this.form.type,type,null,null,null,null,this.form.type === '1' ? "工业工程" : "市政工程")
+        ], this.form.type, type, null, null, null, null, this.form.type === '1' ? "工业工程" : "市政工程")
         this.status = 'read-only'
       })
       // this.$refs.ConstructionDetails.open(_, this.form.type,null,null,null,null,null,this.form.type === '1' ? "工业工程" : "市政工程")
@@ -772,26 +774,26 @@ export default {
       val = 'municipal_engineering_node'
       // alert(val)
       getDicts(val).then(res => {
-          let dict = []
-          for (let i = 0; i < res.data.length; i++) {
-            dict.push({
-              "label": res.data[i].dictLabel,
-              "value": res.data[i].dictValue,
-            })
+        let dict = []
+        for (let i = 0; i < res.data.length; i++) {
+          dict.push({
+            "label": res.data[i].dictLabel,
+            "value": res.data[i].dictValue,
+          })
+        }
+        // 市政工程功能已完成 工业工程请根据自己需求酌情修改此处代码
+        this.$refs.ConstructionDetails.open(this.form.type == 2 ? dict : [
+          {
+            value: "历史数据",
+            label: "历史数据"
           }
-          // 市政工程功能已完成 工业工程请根据自己需求酌情修改此处代码
-          this.$refs.ConstructionDetails.open(this.form.type==2?dict:[
-            {
-              value: "历史数据",
-              label: "历史数据"
-            }
-          ], this.form.type,null,null,null,null,null,this.form.type === '1' ? "工业工程" : "市政工程")
+        ], this.form.type, null, null, null, null, null, this.form.type === '1' ? "工业工程" : "市政工程")
         this.status = 'put'
       })
     },
     viewNodeSource(e) {
       // alert('type='+e)
-      if(!e)return
+      if (!e) return
       console.log('todo: 获取数据', e)
       // todo: 获取数据
       QueryEngineeIndustry({
@@ -799,7 +801,7 @@ export default {
         type: e
       }).then(res => {
         this.createTime = res.data.createTime
-        console.log("{id, type}",res)
+        console.log("{id, type}", res)
         this.form = res.data
         try {
           this.currentCollapses = res.data.zEngineeringNodeBo.zEngineeringInfoBoList
@@ -899,7 +901,7 @@ export default {
             this.zEngineeringNodeBo.zEngineeringInfoBo = response.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList[0]
           }
         }
-        if(this.form.enginClassification != null){
+        if (this.form.enginClassification != null) {
           this.form.enginClassification = this.form.enginClassification.split(",");
         }
         this.title = (this.form.type === '1' ? "修改工业工程" : "修改市政工程");
@@ -915,9 +917,9 @@ export default {
         this.form.zEngineeringNodeBo = this.zEngineeringNodeBo
         this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.zEngineeringMaterialBo
       }
-      if (this.form.enginClassification && this.form.enginClassification != [] && this.form.enginClassification.length>0) {
+      if (this.form.enginClassification && this.form.enginClassification != [] && this.form.enginClassification.length > 0) {
         this.form.enginClassification = this.form.enginClassification.join(',');
-      }else {
+      } else {
         this.form.enginClassification = ""
       }
       this.$refs["form"].validate(valid => {