待办更新

src/api/toBeDone/toBeDone.js

@@ -6,5 +6,22 @@ export default class toBeDone {
             `/assign/assignWorkOrder/list2`,
             params
         )
+    };
+    queryById(id) {
+        return request.get(
+            `/assign/assignWorkOrder/queryById`, { id: id }
+        )
+    };
+    save(inputFrom) {
+        return request.post(
+            `/assign/assignWorkOrder/save`,
+            inputFrom
+        )
+    };
+    list2(params) {
+        return request.get(
+            `/assign/assignWorkOrder/list3`,
+            params
+        )
     }
 }

src/router/index.js

@@ -238,4 +238,4 @@ const router = createRouter({
     routes,
 })
 
-export default router
+export default router

src/views/toBeDone/toBeDone.vue

@@ -13,7 +13,9 @@
               <p style="color: #a3a3a3">{{item.createDate.split(' ')[0]}}</p>
               <p style="color: #a3a3a3">{{item.createDate.split(' ')[1]}}</p>
             </div>
-            <p style="color: red; margin-top: 10px">待处理{{item.state}}</p>
+            <p v-if="item.assignState==1" style="color: red; margin-top: 10px">已发起</p>
+            <p v-else-if="item.assignState==2" style="color: red; margin-top: 10px">待办中</p>
+            <p v-if="item.assignState==5" style="color: red; margin-top: 10px">已超期</p>
           </van-col>
           <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
             <van-row>
@@ -31,23 +33,24 @@
     </van-tab>
     <van-tab title="已处理">
       <div class="list1">
-        <van-row class="list-item" v-for="item in toBeDone.DoneList2" :key="item.dateTime" @click="goToBeDoneinfo">
+        <van-row class="list-item" v-for="item in toBeDone.toBeDoneList2" :key="item.id" @click="goToBeDoneinfo(item)">
           <van-col span="6" class="list-item-left">
             <div>
-              <p style="color: #a3a3a3">{{item.dateTime}}</p>
-              <p style="color: #a3a3a3">{{item.timer}}</p>
+              <p style="color: #a3a3a3">{{item.createDate.split(' ')[0]}}</p>
+              <p style="color: #a3a3a3">{{item.createDate.split(' ')[1]}}</p>
             </div>
-            <p style="color: red; margin-top: 10px">已处理{{item.state}}</p>
+            <p v-if="item.assignState==3" style="color: red; margin-top: 10px">已反馈</p>
+            <p v-if="item.assignState==4" style="color: red; margin-top: 10px">已归档</p>
           </van-col>
           <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
             <van-row>
-              <van-col span="24">
-                <p>{{item.title}}</p>
+              <van-col span="24" style="height:50px;overflow: hidden;">
+                <span v-html="item.problemContent"></span>
               </van-col>
             </van-row>
             <van-row justify="space-between">
-              <van-col span="12">{{item.address}}</van-col>
-              <van-col span="8">{{item.type}}交办</van-col>
+              <van-col span="12">{{item.areaSelectName}}</van-col>
+              <van-col span="8">{{item.assignTypeName}}</van-col>
             </van-row>
           </van-col>
         </van-row>
@@ -64,14 +67,20 @@ export default {
   
   setup() {
     const toBeDone =reactive({
+      //未处理
       toBeDoneList:[],
+      //已处理
+      toBeDoneList2:[]
     })
     //获取待办列表
     let workDBList = ref([])
     new ToBeDone().list({}).then((res)=>{
-      console.log(res);
       workDBList.value.push(...res.records)
-      toBeDone.toBeDoneList = workDBList
+      toBeDone.toBeDoneList = workDBList;
+      
+    })
+    new ToBeDone().list2({}).then((res)=>{
+      toBeDone.toBeDoneList2.push(...res.records);
     })
     //跳转
     let router = useRouter()

src/views/toBeDone/toBeDone_details.vue

@@ -17,29 +17,50 @@
       <p>详细地址：{{ PersonInfo.data.areaSelectName }}</p>
       <p>发生时间：{{ PersonInfo.data.problemTime }}</p>
       <p>截止时间：{{ PersonInfo.data.deadlineTime }}</p>
-      <p>问题附件：<span style="color: #6892ff">活动申请书</span></p>
+      <p>
+        问题附件：
+        <van-uploader>
+          <van-button>活动申请书</van-button>
+        </van-uploader>
+      </p>
     </div>
     <div class="content-bottom">
       <p>处理结果：</p>
       <div>
         <form action="">
-          <textarea name="" id="" cols="40" rows="5"></textarea>
+          <textarea
+            v-if="PersonInfo.data.disposeContent == ''"
+            v-model="PersonInfo.disposeContent"
+            name=""
+            id=""
+            cols="40"
+            rows="5"
+          ></textarea>
+          <textarea
+            v-if="PersonInfo.data.disposeContent != ''"
+            v-model="PersonInfo.data.disposeContent"
+            name=""
+            id=""
+            cols="40"
+            rows="5"
+          ></textarea>
         </form>
       </div>
       <div style="margin-top: 15px">
         处理证据资料：
         <van-uploader>
-          <van-button icon="plus" >点击上传</van-button>
+          <van-button icon="plus">点击上传</van-button>
         </van-uploader>
       </div>
     </div>
-    <van-button type="primary">确认</van-button>
+    <van-button type="primary" @click="submit">确认</van-button>
   </div>
 </template>
 
 <script>
 import { useRouter } from "vue-router";
 import { onMounted, reactive, ref } from "vue";
+import ToBeDone from "@/api/toBeDone/toBeDone";
 export default {
   setup() {
     const router = useRouter();
@@ -47,23 +68,50 @@ export default {
       data: {},
       createDepartment: {},
       todoBy: {},
+      disposeContent: "",
     });
     //数据接收
     onMounted(() => {
       var item = JSON.parse(router.currentRoute.value.query.data);
+      // let itemId = item.id
+      console.log(item);
       PersonInfo.data = item;
-      console.log(PersonInfo.data);
       PersonInfo.createDepartment = PersonInfo.data.createDepartment;
       PersonInfo.todoBy = PersonInfo.data.todoBy;
+      // new ToBeDone().queryById(itemId).then((res)=>{
+
+      // })
     });
     //返回事件
     const goback = () => {
       history.back();
     };
-
+    //待办反馈提交
+    const submit = () => {
+      if (
+        PersonInfo.data.assignState != "3" ||
+        PersonInfo.data.assignState != "4"
+      ) {
+        PersonInfo.data.disposeContent = PersonInfo.disposeContent;
+        PersonInfo.data.assignState = "3";
+        new ToBeDone().save(PersonInfo.data).then((res) => {
+          // console.log(PersonInfo.data);
+          // console.log("提交成功");
+          // console.log(res);
+          router.push({
+            path: "/toBeDone",
+          });
+        });
+      }else{
+        router.push({
+          path:'/toBeDone'
+        })
+      }
+    };
     return {
       goback,
       PersonInfo,
+      submit,
     };
   },
 };
@@ -133,7 +181,6 @@ html {
   }
   .content-bottom {
     margin-top: 20px;
-
   }
 }
 </style>