Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/App.vue

@@ -117,12 +117,12 @@ export default {
     }
   },
   mounted() {
-    if (!this.getLocalStorage() && document.URL.indexOf("SupplierLogin")==-1&& document.URL.indexOf("clientConfirm")==-1&& document.URL.indexOf("TravelContractConfirm")==-1) {
+    if (!this.getLocalStorage() && document.URL.indexOf("SupplierLogin")==-1&& document.URL.indexOf("clientConfirm")==-1&& document.URL.indexOf("TravelContractConfirm")==-1&& document.URL.indexOf("ViittoContractConfirm")==-1) {
       this.$router.push({
         path: '/login'
       })
     }else{
-      if(document.URL.indexOf("clientConfirm")!=-1||document.URL.indexOf("TravelContractConfirm")!=-1){
+      if(document.URL.indexOf("clientConfirm")!=-1||document.URL.indexOf("TravelContractConfirm")!=-1||document.URL.indexOf("ViittoContractConfirm")!=-1){
           localStorage.openMode=0
       }else{
         

src/components/administrative/ViittoContract.vue

@@ -51,7 +51,7 @@
                     </template>
                 </td>
                 <td>
-                    <img :src="item.CustomerSignImg" style="width:100px;"/>
+                    <img :src="item.CustomerSignImg" style="height:60px;"/>
                 </td>
                 <td>
                     <template v-if="item.CustomerSignDate!=null">
@@ -67,15 +67,20 @@
                     </template>
                 </td>
                 <td>
-                    <el-tooltip class="item" effect="dark" content="修改" placement="top-start">
+                    <el-tooltip class="item" effect="dark" v-if="item.CustomerSignImg!=''&&item.CustomerSignImg!=null" content="修改" placement="top-start">
                         <el-button type="primary" icon="iconfont icon-Edit" @click="goContract(item)" circle></el-button>
                     </el-tooltip>
-                    <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
+                    <el-tooltip class="item" effect="dark" content="复制链接发送给客户">
+                      <el-button type="info" icon="iconfont icon-copy-l" circle @click="CopyUrl(item)"
+                        style="padding:4px;background-color:#9266f9;border-color:#9266f9;"></el-button>
+                    </el-tooltip>
+
+                    <el-tooltip class="item" effect="dark" v-if="item.CustomerSignImg!=''&&item.CustomerSignImg!=null" content="删除" placement="top-start">
                         <el-button type="danger" icon="iconfont icon-img_delete_small" circle @click="isdelete(item.Id)">
                         </el-button>
                     </el-tooltip>
 
-                     <el-tooltip class="item" effect="dark" content="下载" placement="top-start">
+                     <el-tooltip class="item" effect="dark" v-if="item.CustomerSignImg!=''&&item.CustomerSignImg!=null" content="下载" placement="top-start">
                         <el-button type="success" icon="iconfont icon-img_download" circle @click="ToDownWord(item)">
                         </el-button>
                     </el-tooltip>
@@ -123,6 +128,16 @@
             this.loading = false;
             if (res.data.resultCode == 1) {
               this.dataList = res.data.data.pageData;
+              this.dataList.forEach(x => {
+                let Url = "";
+                if (this.isOnline()) {
+                  Url = window.location.hostname + '/#/ViittoContractConfirm?Id=' + x.Id;
+                } else {
+                  Url = window.location.hostname + ":8080/" + '#/ViittoContractConfirm?Id=' + x.Id;
+                }
+                x.Url = Url;
+              })
+
               this.total = res.data.data.count;
             } else {
               this.Error(res.data.message);
@@ -193,7 +208,7 @@
           }
         }).then(res => {
           if (res.data.resultCode === 1) {
-             let sign = item.CustomerName+"_合同.doc";
+              let sign = item.CustomerName+"_合同.doc";
               const a = document.createElement('a');
               a.setAttribute('download', '');
               a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
@@ -207,6 +222,18 @@
 
         })
       },
+      //复制URL
+      CopyUrl(item) {
+        var oInput = document.createElement('input');
+        oInput.value = item.Url;
+        document.body.appendChild(oInput);
+        oInput.select(); // 选择对象
+        document.execCommand("Copy"); // 执行浏览器复制命令
+        oInput.className = 'oInput';
+        oInput.style.display = 'none';
+        this.Info("复制成功!");
+      },
+
     },
     mounted() {
         this.getList();

src/plug/index.js

@@ -114,7 +114,7 @@ export default {
       //域名管理对象
       Vue.prototype.domainManager = function () {
         let domainUrl = '';
-        domainUrl = "http://192.168.2.214:8082";
+        domainUrl = "http://127.0.0.1";
         let locationName = window.location.hostname;
 
         let javaUrldo = "";
@@ -232,7 +232,7 @@ export default {
 
     //HTTP提交数据
     Vue.prototype.apipost = function (cmd, msg, successCall, faildCall, isOnline) {
-        if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('clientConfirm') === -1 && this.$route.name.indexOf('confirmationOrderDownLoad') === -1 && this.$route.name.indexOf('PrintPage') === -1 && this.$route.name.indexOf('TravelContractConfirm') === -1) {
+        if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('clientConfirm') === -1 && this.$route.name.indexOf('confirmationOrderDownLoad') === -1 && this.$route.name.indexOf('PrintPage') === -1 && this.$route.name.indexOf('TravelContractConfirm') === -1 && this.$route.name.indexOf('ViittoContractConfirm') === -1 ) {
 
           let previousPathInfo = {
             path: this.$route.name,
@@ -273,6 +273,14 @@ export default {
               ContractId: ContractId
             }
           })
+        }else if (this.$route.path == "/ViittoContractConfirm") {
+          let Id = this.$route.query.Id;
+          this.$router.push({
+            name: "ViittoContractConfirm",
+            query: {
+              Id: Id
+            }
+          })
         } else {
           if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
             this.$router.push({

src/router/config.js

@@ -4611,6 +4611,14 @@ export default {
                 title: '电子合同签名'
             },
         },
+        {
+            path: '/ViittoContractConfirm',  //微途电子合同签名
+            name: 'ViittoContractConfirm',
+            component: resolve => require(['@/components/ViittoContractConfirm'], resolve),
+            meta: {
+                title: '电子合同签名'
+            },
+        },
         {
             path: '/TravelContractView',  //其他电子合同签名
             name: 'TravelContractView',