新增处理日志

src/components/showModel/showModel.vue

@@ -25,6 +25,9 @@
             placeholder="请选择指派对象"
           ></cube-select>
         </div>
+        <div v-if="textName === 'textarea'">
+          <cube-textarea autofocus :maxlength="255" v-model="textareaData" placeholder="请填写处理日志" style="border:1px solid #ececec;height:2rem;resize:none;"></cube-textarea>
+        </div>
       </div>
       <div class="showModel__footer">
         <div v-if="operate.ok" class="showModel__ok" @click="ok">
@@ -56,7 +59,8 @@ export default {
       timer: null, //5秒后自动关闭，定时器
       timerFlag: true, //是否显示取消自动关闭按钮
       selectData: [], //select数据
-      selectUserId: 0 //select选中的数据
+      selectUserId: 0, //select选中的数据
+      textareaData: '', //textarea的数据
     };
   },
   watch: {
@@ -64,6 +68,9 @@ export default {
       if (newValue && this.selectName === "user") {
         this.selectUserId = 0;
       }
+      if (newValue && this.textName === "textarea") {
+        this.textareaData = '';
+      }
       if (newValue && this.operate.know == "知道了") {
         this.time = 5;
         this.timer = setInterval(() => {
@@ -107,6 +114,11 @@ export default {
       type: String,
       default: ""
     },
+    // 文本块(处理日志)
+    textName: {
+      type: String,
+      default: ""
+    },
     // 操作按钮文字
     operate: {
       type: Object,
@@ -146,8 +158,10 @@ export default {
     },
     // 确定
     ok() {
-      if (this.selectName) {
+      if (this.selectName === 'user') {
         this.$emit("ok", this.selectUserId);
+      }else if (this.textName === 'textarea') {
+        this.$emit("ok", this.textareaData);
       } else {
         this.$emit("ok");
       }

src/views/incidentList.vue

@@ -84,7 +84,8 @@
                   >
                   <span>{{ item.acceptDate | timeFormat("MM-dd HH:mm") }}</span>
                 </div>
-                <cube-form-group
+                <div class="btns">
+                  <cube-form-group
                   class="sub-btn"
                   v-show="
                     (item.state.id === 1544 || item.state.id === 1543) &&
@@ -94,6 +95,13 @@
                 >
                   <cube-button @click.stop="assign(item)">指派</cube-button>
                 </cube-form-group>
+                <cube-form-group
+                  class="sub-btn"
+                  v-show="item.state.id === 1544"
+                >
+                  <cube-button @click.stop="addHandlerLog(item)">新增处理日志</cube-button>
+                </cube-form-group>
+                </div>
               </div>
             </div>
             <template slot="pulldown" slot-scope="props">
@@ -133,7 +141,7 @@
       </div>
     </div>
     <load-ing v-show="loadShow"></load-ing>
-    <!-- 弹窗 -->
+    <!-- 指派弹窗 -->
     <showModel
       :title="models.title"
       :icon="models.icon"
@@ -143,6 +151,16 @@
       :operate="models.operate"
       selectName="user"
     ></showModel>
+    <!-- 新增处理日志弹窗 -->
+    <showModel
+      :title="models1.title"
+      :icon="models1.icon"
+      :disjunctor="models1.disjunctor"
+      @ok="ok1"
+      @cancel="cancel1"
+      :operate="models1.operate"
+      textName="textarea"
+    ></showModel>
   </div>
 </template>
 <script>
@@ -158,10 +176,14 @@ export default {
   data() {
     return {
       modelsData: null, //点击弹窗的那一项数据
+      modelsData1: null, //点击弹窗的那一项数据
       // 弹窗model
       models: {
         disjunctor: false
       },
+      models1: {
+        disjunctor: false
+      },
       isAssign: false, //是否是事件经理或事件分类管理员
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
@@ -306,6 +328,74 @@ export default {
         }
       };
     },
+    //确定
+    ok1(text) {
+      console.log(text);
+      if (!text.trim()) {
+        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/data/addData/operationLog",
+          {operationLog:{opType:'handlerLog',opValue:text,extra1:this.modelsData1.id}}
+        )
+        .then((res) => {
+          toast.hide();
+          this.models1.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();
+          }
+        });
+    },
+    //取消
+    cancel1() {
+      this.models1.disjunctor = false;
+    },
+    // 新增处理日志
+    addHandlerLog(item){
+      this.modelsData1 = item;
+      this.models1 = {
+        disjunctor: true,
+        title: "新增处理日志",
+        icon: "warn",
+        operate: {
+          ok: "确定",
+          cancel: "取消"
+        }
+      };
+    },
     getParamsState() {
       if (this.$route.params.type) {
         this.type = this.$route.params.type;
@@ -466,11 +556,17 @@ export default {
 };
 </script>
 <style lang="stylus" rel="stylesheet/stylus" scoped>
-.sub-btn {
-  background: #ececec;
-  .cube-btn {
-    background-color: #005395 !important;
-    border-radius: 8px
+.btns{
+  display: flex;
+  justify-content: space-between
+  .sub-btn {
+    margin:0 2px;
+    flex:1;
+    background: #ececec;
+    .cube-btn {
+      background-color: #005395 !important;
+      border-radius: 8px
+    }
   }
 }
 .scroll-list-wrap {

src/views/processing.vue

@@ -365,7 +365,7 @@
                     :field="fields[9]"
                     v-if="order == 3"
                   ></cube-form-item>
-                  <cube-form-item
+                  <!-- <cube-form-item
                     :field="fields[16]"
                     class="incidentTitle"
                   >
@@ -377,7 +377,7 @@
                         v-model="handlerLog"
                       ></textarea>
                     </div>
-                  </cube-form-item>
+                  </cube-form-item> -->
                 </cube-form-group>
                 <cube-form-group class="sub">
                   <cube-button type="submit" @click="subVali()"