商业和工业基本信息修改

huaxin-system/src/main/java/com/zehong/system/domain/TBusiness.java

@@ -21,12 +21,12 @@ public class TBusiness extends BaseEntity
     /** $column.columnComment */
     private Long id;
 
-    /** 用户编号（表号） */
-    @Excel(name = "用户编号")
+    /** 表具编号（表号） */
+    @Excel(name = "表具编号")
     private String usernum;
 
     /** 合同号 */
-    @Excel(name = "合同号")
+    @Excel(name = "用户类型", readConverterExp = "1=小商业,2=大商业")
     private String contract;
 
     /** 市 */

huaxin-system/src/main/java/com/zehong/system/domain/TIndustry.java

@@ -22,29 +22,34 @@ public class TIndustry extends BaseEntity
     private Long id;
 
     /** 用户编号 */
-    @Excel(name = "用户编号")
+    @Excel(name = "流量计品牌")
     private String usernum;
 
-    /** 统一社会信用代码 */
-    @Excel(name = "统一社会信用代码")
+    /** 生产品种 */
+    @Excel(name = "生产品种")
     private String contract;
 
     /** 市 */
-    @Excel(name = "市")
     private Long city;
 
     /** 区/县 */
-    @Excel(name = "区/县")
     private Long county;
 
     /** 乡镇/街道 */
-    @Excel(name = "乡镇/街道")
     private Long street;
 
     /** 村 */
     @Excel(name = "村")
     private Long village;
 
+    private String cityName;
+
+    @Excel(name = "区/县")
+    private String countyName;
+
+    @Excel(name = "乡镇/街道")
+    private String streetName;
+
     /** 具体地址 */
     @Excel(name = "具体地址")
     private String address;
@@ -62,7 +67,7 @@ public class TIndustry extends BaseEntity
     private String company;
 
     /** 联系人姓名 */
-    @Excel(name = "联系人姓名")
+    @Excel(name = "联系人")
     private String username;
 
     /** 联系电话 */
@@ -70,7 +75,7 @@ public class TIndustry extends BaseEntity
     private String phone;
 
     /** 用气场景（字典表） */
-    @Excel(name = "用气场景", readConverterExp = "字=典表")
+    @Excel(name = "流量计型号", readConverterExp = "1=DN25,2=DN50,3=DN80,4=DN100,5=DN150,6=DN200")
     private String type;
 
     /** 开通状态（字典表） */
@@ -86,10 +91,6 @@ public class TIndustry extends BaseEntity
     @Excel(name = "最新安检id")
     private Long taskInspectId;
 
-    private String cityName;
-    private String countyName;
-    private String streetName;
-
     //巡检人
     private String inspector;
 

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

@@ -11,7 +11,7 @@
             </el-col>
 
             <el-col :span="12">
-              <el-form-item label="用户编号">
+              <el-form-item label="表具编号">
                 <span>{{ detailInfo.usernum }}</span>
               </el-form-item>
             </el-col>
@@ -19,8 +19,10 @@
 
           <el-row>
             <el-col :span="12">
-              <el-form-item label="合同号">
-                <span>{{ detailInfo.contract }}</span>
+              <el-form-item label="用户类型">
+                <span v-if="detailInfo.contract == '1'">小商业</span>
+                <span v-else-if="detailInfo.contract == '2'">大商业</span>
+                <span v-else>-</span>
               </el-form-item>
             </el-col>
 
@@ -113,7 +115,7 @@
       </el-col>
     </el-row>
 
-    <el-row>
+    <!--<el-row>
       <el-col :span="24">
         <div style="font-size: 14px;color: #606266;font-weight: 700;margin: 18px 1px 12px 0px;">燃气用具</div>
         <table border="1" cellspacing="0" style="width: 100%;text-align:center;">
@@ -157,7 +159,7 @@
 
       </el-col>
 
-    </el-row>
+    </el-row>-->
 
   </el-dialog>
 

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

@@ -2,20 +2,20 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
 
-      <el-form-item label="餐饮用户" prop="username">
+      <el-form-item label="商业用户" prop="username">
         <el-input
           v-model="queryParams.username"
-          placeholder="请输入餐饮用户"
+          placeholder="请输入商业用户"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
 
-      <el-form-item label="用户编号" prop="usernum">
+      <el-form-item label="表具编号" prop="usernum">
         <el-input
           v-model="queryParams.usernum"
-          placeholder="请输入用户编号"
+          placeholder="请输入表具编号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -90,9 +90,15 @@
 
     <el-table v-loading="loading" :data="businessList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="餐饮用户" align="center" prop="username" :show-overflow-tooltip="true"/>
-      <el-table-column label="用户编号" align="center" prop="usernum" :show-overflow-tooltip="true"/>
-      <!--<el-table-column label="合同号" align="center" prop="contract" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="商业用户" align="center" prop="username" :show-overflow-tooltip="true"/>
+      <el-table-column label="表具编号" align="center" prop="usernum" :show-overflow-tooltip="true"/>
+      <el-table-column label="用户类型" align="center" prop="contract" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span v-if="scope.row.contract == '1'">小商业</span>
+          <span v-else-if="scope.row.contract == '2'">大商业</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
      <!-- <el-table-column label="所属市" align="center" prop="county" width="120" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span v-if="scope.row.city">{{ getAddressFormatter(scope.row.city) }}</span>
@@ -157,28 +163,36 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改餐饮用户对话框 -->
+    <!-- 添加或修改商业用户对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body destroy-on-close :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="餐饮用户" prop="username">
+            <el-form-item label="商业用户" prop="username">
               <el-input v-model="form.username" placeholder="请输入用户姓名" />
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="用户编号" prop="usernum">
-              <el-input v-model="form.usernum" placeholder="请输入用户编号" />
+            <el-form-item label="表具编号" prop="usernum">
+              <el-input v-model="form.usernum" placeholder="请输入表具编号" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="合同号" prop="contract">
-              <el-input v-model="form.contract" placeholder="请输入合同号" />
+            <el-form-item label="用户类型" prop="contract">
+              <!--<el-input v-model="form.contract" placeholder="请输入合同号" />-->
+              <el-select
+                v-model="form.contract"
+                palceholder="请选择用户类型"
+                style="width: 100%"
+              >
+                <el-option label="小商业" value="1" />
+                <el-option label="大商业" value="2" />
+              </el-select>
             </el-form-item>
           </el-col>
 
@@ -268,19 +282,28 @@
         </el-row>
 
         <el-row>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="开通状态" prop="status">
-              <el-select v-model="form.status" placeholder="请选择开通状态" style="width: 100%">
+              <!--<el-select v-model="form.status" placeholder="请选择开通状态" style="width: 100%">
                 <el-option
                   v-for="item in openStatus"
                   :key="item.dictValue"
                   :label="item.dictLabel"
                   :value="item.dictValue"
                 />
-              </el-select>
+              </el-select>-->
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in openStatus"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                >{{dict.dictLabel}}</el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
+        </el-row>
 
+        <el-row>
           <el-col :span="12">
             <el-form-item label="通气日期" prop="starttime">
               <el-date-picker clearable size="small"
@@ -292,9 +315,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
 
-        <el-row>
           <el-col :span="12">
             <el-form-item label="表具类型" prop="meterType">
               <el-select v-model="form.meterType" placeholder="请选择表具类型" style="width: 100%">
@@ -303,6 +324,9 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row>
           <el-col :span="12">
             <el-form-item label="表具厂家" prop="meterCompany">
               <el-select v-model="form.meterCompany" placeholder="请选择表具厂家" style="width: 100%">
@@ -311,9 +335,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
 
-        <el-row>
           <el-col :span="12">
             <el-form-item label="表具型号" prop="meterModel">
               <el-select v-model="form.meterModel" placeholder="请选择表具型号" style="width: 100%">
@@ -323,6 +345,9 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row>
           <el-col :span="12">
             <el-form-item label="进气方向" prop="direction">
               <el-select v-model="form.direction" placeholder="请选择进气方向" style="width: 100%">
@@ -333,7 +358,7 @@
           </el-col>
         </el-row>
 
-        <el-row>
+        <!--<el-row>
           <el-form-item label="燃气用具" prop="direction">
             <el-form :model="gasUseDevice" label-width="80px">
               <el-row>
@@ -426,7 +451,7 @@
             </el-form>
           </el-form-item>
 
-        </el-row>
+        </el-row>-->
 
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -477,7 +502,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 餐饮用户表格数据
+      // 商业用户表格数据
       businessList: [],
       // 弹出层标题
       title: "",
@@ -516,7 +541,7 @@ export default {
           { required: true, message: "用户名不能为空", trigger: "blur" }
         ],
         usernum: [
-          { required: true, message: "用户编号不能为空", trigger: "blur" }
+          { required: true, message: "表具编号不能为空", trigger: "blur" }
         ],
         contract: [
           { required: true, message: "合同号不能为空", trigger: "blur" }
@@ -536,9 +561,9 @@ export default {
         address: [
           { required: true, message: "具体地址不能为空", trigger: "blur" }
         ],
-        longitude: [
+        /*longitude: [
           { required: true, message: "经纬度不能为空", trigger: "blur" }
-        ],
+        ],*/
         phone: [
           { required: true, message: "电话不能为空", trigger: "blur" },
           {
@@ -558,9 +583,9 @@ export default {
         status: [
           { required: true, message: "请选择开通状态", trigger: "change" }
         ],
-        starttime: [
+        /*starttime: [
           { required: true, message: "请选择通气日期", trigger: "change" }
-        ],
+        ],*/
       },
       meterType: [],
       openStatus: [],
@@ -596,7 +621,7 @@ export default {
     this.getAddressInfo();
   },
   methods: {
-    /** 查询餐饮用户列表 */
+    /** 查询商业用户列表 */
     getList() {
       this.loading = true;
       listBusiness(this.queryParams).then(response => {
@@ -681,7 +706,7 @@ export default {
       this.getProvinceInfo();
       this.resetGasUseDevice();
       this.open = true;
-      this.title = "添加餐饮用户";
+      this.title = "添加商业用户";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -696,7 +721,7 @@ export default {
         }
         this.gasUseDevice = JSON.parse(this.form.device);
         this.open = true;
-        this.title = "修改餐饮用户";
+        this.title = "修改商业用户";
       });
     },
     /** 提交按钮 */
@@ -724,7 +749,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       const userNames = row.username || this.userNames;
-      this.$confirm('是否确认删除餐饮用户名称为"' + userNames + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除商业用户名称为"' + userNames + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -738,7 +763,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有餐饮用户数据项?', "警告", {
+      this.$confirm('是否确认导出所有商业用户数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

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

@@ -10,14 +10,14 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="信用代码">
+              <el-form-item label="生产品种">
                 <span>{{ detailInfo.contract }}</span>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="用户姓名">
+              <el-form-item label="联系人">
                 <span>{{ detailInfo.username }}</span>
               </el-form-item>
             </el-col>
@@ -30,13 +30,19 @@
 
           <el-row>
             <el-col :span="12">
-              <el-form-item label="用户编号">
+              <el-form-item label="流量计品牌">
                 <span>{{ detailInfo.usernum }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="用气设施">
-                <span>{{ $parent.typeFormat(this.detailInfo) }}</span>
+              <el-form-item label="流量计型号">
+                <span v-if="detailInfo.type == '1'">DN25</span>
+                <span v-else-if="detailInfo.type == '2'">DN50</span>
+                <span v-else-if="detailInfo.type == '3'">DN80</span>
+                <span v-else-if="detailInfo.type == '4'">DN100</span>
+                <span v-else-if="detailInfo.type == '5'">DN150</span>
+                <span v-else-if="detailInfo.type == '6'">DN200</span>
+                <span v-else>-</span>
               </el-form-item>
             </el-col>
           </el-row>

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

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="用户编号" prop="usernum">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
+      <el-form-item label="流量计品牌" prop="usernum">
         <el-input
           v-model="queryParams.usernum"
-          placeholder="请输入用户编号"
+          placeholder="请输入流量计品牌"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -98,8 +98,8 @@
       <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="contract" />-->
+      <el-table-column label="流量计品牌" align="center" prop="usernum" />
+      <!--<el-table-column label="社会生产品种" align="center" prop="contract" />-->
       <el-table-column label="所属区域" align="center" prop="countyName" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           {{ scope.row.countyName }}
@@ -108,7 +108,17 @@
         </template>
       </el-table-column>
       <el-table-column label="具体地址" align="center" prop="streetName" width="180" :show-overflow-tooltip="true"/>
-      <!--<el-table-column label="用气场景" align="center" prop="type" :formatter="typeFormat" />-->
+      <el-table-column label="流量计型号" align="center" prop="type">
+        <template slot-scope="scope">
+          <span v-if="scope.row.type == '1'">DN25</span>
+          <span v-else-if="scope.row.type == '2'">DN50</span>
+          <span v-else-if="scope.row.type == '3'">DN80</span>
+          <span v-else-if="scope.row.type == '4'">DN100</span>
+          <span v-else-if="scope.row.type == '5'">DN150</span>
+          <span v-else-if="scope.row.type == '6'">DN200</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
       <el-table-column label="开通状态" align="center" prop="status" :formatter="statusFormat" />
       <el-table-column label="通气日期" align="center" prop="starttime" width="180">
         <template slot-scope="scope">
@@ -152,7 +162,7 @@
 
     <!-- 添加或修改工业用户对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
               <el-form-item label="单位名称" prop="company">
@@ -160,24 +170,30 @@
               </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="信用代码" prop="contract">
-              <el-input v-model="form.contract" placeholder="请输入统一社会信用代码" />
+            <el-form-item label="生产品种" prop="contract">
+              <el-input v-model="form.contract" placeholder="请输入生产品种" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="用户编号" prop="usernum">
-              <el-input v-model="form.usernum" placeholder="请输入用户编号" />
+            <el-form-item label="流量计品牌" prop="usernum">
+              <el-input v-model="form.usernum" placeholder="请输入流量计品牌" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="用气设施" prop="type">
-              <el-select multiple v-model="form.type" placeholder="请选择用气设施">
-                <el-option
+            <el-form-item label="流量计型号" prop="type">
+              <el-select multiple v-model="form.type" placeholder="请选择流量计型号">
+                <!--<el-option
                   v-for="dict in typeOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
-                ></el-option>
+                ></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-select>
             </el-form-item>
           </el-col>
@@ -370,17 +386,17 @@ export default {
           { required: true, message: "单位名称不能为空", trigger: "blur" }
         ],
         contract: [
-          { required: true, message: "统一社会信用代码不能为空", trigger: "blur" }
+          { required: true, message: "生产品种不能为空", trigger: "blur" }
         ],
         usernum: [
-          { required: true, message: "用户编号不能为空", trigger: "blur" }
+          { required: true, message: "流量计品牌不能为空", trigger: "blur" }
         ],
         type: [
           { required: true, message: "用气设置不能为空", trigger: "blur" }
         ],
-        username: [
+        /*username: [
           { required: true, message: "联系人不能为空", trigger: "blur" }
-        ],
+        ],*/
         phone: [
           { required: true, message: "用户手机不能为空", trigger: "blur" },
           {
@@ -400,9 +416,9 @@ export default {
         city: [
           { required: true, message: "区域不能为空", trigger: "change" }
         ],
-        longitude: [
+        /*longitude: [
           { required: true, message: "经纬度不能为空", trigger: "blur" }
-        ],
+        ],*/
       }
     };
   },

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

@@ -615,15 +615,15 @@
           city: [
             { required: true, message: "区域不能为空", trigger: "change" }
           ],
-          longitude: [
+          /*longitude: [
             { required: true, message: "经纬度不能为空", trigger: "blur" }
-          ],
+          ],*/
           status: [
             { required: true, message: "开通状态不能为空", trigger: "blur" }
           ],
-          position: [
+          /*position: [
             { required: true, message: "请选择表具位置", trigger: "change" }
-          ],
+          ],*/
           taskType: [
             { required: true, message: "请选择安检类型", trigger: "blur" }
           ],