From bcfdfbb7b9a410920bc9ef9061081dc4f7501df1 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Mon, 5 Aug 2024 18:03:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=8A=A4=E9=99=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/http.api.js                            |  14 +-
 .../addLongInsurance/addLongInsurance.vue     | 174 +++++-
 package_sub/pages/customer/customer.vue       |  15 +-
 package_sub/pages/index/index.vue             |   5 +-
 .../pages/longInsurance/longInsurance.vue     | 523 ++++++++++++++++++
 .../longInsurance/longInsuranceDetail.vue     | 378 +++++++++++++
 package_sub/pages/schedule/schedule.vue       |   3 +-
 pages.json                                    |  12 +
 pages/showimg/showimg.vue                     |   4 +-
 pages/sign/sign.vue                           | 149 ++---
 store/index.js                                |   3 +-
 11 files changed, 1174 insertions(+), 106 deletions(-)
 create mode 100644 package_sub/pages/longInsurance/longInsurance.vue
 create mode 100644 package_sub/pages/longInsurance/longInsuranceDetail.vue

diff --git a/common/http.api.js b/common/http.api.js
index 01d41fa..c9b4750 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -31,6 +31,10 @@ let apiAdmin = {
 	callbackDetail: "/api/admin/schedule-list-callbacks/get-form/",
 	checkList: "/api/admin/schedule-list-checks/get-list",
 	checkDetail: "/api/admin/schedule-list-checks/get-form/",
+	productTypeList: "/api/admin/product-type/get-list",
+	saveLongInsurance: "/api/admin/long-insurance/save",
+	longInsuranceList: "/api/admin/long-insurance/get-list",
+	longInsuranceDetail: "/api/admin/long-insurance/get-form/",
 }
 // 此处第二个参数vm，就是我们在页面使用的this，你可以通过vm获取vuex等操作
 const install = (Vue, vm) => {
@@ -63,6 +67,10 @@ const install = (Vue, vm) => {
 	let adminCallbackDetail = (id) => vm.$u.get(apiAdmin.callbackDetail + id);
 	let adminCheckList = (data = {}) => vm.$u.get(apiAdmin.checkList, data);
 	let adminCheckDetail = (id) => vm.$u.get(apiAdmin.checkDetail + id);
+	let adminProductTypeList = (data) => vm.$u.get(apiAdmin.productTypeList, data);
+	let adminSaveLongInsurance = (data) => vm.$u.post(apiAdmin.saveLongInsurance, data);
+	let adminLongInsuranceList = (data) => vm.$u.get(apiAdmin.longInsuranceList, data);
+	let adminLongInsuranceDetail = (id) => vm.$u.get(apiAdmin.longInsuranceDetail + id);
 	// 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
 	vm.$u.api = {
 		login,
@@ -90,7 +98,11 @@ const install = (Vue, vm) => {
 		adminCallbackList,
 		adminCallbackDetail,
 		adminCheckList,
-		adminCheckDetail
+		adminCheckDetail,
+		adminProductTypeList,
+		adminSaveLongInsurance,
+		adminLongInsuranceList,
+		adminLongInsuranceDetail
 	};
 };
 
diff --git a/package_sub/pages/addLongInsurance/addLongInsurance.vue b/package_sub/pages/addLongInsurance/addLongInsurance.vue
index 10014d2..fcd3783 100644
--- a/package_sub/pages/addLongInsurance/addLongInsurance.vue
+++ b/package_sub/pages/addLongInsurance/addLongInsurance.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <cpn-navbar title="督查" :is-back="true"></cpn-navbar>
+    <cpn-navbar title="长护险回访" :is-back="true"></cpn-navbar>
 
     <view class="container">
       <u-form :model="form" ref="uForm" :label-width="200" :error-type="['message', 'border-bottom']">
@@ -21,10 +21,10 @@
         <u-form-item label="是否在岗" prop="is_work">
           <u-switch v-model="form.is_work" :active-value="1" :inactive-value="0"></u-switch>
         </u-form-item>
-        <u-form-item label="是否准时" prop="is_on_time">
+        <u-form-item label="按照排班时间上门服务" prop="is_on_time">
           <u-switch v-model="form.is_on_time" :active-value="1" :inactive-value="0"></u-switch>
         </u-form-item>
-        <u-form-item label="护理工具" prop="tools">
+        <u-form-item label="护理工具携带" prop="tools">
           <u-checkbox-group ref="tools" @change="e => checkboxChange(e,'tools')">
             <u-checkbox v-for="(item, index) in tools" :key="index" :name="item.name" v-model="item.checked">
               {{ item.name }}
@@ -69,6 +69,9 @@
             </u-checkbox>
           </u-checkbox-group>
         </u-form-item>
+        <u-form-item label="建议" prop="tip">
+          <u-input v-model="form.tip" type="textarea"></u-input>
+        </u-form-item>
         <u-form-item label="回访图片">
           <u-upload ref="uUpload" :custom-btn="true" :action="action" :file-list="fileList"
                     :source-type="['camera']">
@@ -77,16 +80,22 @@
             </view>
           </u-upload>
         </u-form-item>
-        <u-form-item label="服务对象/家属签名">
+        <u-form-item label="服务对象/家属签名" required prop="sign_image_id">
           <view>
-            <u-button type="primary" size="mini" :throttle-time="3000" @click="pageTo('/pages/sign/sign')">签名</u-button>
-
+            <u-button type="primary" size="mini" :throttle-time="3000" @click="pageTo('/pages/sign/sign?key=vuex_sign_image')">点击签名</u-button>
+            <image v-if="vuex_sign_image"
+                   :src="vuex_sign_image"
+                   style="height: 260rpx;object-fit: cover"
+                   @click="showimg(vuex_sign_image)"></image>
           </view>
         </u-form-item>
-        <u-form-item label="调查人员签名">
+        <u-form-item label="调查人员签名" required prop="admin_sign_image_id">
           <view>
-            <u-button type="primary" size="mini" :throttle-time="3000" @click="pageTo('/pages/sign/sign')">签名</u-button>
-
+            <u-button type="primary" size="mini" :throttle-time="3000" @click="pageTo('/pages/sign/sign?key=vuex_admin_sign_image')">点击签名</u-button>
+            <image v-if="vuex_admin_sign_image"
+                   :src="vuex_admin_sign_image"
+                   style="height: 260rpx;object-fit: cover"
+                   @click="showimg(vuex_admin_sign_image)"></image>
           </view>
         </u-form-item>
         <u-form-item label="所在位置">
@@ -127,12 +136,37 @@ export default {
         other: "",
         tip: "",
         sign_image_id: "",
+        admin_sign_image_id: "",
         remark: "",
         file_ids: [],
         lat: "",
         lng: "",
         address: ""
       },
+      rules: {
+        sign_image_id: [
+          {
+            validator: (rule, value, callback) => {
+              if (!this.vuex_sign_image) {
+                callback(new Error('请签名'))
+              } else {
+                callback()
+              }
+            }
+          }
+        ],
+        admin_sign_image_id: [
+          {
+            validator: (rule, value, callback) => {
+              if (!this.vuex_admin_sign_image) {
+                callback(new Error('请签名'))
+              } else {
+                callback()
+              }
+            }
+          }
+        ]
+      },
       satisfies: [
         {
           label: "90分以上",
@@ -238,6 +272,13 @@ export default {
     };
   },
   methods: {
+    showimg(url) {
+      if (url)
+        this.$showimg({
+          imgs: [url],
+          current: 0
+        })
+    },
     pageTo (url) {
       uni.navigateTo({
         url
@@ -314,27 +355,86 @@ export default {
     },
 
     submit () {
-      console.log(this.form)
-      return
-      this.form.file_ids = this.$refs.uUpload.lists.filter(i => i.progress === 100).map(i => i.response?.id)
-      if (this.type === 'add') {
-        delete this.form.id
-      } else {
-        this.form.id = this.id
+      const uploadSignImage = () => {
+        return new Promise((resolve, reject) => {
+          uni.uploadFile({
+            url: `${ROOTPATH}/api/admin/upload-file`,
+            header: {
+              Authorization: `Bearer ${this.vuex_token}`
+            },
+            filePath: this.vuex_sign_image,
+            name: 'file',
+            success: (res) => {
+              if (res.statusCode === 200) {
+                const response = JSON.parse(res.data)
+                resolve(response)
+              } else {
+                reject(res.data)
+              }
+            },
+            fail: (err) => {
+              reject(err)
+            }
+          })
+        })
       }
-      this.$u.api.adminSaveCheck(this.form).then(res => {
-        uni.showToast({
-          icon: 'success',
-          title: '保存成功',
+      const uploadAdminSignImage = () => {
+        return new Promise((resolve, reject) => {
+          uni.uploadFile({
+            url: `${ROOTPATH}/api/admin/upload-file`,
+            header: {
+              Authorization: `Bearer ${this.vuex_token}`
+            },
+            filePath: this.vuex_admin_sign_image,
+            name: 'file',
+            success: (res) => {
+              if (res.statusCode === 200) {
+                const response = JSON.parse(res.data)
+                resolve(response)
+              } else {
+                reject(res.data)
+              }
+            },
+            fail: (err) => {
+              reject(err)
+            }
+          })
         })
-        setTimeout(() => {
-          uni.navigateBack()
-        },1500)
+      }
+      this.$refs.uForm.validate(valid => {
+        if (valid) {
+          Promise.all([uploadSignImage(),uploadAdminSignImage()]).then(res => {
+            console.log(res)
+            this.form.sign_image_id = res[0].id
+            this.form.admin_sign_image_id = res[1].id
+            this.form.file_ids = this.$refs.uUpload.lists.filter(i => i.progress === 100).map(i => i.response?.id)
+            if (this.type === 'add') {
+              delete this.form.id
+            } else {
+              this.form.id = this.id
+            }
+            this.$u.api.adminSaveLongInsurance(this.form).then(res => {
+              uni.showToast({
+                icon: 'success',
+                title: '保存成功',
+              })
+              setTimeout(() => {
+                uni.navigateBack()
+              },1500)
+            })
+          }).catch(err => {
+            console.error(err)
+            uni.showToast({
+              title: "签名保存失败",
+              icon: "none"
+            })
+          })
+        }
       })
     },
 
     async getDetail () {
-      const res = await this.$u.api.adminCheckDetail(this.id)
+      const res = await this.$u.api.adminLongInsuranceDetail(this.id)
       for (let key in this.form) {
         this.form[key] = res[key]
       }
@@ -343,6 +443,31 @@ export default {
         url: i.url,
         response: i
       }))
+      this.temp1 = /工作服/g.test(res.accessory)
+      this.temp2 = /工作证/g.test(res.accessory)
+      let resTools = res.tools?.split('|')?.filter(i => i.trim())
+      this.tools.forEach(item => {
+        item.checked = res.tools.indexOf(item.name) !== -1
+      })
+      this.otherTool.name = resTools.find(i => !this.tools.find(j => j.name === i))
+      this.otherTool.checked = !!this.otherTool.name
+      //serve
+      let resServes = res.serve?.split('|')?.filter(i => i.trim())
+      this.serves.forEach(item => {
+        item.checked = res.serve.indexOf(item.name) !== -1
+      })
+      this.otherServe.name = resServes.find(i => !this.serves.find(j => j.name === i))
+      this.otherServe.checked = !!this.otherServe.name
+      //other
+      let resOthers = res.other?.split('|')?.filter(i => i.trim())
+      this.others.forEach(item => {
+        item.checked = res.other.indexOf(item.name) !== -1
+      })
+      this.otherOther.name = resOthers.find(i => !this.others.find(j => j.name === i))
+      this.otherOther.checked = !!this.otherOther.name
+
+      this.$u.vuex('vuex_admin_sign_image', res.admin_sign_image?.url)
+      this.$u.vuex('vuex_sign_image', res.sign_image?.url)
     }
   },
   onLoad(option) {
@@ -355,6 +480,7 @@ export default {
   },
   onReady() {
     this.load();
+    this.$refs.uForm.setRules(this.rules);
   },
 }
 </script>
diff --git a/package_sub/pages/customer/customer.vue b/package_sub/pages/customer/customer.vue
index 779e39c..f5467be 100644
--- a/package_sub/pages/customer/customer.vue
+++ b/package_sub/pages/customer/customer.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <cpn-navbar title="客户列表"></cpn-navbar>
+    <cpn-navbar title="客户列表" :is-back="true"></cpn-navbar>
 
     <view>
       <view>
@@ -148,8 +148,9 @@ export default {
       },
       nursingList: [],
 
-
+      product_type_id: "",
       select: {
+        product_type_id: "",
         page_size: 10,
         page: 1,
         sex: '',
@@ -160,8 +161,16 @@ export default {
   },
   methods: {
     getAgeByIdcard,
+    async getProductType () {
+      const res = await this.$u.api.adminProductTypeList({
+        page: 1,
+        page_size: 999
+      })
+      this.product_type_id = this.select.product_type_id = res.data.find(i => /长护险/g.test(i.name))?.id ?? ""
+    },
     refresh(){
       this.select = {
+        product_type_id: this.product_type_id,
         page_size: 10,
         page: 1,
         sex: '',
@@ -234,7 +243,7 @@ export default {
   onShow() {
     this.select.page = 1
     this.nursingList = []
-    this.getList()
+    this.getProductType().then(_ => this.getList())
   },
   onPageScroll(e) {
     this.scrollTop = e.scrollTop;
diff --git a/package_sub/pages/index/index.vue b/package_sub/pages/index/index.vue
index e424ae2..9d97eac 100644
--- a/package_sub/pages/index/index.vue
+++ b/package_sub/pages/index/index.vue
@@ -78,7 +78,10 @@ export default {
           url: "/package_sub/pages/check/check",
           icon: ""
         },
-
+        {
+          label: "长护险回访",
+          url: "/package_sub/pages/longInsurance/longInsurance"
+        }
       ]
     }
   },
diff --git a/package_sub/pages/longInsurance/longInsurance.vue b/package_sub/pages/longInsurance/longInsurance.vue
new file mode 100644
index 0000000..0704284
--- /dev/null
+++ b/package_sub/pages/longInsurance/longInsurance.vue
@@ -0,0 +1,523 @@
+<template>
+  <view>
+    <cpn-navbar title="长护险回访列表" :is-back="true"></cpn-navbar>
+
+    <view>
+      <view>
+        <u-button :custom-style="{'margin':'24rpx 24rpx 0 24rpx'}" type="warning" @click="refresh">刷新</u-button>
+      </view>
+      <!-- 搜索 -->
+      <view class="search">
+        <view class="input-content">
+          <u-input :clearable="false" :value="select.keyword" placeholder="请输入要搜索的内容" height="30" :custom-style="inputStyle"
+                   @input="searchInput"></u-input>
+        </view>
+        <view class="icon">
+          <u-icon name="search" size="46" color="#ABAEBE"></u-icon>
+        </view>
+      </view>
+
+      <!-- 下拉菜单 -->
+<!--      <view class="drop-down">-->
+<!--        <u-dropdown @open="calendarShow" @close="calendarHide" ref="uDropdown">-->
+<!--          <u-dropdown-item v-model="select.status" :title="statusComputed(select.status)"-->
+<!--                           :options="optionsStatus" @change='nursingList = [],select.page = 1,getList()'>-->
+<!--          </u-dropdown-item>-->
+<!--          &lt;!&ndash;          <u-dropdown-item v-model="select.sex" :title="select.sex || '全部'" :options="optionsSex"&ndash;&gt;-->
+<!--          &lt;!&ndash;                           @change="nursingList = [],select.page = 1,getList()">&ndash;&gt;-->
+<!--          &lt;!&ndash;          </u-dropdown-item>&ndash;&gt;-->
+<!--          <u-dropdown-item title="时间">-->
+<!--          </u-dropdown-item>-->
+<!--        </u-dropdown>-->
+<!--      </view>-->
+
+      <!-- 护理列表 -->
+      <view class="nursing-list">
+        <view v-if="nursingList && nursingList.length > 0">
+          <view v-for="(item,index) in nursingList" :key="index" class="list-item" @click="pageTo('/package_sub/pages/longInsurance/longInsuranceDetail?id='+item.id)">
+            <view class="top">
+              <view class="time">{{item.created_at}}</view>
+            </view>
+
+            <view class="line"></view>
+
+            <view style="padding: 20rpx 40rpx 0;font-size: 32rpx;line-height: 2;font-weight: 600;">
+              被护理人
+            </view>
+            <view class="center" v-if="item.customer">
+              <view class="avatar">
+                <u-image :src="((item.customer && item.customer.idcard) ? getSexByIdcard(item.customer.idcard) : '无') === '男' ? vuex_male_img : vuex_female_img" height="104"
+                         width="104" shape="circle"></u-image>
+              </view>
+              <view class="user-info">
+                <view class="name">{{ item.customer ? item.customer.name : "" }}</view>
+                <view class="tel">
+                  <view>
+                    <u-icon name="phone" size="28" color="#1479FF"></u-icon>
+                  </view>
+                  <view class="text">{{ item.customer ? item.customer.phone : '无'}}</view>
+                </view>
+                <view class="address">
+                  <view>
+                    <u-icon name="map" size="28" color="#1479FF"></u-icon>
+                  </view>
+                  <view class="text">{{ item.customer_address ? item.customer_address.address : '无'}}</view>
+                </view>
+              </view>
+              <view class="sex">
+                <view class="sex-text">
+                  {{ (item.customer && item.customer.idcard) ? getSexByIdcard(item.customer.idcard) : '无' }}
+                </view>
+              </view>
+            </view>
+
+            <view class="line" style="margin-top: 22rpx;"></view>
+
+            <view class="bottom">
+              <view class="bottom-item">
+                <view class="bottom-item__title">服务满意度</view>
+                <view class="bottom-item__value">{{ satisfies.find(i => i.value === item.satisfy) ? satisfies.find(i => i.value === item.satisfy).label : '' }}</view>
+              </view>
+              <view class="bottom-item">
+                <view class="bottom-item__title">护理员护理情况调查</view>
+                <view class="bottom-item__value">{{ nurseInvestigates.find(i => i.value === item.nurse_investigate) ? nurseInvestigates.find(i => i.value === item.nurse_investigate).label : '' }}</view>
+              </view>
+            </view>
+
+          </view>
+        </view>
+
+        <view v-else>
+          <u-empty mode="list" text="暂无回访"></u-empty>
+        </view>
+      </view>
+    </view>
+
+    <u-loadmore :status="status" :load-text='loadText' @loadmore='select.page++,getList()' />
+
+    <u-calendar v-model="isShowCalendar" max-date="2100-01-01" mode="range" @change='datePick'>
+
+    </u-calendar>
+  </view>
+</template>
+
+<script>
+import { getSexByIdcard } from "@/common/util";
+export default {
+  data() {
+    return {
+      isShowCalendar: false,
+      inputStyle: {
+        width: "600rpx",
+        fontSize: "28rpx",
+        fontWeight: "500"
+      },
+      satisfies: [
+        {
+          label: "90分以上",
+          value: 1
+        },
+        {
+          label: "80-90分",
+          value: 2
+        },
+        {
+          label: "80分以下",
+          value: 3
+        },
+      ],
+      nurseInvestigates: [
+        {
+          label: "护理中回访",
+          value: 1
+        },
+        {
+          label: "日常回访",
+          value: 2
+        },
+      ],
+      optionsSex: [{
+        label: '全部',
+        value: ''
+      },
+        {
+          label: '男',
+          value: '男',
+        },
+        {
+          label: '女',
+          value: '女',
+        },
+
+      ],
+      status: 'loadmore',
+      loadText: {
+        loadmore: '轻轻上拉或点击',
+        loading: '努力加载中',
+        nomore: '实在没有了'
+      },
+      nursingList: [],
+
+
+      select: {
+        page_size: 10,
+        page: 1,
+        //sex: '',
+        //status: '',
+        lat: '',
+        lng: '',
+        //start_date: this.$moment(new Date()).startOf('month').format('YYYY-MM-DD'),
+        //end_date: this.$moment(new Date()).endOf('month').format('YYYY-MM-DD'),
+        keyword: '',
+        is_myself: 1
+      },
+    }
+  },
+  methods: {
+    getSexByIdcard,
+    pageTo (url) {
+      uni.navigateTo({
+        url
+      })
+    },
+    refresh(){
+      this.select = {
+        page_size: 10,
+        page: 1,
+        //sex: '',
+        //status: '',
+        lat: '',
+        lng: '',
+        //start_date: this.$moment(new Date()).startOf('month').format('YYYY-MM-DD'),
+        //end_date: this.$moment(new Date()).endOf('month').format('YYYY-MM-DD'),
+        keyword: '',
+        is_myself: 1
+      }
+      this.nursingList = []
+      this.getList()
+    },
+
+    // calendarShow(e) {
+    //   if (e === 1) {
+    //     this.isShowCalendar = true
+    //   }
+    // },
+    // calendarHide() {
+    //   this.isShowCalendar = false
+    // },
+    // datePick(e) {
+    //   this.select.page = 1
+    //   this.select.start_date = `${e.startDate}`
+    //   this.select.end_date = `${e.endDate}`
+    //   this.nursingList = []
+    //   this.getList()
+    // },
+
+    searchInput(e) {
+      this.select.keyword = e
+
+      this.nursingList = []
+      this.select.page = 1
+      this.$u.debounce(this.getList, 1000)
+    },
+    async getList() {
+      let res = await this.$u.api.adminLongInsuranceList(this.select)
+      if (res.data.length > 0 && res.data) {
+        this.nursingList.push(...res.data)
+        this.status = 'loadmore'
+      } else {
+        this.status = 'nomore'
+        if (this.select.page > 1) {
+          this.select.page--
+        }
+      }
+    },
+
+    //跳转详情
+    toDetail(item) {
+
+    },
+
+  },
+  computed: {
+    statusComputed() {
+      return function(status) {
+        switch (status) {
+          case '0':
+            return "待护理"
+            break;
+          case 1:
+            return "护理中"
+            break;
+          case 2:
+            return "已护理"
+            break;
+          default:
+            return '全部'
+        }
+      }
+    }
+  },
+  watch: {
+    isShowCalendar(val) {
+      if (!val) {
+        this.$refs.uDropdown.close()
+      }
+    },
+  },
+  onReachBottom() {
+    this.select.page++
+    this.status = 'loading';
+    this.getList()
+  },
+  onShow() {
+    this.select.page = 1
+    this.nursingList = []
+    uni.getLocation().then(res => {
+      this.select.lat = res[1]?.latitude
+      this.select.lng = res[1]?.longitude
+
+      this.getList()
+    })
+  },
+  onHide() {
+
+  }
+}
+</script>
+
+<style scoped lang="scss">
+//下拉自定义
+/deep/.u-dropdown__menu {
+  justify-content: space-evenly !important;
+}
+
+/deep/.u-dropdown__menu__item {
+  width: 336rpx !important;
+  flex: none !important;
+  height: 70rpx;
+  background: #FFFFFF;
+  border-radius: 10rpx;
+  justify-content: space-between !important;
+}
+
+/deep/.u-dropdown__menu__item .u-flex {
+  flex: 1;
+}
+
+/deep/.u-dropdown__menu__item__text {
+  flex: 1 !important;
+  font-size: 32rpx !important;
+  font-weight: 500 !important;
+  color: #333333 !important;
+  text-align: center;
+
+  padding: 12rpx 0rpx !important;
+}
+
+/deep/.u-dropdown__menu__item__arrow {
+  width: 70rpx !important;
+  height: 70rpx !important;
+  background: rgba(20, 121, 255, 0.1) !important;
+  border-radius: 10rpx !important;
+  border: 2rpx solid #FFFFFF !important;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+/deep/.u-load-more-wrap {
+  padding: 10px 0;
+}
+
+.search {
+  width: 710rpx;
+  height: 70rpx;
+  background: #FFFFFF;
+  border: 2rpx solid #FAFBFC;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  margin: 24rpx 24rpx 0 24rpx;
+
+  .input-content {
+
+    margin-left: 30rpx;
+  }
+
+  .icon {
+
+
+    margin-right: 30rpx;
+  }
+}
+
+.drop-down {
+  margin-top: 20rpx;
+}
+
+.nursing-list {
+
+  margin-top: 10rpx;
+
+  .list-item {
+    width: 710rpx;
+    background: #FFFFFF;
+    box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(219, 218, 218, 0.5);
+
+    margin: 0 20rpx 26rpx 22rpx;
+
+    .top {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      padding: 22rpx 0;
+
+      .time {
+        height: 40rpx;
+        font-size: 40rpx;
+        font-weight: 500;
+        color: #36596A;
+        line-height: 40rpx;
+
+        padding-left: 20rpx;
+      }
+
+      .status {
+        display: flex;
+        align-items: center;
+
+        .status-icon {
+
+          margin-right: 10rpx;
+        }
+
+        .status-text {
+          width: 84rpx;
+          height: 40rpx;
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #36596A;
+          line-height: 40rpx;
+
+          margin-right: 20rpx;
+        }
+      }
+    }
+
+    .line {
+      width: 670rpx;
+      height: 2rpx;
+      border: 2rpx solid #EEEFF5;
+
+      margin: 0 auto;
+    }
+
+    .center {
+      display: flex;
+      justify-content: space-between;
+
+      padding-top: 24rpx;
+
+      .avatar {
+
+        padding-top: 4rpx;
+        padding-left: 20rpx;
+      }
+
+      .user-info {
+        flex: 1;
+
+        padding-left: 24rpx;
+
+        .name {
+          width: 270rpx;
+          height: 48rpx;
+          font-size: 32rpx;
+          font-weight: 500;
+          color: #333333;
+        }
+
+        .tel {
+          height: 40rpx;
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #36596A;
+          line-height: 40rpx;
+          display: flex;
+
+          margin-top: 18rpx;
+
+          .text {
+
+            margin-left: 10rpx;
+          }
+        }
+
+        .address {
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #36596A;
+          line-height: 40rpx;
+          display: flex;
+
+          margin-top: 14rpx;
+
+          .text {
+
+            margin-left: 10rpx;
+          }
+        }
+      }
+
+      .sex {
+        width: 40rpx;
+        height: 40rpx;
+        background: #FDECEC;
+        opacity: 0.5;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        margin-right: 20rpx;
+
+        .sex-text {
+          width: 28rpx;
+          height: 34rpx;
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #36596A;
+          line-height: 34rpx;
+        }
+      }
+    }
+
+    .bottom {
+
+      margin-top: 16rpx;
+      padding: 10rpx 60rpx 26rpx;
+
+      &-item {
+        display: flex;
+        justify-content: space-between;
+        line-height: 2;
+        padding-left: 30rpx;
+        position: relative;
+
+        &::before {
+          content: "";
+          width: 12rpx;
+          height: 12rpx;
+          border-radius: 100%;
+          background: #3877f6;
+          position: absolute;
+          top: calc(50% - 6rpx);
+          left: 0;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/package_sub/pages/longInsurance/longInsuranceDetail.vue b/package_sub/pages/longInsurance/longInsuranceDetail.vue
new file mode 100644
index 0000000..51fa3cf
--- /dev/null
+++ b/package_sub/pages/longInsurance/longInsuranceDetail.vue
@@ -0,0 +1,378 @@
+<template>
+  <view>
+    <cpn-navbar title="回访详情" :is-back="true"></cpn-navbar>
+
+    <view class="container">
+      <view class="nursing-list">
+        <view class="list-item">
+          <view class="top">
+            <view class="time">{{detail.created_at}}</view>
+          </view>
+
+          <view class="line"></view>
+
+          <view style="padding: 20rpx 40rpx 0;font-size: 32rpx;line-height: 2;font-weight: 600;">
+            被护理人
+          </view>
+          <view class="center" v-if="detail.customer">
+            <view class="avatar">
+              <u-image :src="((detail.customer && detail.customer.idcard) ? getSexByIdcard(detail.customer.idcard) : '无') === '男' ? vuex_male_img : vuex_female_img" height="104"
+                       width="104" shape="circle"></u-image>
+            </view>
+            <view class="user-info">
+              <view class="name">{{ detail.customer ? detail.customer.name : "" }}</view>
+              <view class="tel">
+                <view>
+                  <u-icon name="phone" size="28" color="#1479FF"></u-icon>
+                </view>
+                <view class="text">{{ detail.customer ? detail.customer.phone : '无'}}</view>
+              </view>
+              <view class="address">
+                <view>
+                  <u-icon name="map" size="28" color="#1479FF"></u-icon>
+                </view>
+                <view class="text">{{ detail.customer_address ? detail.customer_address.address : '无'}}</view>
+              </view>
+            </view>
+            <view class="sex">
+              <view class="sex-text">
+                {{ (detail.customer && detail.customer.idcard) ? getSexByIdcard(detail.customer.idcard) : '无' }}
+              </view>
+            </view>
+          </view>
+
+          <view class="line" style="margin-top: 22rpx;"></view>
+
+          <view class="bottom">
+            <view class="bottom-item">
+              <view class="bottom-item__title">服务满意度</view>
+              <view class="bottom-item__value">{{ satisfies.find(i => i.value === detail.satisfy) ? satisfies.find(i => i.value === detail.satisfy).label : '' }}</view>
+            </view>
+            <view class="bottom-item">
+              <view class="bottom-item__title">护理员护理情况调查</view>
+              <view class="bottom-item__value">{{ nurseInvestigates.find(i => i.value === detail.nurse_investigate) ? nurseInvestigates.find(i => i.value === detail.nurse_investigate).label : '' }}</view>
+            </view>
+            <view class="bottom-item">
+              <view class="bottom-item__title">是否在岗</view>
+              <view class="bottom-item__value">{{ detail.is_work ? '是' : '否' }}</view>
+            </view>
+            <view class="bottom-item">
+              <view class="bottom-item__title">按照排班时间上门服务</view>
+              <view class="bottom-item__value">{{ detail.is_on_time ? '是' : '否' }}</view>
+            </view>
+            <view class="bottom-item">
+              <view class="bottom-item__title">护理工具携带</view>
+              <view class="bottom-item__value">{{ detail.tools ? detail.tools.split("|").toString() : '' }}</view>
+            </view>
+            <view class="bottom-item">
+              <view class="bottom-item__title">是否有工作服</view>
+              <view class="bottom-item__value">{{ /工作服/g.test(detail.accessory) ? '有' : '无' }}</view>
+            </view>
+            <view class="bottom-item">
+              <view class="bottom-item__title">是否有工作证</view>
+              <view class="bottom-item__value">{{ /工作证/g.test(detail.accessory) ? '有' : '无' }}</view>
+            </view>
+            <view class="bottom-item">
+              <view class="bottom-item__title">服务内容</view>
+              <view class="bottom-item__value">{{ detail.serve ? detail.serve.split("|").toString() : '' }}</view>
+            </view>
+            <view class="bottom-item">
+              <view class="bottom-item__title">其他需求</view>
+              <view class="bottom-item__value">{{ detail.other ? detail.other.split("|").toString() : '' }}</view>
+            </view>
+            <view class="bottom-item">
+              <view class="bottom-item__title">建议</view>
+              <view class="bottom-item__value">{{ detail.tip }}</view>
+            </view>
+            <view class="bottom-item">
+              <view class="bottom-item__title">回访地址</view>
+              <view class="bottom-item__value">
+                {{ `${(detail.lng || detail.lat) ? ('(' + detail.lng + ',' + detail.lat + ')') : ''}${detail.address}` }}
+              </view>
+            </view>
+            <view class="bottom-item">
+              <view class="bottom-item__title">回访图片</view>
+              <view class="bottom-item__value">
+                <u-image :width="300"
+                         :height="300"
+                         style="margin-bottom: 10rpx"
+                         :border-radius="8"
+                         v-for="img in detail.files"
+                         :key="img.id"
+                         :src="img.url"
+                         @click="showimg(img.url)"></u-image>
+              </view>
+            </view>
+            <view class="bottom-item">
+              <view class="bottom-item__title">服务对象/家属签名</view>
+              <view class="bottom-item__value">
+                <u-image :width="300"
+                         :height="300"
+                         style="margin-bottom: 10rpx"
+                         :border-radius="8"
+                         :src="detail.sign_image ? detail.sign_image.url : ''"
+                         @click="showimg(detail.sign_image ? detail.sign_image.url : '')"></u-image>
+              </view>
+            </view>
+            <view class="bottom-item">
+              <view class="bottom-item__title">调查人员签名</view>
+              <view class="bottom-item__value">
+                <u-image :width="300"
+                         :height="300"
+                         style="margin-bottom: 10rpx"
+                         :border-radius="8"
+                         :src="detail.admin_sign_image ? detail.admin_sign_image.url : ''"
+                         @click="showimg(detail.admin_sign_image ? detail.admin_sign_image.url : '')"></u-image>
+              </view>
+            </view>
+          </view>
+
+        </view>
+      </view>
+
+      <u-button class="operate-item"
+                :custom-style="{ width: '90%', 'margin-left': '5%' }"
+                type="primary"
+                size="medium"
+                ripple
+                @click="pageTo('/package_sub/pages/addLongInsurance/addLongInsurance' + '?customer_id=' + detail.customer_id + '&id=' + detail.id)">编辑</u-button>
+    </view>
+  </view>
+</template>
+
+<script>
+import { getSexByIdcard } from "@/common/util"
+export default {
+  data() {
+    return {
+      id: "",
+      detail: {},
+
+      satisfies: [
+        {
+          label: "90分以上",
+          value: 1
+        },
+        {
+          label: "80-90分",
+          value: 2
+        },
+        {
+          label: "80分以下",
+          value: 3
+        },
+      ],
+      nurseInvestigates: [
+        {
+          label: "护理中回访",
+          value: 1
+        },
+        {
+          label: "日常回访",
+          value: 2
+        },
+      ],
+    };
+  },
+  methods: {
+    showimg(url) {
+      if (url)
+        this.$showimg({
+          imgs: [url],
+          current: 0
+        })
+    },
+    getSexByIdcard,
+    pageTo (url) {
+      uni.navigateTo({
+        url
+      })
+    },
+    async getDetail () {
+      const res = await this.$u.api.adminLongInsuranceDetail(this.id)
+      console.log(res)
+      this.detail = res;
+    }
+  },
+  onLoad(option) {
+    this.id = option.id;
+    this.getDetail()
+  },
+}
+</script>
+
+<style lang="scss">
+.container {
+  padding-bottom: 20rpx;
+}
+.nursing-list {
+
+  margin-top: 20rpx;
+
+  .list-item {
+    width: 710rpx;
+    background: #FFFFFF;
+    box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(219, 218, 218, 0.5);
+
+    margin: 0 20rpx 26rpx 22rpx;
+
+    .top {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      padding: 22rpx 0;
+
+      .time {
+        height: 40rpx;
+        font-size: 40rpx;
+        font-weight: 500;
+        color: #36596A;
+        line-height: 40rpx;
+
+        padding-left: 20rpx;
+      }
+
+      .status {
+        display: flex;
+        align-items: center;
+
+        .status-icon {
+
+          margin-right: 10rpx;
+        }
+
+        .status-text {
+          width: 84rpx;
+          height: 40rpx;
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #36596A;
+          line-height: 40rpx;
+
+          margin-right: 20rpx;
+        }
+      }
+    }
+
+    .line {
+      width: 670rpx;
+      height: 2rpx;
+      border: 2rpx solid #EEEFF5;
+
+      margin: 0 auto;
+    }
+
+    .center {
+      display: flex;
+      justify-content: space-between;
+
+      padding-top: 24rpx;
+
+      .avatar {
+
+        padding-top: 4rpx;
+        padding-left: 20rpx;
+      }
+
+      .user-info {
+        flex: 1;
+
+        padding-left: 24rpx;
+
+        .name {
+          width: 270rpx;
+          height: 48rpx;
+          font-size: 32rpx;
+          font-weight: 500;
+          color: #333333;
+        }
+
+        .tel {
+          height: 40rpx;
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #36596A;
+          line-height: 40rpx;
+          display: flex;
+
+          margin-top: 18rpx;
+
+          .text {
+
+            margin-left: 10rpx;
+          }
+        }
+
+        .address {
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #36596A;
+          line-height: 40rpx;
+          display: flex;
+
+          margin-top: 14rpx;
+
+          .text {
+
+            margin-left: 10rpx;
+          }
+        }
+      }
+
+      .sex {
+        width: 40rpx;
+        height: 40rpx;
+        background: #FDECEC;
+        opacity: 0.5;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        margin-right: 20rpx;
+
+        .sex-text {
+          width: 28rpx;
+          height: 34rpx;
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #36596A;
+          line-height: 34rpx;
+        }
+      }
+    }
+
+    .bottom {
+
+      margin-top: 16rpx;
+      padding: 10rpx 60rpx 26rpx;
+
+      &-item {
+        display: flex;
+        justify-content: space-between;
+        line-height: 2;
+        padding-left: 30rpx;
+        position: relative;
+
+        &__title {
+          flex-shrink: 0;
+          flex-basis: 40%;
+        }
+        &__value {
+          word-break: break-all;
+        }
+        &::before {
+          content: "";
+          width: 12rpx;
+          height: 12rpx;
+          border-radius: 100%;
+          background: #3877f6;
+          position: absolute;
+          top: calc(28rpx - 6rpx);
+          left: 0;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/package_sub/pages/schedule/schedule.vue b/package_sub/pages/schedule/schedule.vue
index 3a6fd81..eb57b42 100644
--- a/package_sub/pages/schedule/schedule.vue
+++ b/package_sub/pages/schedule/schedule.vue
@@ -248,7 +248,7 @@ export default {
         start_date: this.$moment(new Date()).startOf('month').format('YYYY-MM-DD'),
         end_date: this.$moment(new Date()).endOf('month').format('YYYY-MM-DD'),
         keyword: '',
-        is_new_auth: 1,
+        is_auth: 1,
         sort_name:'start_time',
         sort_type:'asc'
       },
@@ -272,6 +272,7 @@ export default {
         start_date: this.$moment(new Date()).startOf('month').format('YYYY-MM-DD'),
         end_date: this.$moment(new Date()).endOf('month').format('YYYY-MM-DD'),
         keyword: '',
+        is_auth: 1,
         sort_name:'start_time',
         sort_type:'asc'
       }
diff --git a/pages.json b/pages.json
index cc5d75d..69c553c 100644
--- a/pages.json
+++ b/pages.json
@@ -158,6 +158,18 @@
           "style": {
             "navigationStyle": "custom"
           }
+        },
+        {
+          "path": "pages/longInsurance/longInsurance",
+          "style": {
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "pages/longInsurance/longInsuranceDetail",
+          "style": {
+            "navigationStyle": "custom"
+          }
         }
       ]
     }
diff --git a/pages/showimg/showimg.vue b/pages/showimg/showimg.vue
index 2f5bc70..da8dcde 100644
--- a/pages/showimg/showimg.vue
+++ b/pages/showimg/showimg.vue
@@ -5,7 +5,7 @@
         <view class="img-page">
           <movable-area scale-area>
             <movable-view direction="all" scale="true" scale-min="1" scale-max="4">
-              <image :src="item" mode="widthFix" :lazy-load="true" />
+              <image :src="item" mode="widthFix" :lazy-load="true" style="background: #fff"/>
             </movable-view>
           </movable-area>
         </view>
@@ -250,4 +250,4 @@
       }
     }
   }
-</style>
+</style>
diff --git a/pages/sign/sign.vue b/pages/sign/sign.vue
index f107fbb..91c20e5 100644
--- a/pages/sign/sign.vue
+++ b/pages/sign/sign.vue
@@ -1,5 +1,7 @@
 <template>
   <view class="sign">
+    <canvas canvas-id="sign-cnv" :style="{ height: cnv.height + 'px', width: cnv.width + 'px' }"></canvas>
+    <image ref="resultImg" :src="src" alt="" @load="resultImgLoad"></image>
     <view class="sign-bkg">
       <view class="sign-bkg__word">
         <span>签</span>
@@ -19,7 +21,7 @@
     </view>
 
     <view class="sign-btn">
-      <view class="sign-btn__back" @click="$u.throttle(pageBack())">重置</view>
+      <view class="sign-btn__back" @click="$u.throttle(pageBack())">返回</view>
       <view class="sign-btn__reset" @click="$u.throttle(onClick('clear'))">重置</view>
       <view class="sign-btn__confirm" @click="$u.throttle(onClick('save'))">确认</view>
     </view>
@@ -36,6 +38,13 @@ import {
 export default {
   data() {
     return {
+      src: '',
+      Img: {},
+      cnv: {
+        width: 300,
+        height: 225
+      },
+      saveKey: '',
       url: '',
       options: {
         penColor: '#000',
@@ -46,79 +55,39 @@ export default {
     }
   },
   methods: {
+    resultImgLoad (e) {
+      this.Img = e.detail;
+      let rate = this.Img.width / this.Img.height;
+      this.cnv.width  = 300 / rate;
+      this.cnv.height = 300;
+      this.rotateImage(this.src, 270)
+    },
     pageBack () {
       uni.navigateBack()
     },
     //src - 图片路径，deg旋转角度
-    rotateBase64Img(src, edg) {
-      return new Promise((resolve, reject) => {
-        const canvas = document.createElement('canvas')
-        const ctx = canvas.getContext('2d')
-        let imgW // 图片宽度
-        let imgH // 图片高度
-        let size // canvas初始大小
-        if (edg % 90 != 0) {
-          console.error('旋转角度必须是90的倍数!')
-        }
-        (edg < 0) && (edg = (edg % 360) + 360)
-        const quadrant = (edg / 90) % 4 // 旋转象限
-        const cutCoor = {
-          sx: 0,
-          sy: 0,
-          ex: 0,
-          ey: 0
-        } // 裁剪坐标
-        const image = new Image()
-        image.crossOrigin = 'anonymous'
-        image.src = src
-        image.onload = () => {
-          imgW = image.width
-          imgH = image.height
-          size = imgW > imgH ? imgW : imgH
-          canvas.width = size * 2
-          canvas.height = size * 2
-          switch (quadrant) {
-            case 0:
-              cutCoor.sx = size
-              cutCoor.sy = size
-              cutCoor.ex = size + imgW
-              cutCoor.ey = size + imgH
-              break
-            case 1:
-              cutCoor.sx = size - imgH
-              cutCoor.sy = size
-              cutCoor.ex = size
-              cutCoor.ey = size + imgW
-              break
-            case 2:
-              cutCoor.sx = size - imgW
-              cutCoor.sy = size - imgH
-              cutCoor.ex = size
-              cutCoor.ey = size
-              break
-            case 3:
-              cutCoor.sx = size
-              cutCoor.sy = size - imgW
-              cutCoor.ex = size + imgH
-              cutCoor.ey = size + imgW
-              break
-          }
-          ctx.translate(size, size)
-          ctx.rotate(edg * Math.PI / 180)
-          ctx.drawImage(image, 0, 0)
-          var imgData = ctx.getImageData(cutCoor.sx, cutCoor.sy, cutCoor.ex, cutCoor.ey)
-          if (quadrant % 2 == 0) {
-            canvas.width = imgW
-            canvas.height = imgH
-          } else {
-            canvas.width = imgH
-            canvas.height = imgW
+    rotateImage(src, degree) {
+      const ctx = uni.createCanvasContext('sign-cnv',this);
+      ctx.translate(this.cnv.width / 2, 0);
+      ctx.rotate(degree * Math.PI / 180);
+      ctx.drawImage(src, 0, 0,-this.cnv.width / 2, -this.cnv.height / 2, this.cnv.width, this.cnv.height);
+      ctx.draw(false, () => {
+        // 将canvas转换为图片
+        uni.canvasToTempFilePath({
+          canvasId: 'sign-cnv',
+          success: (res) => {
+            // res.tempFilePath是旋转后的图片路径
+            console.log(this.saveKey, res.tempFilePath)
+            this.$u.vuex(this.saveKey, res.tempFilePath)
+            setTimeout(() => {
+              this.pageBack()
+            }, 500)
+          },
+          fail: (err) => {
+            console.error(err);
           }
-          ctx.putImageData(imgData, 0, 0)
-          // 获取旋转后的base64图片
-          resolve(canvas.toDataURL())
-        }
-      })
+        });
+      });
     },
 
     onClick(type) {
@@ -141,10 +110,11 @@ export default {
             // app | H5 | 微信小程序 生成的是base64
             if (res.tempFilePath) {
               //this.$u.vuex('vuex_sign_base64', res.tempFilePath)
-              this.rotateBase64Img(res.tempFilePath, -90).then(res => {
-                this.$u.vuex('vuex_sign_base64', res)
-                this.pageBack()
-              })
+              this.src = res.tempFilePath;
+              // this.rotateBase64Img(res.tempFilePath, -90).then(res => {
+              //   this.$u.vuex(this.saveKey, res)
+              //   this.pageBack()
+              // })
             }
           }
         })
@@ -154,6 +124,10 @@ export default {
         this.$refs.signatureRef[type]()
     },
   },
+  onLoad (option) {
+    console.log(option)
+    this.saveKey = option.key;
+  }
 }
 </script>
 
@@ -228,6 +202,20 @@ export default {
       position: fixed;
       top: 50%;
 
+      &__back {
+        width: 200rpx;
+        height: 66rpx;
+        background: #FEFAEE;
+        border: 4rpx solid #CA3F32;
+        border-radius: 34rpx;
+        font-size: 26rpx;
+        font-weight: 400;
+        color: #B61F2E;
+        line-height: 58rpx;
+        text-align: center;
+
+        margin-right: 52rpx;
+      }
       &__reset {
         width: 200rpx;
         height: 66rpx;
@@ -329,6 +317,21 @@ export default {
       bottom: 8vh;
       left: 50%;
 
+      &__back {
+        width: 16.6vw;
+        height: 5.2vw;
+        background: #FEFAEE;
+        border: 0.4vw solid #CA3F32;
+        border-radius: 34rpx;
+        font-size: 2.6vw;
+        font-weight: 400;
+        color: #B61F2E;
+        text-align: center;
+        line-height: 5.2vw;
+        box-sizing: content-box;
+
+        margin-right: 48rpx;
+      }
       &__reset {
         width: 16.6vw;
         height: 5.2vw;
diff --git a/store/index.js b/store/index.js
index 46510f1..f4ce2a6 100644
--- a/store/index.js
+++ b/store/index.js
@@ -44,7 +44,8 @@ const store = new Vuex.Store({
 			password: "",
 			myRole: 1
 		},
-		vuex_sign_base64: "",
+		vuex_sign_image: "",
+		vuex_admin_sign_image: "",
 
 		vuex_selected_customer: {},//预约护理下选择的用户信息
 	},