Merge branch 'greenUrgent' into allTestUrgent

src/HDrpManagement/serveWorkBill/modules/signature/index.vue

@@ -5,7 +5,7 @@
         type="primary"
         @click="startSignature"
         style="margin-bottom: 20px"
-        v-if="!signatureStarted"
+        v-if="!signatureData"
     >
       {{$t(btnTitle)}}
     </el-button>
@@ -13,14 +13,14 @@
     <!-- 签名画布区域 -->
     <div class="signature-canvas-container" v-if="signatureStarted">
       <div class="canvas-header">
-        <span class="prompt-text">请在下方区域签名</span>
+        <span class="prompt-text">{{$t(`请在下方区域签名`)}}</span>
         <div class="toolbar">
           <el-button
               @click="clearCanvas"
               :disabled="!hasSignature"
               size="small"
           >
-            <i class="el-icon-delete"></i> 清空
+            <i class="el-icon-delete"></i> {{$t(`清空`)}}
           </el-button>
           <el-button
               type="primary"
@@ -29,7 +29,7 @@
               size="small"
               :loading="saving"
           >
-            <i class="el-icon-check"></i> {{ saving ? '保存中...' : '确认签名' }}
+            <i class="el-icon-check"></i> {{ saving ? $t(`保存中...`) : $t(`确认签名`) }}
           </el-button>
         </div>
       </div>
@@ -57,8 +57,8 @@
           <div class="hint-icon">
             <i class="el-icon-edit"></i>
           </div>
-          <p class="hint-text">请在此处签名</p>
-          <p class="hint-subtext">支持鼠标或触摸操作</p>
+          <p class="hint-text">{{$t(`请在此处签名`)}}</p>
+          <p class="hint-subtext">{{$t(`支持鼠标或触摸操作`)}}</p>
         </div>
       </div>
     </div>
@@ -67,40 +67,15 @@
     <!-- 预览区域 -->
     <div class="preview-area" v-if="signatureData">
       <div class="preview-header">
-        <span class="preview-title">签名预览</span>
+        <span class="preview-title">{{$t(`签名预览`)}}</span>
+        <el-button type="primary" size="small" @click="restartSignature">{{$t(`删除`)}}</el-button>
       </div>
 
       <div class="preview-content">
         <div class="preview-image-container">
-          <img :src="signatureData" alt="签名预览" class="preview-image" />
+          <img :src="signatureData"  class="preview-image" />
         </div>
 
-        <!--        <div class="preview-actions">-->
-        <!--          <el-button-->
-        <!--              type="success"-->
-        <!--              @click="uploadToHuaweiCloud"-->
-        <!--              :loading="uploading"-->
-        <!--              :disabled="uploading"-->
-        <!--          >-->
-        <!--            <i class="el-icon-upload"></i>-->
-        <!--            {{ uploading ? '上传中...' : '上传至华为云' }}-->
-        <!--          </el-button>-->
-
-        <!--          <el-button-->
-        <!--              type="info"-->
-        <!--              @click="downloadSignature"-->
-        <!--              :disabled="!signatureData"-->
-        <!--          >-->
-        <!--            <i class="el-icon-download"></i> 下载签名-->
-        <!--          </el-button>-->
-
-        <!--          <el-button-->
-        <!--              type="warning"-->
-        <!--              @click="restartSignature"-->
-        <!--          >-->
-        <!--            <i class="el-icon-refresh-left"></i> 重新签名-->
-        <!--          </el-button>-->
-        <!--        </div>-->
 
         <!-- 上传状态 -->
         <div class="upload-status" v-if="uploadStatus">
@@ -115,35 +90,6 @@
         </div>
       </div>
     </div>
-
-    <!-- 上传进度弹窗 -->
-    <el-dialog
-        title="上传华为云"
-        :visible.sync="uploadDialogVisible"
-        width="400px"
-        :close-on-click-modal="false"
-        :show-close="false"
-        center
-    >
-      <div class="upload-progress-container">
-        <el-progress
-            :percentage="uploadProgress"
-            :status="uploadStatusClass"
-            :stroke-width="16"
-        ></el-progress>
-        <p class="progress-text">
-          {{ progressText }}
-        </p>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button
-            @click="cancelUpload"
-            :disabled="uploadProgress === 100"
-        >
-          取消上传
-        </el-button>
-      </span>
-    </el-dialog>
   </div>
 </template>
 
@@ -230,15 +176,13 @@ export default {
   methods: {
     // 开始签名
     startSignature() {
-      if (this.btnTitle == '重新签字'){
-        this.restartSignature()
-      }else {
-        this.signatureData = ''
-        this.signatureStarted = true
-        this.$nextTick(() => {
-          this.initCanvas()
-        })
-      }
+
+      this.signatureData = ''
+      this.signatureStarted = true
+      this.$nextTick(() => {
+        this.initCanvas()
+      })
+
     },
 
     // 取消签名
@@ -548,7 +492,6 @@ export default {
         const url = new URL(res.data[0].url)
         this.signatureData = url.origin + url.pathname
         this.linksid = res.data[0].linksid
-        this.btnTitle = '重新签字'
       }else {
         this.btnTitle = '点击签字'
       }