Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress

gassafetyprogress-web/src/views/complainDeal/index.vue

@@ -197,15 +197,17 @@
         <el-form-item label="转办记录" prop="transferRecord" :style="display">
           <el-input v-model="form.transferRecord" type="textarea"  placeholder="请输入转办记录" :disabled="readonly"/>
         </el-form-item>
-        <el-form-item label="任务状态" :style="display">
-          <el-select v-model="form.complainStatus" placeholder="请选择任务状态"   :disabled="readonly">
-            <el-option
-              v-for="dict in taskStateOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
+        <el-form-item label="任务状态" :style="display" >
+
+          <el-input v-model="form.complainStatus"  placeholder=""  :disabled="readonly"/>
+          <!--<el-select v-model="form.complainStatus" placeholder="请选择任务状态"   :disabled="readonly">-->
+            <!--<el-option-->
+              <!--v-for="dict in taskStateOptions"-->
+              <!--:key="dict.dictValue"-->
+              <!--:label="dict.dictLabel"-->
+              <!--:value="dict.dictValue"-->
+            <!--&gt;</el-option>-->
+          <!--</el-select>-->
         </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" :disabled="readonly"/>
@@ -359,7 +361,6 @@ export default {
       this.form.complainAssignEnterproseName = obj.enterpriseName;
       this.form.complainAssignEnterproseId = value;
       getUserList(value).then(response => {
-        console.log(response.data)
         //console.log(this.peopleList)
         this.peopleList=response.data;
       });
@@ -371,7 +372,6 @@ export default {
       });
       this.form.complainAssignManId === value;
       this.form.complainAssignMan = obj.nickName;
-      console.log(this.form);
     },
     // 取消按钮
     cancel() {
@@ -480,6 +480,8 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改投诉处置";
+        var statusName = this.selectDictLabel(this.taskStateOptions, row.complainStatus);
+        this.form.complainStatus=statusName;
     });
     },
     /** 删除按钮操作 */

gassafetyprogress-web/src/views/regulation/gasuser/index.vue

@@ -354,6 +354,7 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改燃气用户";
+        this.devicePos = [response.data.longitude, response.data.latitude];
       });
     },
     /** 提交按钮 */