工业工程、市政工程页面修改

src/views/zdsz/engineeringIndustry/index.vue

@@ -179,28 +179,26 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <!-- <el-button :loading="buttonLoading" type="primary" @click="submitForm">确定</el-button> -->
         <el-button :loading="buttonLoading" type="primary" @click="toNodeDetail">填写节点信息</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
     <!-- 节点信息dialog -->
-
-        <el-dialog :visible="nodeDetailVisible" :rules="nodeRules" title="节点信息" append-to-body customClass="appendElNodeDialog" width="70% !important">
+        <el-dialog :visible.sync="nodeDetailVisible" :rules="nodeRules" title="节点信息" append-to-body customClass="appendElNodeDialog" width="70% !important">
           <!-- 节点选项卡 -->
-          <el-tabs type="border-card" class="engineNodeTypes">
-            <el-tab-pane label="基本信息"></el-tab-pane>
-            <el-tab-pane
-              :label="e"
-              v-for="e in currentNode"
-              :key="e"
-            >
-            </el-tab-pane>
-          </el-tabs>
+<!--          <el-tabs type="border-card" class="engineNodeTypes">-->
+<!--            <el-tab-pane label="基本信息"></el-tab-pane>-->
+<!--            <el-tab-pane-->
+<!--              :label="e"-->
+<!--              v-for="e in currentNode"-->
+<!--              :key="e"-->
+<!--            >-->
+<!--            </el-tab-pane>-->
+<!--          </el-tabs>-->
           <!-- 节点表单 -->
           <el-form ref="nodeForm" :model="zEngineeringInfoBo" :rules="nodeRules" label-width="200px">
             <el-form-item label="节点类型" prop="type"  >
-              <el-select v-model="nodeType" placeholder="请选择节点类型" disabled>
+              <el-select v-model="nodeType" placeholder="请选择节点类型" disabled style="width: 100%">
                 <el-option
                   v-for="e in dict.type.engineering_infrastructure"
                   :key="e.value"
@@ -229,6 +227,7 @@
                 v-model="zEngineeringInfoBo.backfillTime"
                 value-format="yyyy-MM-dd hh:mm:ss"
                 type="datetime"
+                style="width: 100%"
                 placeholder="请选择回填日期">
               </el-date-picker>
             </el-form-item>
@@ -237,11 +236,12 @@
                 v-model="zEngineeringInfoBo.constructTime"
                 value-format="yyyy-MM-dd hh:mm:ss"
                 type="datetime"
+                style="width: 100%"
                 placeholder="请选择施工时间">
               </el-date-picker>
             </el-form-item>
             <el-form-item label="是否按图纸施工" prop="constructAccordingDrawings">
-              <el-select v-model="zEngineeringInfoBo.constructAccordingDrawings">
+              <el-select v-model="zEngineeringInfoBo.constructAccordingDrawings" style="width: 100%">
                 <el-option
                   v-for="e in constructAccordingDrawingsOption"
                   :key="e.value"
@@ -251,7 +251,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="分段打压" prop="segmentedCompressionQualified">
-              <el-select v-model="zEngineeringInfoBo.segmentedCompressionQualified">
+              <el-select v-model="zEngineeringInfoBo.segmentedCompressionQualified" style="width: 100%">
                 <el-option
                   v-for="e in segmentedCompressionQualifiedOption"
                   :key="e.value"
@@ -265,18 +265,19 @@
                               @input="getUrl"></ObsImageUpload>
             </el-form-item>
             <!-- 节点复选框 -->
-            <el-checkbox-group v-model="currentNode" @change="currentNodeHasChanged">
-              <el-checkbox
-                :label="e"
-                v-for="e in nodeList"
-                :key="e"
-              ></el-checkbox>
-            </el-checkbox-group>
-            <div style="display: flex;margin-top: 3%;">
-              <div style="width: 80%;"></div>
-              <el-button :loading="buttonLoading" type="primary" @click="submitForm">提交</el-button>
-              <el-button @click="nodeCancel">取 消</el-button>
-            </div>
+<!--            <el-checkbox-group v-model="currentNode" @change="currentNodeHasChanged">-->
+<!--              <el-checkbox-->
+<!--                :label="e"-->
+<!--                v-for="e in nodeList"-->
+<!--                :key="e"-->
+<!--              ></el-checkbox>-->
+<!--            </el-checkbox-group>-->
+<!--            <div style="display: flex;margin-top: 3%;">-->
+              <div style="width: 20%; float: right">
+                <el-button :loading="buttonLoading" type="primary" @click="submitForm">提交</el-button>
+                <el-button @click="nodeCancel">取 消</el-button>
+              </div>
+<!--            </div>-->
           </el-form>
         </el-dialog>
   </div>
@@ -515,10 +516,10 @@ export default {
     },
     // 表单重置
     reset() {
-      this.$nextTick(() => {
-        this.$refs['form'].resetFields()
-        this.$refs['nodeForm'].resetFields()
-      })
+      // this.$nextTick(() => {
+      //   this.$refs['form'].resetFields()
+      //   this.$refs['nodeForm'].resetFields()
+      // })
       this.resetForm("form");
       this.resetForm("nodeForm");
     },
@@ -542,7 +543,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "新增工程";
+      this.title = (this.form.type === '1' ? "新增工业工程":"新增市政工程");
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -555,7 +556,7 @@ export default {
         this.zEngineeringInfoBo = response.data.zengineeringNodeBo[0].zEngineeringInfoBoList[0]
         console.log(this.zEngineeringNodeBo)
         this.open = true;
-        this.title = "修改工程";
+        this.title = (this.form.type === '1' ? "修改工业工程":"修改市政工程");
       });
     },
     /** 提交按钮 */
@@ -591,6 +592,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
+      const ids = row.id || this.ids;
       this.$modal.confirm('是否确认删除所选择的数据项？').then(() => {
         this.loading = true;
         return DelEngineeEngineeIndustry(ids);