@zscreate/zhxy-app-component 1.0.245 → 1.0.247

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -911,17 +911,17 @@ export default {
911
911
  if (!moment(time).unix()) return
912
912
  const comps = this.getAllComponent()
913
913
  let target = comps.find(item => item.model == options.conditionValue)
914
- if (options.condition == '小于') {
915
- if (moment(value).unix() <= moment(time).unix()) {
914
+ if (options.condition.includes('小于')) {
915
+ if (options.condition.includes('等于') ? moment(value).unix() <= moment(time).unix(): moment(value).unix() < moment(time).unix()) {
916
916
  callback()
917
917
  } else {
918
- callback(`${this.widget.name}必须小于等于${target.name}`);
918
+ callback(`${this.widget.name}必须${options.condition}${target.name}`);
919
919
  }
920
- } else {
921
- if (moment(value).unix() >= moment(time).unix()) {
920
+ } else if(options.condition.includes('大于')) {
921
+ if (options.condition.includes('等于') ? moment(value).unix() >= moment(time).unix(): moment(value).unix() > moment(time).unix()) {
922
922
  callback()
923
923
  } else {
924
- callback(`${this.widget.name}必须大于等于${target.name}`);
924
+ callback(`${this.widget.name}必须${options.condition}${target.name}`);
925
925
  }
926
926
  }
927
927
  },
@@ -147,7 +147,7 @@
147
147
  </view>
148
148
  </view>
149
149
  </view>
150
- <view class="verify-cot">
150
+ <view class="verify-cot" style="position: initial;">
151
151
  <m-textarea
152
152
  :max-length="item.options.commentsLength"
153
153
  show-word-limit
@@ -156,6 +156,16 @@
156
156
  @change="val => handlerText(val, item.model)">
157
157
  </m-textarea>
158
158
  </view>
159
+ <!-- #ifdef HBSF-MODE -->
160
+ <view style="display: flex;align-items: center;background-color: #fff;padding: 20rpx 30rpx;">
161
+ <view style="color: #808080;">推荐审核意见:</view>
162
+ <view style="display: flex;justify-content: space-between;">
163
+ <view class="form-input-suggest" @click="models[item.model].comments = '同意'">同意</view>
164
+ <view class="form-input-suggest" @click="models[item.model].comments = '情况属实'">情况属实</view>
165
+ <view class="form-input-suggest" @click="models[item.model].comments = '确认审核'">确认审核</view>
166
+ </view>
167
+ </view>
168
+ <!-- #endif -->
159
169
  <view v-if="item.model == verifyNode" class="verify-cot">
160
170
  <view class="verify-title">{{item.options.operation}}</view>
161
171
  <view style="width:200rpx;">
@@ -1103,4 +1113,11 @@ cover-view button::after {
1103
1113
  .uni-input {
1104
1114
  padding: 5rpx 0;
1105
1115
  }
1116
+ .form-input-suggest {
1117
+ padding: 10rpx 22rpx;
1118
+ background-color: #ecf5fc;
1119
+ border-radius: 20rpx;
1120
+ color: #348cd2;
1121
+ margin-right: 20rpx;
1122
+ }
1106
1123
  </style>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zscreate/zhxy-app-component",
3
- "version": "1.0.245",
3
+ "version": "1.0.247",
4
4
  "private": false,
5
5
  "description": "zhxy-app-component",
6
6
  "main": "index.js",