lihongxiao 2 vuotta sitten
vanhempi
commit
08b9dd5821
3 muutettua tiedostoa jossa 20 lisäystä ja 23 poistoa
  1. 2 2
      config/dev.env.js
  2. 2 8
      src/views/Letter/Signature.vue
  3. 16 13
      src/views/Task/daikeComponents/KtOrder.vue

+ 2 - 2
config/dev.env.js

@@ -18,8 +18,8 @@ module.exports = merge(prodEnv, {
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http://192.168.0.250:8080/"',//
-  // BASE_URL: '"http:///192.168.0.103:8080/"',//霍续亮
-  BASE_URL: '"http://192.168.0.52:8080/"',//贺礼霄
+  BASE_URL: '"http:///192.168.0.103:8080/"',//霍续亮
+  // BASE_URL: '"http://192.168.0.52:8080/"',//贺礼霄
   // BASE_URL: '"http:///192.168.0.55:8080/"',//蔡雅茹
   // CONSOLE_BASE_URL: '"http://localhost:8080/"' //控制台测试服务器
   // CONSOLE_BASE_URL: '"https://sxzgkj.baoxianzhanggui.com/console-api"' //控制台正式服务器

+ 2 - 8
src/views/Letter/Signature.vue

@@ -64,14 +64,8 @@ export default {
                     companyId:this.$route.query.companyId,
                     msgCode:this.input
                     }) .then (res=> {
-                    if(res.code==200){
-                         window.location.href=res.msg
-                    }
-                    else{
-                        this.$message({
-                        message: res.msg,
-                        type: 'error'
-                    });
+                    if(res.data.code==200){
+                         window.location.href=res.data.msg
                     }
                 })
                 // this.$api.letter.recoverApplyVerifyCode({companyId:this.$route.query.companyId,msgCode:this.input}).then(res=>{

+ 16 - 13
src/views/Task/daikeComponents/KtOrder.vue

@@ -479,7 +479,8 @@
     </el-dialog>
     <!-- 生成签章 -->
     <el-dialog :visible.sync="signaturedialogVisible" title="生成签章" width="14%">
-      <div style="padding:0 20px">
+      <div >
+        <img :src="resultMessageImg"  alt style="width: 100%" />
         <div  id="signaturecode" ref="signaturecode"></div>
       </div>
     </el-dialog>
@@ -600,6 +601,7 @@ export default {
       statusPor: "",
       deptIdPor: "",
       apiType: "",
+      resultMessageImg:''
     };
   },
   components: { quotationDialog, detailsDialog, quotationDialogPro },
@@ -1244,20 +1246,21 @@ export default {
     signature(row){
       this.$api.letter.pingAnsignEleApply({companyId:row.id}).then((res) => {
         if (res.code == 200 && res.data) {
+          this.resultMessageImg=process.env.BASE_URL+res.data.resultMessage
           this.signaturedialogVisible = true;
               // 查找并删除旧的二维码DOM元素
-          let element = document.getElementById("signaturecode");
-          while (element.firstChild) {
-            element.removeChild(element.firstChild);
-          }
-          this.signaturecode = new QRCode("signaturecode", {
-            text:  res.data.resultMessage, 
-            width: 180,
-            height: 180,
-            colorDark: "#000000",
-            colorLight: "#ffffff",
-            correctLevel: QRCode.CorrectLevel.H,
-          });
+          // let element = document.getElementById("signaturecode");
+          // while (element.firstChild) {
+          //   element.removeChild(element.firstChild);
+          // }
+          // this.signaturecode = new QRCode("signaturecode", {
+          //   text:  resultMessage, 
+          //   width: 180,
+          //   height: 180,
+          //   colorDark: "#000000",
+          //   colorLight: "#ffffff",
+          //   correctLevel: QRCode.CorrectLevel.H,
+          // });
         } else { 
           this.$message({ 
             message: res.msg || "暂无数据!",