wangtong 1 год назад
Родитель
Сommit
bd715d0d99

+ 17 - 19
src/components/ConstructionDetails/index.vue

@@ -127,10 +127,10 @@
 
                   <el-form-item
                     v-if="currentDicts.some(item=>item.label==='底腿')"
-                    :prop="i.number + ''"
+                    :prop="i.remark + ''"
                     :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                     label="第"
-                    v-show="i.number != null"
+                    v-show="i.remark != null"
                     label-width="95px"
                   >
                     <div class="block" style="display: inline-block; margin-right: 20px;">
@@ -138,20 +138,18 @@
                     </div>
                   </el-form-item>
 
+                    <el-form-item
+                      :prop="i.number + ''"
+                      :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
+                      label="数量"
+                      v-show="i.number != null"
+                      label-width="95px"
+                      >
+                      <div class="block" style="display: inline-block; margin-right: 20px;">
+                        <el-input v-model="i.number" placeholder="请输入数量" style="width: 100%"  oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''"  max="999999999" :disabled="status == 'read-only'"> </el-input>
 
-<!--                    <el-form-item-->
-<!--                      v-else-->
-<!--                      :prop="i.number + ''"-->
-<!--                      :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "-->
-<!--                      label="米数"-->
-<!--                      v-show="i.number != null"-->
-<!--                      label-width="95px"-->
-<!--                      >-->
-<!--                      <div class="block" style="display: inline-block; margin-right: 20px;">-->
-<!--                        <el-input v-model="i.number" placeholder="请输入数量" style="width: 100%"  oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''"  max="999999999" :disabled="status == 'read-only'"> <template slot="append">米</template></el-input>-->
-
-<!--                      </div>-->
-<!--                    </el-form-item>-->
+                      </div>
+                    </el-form-item>
 
 
                     <el-form-item
@@ -714,10 +712,10 @@ export default {
         })
       }
       //data.enginStep = this.node
-      data.enginNode = enginClassification
-      getEnginMaterialQualityList(data).then(res => {
-        this.materialQualityList = res.data
-      })
+      // data.enginNode = enginClassification
+      // getEnginMaterialQualityList(data).then(res => {
+      //   this.materialQualityList = res.data
+      // })
       }
       this.currentStatus = currentStatus
       this.titleName = title

+ 1 - 0
src/views/zdsz/engineeringIndustry/index.vue

@@ -691,6 +691,7 @@ export default {
     },
     // 历史查询
     viewSource(e) {
+      console.log(e)
       this.currentId = e.id
       this.$refs.ConstructionDetails.open(_, this.form.type)
       this.status = 'read-only'