@zscreate/zhxy-app-component 1.0.403 → 1.0.405

package/components/form-container/form-container.vue

@@ -168,7 +168,7 @@
                         <text>{{item.name }}</text>
                       </view>
                         <view v-if="item.options.supportMulti && (verifyLogs && verifyLogs[item.model])" >
-                            <view v-for="(v_log, idx) in verifyLogsList(item.model)" :key="idx" style="position: relative;">
+                            <view v-for="(v_log, idx) in verifyLogsList(item.model)" :key="idx" class="verify-log-item">
                                 <view class="verify-cot">
                     <textarea :value="v_log.note" disabled>
                     </textarea>
@@ -191,7 +191,7 @@
                                 </view>
                             </view>
                         </view>
-                        <view style="position: relative;">
+                        <view class="verify-current-section">
                         <view class="verify-cot" :style="{position:item.model === verifyNode ? 'initial' : 'relative'}">
                             <m-textarea
                                 v-if="models[item.model]"
@@ -209,17 +209,9 @@
                             </m-textarea>
                         </view>
                         <!-- 盖章按钮 -->
-                        <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)"
-                          class="verify-seal-btn" @tap="handleVerifySeal(item.model)">
-                          盖章
-                        </view>
-                        <!-- 当前审核盖章 -->
-                        <view v-if="item.model === verifyNode && models[item.model] && models[item.model].userSeal" class="verify-seal">
-                          <image :src="resolveSealUrl(models[item.model].userSeal)" mode="aspectFit" class="verify-seal__img"></image>
-                          <view v-if="!warpVerifyDisable(item)" class="verify-seal__close" @tap.stop="handleVerifySealClose(item.model)">
-                            <text class="verify-seal__close-text">x</text>
-                          </view>
-                        </view>
+                        <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)"
+                          class="verify-seal-btn-wrap">
+                          <text class="verify-seal-btn" @tap="handleVerifySeal(item.model)">盖章</text>
                         </view>
 			<!-- #ifdef HBSF-MODE -->
                         <view style="display: flex;align-items: center;background-color: #fff;padding: 20rpx 30rpx;" v-if="item.model === verifyNode">
@@ -251,9 +243,13 @@
                             <view class="verify-title">{{ item.options.operationTime }}</view>
                             <view style="flex-shrink: 0" v-if="models[item.model]">{{ models[item.model].operationTime }}</view>
                         </view>
-                        <!-- 回显盖章 -->
-                        <view v-if="item.model !== verifyNode && models[item.model] && models[item.model].userSeal" class="verify-seal">
+                        <!-- 盖章（当前审核 + 回显） -->
+                        <view v-if="models[item.model] && models[item.model].userSeal" class="verify-seal">
                           <image :src="resolveSealUrl(models[item.model].userSeal)" mode="aspectFit" class="verify-seal__img"></image>
+                          <view v-if="item.model === verifyNode && !warpVerifyDisable(item)" class="verify-seal__close" @tap.stop="handleVerifySealClose(item.model)">
+                            <text class="verify-seal__close-text">x</text>
+                          </view>
+                        </view>
                         </view>
                     </view>
                 </template>
@@ -810,10 +806,10 @@ export default {
             })
             return
           }
-          if (type === 'hnkj-verify') {
-            const select = this.selectList[widget.model].find(item => item.label === this.suggestType[model])
+          if (type === 'hnkj-verify' || type === 'verify') {
+            const select = this.selectList[widget.model] && this.selectList[widget.model].find(item => item.label === this.suggestType[model])
             const { enableSign , enableSeal } = options
-            if (select.description === 'TIJIAO') {
+            if (select && select.description === 'TIJIAO') {
               this.models[model].loadingSign = true
               this.getUserSignature().then(res => {
                 if (res.success) {
@@ -828,8 +824,9 @@ export default {
                 this.models[model].loadingSign = false
               })
             } else {
-              this.models[model].userSign = ''
-              this.models[model].userSeal = ''
+              this.$set(this.models[model], 'userSign', '')
+              this.$set(this.models[model], 'userSeal', '')
+              this.$set(this.models[model], 'userSealPosition', null)
               this.$set(this.sealCache, model, '')
             }
           }
@@ -849,6 +846,11 @@ export default {
           if (src.startsWith('data:image') || /^https?:\/\//i.test(src)) return src
           return (this.imgUrl || '') + src
         },
+        isSubmitOperation(model) {
+          if (!this.selectList[model] || !this.suggestType[model]) return false
+          const select = this.selectList[model].find(item => item.label === this.suggestType[model])
+          return select && select.description === 'TIJIAO'
+        },
         scrollToTop(top) {
             const _this = this
             this.$nextTick(function() {
@@ -1732,6 +1734,14 @@ $mybottom: 0; //底部按钮
     }
 }
 
+.verify-log-item {
+    position: relative;
+}
+
+.verify-current-section {
+    position: relative;
+}
+
 .verify-seal {
   position: absolute;
   left: 200rpx;
@@ -1766,9 +1776,13 @@ $mybottom: 0; //底部按钮
 }
 
 .verify-seal-btn {
+    display: inline-block;
     padding: 10rpx 24rpx;
     color: #0599d7;
     font-size: 26rpx;
+    background-color: #fff;
+}
+.verify-seal-btn-wrap {
     text-align: right;
     background-color: #fff;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zscreate/zhxy-app-component",
-	"version": "1.0.403",
+	"version": "1.0.405",
 	"private": false,
 	"description": "zhxy-app-component",
 	"main": "index.js",