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

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -27,7 +27,7 @@
   .CostNewTable td {
     padding: 5px;
     height: 40px;
-    border: 1px solid #106BAF!important;
+    border: 1px solid #106BAF !important;
   }
 
   .CostPriceDiv {
@@ -39,22 +39,28 @@
   .CP_ComTitle {
     color: #106BAF;
   }
+
   .w79 {
     width: 79px !important;
   }
-  .w70{
-    width:70px!important;
+
+  .w70 {
+    width: 70px !important;
   }
+
   .CostcomCenter {
     text-align: center;
   }
-  .txtRightCost{
+
+  .txtRightCost {
     text-align: right;
     padding-right: 10px;
   }
-  .CostNewTable .el-input__inner{
-    padding:0 5px;
+
+  .CostNewTable .el-input__inner {
+    padding: 0 5px;
   }
+
 </style>
 
 <template>
@@ -94,8 +100,8 @@
             <tr>
               <td width="80" class="txtRightCost">团队标题</td>
               <td colspan="3">
-                  <el-input v-model="postConfig.Title" type="textarea" :autosize="{minRows: 1, maxRows: 2 }"
-                  resize="none" placeholder="请填写团队标题" maxlength="200"></el-input>
+                <el-input v-model="postConfig.Title" type="textarea" :autosize="{minRows: 1, maxRows: 2 }" resize="none"
+                  placeholder="请填写团队标题" maxlength="200"></el-input>
               </td>
               <td width="80" class="txtRightCost">行程天数</td>
               <td>
@@ -199,7 +205,7 @@
                 <el-form-item>
                   <el-input class="w50" v-model='queryMsg.PeopleNumber'
                     @keyup.native="checkInteger(queryMsg,'PeopleNumber'),getchange()"></el-input>
-                    <i class="iconfont icon-img_haha" style="cursor:pointer;" @click="addPeoNunber"></i>
+                  <i class="iconfont icon-img_haha" style="cursor:pointer;" @click="addPeoNunber"></i>
                 </el-form-item>
               </td>
             </tr>
@@ -217,7 +223,7 @@
               </td>
             </tr>
           </thead>
-           <tr>
+          <tr>
             <td colspan="9"></td>
           </tr>
           <tr>
@@ -298,7 +304,7 @@
                 </el-select>
               </el-form-item>
             </td>
-            <td  >
+            <td>
               <el-form-item>
                 <el-input type='text' class="w70" v-model="OtherPrice.InlandAirTicketMoney"
                   @keyup.native="checkPrice(OtherPrice,'InlandAirTicketMoney'),getchange()"></el-input>
@@ -326,7 +332,7 @@
                 </el-select>
               </el-form-item>
             </td>
-            <td  >
+            <td>
               <el-form-item>
                 <el-input type='text' class="w70" v-model="OtherPrice.InlandShipTicketMoney"
                   @keyup.native="checkPrice(OtherPrice,'InlandShipTicketMoney'),getchange()"></el-input>
@@ -354,7 +360,7 @@
                 </el-select>
               </el-form-item>
             </td>
-            <td  >
+            <td>
               <el-form-item>
                 <el-input type='text' class="w70" v-model="OtherPrice.InlandTrainTicketMoney"
                   @keyup.native="checkPrice(OtherPrice,'InlandTrainTicketMoney'),getchange()"></el-input>
@@ -391,13 +397,13 @@
           </tr>
           <tr>
             <td class="CP_ComTitle2 CostcomCenter">摘要</td>
-            <td class="CP_ComTitle2 CostcomCenter">金额<br/>(人民币)</td>
+            <td class="CP_ComTitle2 CostcomCenter">金额<br />(人民币)</td>
             <td class="CP_ComTitle2 CostcomCenter">摘要</td>
-            <td class="CP_ComTitle2 CostcomCenter">金额<br/>(人民币)</td>
+            <td class="CP_ComTitle2 CostcomCenter">金额<br />(人民币)</td>
             <td class="CP_ComTitle2 CostcomCenter">摘要</td>
-            <td class="CP_ComTitle2 CostcomCenter">金额<br/>(人民币)</td>
+            <td class="CP_ComTitle2 CostcomCenter">金额<br />(人民币)</td>
             <td class="CP_ComTitle2 CostcomCenter">摘要</td>
-            <td class="CP_ComTitle2 CostcomCenter" colspan="2">金额<br/>(人民币)</td>
+            <td class="CP_ComTitle2 CostcomCenter" colspan="2">金额<br />(人民币)</td>
           </tr>
           <tr>
             <td style="white-space:nowrap; " class="CP_ComTitle2">销售提成1%</td>
@@ -555,8 +561,7 @@
 
     },
     methods: {
-      ReCalc() {
-      },
+      ReCalc() {},
       //获取汇率
       getCurrencyMoney(currencyId) {
         let currency = 0.0;
@@ -673,7 +678,7 @@
       getCurrencyNumberList(CurrencyId) {
         let currencyNumberList = [];
         let flag = false;
-        console.log("this.CurrencyNumberListExt", this.CurrencyNumberListExt);
+
         this.CurrencyNumberListExt.forEach(item => {
           if (!flag && item.Key == CurrencyId) {
             flag = true;
@@ -875,11 +880,10 @@
       }
     },
     mounted() {
-
       this.getAllCurrency();
     },
     created() {
-
+      
     },
     watch: {
       postConfig: {

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -51,7 +51,7 @@
           NightNum: 0, //晚数
           StartCityId: 0,
           ReturnArriveCityId: 0, //返回抵达城市
-          CustomerName:"",//客户名称
+          CustomerName: "", //客户名称
         },
         dayCostPriceList: [], //报价列表
         isSubmit: true,
@@ -114,7 +114,7 @@
           ContractUrl: "", //合同地址
         },
         LineList: [], //线路列表
-        loading:false
+        loading: false
       };
     },
     methods: {
@@ -141,11 +141,11 @@
           CostNumberList: this.CostNumberList,
           CurrencyNumberListExt: currencyNumList
         };
-        this.loading=true;
+        this.loading = true;
         this.apipost(
           "travel_post_SetConfigOffer_V2", nObj,
           res => {
-              this.loading=false;
+            this.loading = false;
             if (res.data.resultCode == 1) {
               this.Success(res.data.message);
               this.goUrl('newQuotation');
@@ -175,7 +175,6 @@
           res => {
             if (res.data.resultCode == 1) {
               var tempData = res.data.data;
-              console.log("temp",tempData);
               if (tempData.ID && tempData.ID > 0) {
                 this.postData.ID = tempData.ID;
               }
@@ -206,7 +205,7 @@
               if (tempData.NightNum && tempData.NightNum > 0) {
                 this.postData.NightNum = tempData.NightNum;
               }
-              this.postData.CustomerName=tempData.CustomerName;
+              this.postData.CustomerName = tempData.CustomerName;
               this.LineList = tempData.LineList;
               if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
                 0) {
@@ -229,6 +228,16 @@
                 .CurrencyNumberListExt.length > 0) {
                 this.CurrencyNumberListExt = tempData.CurrencyNumberListExt;
               }
+              if (this.CostCurrencyList && this.CostCurrencyList.length > 0 &&
+                this.CurrencyNumberListExt) {
+                this.CostCurrencyList.forEach(item => {
+                  let currencyNumberItem = {
+                    Key: item.CurrencyId,
+                    currencyNumberList: []
+                  };
+                  this.CurrencyNumberListExt.push(currencyNumberItem);
+                });
+              }
             } else {
               this.Error(res.data.message);
             }
@@ -236,13 +245,14 @@
           err => {}
         );
       },
-       
+
     },
     created() {
       this.getPostData();
     },
     components: {
       DirectQuotation: DirectQuotation
-    }  
+    }
   };
-</script>
\ No newline at end of file
+
+</script>

src/components/work/mywork.vue

@@ -266,6 +266,7 @@
         </el-form-item>
         <el-form-item label="计划日期" prop="TimeRanges">
           <el-date-picker
+            :picker-options="pickerOptions"
             v-model="addMsg.TimeRanges"
             type="datetimerange"
             class="wd100"
@@ -363,7 +364,13 @@ export default {
       inputValue: "",
       datas: [],
       tempList: [],
-      examineStatusValue: "-2"
+      examineStatusValue: "-2",
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;   //禁用以前的日期，今天不禁用
+          // return date.getTime() <= Date.now();    //禁用今天以及以前的日期
+        }
+      }
     };
   },
   mounted() {