小程序工单联调

components/searchSelectWrapper/index.js

@@ -19,6 +19,7 @@ Component({
     useSlot: Boolean,
     hideBorder: Boolean,
     required: Boolean,
+    transparent: Boolean,
   },
 
   /**

components/searchSelectWrapper/index.wxml

@@ -1,7 +1,7 @@
 <!--components/searchSelectWrapper/index.wxml-->
 <view class="wrapper" wx:if="{{type === 'select'}}">
     <view class="label"><text class="required" wx:if="{{required}}">*</text>{{ label }}</view>
-    <view class="content" bind:tap="clickTime" bind:tap="onSearch">
+    <view class="content" bind:tap="clickTime" bind:tap="onSearch" style="background-color: {{transparent ? 'transparent' : 'white'}};">
         <view class="text" wx:if="{{!text}}" style="color: #ccc;"> {{placeholder}} </view>
         <view class="text" wx:else> {{text}} </view>
         <!-- <van-icon name="close" custom-style="margin-right: 16rpx" /> -->
@@ -10,7 +10,7 @@
 </view>
 <view class="wrapper" wx:if="{{type === 'inputSearch'}}">
     <view class="label"><text class="required" wx:if="{{required}}">*</text>{{ label }}</view>
-    <view class="inputContent" bind:tap="clickTime">
+    <view class="inputContent" bind:tap="clickTime" style="background-color: {{transparent ? 'transparent' : 'white'}};">
         <van-field
             value="{{ value }}"
             placeholder="{{placeholder}}"
@@ -23,7 +23,7 @@
 </view>
 <view class="wrapper" wx:if="{{type === 'input'}}">
     <view class="label"><text class="required" wx:if="{{required}}">*</text>{{ label }}</view>
-    <view class="inputContent" bind:tap="clickTime">
+    <view class="inputContent" bind:tap="clickTime" style="background-color: {{transparent ? 'transparent' : 'white'}};">
         <van-field
             value="{{ value }}"
             placeholder="{{placeholder}}"
@@ -37,7 +37,7 @@
 
 <view class="wrapper" wx:if="{{useSlot}}">
     <view class="label"><text class="required" wx:if="{{required}}">*</text>{{ label }}</view>
-    <view class="inputContent" bind:tap="clickTime" style="{{hideBorder ? 'border: none;' : ''}}">
+    <view class="inputContent" bind:tap="clickTime" style="{{hideBorder ? 'border: none;' : ''}} {{transparent ? 'background-color: transparent;' : ''}}">
         <slot></slot>
     </view>
 </view>

pages/workBenchNew/components/installMeter/index.js

@@ -381,7 +381,7 @@ Page({
       return;
     }
     const { code, data, message } = await installMeter({
-      park, meter, address, building, meterBox, meterType,  
+      park, meterSn: meter, address, building, meterBox, meterType,  
       ratio, area, card, collectionA, collectionB, collectionC,
       tenement, sharp, peak, flat, valley, overall, url, sn
     })

pages/workBenchNew/components/workBenchMeterControl/index.js

@@ -112,6 +112,12 @@ Page({
             alertSuccess("操作成功")
           
             await that.init();
+            this.setData({
+              mode: null, 
+              days: null, 
+              reason: null, 
+              url: null,
+            })
           })
         }
       }

pages/workBenchNew/components/workBenchMeterControl/index.json

@@ -4,6 +4,7 @@
     "van-button": "@vant/weapp/button/index",
     "search-select": "/components/searchSelect/index",
     "van-empty": "@vant/weapp/empty/index",
+    "van-image": "@vant/weapp/image/index",
     "table": "/components/table/table",
     "pagination": "/components/pagination/index",
     "empty": "/components/empty/index",

pages/workBenchNew/components/workBenchMeterControl/index.wxml

@@ -117,6 +117,7 @@
                 text="{{days}}"
                 type="input"
                 bind:changeText="changeDays"
+                required="{{true}}"
             />
             <searchSelectWrapper 
                 label="原因" 
@@ -130,6 +131,7 @@
                 useSlot="{{true}}"
                 type=""
                 hideBorder="{{true}}"
+                transparent="{{true}}"
             >
                 <view style="display: flex; align-items: center;">
                     <view>
@@ -138,7 +140,7 @@
                             <van-button type="danger" size="small" bind:click="clearImage" custom-style="margin-right: 20rpx;"> 清除 </van-button>
                         </view>
                     </view>
-                    <van-image wx:if="{{!!url}}" width="100" height="100" src="{{url}}" custom-style="margin-left: 20rpx;" />
+                    <van-image wx:if="{{url}}" width="100" height="100" src="{{url}}" custom-style="margin-left: 20rpx;" />
                 </view>
 
             </searchSelectWrapper>

pages/workBenchTodoList/index.js

@@ -35,8 +35,12 @@ onMenuSelect(e) {
   } = e.detail;
   const id = e.currentTarget.dataset.id;
 
-  if (value === 'detail') {
+  switch(value) {
+    case "detail":
       this.jumpToDetail(id);
+      break;
+    case "ok":
+      break;
   }
 },
   jumpToDetail(id) {

pages/workBenchTodoList/index.wxml

@@ -55,7 +55,7 @@
                                     {{ item.flow_status === 1 ? "处理中" : "已确认" }}
                                 </view>
                                 <view class="th" style="flex: 0 0 120rpx; justify-content: flex-end; display: flex; align-items: center;">
-                                    <!-- <van-icon name="ellipsis" size="24px" bind:tap="showActionMenu" data-data="{{index}}" class="more-icon" />
+                                    <van-icon name="ellipsis" size="24px" bind:tap="showActionMenu" data-data="{{index}}" class="more-icon" />
                                     <van-action-sheet 
                                         show="{{ currentActionSheet === item.id }}" 
                                         actions="{{ actionItems }}" 
@@ -63,12 +63,12 @@
                                         bind:select="onMenuSelect" 
                                         data-id="{{item.id}}" 
                                         close-on-click-action 
-                                    /> -->
+                                    />
-                                    <view 
+                                    <!-- <view 
                                         class="primaryTextBtn" 
                                         wx:if="{{item.flow_status === 1}}"
                                         data-id="{{item.id}}"    
-                                    > 确认 </view>
+                                    > 确认 </view> -->
                                 </view>
                             </view>