工业基本信息修改

huaxin-web/src/views/baseinfo/industry/components/DetailInfo.vue

@@ -35,7 +35,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="流量计品牌">
-                <span v-if="detailInfo.usernum">{{ detailInfo.usernum }}</span>
+                <span v-if="detailInfo.usernum">{{ $parent.meterModelCompanyFormatter(detailInfo) }}</span>
                 <span v-else>-</span>
               </el-form-item>
             </el-col>

huaxin-web/src/views/baseinfo/industry/index.vue

@@ -99,7 +99,7 @@
       <el-table-column label="单位名称" align="center" prop="company" width="180" :show-overflow-tooltip="true"/>
       <el-table-column label="联系人姓名" align="center" prop="username" />
       <el-table-column label="联系电话" align="center" prop="phone" />
-      <el-table-column label="流量计品牌" align="center" prop="usernum" />
+      <el-table-column label="流量计品牌" align="center" prop="usernum" :formatter="meterModelCompanyFormatter"/>
       <!--<el-table-column label="社会生产品种" align="center" prop="contract" />-->
       <el-table-column label="所属区域" align="center" prop="countyName" :show-overflow-tooltip="true">
         <template slot-scope="scope">
@@ -177,7 +177,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="流量计品牌" prop="usernum">
-              <el-select v-model="form.usernum" placeholder="请选择表具品牌" style="width: 100%">
+              <el-select v-model="form.usernum" placeholder="请选择流量计品牌" style="width: 100%">
                 <el-option
                   v-for="dict in meterCompanyOptions"
                   :key="dict.dictValue"
@@ -189,19 +189,19 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="流量计型号" prop="type">
-              <el-select v-model="form.type" placeholder="请选择流量计型号">
+              <el-select v-model.number="form.type" placeholder="请选择流量计型号">
                 <!--<el-option
                   v-for="dict in typeOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
                 ></el-option>-->
-                <el-option label="DN25" :value="1" />
-                <el-option label="DN50" :value="2" />
-                <el-option label="DN80" :value="3" />
-                <el-option label="DN100" :value="4" />
-                <el-option label="DN150" :value="5" />
-                <el-option label="DN200" :value="6" />
+                <el-option label="DN25" value="1" />
+                <el-option label="DN50" value="2" />
+                <el-option label="DN80" value="3" />
+                <el-option label="DN100" value="4" />
+                <el-option label="DN150" value="5" />
+                <el-option label="DN200" value="6" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -567,9 +567,9 @@ export default {
       const id = row.id || this.ids
       getIndustry(id).then(response => {
         this.form = response.data;
-        if(this.form.type!=null&&this.form.type!=''){
+        /*if(this.form.type!=null&&this.form.type!=''){
           this.form.type = this.form.type.split(',')
-        }
+        }*/
         this.getAreaListtwo(this.form.city,2);
         this.getAreaListtwo(this.form.county,3);
         this.open = true;
@@ -578,11 +578,11 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      if(this.form.type!=null&&this.form.type!=''){
+      /*if(this.form.type!=null&&this.form.type!=''){
         this.form.type = this.form.type.join(",")
       }else{
         this.form.type=''
-      }
+      }*/
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {