报修端初步修改

src/views/Login.vue

@@ -244,7 +244,7 @@ export default {
           );
           // 判断是否有区域地点或联系电话，没有则需要补充 liaomingming
           var requester = res.data.data.requester;
-          if (!requester.place || !requester.mphone) {
+          if (!requester.place || !requester.phone) {
             this.$router.push({ path: "/supplementary" });
           } else {
             this.loginNext(res.data.data.requester);

src/views/evaluate.vue

@@ -165,8 +165,8 @@ export default {
             if(type === 'wechatRequesterIncident'){
               id = this.data.id;
             }else if(type === 'incident'){
-              if(this.data.incident){
-                id = this.data.incident.processInstanceId;
+              if(this.data){
+                id = this.data.processInstanceId;
               } else {
                 that['imgs_' + type] = [];
                 return;

src/views/incidentDetails.vue

@@ -5,15 +5,15 @@
         报修信息
       </div>
       <div class="state">
-        <div>报修编号：{{ data.bxcode }}</div>
+        <div>工单单号：{{ data.incidentsign }}</div>
         <div :class="stateClassFn(data.state.name)">{{ data.state.name }}</div>
       </div>
-      <div class="description">
+      <div class="description" v-if="data.category">
         <div>
           报修类别：
         </div>
         <div>
-          {{ data.category ? data.category.category : '' }}
+          {{ data.category.category }}
         </div>
       </div>
       <div class="description">
@@ -59,7 +59,7 @@
         <div>
           <template v-if="data.place">
             {{ data.place.area.area }} {{ data.place.place }}
-          {{ data.address }}
+          {{ data.houseNumber }}
           </template>
         </div>
       </div>
@@ -68,8 +68,8 @@
           维修总金额：
         </div>
         <div>
-          <template v-if="data.incident.repairSummaryDTO">
-            {{ data.incident.repairSummaryDTO.totalMaintenancePrice }}元
+          <template v-if="data.repairSummaryDTO">
+            {{ data.repairSummaryDTO.totalMaintenancePrice }}元
           </template>
         </div>
       </div>
@@ -89,25 +89,25 @@
       <div class="handleUser">
         <div>
           维修人：{{
-            data.incident.handlingPersonnelUser &&
-            data.incident.handlingPersonnelUser.name
-              ? data.incident.handlingPersonnelUser.name
+            data.handlingPersonnelUser &&
+            data.handlingPersonnelUser.name
+              ? data.handlingPersonnelUser.name
               : "暂无"
           }}
         </div>
         <div>
           电话：<a
-            :href="'tel:' + data.incident.handlingPersonnelUser.phone"
+            :href="'tel:' + data.handlingPersonnelUser.phone"
             v-if="
-              data.incident.handlingPersonnelUser &&
-                data.incident.handlingPersonnelUser.phone
+              data.handlingPersonnelUser &&
+                data.handlingPersonnelUser.phone
             "
-            >{{ data.incident.handlingPersonnelUser.phone }}</a
+            >{{ data.handlingPersonnelUser.phone }}</a
           >
           <span
             v-if="
-              !data.incident.handlingPersonnelUser ||
-                !data.incident.handlingPersonnelUser.phone
+              !data.handlingPersonnelUser ||
+                !data.handlingPersonnelUser.phone
             "
             >暂无</span
           >
@@ -116,16 +116,16 @@
         <i
           class="iconfont icon-shouji"
           v-if="
-            !data.incident.handlingPersonnelUser ||
-              !data.incident.handlingPersonnelUser.phone
+            !data.handlingPersonnelUser ||
+              !data.handlingPersonnelUser.phone
           "
         ></i>
         <a
           v-if="
-            data.incident.handlingPersonnelUser &&
-              data.incident.handlingPersonnelUser.phone
+            data.handlingPersonnelUser &&
+              data.handlingPersonnelUser.phone
           "
-          :href="'tel:' + data.incident.handlingPersonnelUser.phone"
+          :href="'tel:' + data.handlingPersonnelUser.phone"
           ><i class="iconfont icon-shouji"></i
         ></a>
       </div>
@@ -207,46 +207,6 @@
           v-html="processMessage[3] ? processMessage[3].desc : ''"
         ></div>
       </div>
-      <!-- 处理日志 start -->
-      <div v-for="(item, i) in data.incident.handlerLogs" :key="i">
-        <div
-          class="process"
-          v-if="
-            processData == '处理' ||
-              processData == '评价' ||
-              (processData == '结束' && processData != '重复事件')
-          "
-        >
-          <div class="status">
-            {{ processMessage[2] ? processMessage[2].name : "" }}
-          </div>
-          <div class="ico">
-            <i
-              class="iconfont icon-icon_zhengzaijinx now"
-              v-if="processData == '处理' && i === 0"
-            ></i>
-            <i
-              class="iconfont icon-icon_weizuo last"
-              v-else
-            ></i>
-          </div>
-          <div class="time">
-            {{ item.opTime | timeFormat("MM-dd HH:mm:ss")}}，{{ item.userName }}
-          </div>
-        </div>
-        <div
-          class="processCont"
-          v-if="
-            processData == '处理' ||
-              processData == '评价' ||
-              (processData == '结束' && processData != '重复事件')
-          "
-        >
-          <div class="status"></div>
-          <div class="conents"><span v-if="item.repairType && item.expectedDate">{{item.repairType.name}} {{item.expectedDate|timeFormat("MM月dd日前完成")}}</span><br>{{ item.opValue }}</div>
-        </div>
-      </div>
-      <!-- 处理日志 end -->
       <div
         class="process"
         v-if="
@@ -261,7 +221,7 @@
         <div class="ico">
           <i
             class="iconfont icon-icon_zhengzaijinx now"
-            v-if="processData == '处理' && !data.incident.handlerLogs"
+            v-if="processData == '处理'"
           ></i>
           <i
             class="iconfont icon-icon_weizuo last"
@@ -360,28 +320,6 @@
         ></div>
       </div>
     </div>
-    <!-- 处理日志 -->
-    <!-- <div class="repairProgress">
-      <div class="label">
-        处理日志
-      </div>
-      <div class="handlerLog">
-        <table class="handlerLog__table">
-          <tr>
-            <td class="xh">序号</td>
-            <td class="clr">处理人</td>
-            <td class="date">时间</td>
-            <td>内容</td>
-          </tr>
-          <tr v-for="(item,i) in data.incident.handlerLogs" :key="item.id">
-            <td>{{ i + 1 }}</td>
-            <td>{{ item.userName }}</td>
-            <td>{{ item.opTime | timeFormat("yyyy-MM-dd HH:mm:ss")}}</td>
-            <td>{{ item.opValue }}</td>
-          </tr>
-        </table>
-      </div>
-    </div> -->
     <!-- 撤回原因 -->
     <div class="label" v-if="processData == '已撤回'">
       撤回原因
@@ -408,13 +346,13 @@
     </div>
     <div class="chehui" v-if="processData == '申请'">
       <div class="btn" @click="cehui()">撤&nbsp;回</div>
-      <div class="btn" @click="goToSummary()" v-if="data.incident.duty && data.incident.duty.addSummary == 1">维修单</div>
+      <div class="btn" @click="goToSummary()" v-if="data.duty && data.duty.addSummary == 1">维修单</div>
     </div>
     <div class="chehui" v-if="processData == '评价'">
       <div class="btn" @click="evaluate()">评&nbsp;价</div>
-      <div class="btn" @click="goToSummary()" v-if="data.incident.duty && data.incident.duty.addSummary == 1">维修单</div>
+      <div class="btn" @click="goToSummary()" v-if="data.duty && data.duty.addSummary == 1">维修单</div>
     </div>
-    <div class="chehui" v-if="processData != '申请' && processData != '评价' && data.incident.duty && data.incident.duty.addSummary == 1">
+    <div class="chehui" v-if="processData != '申请' && processData != '评价' && data.duty && data.duty.addSummary == 1">
       <div class="btn" @click="goToSummary()">维修单</div>
     </div>
     <div class="fot"></div>
@@ -453,7 +391,7 @@ export default {
   methods: {
     goToSummary(){
       this.$router.push({
-        path: `/summaryOrderDetail/${this.data.incident.id}`
+        path: `/summaryOrderDetail/${this.data.id}`
       });
     },
     evaluate() {
@@ -548,12 +486,7 @@ export default {
     getParamsData() {
       this.data = JSON.parse(this.$route.params.data);
       console.log(this.data);
-      if(!this.data.incident.handlerLogs){
-        this.data.incident.handlerLogs = [];
-      }else{
-        this.data.incident.handlerLogs.reverse();
-      }
-      if (this.data.incident.repeat) {
+      if (this.data.repeat) {
         this.processData = "重复事件";
       } else if (this.data.state.name == "不受理") {
         this.processData = "不受理";
@@ -572,11 +505,11 @@ export default {
     },
     getProcessTime() {
       var that = this;
-      if (this.data.incident.processInstanceId) {
+      if (this.data.processInstanceId) {
         this.$http
           .post(
             "service/bpm/bpm/flowTracing/" +
-              this.data.incident.processInstanceId,
+              this.data.processInstanceId,
             {}
           )
           .then(function(res) {
@@ -590,8 +523,8 @@ export default {
       if(type === 'wechatRequesterIncident'){
         id = this.data.id;
       }else if(type === 'incident'){
-        if(this.data.incident){
-          id = this.data.incident.processInstanceId;
+        if(this.data){
+          id = this.data.id;
         } else {
           that['imgs_' + type] = [];
           return;
@@ -600,16 +533,11 @@ export default {
       this.$http
         .get(
           "service/common/common/listAttachment/"+ type +"/" + id,
-          {
-            // this.$http.get('service/common/common/listAttachment/wechatRequesterIncident/'+this.data.bxcode,{
-          }
+          {}
         )
         .then(function(res) {
           for (var i = 0; i < res.data.data.length; i++) {
-            // that.imgs_wechatRequesterIncident.push("http://localhost/service/common/common/downloadAttachment/"+res.data.data[i].token)
-            // that.imgs_wechatRequesterIncident.push("http://weixintest.ngser.dashitech.com/service/common/common/downloadAttachment/"+res.data.data[i].token)
             that['imgs_' + type].push(location.origin + '/file' + res.data.data[i].relativeFilePath);
-            // that.imgs_wechatRequesterIncident.push("http://192.168.3.95/service/common/common/downloadAttachment/"+res.data.data[i].token)
           }
         });
     },
@@ -630,32 +558,6 @@ export default {
         return "yichehui";
       }
     },
-    getProcessData() {
-      var that = this;
-      this.$http
-        .post(
-          "service/bpm/bpm/flowTracing/" + this.data.incident.processInstanceId,
-          {}
-        )
-        .then(function(res) {
-          var data = res.data.data;
-          // if(data.length==0&&that.data.state.name=="已解决"){
-          //     that.processData="不受理"
-          // }else if(data.length==0&&that.data.state.name=="未受理"){
-          //     that.processData="申请"
-          // }else if(data.length>0&&data[data.length-1].activityName=="接单"){
-          //     that.processData="处理"
-          // }else if(data.length>0&&data[data.length-1].activityName=="事件处理"){
-          //     that.processData="处理"
-          // }else if(data.length>0&&data[data.length-1].activityName=="事件关闭"){
-          //     that.processData="评价"
-          // }else if(data.length>0&&data[data.length-1].activityName=="结束"){
-          //     that.processData="结束"
-          // }else{
-          //     that.processData="已撤回"
-          // }
-        });
-    },
     getProcessMessageData() {
       var that = this;
       this.$http
@@ -669,11 +571,6 @@ export default {
         .then(function(res) {
           that.processMessage = res.data.list;
           console.log(that.processMessage);
-          // that.shenqing=that.processMessage[0].desc;
-          // that.shouli=that.processMessage[1].desc;
-          // that.chuli=that.processMessage[2].desc;
-          // that.pingjia=that.processMessage[3].desc;
-          // that.jieshu=that.processMessage[4].desc;
         });
     }
   },
@@ -686,7 +583,6 @@ export default {
     this.getParamsData();
     this.getImgsData('wechatRequesterIncident');
     this.getImgsData('incident');
-    this.getProcessData();
     this.getProcessMessageData();
     this.getProcessTime();
   }

src/views/incidentList.vue

@@ -28,7 +28,7 @@
                   <div class="title">
                     <div>
                       <i class="iconfont icon-baoxiuliebiao"></i
-                      ><span>{{ data.bxcode || "暂无" }}</span>
+                      ><span>{{ data.incidentsign || "暂无" }}</span>
                     </div>
                     <div :class="stateClassFn(data.state.name)">
                       {{ data.state.name }}
@@ -40,12 +40,12 @@
                   <div class="timeBox">
                     <div>
                       维修人：&nbsp;{{
-                        data.incident.handlingPersonnelUser
-                          ? data.incident.handlingPersonnelUser.name
+                        data.handlingPersonnelUser
+                          ? data.handlingPersonnelUser.name
                           : "暂无"
                       }}
                     </div>
-                    <div>报修时间：&nbsp;{{ data.createTime }}</div>
+                    <div>报修时间：&nbsp;{{ data.startDate }}</div>
                   </div>
                   <div
                     class="timeBox noneBorder"
@@ -130,36 +130,7 @@ export default {
       pullUpLoadMoreTxt: "Load more",
       pullUpLoadNoMoreTxt: "没有更多数据",
       customPullDown: true,
-      stateData: [
-        {
-          text: "全部",
-          value: 0,
-        },
-        {
-          text: "未受理",
-          value: 1592,
-        },
-        {
-          text: "不受理",
-          value: 1593,
-        },
-        {
-          text: "处理中",
-          value: 1594,
-        },
-        {
-          text: "待评价",
-          value: 1595,
-        },
-        {
-          text: "已解决",
-          value: 1596,
-        },
-        {
-          text: "已撤回",
-          value: 1597,
-        },
-      ],
+      stateData: [],
       stateValue: 0,
       sum: 10,
       idx: 0,
@@ -203,6 +174,19 @@ export default {
     },
   },
   methods: {
+    getIncidentStatus(){
+        this.$http.post('service/common/common/getDictionary',{
+            key: "incident_status",
+            type: "list"
+        }).then((res) => {
+            let stateData = res.data.map(v => ({
+              text: v.name,
+              value: v.id,
+            }));
+            this.stateData = [...[{text: '全部', value: 0}], ...stateData];
+            this.getData(this.idx, this.sum);
+        })
+    },
     changeTab(tab){
       this.avtiveTabId = tab.id;
       this.stateChange();
@@ -234,26 +218,27 @@ export default {
       this.loadShow = true;
       that.items = [];
       this.$http
-        .post("service/apply/bpm/fetchServiceTasks", {
-          deptId: that.loginUser.dept?that.loginUser.dept.id:undefined,
-          state: that.stateValue,
+        .post("service/user/data/fetchDataList/incident", {
           idx: 0,
           sum: 10,
-          assignee: this.avtiveTabId == -1 ? this.loginUser.account : undefined,
-          deptId: this.avtiveTabId == -2 ? this.loginUser.dept.id : undefined,
+          incident: {
+            requester: this.avtiveTabId == -1 ? { id: this.loginUser.id } : undefined,
+            department: this.avtiveTabId == -2 ? { id: this.loginUser.dept.id } : undefined,
+            statusId: that.stateValue || undefined,
+          }
         })
         .then((res) => {
-          if (res.data.data.length > 0) {
-            for (var i = 0; i < res.data.data.length; i++) {
-              res.data.data[i].createTime = formatDate(
-                new Date(res.data.data[i].createTime),
+          if (res.data.list.length > 0) {
+            for (var i = 0; i < res.data.list.length; i++) {
+              res.data.list[i].startDate = formatDate(
+                new Date(res.data.list[i].startDate),
                 "yyyy-MM-dd hh:mm"
               );
             }
             if (this.idx) {
-              this.items = this.items.concat(res.data.data);
+              this.items = this.items.concat(res.data.list);
             } else {
-              this.items = res.data.data;
+              this.items = res.data.list;
             }
           } else {
             that.$refs.scroll.forceUpdate();
@@ -276,27 +261,27 @@ export default {
         var that = this;
         // that.items=[];
         this.$http
-          .post("service/apply/bpm/fetchServiceTasks", {
-            // assignee: that.loginUser.account,
-            deptId: that.loginUser.dept?that.loginUser.dept.id:undefined,
-            state: that.stateValue,
+          .post("service/user/data/fetchDataList/incident", {
             idx: 0,
             sum: 10,
-            assignee: this.avtiveTabId == -1 ? this.loginUser.account : undefined,
-            deptId: this.avtiveTabId == -2 ? this.loginUser.dept.id : undefined,
+            incident: {
+              requester: this.avtiveTabId == -1 ? { id: this.loginUser.id } : undefined,
+              department: this.avtiveTabId == -2 ? { id: this.loginUser.dept.id } : undefined,
+              statusId: that.stateValue || undefined,
+            }
           })
           .then((res) => {
-            if (res.data.data.length > 0) {
-              for (var i = 0; i < res.data.data.length; i++) {
-                res.data.data[i].createTime = formatDate(
-                  new Date(res.data.data[i].createTime),
+            if (res.data.list.length > 0) {
+              for (var i = 0; i < res.data.list.length; i++) {
+                res.data.list[i].startDate = formatDate(
+                  new Date(res.data.list[i].startDate),
                   "yyyy-MM-dd hh:mm"
                 );
               }
               if (this.idx) {
-                this.items = this.items.concat(res.data.data);
+                this.items = this.items.concat(res.data.list);
               } else {
-                this.items = res.data.data;
+                this.items = res.data.list;
               }
             } else {
               that.$refs.scroll.forceUpdate();
@@ -307,26 +292,27 @@ export default {
     getData(idx, sum) {
       var that = this;
       this.$http
-        .post("service/apply/bpm/fetchServiceTasks", {
-          deptId: that.loginUser.dept?that.loginUser.dept.id:undefined,
-          state: that.stateValue,
+        .post("service/user/data/fetchDataList/incident", {
           idx: idx,
           sum: sum,
-          assignee: this.avtiveTabId == -1 ? this.loginUser.account : undefined,
-          deptId: this.avtiveTabId == -2 ? this.loginUser.dept.id : undefined,
+          incident: {
+            requester: this.avtiveTabId == -1 ? { id: this.loginUser.id } : undefined,
+            department: this.avtiveTabId == -2 ? { id: this.loginUser.dept.id } : undefined,
+            statusId: that.stateValue || undefined,
+          }
         })
         .then((res) => {
-          if (res.data.data.length > 0) {
-            for (var i = 0; i < res.data.data.length; i++) {
-              res.data.data[i].createTime = formatDate(
-                new Date(res.data.data[i].createTime),
+          if (res.data.list.length > 0) {
+            for (var i = 0; i < res.data.list.length; i++) {
+              res.data.list[i].startDate = formatDate(
+                new Date(res.data.list[i].startDate),
                 "yyyy-MM-dd hh:mm"
               );
             }
             if (this.idx) {
-              this.items = this.items.concat(res.data.data);
+              this.items = this.items.concat(res.data.list);
             } else {
-              this.items = res.data.data;
+              this.items = res.data.list;
             }
           } else {
             this.$refs.scroll.forceUpdate();
@@ -338,26 +324,27 @@ export default {
       var that = this;
       that.idx = that.idx + 1;
       this.$http
-        .post("service/apply/bpm/fetchServiceTasks", {
-          deptId: that.loginUser.dept?that.loginUser.dept.id:undefined,
-          state: that.stateValue,
+        .post("service/user/data/fetchDataList/incident", {
           idx: that.idx,
           sum: that.sum,
-          assignee: this.avtiveTabId == -1 ? this.loginUser.account : undefined,
-          deptId: this.avtiveTabId == -2 ? this.loginUser.dept.id : undefined,
+          incident: {
+            requester: this.avtiveTabId == -1 ? { id: this.loginUser.id } : undefined,
+            department: this.avtiveTabId == -2 ? { id: this.loginUser.dept.id } : undefined,
+            statusId: that.stateValue || undefined,
+          }
         })
         .then((res) => {
-          for (var i = 0; i < res.data.data.length; i++) {
-            res.data.data[i].createTime = formatDate(
-              new Date(res.data.data[i].createTime),
+          for (var i = 0; i < res.data.list.length; i++) {
+            res.data.list[i].startDate = formatDate(
+              new Date(res.data.list[i].startDate),
               "yyyy-MM-dd hh:mm"
             );
           }
-          if (res.data.data.length > 0) {
+          if (res.data.list.length > 0) {
             if (this.idx) {
-              this.items = this.items.concat(res.data.data);
+              this.items = this.items.concat(res.data.list);
             } else {
-              this.items = res.data.data;
+              this.items = res.data.list;
             }
           } else {
             that.$refs.scroll.forceUpdate();
@@ -399,7 +386,7 @@ export default {
   mounted() {
     this.getParamsState();
     setTimeout(()=>{
-      this.getData(this.idx, this.sum);
+      this.getIncidentStatus();
     },0)
   },
 };

src/views/indes.vue

@@ -59,106 +59,104 @@
             >更多<i class="iconfont icon-moren"></i
           ></span>
         </div>
-        <div
-          class="conentBox"
-          v-for="v in newRapirData"
-          @click="toIncidentDetails(v)"
-          v-if="!newRapirNoData && !newRapirLoading"
-        >
-          <div class="conent">
-            <div class="head">
-              <!-- <span>{{v.requester.name}}</span> -->
-              <span>报修编号:{{ v.bxcode }}</span>
-              <span>{{ v.createTime }}</span>
-            </div>
-            <div class="cot">
-              {{ v.description }}
+        <template v-if="!newRapirNoData && !newRapirLoading">
+          <div class="conentBox" v-for="v in newRapirData" :key="v.id" @click="toIncidentDetails(v)">
+            <div class="conent">
+              <div class="head">
+                <!-- <span>{{v.requester.name}}</span> -->
+                <span>工单单号:{{ v.incidentsign }}</span>
+                <span>{{ v.startDate }}</span>
+              </div>
+              <div class="cot">
+                {{ v.description }}
+              </div>
             </div>
-          </div>
-          <div class="flowChart">
-            <div class="pits">
-              <div :class="state != 1 ? 'yesLine' : ''"></div>
-              <div :class="state != 1 && state != 2 ? 'yesLine' : ''"></div>
-              <div
-                :class="state != 1 && state != 2 && state != 3 ? 'yesLine' : ''"
-              ></div>
-              <div
-                :class="
-                  state != 1 && state != 2 && state != 3 && state != 4
-                    ? 'yesLine'
-                    : ''
-                "
-              ></div>
+            <div class="flowChart">
+              <div class="pits">
+                <div :class="state != 1 ? 'yesLine' : ''"></div>
+                <div :class="state != 1 && state != 2 ? 'yesLine' : ''"></div>
+                <div
+                  :class="state != 1 && state != 2 && state != 3 ? 'yesLine' : ''"
+                ></div>
+                <div
+                  :class="
+                    state != 1 && state != 2 && state != 3 && state != 4
+                      ? 'yesLine'
+                      : ''
+                  "
+                ></div>
 
-              <i class="iconfont icon-icon_weizuo shenqing no" v-if="false"></i>
-              <i
-                class="iconfont icon-icon_weizuo shouli no"
-                v-if="state == 1"
-              ></i>
-              <i
-                class="iconfont icon-icon_weizuo chuli no"
-                v-if="state == 2 || state == 1"
-              ></i>
-              <i
-                class="iconfont icon-icon_weizuo pingjia no"
-                v-if="state == 3 || state == 2 || state == 1"
-              ></i>
-              <i
-                class="iconfont icon-icon_weizuo wancheng no"
-                v-if="state == 4 || state == 3 || state == 2 || state == 1"
-              ></i>
+                <i class="iconfont icon-icon_weizuo shenqing no" v-if="false"></i>
+                <i
+                  class="iconfont icon-icon_weizuo shouli no"
+                  v-if="state == 1"
+                ></i>
+                <i
+                  class="iconfont icon-icon_weizuo chuli no"
+                  v-if="state == 2 || state == 1"
+                ></i>
+                <i
+                  class="iconfont icon-icon_weizuo pingjia no"
+                  v-if="state == 3 || state == 2 || state == 1"
+                ></i>
+                <i
+                  class="iconfont icon-icon_weizuo wancheng no"
+                  v-if="state == 4 || state == 3 || state == 2 || state == 1"
+                ></i>
 
-              <i
-                class="iconfont icon-icon_weizuo shenqing yes"
-                v-if="state != 1"
-              ></i>
-              <i
-                class="iconfont icon-icon_weizuo shouli yes"
-                v-if="state != 1 && state != 2"
-              ></i>
-              <i
-                class="iconfont icon-icon_weizuo chuli yes"
-                v-if="state != 1 && state != 2 && state != 3"
-              ></i>
-              <i
-                class="iconfont icon-icon_weizuo pingjia yes"
-                v-if="state != 1 && state != 2 && state != 3 && state != 4"
-              ></i>
-              <i
-                class="iconfont icon-icon_weizuo wancheng yes"
-                v-if="false"
-              ></i>
+                <i
+                  class="iconfont icon-icon_weizuo shenqing yes"
+                  v-if="state != 1"
+                ></i>
+                <i
+                  class="iconfont icon-icon_weizuo shouli yes"
+                  v-if="state != 1 && state != 2"
+                ></i>
+                <i
+                  class="iconfont icon-icon_weizuo chuli yes"
+                  v-if="state != 1 && state != 2 && state != 3"
+                ></i>
+                <i
+                  class="iconfont icon-icon_weizuo pingjia yes"
+                  v-if="state != 1 && state != 2 && state != 3 && state != 4"
+                ></i>
+                <i
+                  class="iconfont icon-icon_weizuo wancheng yes"
+                  v-if="false"
+                ></i>
 
-              <i
-                class="iconfont icon-icon_zhengzaijinx shenqing now"
-                v-if="state == 1"
-              ></i>
-              <i
-                class="iconfont icon-icon_zhengzaijinx shouli now"
-                v-if="state == 2"
-              ></i>
-              <i
-                class="iconfont icon-icon_zhengzaijinx chuli now"
-                v-if="state == 3"
-              ></i>
-              <i
-                class="iconfont icon-icon_zhengzaijinx pingjia now"
-                v-if="state == 4"
-              ></i>
-              <i
-                class="iconfont icon-icon_zhengzaijinx wancheng now"
-                v-if="state == 5"
-              ></i>
-            </div>
-            <div class="words">
-              <div>申请</div>
-              <div>受理</div>
-              <div>处理</div>
-              <div>评价</div>
-              <div>完成</div>
+                <i
+                  class="iconfont icon-icon_zhengzaijinx shenqing now"
+                  v-if="state == 1"
+                ></i>
+                <i
+                  class="iconfont icon-icon_zhengzaijinx shouli now"
+                  v-if="state == 2"
+                ></i>
+                <i
+                  class="iconfont icon-icon_zhengzaijinx chuli now"
+                  v-if="state == 3"
+                ></i>
+                <i
+                  class="iconfont icon-icon_zhengzaijinx pingjia now"
+                  v-if="state == 4"
+                ></i>
+                <i
+                  class="iconfont icon-icon_zhengzaijinx wancheng now"
+                  v-if="state == 5"
+                ></i>
+              </div>
+              <div class="words">
+                <div>申请</div>
+                <div>受理</div>
+                <div>处理</div>
+                <div>评价</div>
+                <div>完成</div>
+              </div>
             </div>
           </div>
-        </div>
+        </template>
+
         <!-- 无数据 -->
         <div class="wushuju" v-if="newRapirNoData">
           <img src="./../../static/images/wushuju.svg" alt="" />
@@ -183,7 +181,7 @@
         <div class="conentBox" v-if="!newNoticeNoData && !newNoticeLoading">
           <div
             class="conent"
-            v-for="v in noticeData"
+            v-for="v in noticeData" :key="v.id"
             @click="toNoticeDetails(v)"
           >
             <div class="head">
@@ -260,46 +258,36 @@ export default {
     getNewRapir() {
       var that = this;
       this.$http
-        .post("service/apply/bpm/fetchServiceTasks", {
-          deptId: that.loginUser.dept?that.loginUser.dept.id:undefined,
+        .post("service/user/data/fetchDataList/incident", {
+          incident: {
+            department: that.loginUser.dept ? { id: that.loginUser.dept.id, } : undefined,
+            source:{value:'im'}
+          },
           idx: 0,
           sum: 1
         })
         .then(function(res) {
           that.newRapirLoading = false;
-          if (res.data.data.length > 0) {
+          if (res.data.list.length > 0) {
             that.newRapirNoData = false;
-            that.newRapirData = res.data.data;
-            that.newRapirData[0].createTime = formatDate(
-              new Date(that.newRapirData[0].createTime),
+            that.newRapirData = res.data.list;
+            that.newRapirData[0].startDate = formatDate(
+              new Date(that.newRapirData[0].startDate),
               "MM-dd hh:mm"
             );
-            if (
-              that.newRapirData[0].state.name == "未受理" ||
-              that.newRapirData[0].state.name == "未受理"
-            ) {
+            if (that.newRapirData[0].state.value == "accept" || that.newRapirData[0].state.value == "storage" || that.newRapirData[0].state.value == "reassign") {
               that.state = 1;
-            } else if (that.newRapirData[0].state.name == "已受理") {
+            } else if (that.newRapirData[0].state.value == "pending") {
               that.state = 2;
-            } else if (that.newRapirData[0].state.name == "处理中") {
+            } else if (that.newRapirData[0].state.value == "handler") {
               that.state = 3;
-            } else if (that.newRapirData[0].state.name == "待评价") {
+            } else if (that.newRapirData[0].state.value == "resolved") {
               that.state = 4;
-            } else if (that.newRapirData[0].state.name == "已解决") {
+            } else if (that.newRapirData[0].state.value == "close") {
               that.state = 5;
             } else {
               that.state = 5;
             }
-            if (
-              that.newRapirData[0].incident.state &&
-              that.newRapirData[0].incident.state.name
-            ) {
-              if (that.newRapirData[0].incident.state.name == "待接单") {
-                that.state = 3;
-              } else if (that.newRapirData[0].incident.state.name == "处理中") {
-                that.state = 3;
-              }
-            }
             console.log(that.state);
           } else {
             that.newRapirNoData = true;

src/views/my.vue

@@ -52,7 +52,7 @@
 
         <li>
           <div><span class="red">*</span>联系电话</div>
-          <div><cube-input v-model="loginUser.mphone" class="inputName"></cube-input></div>
+          <div><cube-input v-model="loginUser.phone" class="inputName"></cube-input></div>
         </li>
 
       </ul>
@@ -253,7 +253,7 @@ export default {
         }).show();
         return;
       }
-      if (!this.loginUser.mphone) {
+      if (!this.loginUser.phone) {
         this.$createDialog({
           type: "alert",
           content: "联系电话不能为空",
@@ -268,9 +268,8 @@ export default {
       });
       toast.show();
       this.$http
-        .post("service/user/data/addData/requester", {
-          repairType: this.repairMain.valueconfig,
-          requester: this.loginUser,
+        .post("service/user/data/addData/user", {
+          user: this.loginUser,
         })
         .then((res) => {
           toast.hide();
@@ -296,6 +295,9 @@ export default {
     }
   },
   created() {
+    if(this.loginUser.place){
+      this.loginUser.area = this.loginUser.place.area;
+    }
     // 回显选择的报修科室
     if(this.$route.params.dataInfo){
       this.loginUser = this.$route.params.dataInfo;

src/views/myModify.vue

@@ -38,17 +38,17 @@ export default {
             value: this.loginUser.houseNumber
           };
           break;
-        case "mphone":
+        case "phone":
           this.value = {
-            type: "mphone",
+            type: "phone",
             name: "联系电话",
-            value: this.loginUser.mphone
+            value: this.loginUser.phone
           };
           break;
       }
     },
     sub() {
-      if (!this.value.value && this.value.type == "mphone") {
+      if (!this.value.value && this.value.type == "phone") {
         this.$createDialog({
           type: "alert",
           title: "保存失败",
@@ -67,11 +67,11 @@ export default {
               houseNum: that.value.value
             };
             break;
-          case "mphone":
+          case "phone":
             url = "service/user/updPhone";
             postData = {
               reqId: that.loginUser.id,
-              mphone: that.value.value
+              phone: that.value.value
             };
             break;
         }

src/views/repair.vue

@@ -441,74 +441,79 @@ export default {
     },
     submmitBx(){
       var that = this;
-      this.$http.get("service/bpm/bpm/restful/sj", {}).then((res) => {
-        that.model.incidentsign = res.data.data;
-        delete this.model.pcaValue;
-        this.model["requester"] = this.loginUser;
-        this.model.fileUrl = "url";
-        this.model.sourceType = "wechatRequesterIncident";
-        var reqData = {
-          incident: JSON.parse(JSON.stringify(this.model))
-        };
-        //  报修主体是报修科室的时候，不传科室id
-        if (this.repairMain.valueconfig == 2) {
-          reqData.incident.deptId = this.deptId;
-        } else {
-          delete reqData.incident.deptId;
-        }
-        if (this.ifRoom == 1) {
-          reqData.incident.roomId = this.model.roomId;
-        } else {
-          delete reqData.incident.roomId;
-        }
-        reqData.incident.branch = this.model.branch || undefined;
-        this.$http
-          .post("service/flow/incident/task/request", reqData)
-          .then(function(res) {
-            if (res.data.state == 200) {
-              that.action.target = that.action.target + res.data.data.id;
-              setTimeout(function() {
-                that.$refs.upload.start();
-              }, 100);
-              $("#fade").fadeIn();
-              that.promptingConent = "恭喜您,新建报修成功!";
-              that.promptingStatus = true;
-              that.dialog = that
-                .$createDialog({
-                  type: "alert",
-                  title: "报修成功",
-                  content: "点击返回首页",
-                  icon: "cubeic-right",
-                  onConfirm: (e, promptValue) => {
-                    that.$router.push({ path: "/main" });
-                  }
-                })
-                .show();
-              setTimeout(function() {
-                $("#fade").fadeOut();
-              }, 2000);
-            } else {
-              $("#fade").fadeIn();
-              that.promptingConent = "系统错误,请稍后再试!";
-              that.promptingStatus = false;
-              that.loadShow = false;
-              that.dialog = that
-                .$createDialog({
-                  type: "alert",
-                  title: "系统错误,请稍后再试!",
-                  content: "点击返回首页",
-                  icon: "cubeic-wrong",
-                  onConfirm: (e, promptValue) => {
-                    that.$router.push({ path: "/main" });
-                  }
-                })
-                .show();
-              setTimeout(function() {
-                $("#fade").fadeOut();
-              }, 2000);
-            }
-          });
+      this.$http.post('service/common/common/getDictionary',{
+          key: "incident_source",
+          type: "list"
+      }).then((res1) => {
+          let incidentSourceList = res1.data || [];
+          let im = incidentSourceList.find(v => v.value === 'im');
+          this.$http.get("service/bpm/bpm/restful/sj", {}).then((res2) => {
+          var reqData = {
+            incident: {
+              "incidentsign": res2.data.data,
+              "deleteFlag": 0,
+              "department": { id: this.deptId },
+              "contactsInformation": this.model.contactsInformation,
+              "contacts": this.model.contacts,
+              "branch": this.model.branch,
+              "area": { id: this.model.areaId },
+              "place": { id: this.model.placeId },
+              "houseNumber":this.model.address,
+              "source": im,
+              "description": this.model.description,
+              "repairType": JSON.parse(localStorage.getItem("repairMain"))?JSON.parse(localStorage.getItem("repairMain")).valueconfig:undefined,
+              "requester": this.loginUser,
+              "acceptUser": this.loginUser,
+            },
+          };
+          this.$http
+            .post("service/flow/incident/task/request", reqData)
+            .then(function(res) {
+              if (res.data.state == 200) {
+                that.action.target = that.action.target + res.data.data.id;
+                setTimeout(function() {
+                  that.$refs.upload.start();
+                }, 100);
+                $("#fade").fadeIn();
+                that.promptingConent = "恭喜您,新建报修成功!";
+                that.promptingStatus = true;
+                that.dialog = that
+                  .$createDialog({
+                    type: "alert",
+                    title: "报修成功",
+                    content: "点击返回首页",
+                    icon: "cubeic-right",
+                    onConfirm: (e, promptValue) => {
+                      that.$router.push({ path: "/main" });
+                    }
+                  })
+                  .show();
+                setTimeout(function() {
+                  $("#fade").fadeOut();
+                }, 2000);
+              } else {
+                $("#fade").fadeIn();
+                that.promptingConent = "系统错误,请稍后再试!";
+                that.promptingStatus = false;
+                that.loadShow = false;
+                that.dialog = that
+                  .$createDialog({
+                    type: "alert",
+                    title: "系统错误,请稍后再试!",
+                    content: "点击返回首页",
+                    icon: "cubeic-wrong",
+                    onConfirm: (e, promptValue) => {
+                      that.$router.push({ path: "/main" });
+                    }
+                  })
+                  .show();
+                setTimeout(function() {
+                  $("#fade").fadeOut();
+                }, 2000);
+              }
+            });
         });
+      })
     },
     // 获取报修类别
     getCategory(){

src/views/supplementary.vue

@@ -17,8 +17,8 @@
         </li>
         <li>
           <div>联系电话</div>
-          <div class="factionAdd" @click="toModify('mphone')">
-            <span>{{ loginUser.mphone || "暂无" }}</span>
+          <div class="factionAdd" @click="toModify('phone')">
+            <span>{{ loginUser.phone || "暂无" }}</span>
             <i class="iconfont icon-moren"></i>
           </div>
         </li>
@@ -101,7 +101,7 @@ export default {
       // seimin
     },
     goToSystem() {
-      if (!this.loginUser.mphone) {
+      if (!this.loginUser.phone) {
         this.$createDialog({
           type: "alert",
           content: "联系电话不能为空",