Merge branch 'master' of http://111.30.93.211:10101/r/supipe

李旭东

2023-12-08 7efc6ed86025b610cab109a2e9f83362740d8ed4

 web/src/views/ProjectManage/components/RawConsump.vue

@@ -137,7 +137,7 @@
                            :size="size"
                            type="number"
                            placeholder="请输入">
                            <template slot="append">吨</template>
                            <template slot="append">kg</template>
                        </el-input>
                    </template>
                </el-table-column>
@@ -247,15 +247,13 @@
      this.$api.Reinforce.searchProjectSize({proId:val,pageNum: 1,
          pageSize:100000000}).then(res=>{
        if(res.statusMsg === 'ok'){
          if(this.search.proId ===""){
          if(val ===""){
            this.optionsSize = []
            this.search.size = ""
            this.search.reinforcement = ""
          }else if(this.ruleForm.proId ===""){
            this.optionsSize = []
            this.ruleForm.size = ""
            this.ruleForm.reinforcement = ""
            this.ruleForm.blockNum = ""
            this.$set(this.ruleForm,'size','')
            this.$set(this.ruleForm,'reinforcement','')
            this.$set(this.ruleForm,'blockNum','')
          }else{
            this.optionsSize = res.data.list
          }
@@ -304,7 +302,7 @@
            let titles = []
            titles =res.data.tableHeader.map(item=>{
                return{
                    label:item.headName+'(吨)',
                    label:item.headName+'(kg)',
                    prop:item.fieldName
                }
            })