wangzhe 1 рік тому
батько
коміт
08a9d23a0a

+ 68 - 5
src/components/ConstructionDetails/index.vue

@@ -50,11 +50,71 @@
             <hr>
             <!--带气封堵施工 start-->
             <div style="display: flex;width: 100%;height: 100%;" v-if="engineType==='pe' || engineType==='iron_air'">
-              <h4 style="width: 995px;font-weight: 600;text-align: left;text-indent: 25px;">工程名称:{{ e.headName }}</h4>
-              <h4 style="width: 995px;font-weight: 600;text-align: left;text-indent: 25px;">地点:{{ e.constructAddre }}</h4>
-              <h4 style="width: 995px;font-weight: 600;text-align: left;text-indent: 25px;">作业方式:{{ e.segmentedCompressionQualified }}</h4>
-              <h4 style="width: 995px;font-weight: 600;text-align: left;text-indent: 25px;">施工内容:{{ e.remark }}</h4>
-              <h4 style="width: 995px;font-weight: 600;text-align: left;text-indent: 25px;">管道压力:{{ e.constructAccordingDrawings }}</h4>
+              <el-form :model="nodeInfo" class="nodeForm materialForm">
+                <el-row style="width: 100%;">
+                  <el-col :span="17">
+                    <el-form-item
+                        :class="'labelWidth'"
+                        label="工程名称"
+                        label-width="95px"
+                    >
+                      <div class="block" style="display: inline-block; margin-right: 20px;">
+                        <!--{{ kind }}-->
+                        <!--<h4 style="width: 995px;font-weight: 600;text-align: left;text-indent: 25px;">工程名称:{{ kind }}</h4>-->
+                        <!--<h4 style="width: 995px;font-weight: 600;text-align: left;text-indent: 25px;">工程名称:{{ kind }}</h4>-->
+                        <el-input v-model="kind" placeholder="请输入工程名称" style="width: 100%" :disabled="true"> </el-input>
+                      </div>
+                    </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row style="width: 100%;">
+                  <el-col :span="17">
+                    <el-form-item
+                        :class="'labelWidth'"
+                        label="工程地点"
+                        label-width="95px"
+                    >
+                      <div class="block" style="display: inline-block; margin-right: 20px;">
+                        <el-input v-model="e.constructAddre" placeholder="请输入工程地点" style="width: 100%" :disabled="status == 'read-only'"> </el-input>
+                      </div>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-form-item
+                    style="width: 100%;"
+                    :class="'labelWidth'"
+                    label="作业方式"
+                    label-width="95px"
+                >
+                  <div class="block" style="display: inline-block; margin-right: 20px;">
+                    <el-input v-model="e.segmentedCompressionQualified" placeholder="请输入作业方式" style="width: 100%" :disabled="status == 'read-only'"> </el-input>
+                  </div>
+                </el-form-item>
+                <el-form-item
+                    style="width: 100%;"
+                    :class="'labelWidth'"
+                    label="管道压力"
+                    label-width="95px"
+                >
+                  <div class="block" style="display: inline-block; margin-right: 20px;">
+                    <el-input v-model="e.constructAccordingDrawings" placeholder="请输入管道压力" style="width: 100%" :disabled="status == 'read-only'"> </el-input>
+                  </div>
+                </el-form-item>
+                <el-form-item
+                    :class="'labelWidth'"
+                    label="施工内容"
+                    label-width="95px"
+                >
+                  <div class="block" style="display: inline-block; margin-right: 20px;">
+                    <el-input type="textarea" :rows="3" v-model="e.remark" placeholder="请输入施工内容" style="width: 100%" :disabled="status == 'read-only'"> </el-input>
+                  </div>
+                </el-form-item>
+              </el-form>
+              <!--<h4 style="width: 995px;font-weight: 600;text-align: left;text-indent: 25px;">工程名称:{{ kind }}</h4>-->
+              <!--<h4 style="width: 995px;font-weight: 600;text-align: left;text-indent: 25px;">地点:{{ e.constructAddre }}</h4>-->
+              <!--<h4 style="width: 995px;font-weight: 600;text-align: left;text-indent: 25px;">作业方式:{{ e.segmentedCompressionQualified }}</h4>-->
+              <!--<h4 style="width: 995px;font-weight: 600;text-align: left;text-indent: 25px;">施工内容:{{ e.remark }}</h4>-->
+              <!--<h4 style="width: 995px;font-weight: 600;text-align: left;text-indent: 25px;">管道压力:{{ e.constructAccordingDrawings }}</h4>-->
               <!--<el-form class="nodeForm materialForm">-->
                 <!--<el-form-item-->
                     <!--:prop="e.headName + ''"-->
@@ -821,6 +881,7 @@ export default {
   props: ['currentCollapses','nodeDetailType','enginType','status','zEngineeringNodeBo'],
   data() {
     return {
+      kind:null,
       userNames:[],
 
       enginSort:'',
@@ -1098,9 +1159,11 @@ export default {
      * @param enginType 工程大类名称
      */
     open(dicts, type = null,currentStatus = null,kind = null,title= null,enginClassification,enginSort,enginType) {
+      this.kind = kind
       if(dicts && dicts[0]){
         this.node = dicts[0].value
       }
+      // alert(kind)
       // alert(enginType)
       console.log(1)
       console.log('dicts=',dicts)

+ 2 - 2
src/views/zdsz/engineeringAirWall/index.vue

@@ -710,7 +710,7 @@ export default {
         this.$refs.ConstructionDetails.open([{
           value: "历史数据",
           label: "历史数据"
-        }], e.enginType,null,null,null,null,null,e.enginType)
+        }], e.enginType,null,e.enginName,null,null,null,e.enginType)
         // this.$refs.ConstructionDetails.open(dict, this.form.type,null,null,null,null,null,this.form.type === '1' ? "工业工程" : "市政工程")
         this.status = 'read-only'
       })
@@ -738,7 +738,7 @@ export default {
       //   value: "历史数据",
       //   label: "历史数据"
       // }]
-      this.$refs.ConstructionDetails.open(dicts, this.form.type,null,null,null,null,null,enginType)
+      this.$refs.ConstructionDetails.open(dicts, this.form.type,null,e.enginName,null,null,null,enginType)
       this.status = 'put'
     },
     viewNodeSource(e) {

+ 26 - 9
src/views/zdsz/engineeringGasOpening/index.vue

@@ -430,15 +430,32 @@
             <h1>灶前阀门</h1>
           </el-col>
         </el-row>
-        <el-form-item label="是否阀管改造" prop="gasChangeType">
-          <el-radio-group v-model="form.gasChangeType">
-            <el-radio
-                v-for="dict in dict.type.gas_change_type"
-                :key="dict.value"
-                :label="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="是否阀管改造" prop="gasChangeType">
+              <el-radio-group v-model="form.isGasChangeType">
+                <el-radio
+                    v-for="dict in dict.type.sys_yes_no"
+                    :key="dict.value"
+                    :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="form.isGasChangeType == 'Y'">
+          <el-col :span="24">
+            <el-form-item label="阀管改造类型" prop="gasChangeType">
+              <el-radio-group v-model="form.gasChangeType">
+                <el-radio
+                    v-for="dict in dict.type.gas_change_type"
+                    :key="dict.value"
+                    :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="20">
           <el-col :span="24">
             <el-form-item label="照片" style="width: 100%">