no message

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -682,8 +682,8 @@
                   <p class="travelnowrap" v-if="item.LineID==14 && item.IsOpenHotel==1">
                     <span style="color:red;font-weight:bold;">※ {{$t('op.DJyiguanbi')}}.</span>
                   </p>
-                  <p class="travelnowrap">
-                    <span style="cursor: pointer;" @click="showDialog(item.ConfigId, item.OfferId)">价格信息</span>
+                  <p class="travelnowrap" v-if="item.Config_OfferId">
+                    <span style="cursor: pointer;" @click="showDialog(item.ID, item.OfferId)">报价详情</span>
                   </p>
                 </div>
               </div>
@@ -1228,7 +1228,7 @@
         </el-col>
       </el-form>
     </div>
-    <el-dialog :visible.sync="dialog.show" width="1400px" title="价格信息">
+    <el-dialog :visible.sync="dialog.show" width="1400px" title="报价详情">
                     <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
                     </el-dialog>
   </div>

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -376,6 +376,9 @@
                     <span>{{$t('scen.sc_cp')}}</span>
                     {{item.OutBranchName}}
                   </p>
+                  <p class="travelnowrap" v-if="item.Config_OfferId">
+                    <span style="cursor: pointer;" @click="showDialog(item.ID, item.OfferId)">报价详情</span>
+                  </p>
                 </div>
               </div>
               <div class="el-col" style="width:190px;">
@@ -685,12 +688,23 @@
         <button class="normalBtn" type="primary" @click="SetSellingPoints">{{$t('pub.sureBtn')}}</button>
       </div>
     </div>
+    <el-dialog :visible.sync="dialog.show" width="1400px" title="报价详情">
+                    <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
+                    </el-dialog>
   </div>
 </template>
 <script>
+  import priceDialog from '../TravelNewQuotation/priceDialog.vue';
   export default {
+    components: {
+      priceDialog
+    },
     data() {
       return {
+        dialog: {
+          show: false,
+          ConfigId: '',OfferId: ''
+        },
         //查询数据列表
         queryCommonData: {
           //线路列表
@@ -834,6 +848,15 @@
       };
     },
     methods: {
+      showDialog(ConfigId,OfferId) {
+        this.dialog = {
+          show: true,
+          ConfigId,OfferId
+        }
+        this.$nextTick(() => {
+          this.$refs.dialog.getPostData()
+        })
+      },
       downloadFile: function (item) {
         let reg = /^http(s)?:\/\/(.*?)\//;
         this.downloadFileRename(item.FullUrl.replace(reg, ""), item.Name);

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -474,8 +474,8 @@
                         v-if="item.PriceOfferUrl" target="_blank">下载报价单</a>
                     </span>
                   </p>
-                  <p class="travelnowrap">
-                    <span style="cursor: pointer;" @click="showDialog(item.ConfigId, item.OfferId)">价格信息</span>
+                  <p class="travelnowrap" v-if="item.Config_OfferId">
+                    <span style="cursor: pointer;" @click="showDialog(item.ID, item.OfferId)">报价详情</span>
                   </p>
                 </div>
               </div>
@@ -791,7 +791,7 @@
         </el-col>
       </el-form>
     </div>
-    <el-dialog :visible.sync="dialog.show" width="1400px" title="价格信息">
+    <el-dialog :visible.sync="dialog.show" width="1400px" title="报价详情">
                     <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
                     </el-dialog>
   </div>

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -1113,8 +1113,8 @@
           <tr>
             <td class="CP_ComTitle2">附件</td>
             <td colspan="13">
-              <el-upload class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;"
-                :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
+              <el-upload v-if="!teamPrice.ContractArray || !teamPrice.ContractArray.length" class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;"
+                :http-request="uploadFileBtn" :show-file-list="false" action="">
                 <el-button size="small" type="primary">报价单附件</el-button>
               </el-upload>
               <template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -229,19 +229,19 @@
             </div>
             <div style="width:134px;">
               <span class="openGroup newAopbdd" @click="goToOpenTravel(item)"
-                v-if="item.TravelState==3&& item.OpenState==2 && [2,5].includes(item.LineId) || 1">
+                v-if="item.TravelState==3&& item.OpenState==2 && [2,5].includes(item.LineId)">
                 <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 v-if="EditBtn" class="bianji newAopbdd"
-                @click="goMakeQuo('QuotationNewPrice',item.ID)">
+                @click="goMakeQuo('QuotationNewPrice',item.ID, item.TeamType)">
                 <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="bianji newAopbdd" @click="goMakeQuo('QuotationNewPrice',item.ID)"
+              <span class="bianji newAopbdd" @click="goMakeQuo('QuotationNewPrice',item.ID, item.TeamType)"
                 v-if="item.TravelState!=3">
                 <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
                   popper-class="max-w250">
@@ -613,21 +613,38 @@
         that.outerVisible = true;
       },
       //报价单跳转
-      goMakeQuo(path, configId) {
+      goMakeQuo(path, configId,TeamType) {
+        if(configId) {
         this.$router.push({
           path: path,
           query: {
-            TeamType: this.queryData.TeamType,
+            TeamType: TeamType,
             configId: configId,
             blank: 'y',
             tab: '报价单'
           }
         });
+        } else {
+        this.$router.push({
+          path: path,
+          query: {
+            configId: configId,
+            blank: 'y',
+            tab: '报价单'
+          }
+        });
+        }
       },
       //开团或修改
       goToOpenTravel(item) {
+        // TeamType 0常规,1-小包团,2-一日游,3-地接团
         var routeName = this.$route.name;
         var path = 'TravelManager5';
+        if(item.TeamType === 0) {
+          path = 'TravelManager2'
+        } else if(item.TeamType === 1) {
+          path = 'TravelManager3'
+        }
         // if (routeName == 'newQuotation') {
         //   path = 'TravelManager6'
         // }
@@ -687,12 +704,12 @@
       this.getEmployeeList();
       this.GetAuth();
       var routeName = this.$route.name;
-      if (routeName == 'newQuotation') {
-        this.queryData.TeamType = 3;
-      }
-      if (routeName == 'newQuotation2') {
-        this.queryData.TeamType = 1;
-      }
+      // if (routeName == 'newQuotation') {
+      //   this.queryData.TeamType = 3;
+      // }
+      // if (routeName == 'newQuotation2') {
+      //   this.queryData.TeamType = 1;
+      // }
       this.getLineList();
       this.getList();
       let isNoOffer = this.$route.params.isNoOffer;