Merge branch 'master' of http://gitea.bugtc.com/zhouyanli/property-manager-side

wuye-manager-uniapp/pageSubPack/inspection/inspection_record.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 顶部导航栏 -->
   <view class="page_padding">
-    <view class="inspection_record_box flex-1 flex flex-col">
+    <view class="inspection_record_box flex flex-col">
       <navBar @clickLeft="navBack" title="巡检记录"></navBar>
       <TabsComponents
         :activeValue="activeValue"
@@ -26,40 +26,39 @@
           </uni-datetime-picker>
         </view>
       </view>
-      <view v-if="list.length > 0">
-        <scroll-view
-          class="record_body record-list"
-          scroll-y
-          lower-threshold="160"
-          @scrolltolower="scrolltolower"
+      <scroll-view
+        v-if="list.length > 0"
+        class="record_body record-list"
+        scroll-y
+        lower-threshold="160"
+        @scrolltolower="scrolltolower"
+      >
+        <view
+          class="record_list_item"
+          v-for="(ite, index) in list"
+          :key="index"
+          @tap="handleTap(ite)"
         >
-          <view
-            class="record_list_item"
-            v-for="(ite, index) in list"
-            :key="index"
-            @tap="handleTap(ite)"
-          >
-            <view class="title flex items-center">
-              <view class="title_name"> {{ ite.taskName }} </view>
-              <view class="title_status" v-if="isComputed(ite.taskStatus)"> 已巡检 </view>
-              <view class="title_status noinspection" v-else> 未巡检 </view>
-            </view>
-            <view class="items" v-if="ite.points">
-              <view class="item" v-for="(itemname, itemindex) in ite.itemslist" :key="itemindex">
-                <text>{{ itemname }}</text>
-              </view>
-            </view>
-            <view class="time">
-              <text>巡检时间：</text>
-              <text>{{ ite.taskTime }}</text>
-            </view>
-            <view class="time user">
-              <text>巡检人：</text>
-              <text>{{ ite.inspectorName }}</text>
+          <view class="title flex items-center">
+            <view class="title_name"> {{ ite.taskName }} </view>
+            <view class="title_status" v-if="isComputed(ite.taskStatus)"> 已巡检 </view>
+            <view class="title_status noinspection" v-else> 未巡检 </view>
+          </view>
+          <view class="items" v-if="ite.points">
+            <view class="item" v-for="(itemname, itemindex) in ite.itemslist" :key="itemindex">
+              <text>{{ itemname }}</text>
             </view>
           </view>
-        </scroll-view>
-      </view>
+          <view class="time">
+            <text>巡检时间：</text>
+            <text>{{ ite.taskTime }}</text>
+          </view>
+          <view class="time user">
+            <text>巡检人：</text>
+            <text>{{ ite.inspectorName }}</text>
+          </view>
+        </view>
+      </scroll-view>
       <view class="nodata" v-if="list.length <= 0">
         <text>暂无数据</text>
       </view>
@@ -100,7 +99,7 @@ const activeValue = ref(2)
 // ---------------------------------------------------------------------
 const list = ref([])
 const queryParmas = ref({
-  date: '',
+  date: parseTime(new Date(), '{y}-{m}-{d}'),
   status: 2,
   pageNum: 1,
   pageSize: 10
@@ -190,11 +189,6 @@ function handleChangeTabs(val: number) {
 }
 // ---------------------------------------------------------------------
 
-function init() {
-  queryParmas.value.date = parseTime(new Date(), '{y}-{m}-{d}')
-  getlist()
-}
-
 onShow(() => {
   hasMore.value = true
   resetList()
@@ -203,9 +197,8 @@ function resetList() {
   list.value = []
   queryParmas.value.status = 2
   queryParmas.value.pageSize = 10
-  queryParmas.value.pageSize = 10
   hasMore.value = true
-  init()
+  getlist()
 }
 
 // 返回上一页
@@ -276,7 +269,6 @@ const navBack = () => {
     overflow: hidden;
     overflow-y: auto;
     box-sizing: border-box;
-
     .record_list_item {
       margin-bottom: 20rpx;
       background: #ffffff;

wuye-manager-uniapp/pageSubPack/inspection/inspection_upload.vue

@@ -95,7 +95,7 @@
             <view class="submitbox" @tap="handleSubmit(ite)" v-if="!ite.complated">
               <text>提交</text>
             </view>
-            <view class="line" v-if="ind + 1 === baseFormData.length"> </view>
+            <view class="line" v-if="ind + 1 < item.points.length"> </view>
           </view>
         </view>
       </view>

wuye-manager-uniapp/pageSubPack/ticket/myticket.vue

@@ -61,9 +61,7 @@
           </view>
 
           <!-- 内容 -->
-          <view class="card-content">
-            {{ record.problem }}
-          </view>
+          <view class="card-content"> {{ record.problem }} </view>
           <!-- 底部信息 -->
           <view class="card-footer">
             <text class="create-time">{{ record.createTime }}</text>
@@ -82,7 +80,7 @@
 
 <script setup>
 import { ref, computed } from 'vue'
-import { onReady, onShow } from '@dcloudio/uni-app'
+import { onReady, onShow, onLoad } from '@dcloudio/uni-app'
 import TabsComponents from '@/components/tabs/tabs.vue'
 import NavBar from '@/components/navbar/navbar.vue'
 import { getUserTicketlist } from '@/api/ticket.js'
@@ -122,6 +120,17 @@ function scrolltolower() {
   queryParmas.value.pageNum += 1
   getlist()
 }
+
+onLoad(data => {
+  if (data.MyOrderNum === '0') {
+    activeStatus.value = 0
+    queryParmas.value.problemStatus = undefined
+  } else {
+    activeStatus.value = 1
+    queryParmas.value.problemStatus = 1
+  }
+})
+
 function getlist() {
   if (isLoading.value || !hasMore.value) return
   isLoading.value = true
@@ -354,6 +363,9 @@ function handlePrivew(imgs) {
   font-size: 32rpx;
   color: #222222;
   line-height: 40rpx;
+  max-width: 500rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 /* 状态标签 */
@@ -385,6 +397,7 @@ function handlePrivew(imgs) {
 /* 类型标签组 */
 .tag-group {
   display: flex;
+  flex-wrap: wrap;
   margin-bottom: 20rpx;
 }
 .tag-group > .tag-item:not(:last-child) {
@@ -392,7 +405,9 @@ function handlePrivew(imgs) {
 }
 .tag-item {
   padding: 0 10rpx;
-  height: 42rpx;
+  margin: 5rpx;
+  min-height: 42rpx;
+  text-align: left;
   border-radius: 8rpx 8rpx 8rpx 8rpx;
   border: 1rpx solid #999999;
 
@@ -400,7 +415,6 @@ function handlePrivew(imgs) {
   font-size: 24rpx;
   color: #999999;
   line-height: 42rpx;
-  text-align: center;
 }
 
 /* 内容 */
@@ -411,6 +425,7 @@ function handlePrivew(imgs) {
   color: #666666;
   line-height: 40rpx;
   letter-spacing: 2rpx;
+  word-wrap: break-word;
 }
 /* 图片  */
 .card-image {