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

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -38,7 +38,8 @@
   .BilldownLoadCommon table td {
     text-align: left;
   }
-  .newAopbdd{
+
+  .newAopbdd {
     font-weight: bold;
     display: inline-block;
     width: 25px;
@@ -50,6 +51,7 @@
     cursor: pointer;
     text-align: center;
   }
+
 </style>
 <template>
   <div class="flexOne quoTation">
@@ -106,7 +108,6 @@
               <p style="font-size:14px">
                 <el-tooltip popper-class="max-w250" effect="dark" :content="item.Title" placement="top-start">
                   <span>线路名称:{{item.LineName}}</span>
-
                 </el-tooltip>
               </p>
               <span>系列名称:{{item.LtName}}</span>
@@ -216,23 +217,38 @@
               </div>
             </div>
             <div style="width:134px;">
-              <span class="openGroup newAopbdd" @click="goToOpenTravel(item)" v-if="item.TravelState==3&&item.OpenState==2">
+              <span class="openGroup newAopbdd" @click="goToOpenTravel(item)"
+                v-if="item.TravelState==3&&item.OpenState==2">
                 <el-tooltip class="item" effect="dark" content="开团" placement="top-start" popper-class="max-w250">
                   <i class="iconfont icon-nav-hangzheng"></i>
                 </el-tooltip>
               </span>
-              <span class="bianji newAopbdd" @click="goMakeQuo('QuotationNewPrice',item.ID)" v-if="item.TravelState==1||item.TravelState==4||item.TravelState==5">
+              <span v-if="userInfo.EmployeeId==615" class="bianji newAopbdd"
+                @click="goMakeQuo('QuotationNewPrice',item.ID)">
                 <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
                   popper-class="max-w250">
                   <i class="iconfont icon-bianji-smal"></i>
                 </el-tooltip>
               </span>
-              <span class="QT-delete newAopbdd" @click="delQuotation(item.ID)" v-if="item.TravelState==1||item.TravelState==4||item.TravelState==5">
+              <span class="bianji newAopbdd" @click="goMakeQuo('QuotationNewPrice',item.ID)"
+                v-if="item.TravelState==1||item.TravelState==4||item.TravelState==5">
+                <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
+                  popper-class="max-w250">
+                  <i class="iconfont icon-bianji-smal"></i>
+                </el-tooltip>
+              </span>
+              <span class="QT-delete newAopbdd" @click="delQuotation(item.ID)"
+                v-if="item.TravelState==1||item.TravelState==4||item.TravelState==5">
                 <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
                   popper-class="max-w250">
                   <i class="iconfont icon-shanchu"></i>
                 </el-tooltip>
               </span>
+              <span style="background:#85ce61; " class="newAopbdd">
+                <el-tooltip class="item" effect="dark" content="查看" placement="top-start" popper-class="max-w250">
+                  <i @click="goUrl('QuotationAduit',item.ID,1)" class="iconfont icon-view"></i>"></i>
+                </el-tooltip>
+              </span>
               <span style="background:#85ce61; " class="newAopbdd" @click="showDownLoad(item)">
                 <el-tooltip class="item" effect="dark" content="下载" placement="top-start" popper-class="max-w250">
                   <i class="iconfont icon-bb-xiazai"></i>
@@ -309,6 +325,7 @@
   export default {
     data() {
       return {
+        userInfo: {},
         queryData: {
           LineId: 0,
           LineteamId: 0,
@@ -386,6 +403,23 @@
       commonTeamInfo: commonTeamInfo
     },
     methods: {
+      goUrl(path, configId, qType) {
+        if (configId > 0) {
+          this.$router.push({
+            name: path,
+            query: {
+              configId: configId,
+              Qtype: qType,
+              blank: 'y',
+              tab: '报价单查看'
+            }
+          });
+        } else {
+          this.$router.push({
+            name: path
+          });
+        }
+      },
       handleCurrentChange(val) {
         this.queryData.pageIndex = val;
         this.getList();
@@ -619,6 +653,7 @@
       }
     },
     created() {
+      this.userInfo = this.getLocalStorage();
       if (this.$route.query.hasOwnProperty("cache")) {
         if (this.$store.state.pageCondition != null) {
           this.queryData = this.$store.state.pageCondition;
@@ -627,4 +662,5 @@
       this.getList();
     }
   };
-</script>
+
\ No newline at end of file
+</script>