商业安检

huaxin-system/src/main/java/com/zehong/system/service/impl/TTaskServiceImpl.java

@@ -212,7 +212,7 @@ public class TTaskServiceImpl implements ITTaskService
      */
     @Override
     public List<TTask> selectTaskByType(Map<String,Object> param){
-        return tTaskMapper.selectCurrentTaskByType(param);
+        return tTaskMapper.selectTaskByType(param);
     }
 
 

huaxin-system/src/main/resources/mapper/system/TIndustryMapper.xml

@@ -189,6 +189,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inspector != null and inspector != ''"> and us.nick_name like concat('%',#{inspector},'%')</if>
             <if test="taskType != null and taskType != ''">and industry.task_type = #{taskType}</if>
         </where>
-        order by taskInspect.create_time desc
+        order by taskInspect.status
     </select>
 </mapper>
\ No newline at end of file

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

@@ -104,7 +104,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="表具品牌">
-                <span v-if="detailInfo.meterModel">{{ $parent.meterModelCompanyFormatter(detailInfo) }}</span>
+                <span v-if="detailInfo.meterCompany > -1">{{ $parent.meterModelCompanyFormatter(detailInfo) }}</span>
                 <span v-else>-</span>
               </el-form-item>
             </el-col>
@@ -113,7 +113,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="表具型号">
-                <span v-if="detailInfo.meterModel">{{ $parent.branchFormat(detailInfo,null) }}</span>
+                <span v-if="detailInfo.meterModel">{{ $parent.meterModelFormatter(detailInfo,null) }}</span>
                 <span v-else>-</span>
               </el-form-item>
             </el-col>
@@ -202,7 +202,7 @@
         getBusiness(businessId).then(response => {
           this.detailInfo = response.data;
           this.title = "商业用户信息详情";
-          this.gasUseDevice = JSON.parse(this.detailInfo.device);
+          //this.gasUseDevice = JSON.parse(this.detailInfo.device);
           this.open = true;
           this.initMap();
         });

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

@@ -780,7 +780,7 @@ export default {
         if(this.form.street){
           this.getStree(this.form.county);
         }
-        this.gasUseDevice = JSON.parse(this.form.device);
+        //this.gasUseDevice = JSON.parse(this.form.device);
         this.open = true;
         this.title = "修改商业用户";
       });
@@ -789,7 +789,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          this.form.device = JSON.stringify(this.gasUseDevice);
+          //this.form.device = JSON.stringify(this.gasUseDevice);
           if (this.form.id != null) {
             updateBusiness(this.form).then(response => {
               this.msgSuccess("修改成功");

huaxin-web/src/views/checktask/inspect/jumInspect/index.vue

@@ -25,14 +25,17 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="用户编号">
+                <el-form-item label="表具编号">
                   <span>{{ detailInfo.usernum || "-" }}</span>
                 </el-form-item>
               </el-col>
 
               <el-col :span="8">
-                <el-form-item label="表计类型">
-                  <span>{{ typeFormat(this.detailInfo) || "-" }}</span>
+                <el-form-item label="用户类型">
+                  <!--<span>{{ typeFormat(this.detailInfo) || "-" }}</span>-->
+                  <span v-if="detailInfo.contract == '1'">小商业</span>
+                  <span v-else-if="detailInfo.contract == '2'">大商业</span>
+                  <span v-else>-</span>
                 </el-form-item>
               </el-col>
 
@@ -61,25 +64,21 @@
 
               <el-col :span="8">
                 <el-form-item label="表具类型">
-                  <span v-if="detailInfo.meterType == 1">皮膜</span>
-                  <span v-if="detailInfo.meterType == 2">超声</span>
-                  <span v-if="detailInfo.meterType == null">-</span>
+                  <span v-if="detailInfo.meterType">{{ typeFormatter(detailInfo) }}</span>
+                  <span>-</span>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="表具厂家">
-                  <span v-if="detailInfo.meterCompany == 1">金卡</span>
-                  <span v-if="detailInfo.meterCompany == 2">秦川</span>
-                  <span v-if="detailInfo.meterCompany == null">-</span>
+                <el-form-item label="表具品牌">
+                  <span v-if="detailInfo.meterCompany > -1">{{ meterModelCompanyFormatter(detailInfo) }}</span>
+                  <span v-else>-</span>
                 </el-form-item>
               </el-col>
 
               <el-col :span="8">
                 <el-form-item label="表具型号">
-                  <span v-if="detailInfo.meterModel == 1">G1.5</span>
-                  <span v-if="detailInfo.meterModel == 2">G2.5</span>
-                  <span v-if="detailInfo.meterModel == 3">G4</span>
-                  <span v-if="detailInfo.meterModel == null">-</span>
+                  <span v-if="detailInfo.meterModel">{{ meterModelFormatter(detailInfo,null) }}</span>
+                  <span v-else>-</span>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -95,11 +94,11 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="24">
+              <!--<el-col :span="24">
                 <el-form-item label="用气设施">
                   <span>{{ sheshiFormat(this.detailInfo) || "-" }}</span>
                 </el-form-item>
-              </el-col>
+              </el-col>-->
             </el-form>
 
             <el-form v-if="userType == 1" label-width="100px">
@@ -514,6 +513,9 @@ export default {
         barrel: "煮面桶",
         wall: "壁挂炉",
       },
+      meterCompany: [],
+      meterType: [],
+      meterModelOptional: []
     };
   },
   watch: {
@@ -536,6 +538,14 @@ export default {
     this.getDicts("t_user_scene").then((response) => {
       this.sceneOptions = response.data;
     });
+    this.getDicts("t_business_factory_meter_type").then((response) => {
+        this.meterCompany = response.data;
+    });
+    this.getMeterType();
+    this.getMeterCompany();
+    this.getDicts("t_business_meter_model").then((response) => {
+        this.meterModelOptional = response.data;
+    });
   },
   methods: {
     getDetailInfo(userId) {
@@ -558,7 +568,7 @@ export default {
           nickName: response.data.username,
           iconType: "19",
         });
-        this.gasUseDevice = JSON.parse(this.detailInfo.device);
+        //this.gasUseDevice = JSON.parse(this.detailInfo.device);
       });
     },
     //获取地址信息
@@ -633,16 +643,14 @@ export default {
     //详情
     handleDetail(row) {
       console.log(row);
-      console.log("--", JSON.parse(row.content));
       this.$refs.cyRecordDetail.open = true;
       this.$refs.cyRecordDetail.checkType = row.type;
       this.$refs.cyRecordDetail.map = row;
       this.$refs.cyRecordDetail.jsondata = JSON.parse(row.content);
       this.$refs.cyRecordDetail.detailInfo = this.detailInfo;
-      console.log(">>>>>>>>>>>>>>",JSON.parse(row.content))
-      if (row.type == 2) {
+      /*if (row.type == 2) {
         this.$refs.cyRecordDetail.device = JSON.parse(this.detailInfo.device);
-      }
+      }*/
     },
     // 表单重置
     reset() {
@@ -827,6 +835,35 @@ export default {
 
       this.$refs.cover.viewCoverPhoto(row.meterImg?row.meterImg:row.meterData);
     },
+    //表计类型
+    typeFormatter(row){
+      return this.selectDictLabel(
+        this.meterType,
+        row.type
+      );
+    },
+    meterModelFormatter(row){
+      return this.selectDictLabel(
+        this.meterModelOptional,
+        row.meterModel
+      );
+    },
+    meterModelCompanyFormatter(row){
+      return this.selectDictLabel(
+        this.meterCompany,
+        row.meterCompany
+      );
+    },
+    getMeterType(){
+      this.getDicts("t_meter_type").then((response) => {
+          this.meterType = response.data;
+      });
+    },
+    getMeterCompany(){
+      this.getDicts("t_business_factory_meter_type").then((response) => {
+          this.meterCompany = response.data;
+      });
+    },
   },
 };
 </script>