@zscreate/zhxy-app-component 1.0.402 → 1.0.404

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.
@@ -168,7 +168,7 @@
168
168
  <text>{{item.name }}</text>
169
169
  </view>
170
170
  <view v-if="item.options.supportMulti && (verifyLogs && verifyLogs[item.model])" >
171
- <view v-for="(v_log, idx) in verifyLogsList(item.model)" :key="idx">
171
+ <view v-for="(v_log, idx) in verifyLogsList(item.model)" :key="idx" class="verify-log-item">
172
172
  <view class="verify-cot">
173
173
  <textarea :value="v_log.note" disabled>
174
174
  </textarea>
@@ -185,8 +185,13 @@
185
185
  <view class="verify-title">{{item.options.operationTime}}</view>
186
186
  <view style="flex-shrink: 0">{{v_log['shenpiTime']}}</view>
187
187
  </view>
188
+ <!-- 历史审核盖章回显 -->
189
+ <view v-if="v_log.userSeal" class="verify-seal">
190
+ <image :src="resolveSealUrl(v_log.userSeal)" mode="aspectFit" class="verify-seal__img"></image>
191
+ </view>
188
192
  </view>
189
193
  </view>
194
+ <view class="verify-current-section">
190
195
  <view class="verify-cot" :style="{position:item.model === verifyNode ? 'initial' : 'relative'}">
191
196
  <m-textarea
192
197
  v-if="models[item.model]"
@@ -204,7 +209,7 @@
204
209
  </m-textarea>
205
210
  </view>
206
211
  <!-- 盖章按钮 -->
207
- <view v-if="(item.type === 'hnkj-verify' && item.options.enableSeal || item.type !== 'hnkj-verify') && item.model === verifyNode && sealCache[item.model] && !(models[item.model] && models[item.model].userSeal) && !warpVerifyDisable(item)"
212
+ <view v-if="(item.type === 'hnkj-verify' && item.options.enableSeal || item.type !== 'hnkj-verify' && isSubmitOperation(item.model)) && item.model === verifyNode && sealCache[item.model] && !(models[item.model] && models[item.model].userSeal) && !warpVerifyDisable(item)"
208
213
  class="verify-seal-btn" @tap="handleVerifySeal(item.model)">
209
214
  盖章
210
215
  </view>
@@ -238,16 +243,13 @@
238
243
  <view class="verify-title">{{ item.options.operationTime }}</view>
239
244
  <view style="flex-shrink: 0" v-if="models[item.model]">{{ models[item.model].operationTime }}</view>
240
245
  </view>
241
- <!-- 当前审核盖章 -->
242
- <view v-if="item.model === verifyNode && models[item.model] && models[item.model].userSeal" class="verify-seal">
246
+ <!-- 盖章(当前审核 + 回显) -->
247
+ <view v-if="models[item.model] && models[item.model].userSeal" class="verify-seal">
243
248
  <image :src="resolveSealUrl(models[item.model].userSeal)" mode="aspectFit" class="verify-seal__img"></image>
244
- <view v-if="!warpVerifyDisable(item)" class="verify-seal__close" @tap.stop="handleVerifySealClose(item.model)">
249
+ <view v-if="item.model === verifyNode && !warpVerifyDisable(item)" class="verify-seal__close" @tap.stop="handleVerifySealClose(item.model)">
245
250
  <text class="verify-seal__close-text">x</text>
246
251
  </view>
247
252
  </view>
248
- <!-- 回显盖章 -->
249
- <view v-if="item.model !== verifyNode && models[item.model] && models[item.model].userSeal" class="verify-seal">
250
- <image :src="resolveSealUrl(models[item.model].userSeal)" mode="aspectFit" class="verify-seal__img"></image>
251
253
  </view>
252
254
  </view>
253
255
  </template>
@@ -804,10 +806,10 @@ export default {
804
806
  })
805
807
  return
806
808
  }
807
- if (type === 'hnkj-verify') {
808
- const select = this.selectList[widget.model].find(item => item.label === this.suggestType[model])
809
+ if (type === 'hnkj-verify' || type === 'verify') {
810
+ const select = this.selectList[widget.model] && this.selectList[widget.model].find(item => item.label === this.suggestType[model])
809
811
  const { enableSign , enableSeal } = options
810
- if (select.description === 'TIJIAO') {
812
+ if (select && select.description === 'TIJIAO') {
811
813
  this.models[model].loadingSign = true
812
814
  this.getUserSignature().then(res => {
813
815
  if (res.success) {
@@ -822,8 +824,9 @@ export default {
822
824
  this.models[model].loadingSign = false
823
825
  })
824
826
  } else {
825
- this.models[model].userSign = ''
826
- this.models[model].userSeal = ''
827
+ this.$set(this.models[model], 'userSign', '')
828
+ this.$set(this.models[model], 'userSeal', '')
829
+ this.$set(this.models[model], 'userSealPosition', null)
827
830
  this.$set(this.sealCache, model, '')
828
831
  }
829
832
  }
@@ -843,6 +846,11 @@ export default {
843
846
  if (src.startsWith('data:image') || /^https?:\/\//i.test(src)) return src
844
847
  return (this.imgUrl || '') + src
845
848
  },
849
+ isSubmitOperation(model) {
850
+ if (!this.selectList[model] || !this.suggestType[model]) return false
851
+ const select = this.selectList[model].find(item => item.label === this.suggestType[model])
852
+ return select && select.description === 'TIJIAO'
853
+ },
846
854
  scrollToTop(top) {
847
855
  const _this = this
848
856
  this.$nextTick(function() {
@@ -1726,10 +1734,18 @@ $mybottom: 0; //底部按钮
1726
1734
  }
1727
1735
  }
1728
1736
 
1737
+ .verify-log-item {
1738
+ position: relative;
1739
+ }
1740
+
1741
+ .verify-current-section {
1742
+ position: relative;
1743
+ }
1744
+
1729
1745
  .verify-seal {
1730
1746
  position: absolute;
1731
1747
  left: 200rpx;
1732
- top: 260rpx;
1748
+ top: 180rpx;
1733
1749
  width: 260rpx;
1734
1750
  height: 260rpx;
1735
1751
  z-index: 10;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zscreate/zhxy-app-component",
3
- "version": "1.0.402",
3
+ "version": "1.0.404",
4
4
  "private": false,
5
5
  "description": "zhxy-app-component",
6
6
  "main": "index.js",