列表增加派单功能,BUG修复

src/components/showModel/showModel.vue

@@ -0,0 +1,298 @@
+<template>
+  <div class="showModel" v-if="disjunctor">
+    <div class="showModel__wrap">
+      <div class="showModel__header" v-if="title">
+        {{ title }}
+        <span v-if="operate.know == '知道了' && timerFlag">({{ time }})</span>
+      </div>
+      <div class="showModel__article">
+        <span
+          v-if="icon"
+          class="showModel__icon icon_transport"
+          :class="[
+            'showModel__icon--' + icon,
+            { 'transport-duigou': icon === 'success' },
+            { 'transport-shibai': icon === 'error' },
+            { 'transport-wenhao': icon === 'warn' }
+          ]"
+        ></span>
+        <div v-if="content" class="showModel__content" v-html="content"></div>
+        <div v-if="info" class="showModel__info">{{ info }}</div>
+        <div class="select-wrap" v-if="selectName === 'user'">
+          <cube-select
+            v-model="selectUserId"
+            :options="selectData"
+            placeholder="请选择指派对象"
+          ></cube-select>
+        </div>
+      </div>
+      <div class="showModel__footer">
+        <div v-if="operate.ok" class="showModel__ok" @click="ok">
+          {{ operate.ok || "" }}
+        </div>
+        <div v-if="operate.cancel" class="showModel__cancel" @click="cancel">
+          {{ operate.cancel || "" }}
+        </div>
+        <div v-if="operate.know" class="showModel__know" @click="know">
+          {{ operate.know || "" }}
+        </div>
+        <div
+          v-if="operate.know && timerFlag"
+          class="showModel__know"
+          @click="cancelTimer"
+        >
+          取消自动关闭
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      time: 5, //5秒后自动关闭
+      timer: null, //5秒后自动关闭，定时器
+      timerFlag: true, //是否显示取消自动关闭按钮
+      selectData: [], //select数据
+      selectUserId: 0 //select选中的数据
+    };
+  },
+  watch: {
+    disjunctor(newValue) {
+      if (newValue && this.selectName === "user") {
+        this.selectUserId = 0;
+      }
+      if (newValue && this.operate.know == "知道了") {
+        this.time = 5;
+        this.timer = setInterval(() => {
+          this.time--;
+          if (this.time <= 0) {
+            clearInterval(this.timer);
+            this.know();
+          }
+        }, 1000);
+      }
+    }
+  },
+  props: {
+    // 显示隐藏
+    disjunctor: {
+      type: Boolean,
+      default: false
+    },
+    // 标题
+    title: {
+      type: String,
+      default: "提示"
+    },
+    // 图标
+    icon: {
+      type: String,
+      default: "success"
+    },
+    // 内容
+    content: {
+      type: String,
+      default: ""
+    },
+    // 说明
+    info: {
+      type: String,
+      default: ""
+    },
+    // 下拉框(user)
+    selectName: {
+      type: String,
+      default: ""
+    },
+    // 操作按钮文字
+    operate: {
+      type: Object,
+      default: () => {
+        return {
+          know: "知道了"
+        };
+      }
+    }
+  },
+  methods: {
+    // 获取指派对象
+    getZpUser() {
+      var postData = {
+        idx: 0,
+        sum: 1000,
+        user: {
+          roledata: { rolecode: "first-line support" },
+          roledata2: { rolecode: "second-line support" },
+          selectType: "1"
+        }
+      };
+      this.$http
+        .post("service/user/data/fetchDataList/user", postData)
+        .then(res => {
+          res.data.list.forEach((v, i) => {
+            this.selectData.push({
+              text: v.name,
+              value: v.id
+            });
+          });
+        });
+    },
+    // 单选框选中
+    radioChange(item) {
+      this.$emit("radioChange", item.target.value);
+    },
+    // 确定
+    ok() {
+      if (this.selectName) {
+        this.$emit("ok", this.selectUserId);
+      } else {
+        this.$emit("ok");
+      }
+    },
+    // 取消
+    cancel() {
+      this.$emit("cancel");
+    },
+    // 知道了
+    know() {
+      clearInterval(this.timer);
+      this.$emit("know");
+    },
+    // 取消自动关闭
+    cancelTimer() {
+      this.timerFlag = false;
+      clearInterval(this.timer);
+    }
+  },
+  created() {
+    if (this.selectName === "user") {
+      this.getZpUser();
+    }
+  }
+};
+</script>
+
+<style lang="less">
+.showModel {
+  position: fixed;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.2);
+  z-index: 99;
+
+  .showModel__wrap {
+    width: 5.6rem;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    background-color: #fff;
+    border-radius: 0.12rem;
+
+    .showModel__header {
+      font-size: 0.36rem;
+      color: 000;
+      height: 0.84rem;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+
+    .showModel__article {
+      margin: 0.4rem auto 0.25rem;
+      width: 4.88rem;
+      padding: 0.6rem 0;
+      background-color: rgb(249, 250, 251);
+      border: 0.02rem solid rgb(229, 233, 237);
+      border-radius: 0.12rem;
+      box-sizing: border-box;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+
+      .showModel__icon {
+        font-size: 1.38rem;
+        margin-bottom: 0.32rem;
+
+        &.showModel__icon--success {
+          color: rgb(52, 179, 73);
+        }
+
+        &.showModel__icon--warn {
+          color: rgb(245, 165, 35);
+        }
+
+        &.showModel__icon--error {
+          color: rgb(255, 58, 82);
+        }
+      }
+
+      .showModel__content {
+        font-size: 0.36rem;
+      }
+
+      .showModel__info {
+        font-size: 0.32rem;
+        color: rgb(102, 102, 102);
+      }
+      .select-wrap {
+        width: 80%;
+        margin: 0 auto;
+      }
+      .specialCloseFlag {
+        width: 90%;
+        height: 100%;
+        padding: 0.16rem;
+      }
+    }
+
+    .showModel__footer {
+      box-sizing: border-box;
+      height: 1rem;
+      border-top: 0.02rem solid rgb(229, 233, 237);
+      display: flex;
+      align-items: center;
+
+      div {
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 0.36rem;
+        color: rgb(102, 102, 102);
+        position: relative;
+
+        &:nth-of-type(2)::before {
+          content: "";
+          position: absolute;
+          left: 0;
+          bottom: 0;
+          width: 0.02rem;
+          height: 0.87rem;
+          background-color: rgb(229, 233, 237);
+        }
+      }
+
+      .showModel__ok {
+        flex: 1;
+        color: #005395;
+      }
+
+      .showModel__cancel {
+        flex: 1;
+      }
+
+      .showModel__know {
+        flex: 1;
+        color: #005395;
+      }
+    }
+  }
+}
+</style>

src/views/incidentList.vue

@@ -17,7 +17,7 @@
             @pulling-down="onPullingDown"
             @pulling-up="onPullingUp"
           >
-            <div class="conentBox">
+            <div class="conentBox" v-if="!loadShow && items.length">
               <div
                 class="conent"
                 v-for="item in items"
@@ -84,18 +84,21 @@
                   >
                   <span>{{ item.acceptDate | timeFormat("MM-dd HH:mm") }}</span>
                 </div>
-                <cube-form-group class="sub">
-                  <cube-button @click="assign(item)">指派</cube-button>
+                <cube-form-group
+                  class="sub-btn"
+                  v-show="
+                    (item.state.id === 1544 || item.state.id === 1543) &&
+                      isAssign &&
+                      item.assignee
+                  "
+                >
+                  <cube-button @click.stop="assign(item)">指派</cube-button>
                 </cube-form-group>
               </div>
-              <div class="wushuju" v-show="wushuju">
-                <img src="./../../static/images/wushuju.svg" alt />
-                <p>暂无事件</p>
-              </div>
             </div>
-            <template v-if="customPullDown" slot="pulldown" slot-scope="props">
+            <template slot="pulldown" slot-scope="props">
               <div
-                v-if="props.pullDownRefresh"
+                v-if="props.pullDownRefreshObj"
                 class="cube-pulldown-wrapper"
                 :style="props.pullDownStyle"
               >
@@ -121,15 +124,30 @@
                 </div>
               </div>
             </template>
+            <div class="wushuju" v-if="!loadShow && items.length === 0">
+              <img src="./../../static/images/wushuju.svg" alt />
+              <p>暂无事件</p>
+            </div>
           </cube-scroll>
         </div>
       </div>
     </div>
-    <load-ing v-show="!items.length && !wushuju"></load-ing>
+    <load-ing v-show="loadShow"></load-ing>
+    <!-- 弹窗 -->
+    <showModel
+      :title="models.title"
+      :icon="models.icon"
+      :disjunctor="models.disjunctor"
+      @ok="ok"
+      @cancel="cancel"
+      :operate="models.operate"
+      selectName="user"
+    ></showModel>
   </div>
 </template>
 <script>
 import Vue from "vue";
+import showModel from "../components/showModel/showModel.vue";
 import CubePage from "../components/cube-page.vue";
 import SwitchOption from "../components/switch-option";
 import InputOption from "../components/input-option";
@@ -139,20 +157,24 @@ import LoadIng from "./../views/loading.vue";
 export default {
   data() {
     return {
-      //   items: _foods,
+      modelsData: null, //点击弹窗的那一项数据
+      // 弹窗model
+      models: {
+        disjunctor: false
+      },
+      isAssign: false, //是否是事件经理或事件分类管理员
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
       items: [],
       pullDownRefresh: true,
       pullDownRefreshThreshold: 60,
       pullDownRefreshStop: 40,
-      pullDownRefreshTxt: "Refresh success",
+      pullDownRefreshTxt: "更新成功",
       pullUpLoad: true,
       pullUpLoadThreshold: 0,
       pullUpLoadMoreTxt: "加载更多",
       pullUpLoadNoMoreTxt: "没有更多数据",
       customPullDown: true,
-      wushuju: false,
       candidateGroups: "",
       searchsType: [
         {
@@ -185,7 +207,8 @@ export default {
     SwitchOption,
     InputOption,
     SelectOption,
-    LoadIng
+    LoadIng,
+    showModel
   },
   computed: {
     options() {
@@ -216,6 +239,73 @@ export default {
     }
   },
   methods: {
+    //确定
+    ok(selectUserId) {
+      console.log(selectUserId);
+      if (!selectUserId) {
+        this.$createDialog({
+          type: "alert",
+          title: "请选择指派对象",
+          icon: "cubeic-warn"
+        }).show();
+        return;
+      }
+      const toast = this.$createToast({
+        txt: "Loading...",
+        mask: true
+      });
+      toast.show();
+      this.$http
+        .post("service/bpm/bpm/delegateTask/" + this.modelsData.taskId, {
+          assginee: selectUserId
+        })
+        .then(res => {
+          toast.hide();
+          this.models.disjunctor = false;
+          if (res.status == 200) {
+            this.$createDialog({
+              type: "alert",
+              title: "操作成功",
+              icon: "cubeic-right",
+              onConfirm: (e, promptValue) => {
+                this.loadShow = true;
+                this.items = [];
+                this.idx = 0;
+                this.getData();
+              }
+            }).show();
+          } else {
+            this.$createDialog({
+              type: "alert",
+              title: "系统错误,请稍后再试!",
+              icon: "cubeic-wrong",
+              onConfirm: (e, promptValue) => {
+                this.loadShow = true;
+                this.items = [];
+                this.idx = 0;
+                this.getData();
+              }
+            }).show();
+          }
+        });
+    },
+    //取消
+    cancel() {
+      this.models.disjunctor = false;
+    },
+    // 指派
+    assign(item) {
+      this.modelsData = item;
+      this.models = {
+        disjunctor: true,
+        title: "指派对象",
+        icon: "warn",
+        operate: {
+          ok: "确定",
+          cancel: "取消"
+        }
+      };
+    },
     getParamsState() {
       if (this.$route.params.type) {
         this.type = this.$route.params.type;
@@ -284,16 +374,19 @@ export default {
         .post("service/bpm/bpm/fetchTask/bpm_incident", postData)
         .then(function(res) {
           if (res.data.data.length > 0) {
-            that.wushuju = false;
             for (var i = 0; i < res.data.data.length; i++) {
               res.data.data[i].createTime = formatDate(
                 new Date(res.data.data[i].createTime),
                 "yyyy-MM-dd hh:mm"
               );
             }
-            that.items = that.items.concat(res.data.data);
-          } else if (res.data.data.length <= 0) {
-            that.wushuju = true;
+            if (that.idx) {
+              that.items = that.items.concat(res.data.data);
+            } else {
+              that.items = res.data.data;
+            }
+          } else {
+            that.pullUpLoad = false;
           }
           that.loadShow = false;
         });
@@ -302,7 +395,6 @@ export default {
       var that = this;
       that.idx = 0;
       that.sum = 10;
-      that.items = [];
       setTimeout(() => {
         that.getData();
       }, 1000);
@@ -345,6 +437,13 @@ export default {
   },
   created() {
     var that = this;
+    if (this.loginUser.role.length) {
+      this.isAssign = this.loginUser.role.some(
+        v =>
+          v.rolecode === "incident-category-manager" ||
+          v.rolecode === "incident manager"
+      );
+    }
     that.loginUser.group.forEach(element => {
       that.candidateGroups += element.id + ",";
     });
@@ -353,6 +452,7 @@ export default {
       that.candidateGroups.length - 1
     );
     this.getParamsState();
+    this.loadShow = true;
     this.getData();
 
     localStorage.removeItem("modelData");
@@ -366,16 +466,15 @@ export default {
 };
 </script>
 <style lang="stylus" rel="stylesheet/stylus" scoped>
-.sub {
+.sub-btn {
   background: #ececec;
   .cube-btn {
     background-color: #005395 !important;
+    border-radius: 8px
   }
 }
 .scroll-list-wrap {
-  /* height: 350px */
-  height: 85vh;
-  /* border: 1px solid rgba(0, 0, 0, 0.1) */
+  height: calc(100vh - 2.72rem);
   border-radius: 5px;
   transform: rotate(0deg); // fix 子元素超出边框圆角部分不隐藏的问题
   overflow: hidden;

src/views/indes.vue

@@ -191,10 +191,10 @@
           </span>
         </div>
         <div class="conentBox" v-if="!newNoticeNoData && !newNoticeLoading">
-          <div class="conent" v-for="v in noticeData" @click="toGuideDetail(v)">
+          <div class="conent" v-for="v in noticeData" :key="v.id" @click="toGuideDetail(v)">
             <div class="head overflowEllipsis2">{{ v.title }}</div>
             <div class="cot">
-              {{ v.createTime.substring(0, v.createTime.length - 5) }}
+              {{ v.createTime | timeFormat("yyyy-MM-dd HH:mm") }}
             </div>
           </div>
         </div>

src/views/processing.vue

@@ -322,10 +322,10 @@
                     :field="fields[6]"
                     v-if="order == 2"
                   ></cube-form-item>
-                  <cube-form-item
+                  <!-- <cube-form-item
                     :field="fields[15]"
                     v-if="order == 5"
-                  ></cube-form-item>
+                  ></cube-form-item> -->
                   <cube-form-item
                     :field="fields[7]"
                     v-if="order == 2"
@@ -544,10 +544,10 @@ export default {
           label: "转派",
           value: 3
         },
-        {
-          label: "指派",
-          value: 5
-        }
+        // {
+        //   label: "指派",
+        //   value: 5
+        // }
         // {
         //   label: "协同",
         //   value: 4