共享资源

js_sdk/http.js

@@ -221,11 +221,7 @@ export function tagsBind(e) {
         '/wx/MnpTagInfoController/bind', e, {}
     )
 }
-export function getDetial(e) {
-    return $http.post(
-        '/wx/meetingAppoint/meetingAppointDetail', e, {}
-    )
-}
+
 export function saleControllerGetById(e) {
     return $http.post(
         '/wx/SaleController/getById', {
@@ -918,7 +914,7 @@ export function roomTimeSoltDetail(data) {
     )
 }
 
-// 共享资源预约
+// 共享资源预约 新增
 export function meetingAppoint(data) {
     return $http.post(
         '/wx/meetingRoom/meetingAppoint',
@@ -934,7 +930,7 @@ export function meetingAppointCheck(data) {
     )
 }
 
-// 共享资源预约历史
+// 共享资源预约 历史
 export function getMeetingAppointListApp(data) {
     return $http.post(
         '/wx/meetingAppoint/getMeetingAppointListApp',
@@ -942,6 +938,21 @@ export function getMeetingAppointListApp(data) {
     )
 }
 
+
+// 共享资源预约 编辑
+export function meetingAppointEdit(data) {
+    return $http.post(
+        '/wx/meetingAppoint/edit',
+        data, {}
+    )
+}
+
+export function meetingAppointDetail(e) {
+    return $http.post(
+        '/wx/meetingAppoint/meetingAppointDetail', e, {}
+    )
+}
+
 // 查询用户部门
 export function getUserDept(data) {
     return $http.post(

pages.json

@@ -2457,6 +2457,42 @@
                         }
                     }
                 },
+                {
+                    "path": "resourceReservation_manage/edit",
+                    "style": {
+                        "navigationBarTitleText": "编辑预约",
+                        "enablePullDownRefresh": true,
+                        "onReachBottomDistance": 100,
+                        "app-plus": {
+                            "bounce": "vertical",
+                            "titleNView": {
+                                "buttons": [
+                                    {
+                                        "text": "\ue534",
+                                        "fontSrc": "/static/uni.ttf",
+                                        "fontSize": "22px",
+                                        "color": "#FFFFFF"
+                                    }
+                                ]
+                            }
+                        },
+                        "component": true,
+                        "usingComponents": {
+                            "van-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/index",
+                            "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                            "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
+                            "van-icon": "/wxcomponents/weapp/dist/icon/index",
+                            "van-tab": "/wxcomponents/weapp/dist/tab/index",
+                            "van-tabs": "/wxcomponents/weapp/dist/tabs/index",
+                            "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index",
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
+                            "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
+                            "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index"
+                        }
+                    }
+                },
                 {
                     "path": "propertyManagement/maintenance",
                     "style": {

pages/subPackages/resourceReservation_manage/add.vue

@@ -46,6 +46,7 @@
             class="myField"
             maxlength="2000"
             show-word-limit
+            @change="changeMsg"
         />
       </li>
     </ul>
@@ -155,6 +156,9 @@ export default {
     }
   },
   methods: {
+    changeMsg(e){
+      this.form.remarks = e.detail
+    },
     async getByCodes() {
       let data = await getByCodes(JSON.stringify(this.dc_key));
       this.dic_SelectList = this.$common.handleDicList(data);

pages/subPackages/resourceReservation_manage/components/appointmentHistory.vue

@@ -11,6 +11,7 @@
               <span class="typeInfo" :class="item.stateStr==='已通过'?'tgType':item.stateStr==='已取消'?'qxType':''">{{item.stateStr}}</span>
               <button @tap="toAdd(item)" class="btn" :class="item.stateStr==='暂存'?'zcBtn':''" v-if="item.stateStr !=='已取消'">{{item.stateStr==='暂存'?'编辑':'取消'}}</button>
             </div>
+            <div v-if="item.stateStr==='已取消'" class="historyItemInfo">{{item.cancelReason}}</div>
         </div>
       <van-dialog
           use-slot
@@ -23,7 +24,7 @@
       >
         <div class="dialogBox">
           <van-field
-              :value="contant"
+              :value="content"
               autosize
               type="textarea"
               placeholder="请输入取消原因"
@@ -38,13 +39,13 @@
 </template>
 
 <script>
-import {getByCodes, getMeetingAppointListApp, getUserLocalStorageInfo} from "@/js_sdk/http";
+import {getByCodes, getMeetingAppointListApp, getUserLocalStorageInfo, cancelAppoint} from "@/js_sdk/http";
 
 export default {
   name: "appointmentHistory",
   data(){
     return{
-      contant:'',
+      content:'',
       show:false,
       getUserLocalStorageInfo: getUserLocalStorageInfo(),
       historyList:[
@@ -52,18 +53,22 @@ export default {
         {stateStr:'已通过'},
         {stateStr:'已取消'},
         {stateStr:'暂存'},
-      ]
+      ],
+      id: ''
     }
   },
   created() {
     this.getList()
   },
   onShow() {
-
+    this.getList()
+  },
+  onLoad(options) {
+    this.getList()
   },
   methods:{
     changeMsg(e){
-      this.contant = e.detail
+      this.content = e.detail
     },
     getList() {
       const _this = this
@@ -89,15 +94,27 @@ export default {
     toAdd(data) {
       if(data.stateStr == '暂存'){
         uni.navigateTo({
-          url: '/pages/subPackages/resourceReservation_manage/add?id=' + data.id
+          url: '/pages/subPackages/resourceReservation_manage/edit?id=' + data.id
         })
       }else if(data.stateStr == '审核中'){
         this.show = true
+        this.id = data.id
       }
 
     },
     confirm(e){
-      console.log('我确定取消了')
+      console.log(this.content)
+      const data = {
+        id: this.id,
+        cancelReason: this.content
+      }
+      cancelAppoint(data).then(res => {
+        if (res.code == '200') {
+          this.getList()
+        }
+      }).catch(err=>{
+        this.$showToast(err);
+      })
     }
   }
 }

pages/subPackages/resourceReservation_manage/index.vue

@@ -2,10 +2,10 @@
     <div>
       <van-tabs :active="active" @change="onChange">
         <van-tab title="共享资源" :name="0">
-          <shareResources/>
+          <shareResources ref="shareResources"/>
         </van-tab>
         <van-tab title="预约历史" :name="1">
-          <appointmentHistory />
+          <appointmentHistory ref="appointmentHistory"/>
         </van-tab>
       </van-tabs>
     </div>
@@ -25,10 +25,35 @@ export default {
       active:0
     }
   },
-  methods:{
-    onChange(){
+  onPullDownRefresh() {
+    this.getList()
+  },
+  onShow(){
 
-    }
+  },
+  methods:{
+    getList(){
+      if(this.active === 0){
+        this.$refs.shareResources.getList()
+        setTimeout(function () {
+          uni.stopPullDownRefresh();
+        }, 1000);
+      }
+      if(this.active === 1){
+        this.$refs.appointmentHistory.getList()
+        setTimeout(function () {
+          uni.stopPullDownRefresh();
+        }, 1000);
+      }
+    },
+    onChange(e){
+      this.active = e.detail.name
+    },
+    otherFun(object) {
+      if (object) {
+        this.getList()
+      }
+    },
   }
 }
 </script>