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

src/components/FinancialModule/OPcommissionPeriods.vue

@@ -98,6 +98,7 @@ import moment from "moment"
           Obj: {},
           SourceID: 0,
           CostType: 112,
+          SelectState:true,
         }
         let id=[29,31];
         this.$router.push({

src/components/FinancialModule/addFinancialDocuments.vue

@@ -310,7 +310,8 @@
                                     <el-option v-for='item in GetCostTypeList'
                                         :label='item.Name'
                                         :value='item.ID'
-                                        :key='item.ID'>
+                                        :key='item.ID'
+                                        >
                                     </el-option>
                                 </el-select>
                             </td>
@@ -342,11 +343,21 @@
 
                     <tr @keyup.enter="addList(1)">
                         <td >
-                            <el-select  filterable  v-model='detailList.CostTypeId' ref='CostTypeId' :placeholder="$t('rule.qxzfyshuoming')" @change="getCostTypeName(detailList.CostTypeId), getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)"  class=" _border_b_1">
+                            <el-select v-if="!SelectState" filterable  v-model='detailList.CostTypeId' ref='CostTypeId' :placeholder="$t('rule.qxzfyshuoming')" @change="getCostTypeName(detailList.CostTypeId), getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)"  class="_border_b_1">
                                 <el-option v-for='item in GetCostTypeList'
                                     :label='item.Name'
                                     :value='item.ID'
-                                    :key='item.ID'>
+                                    :key='item.ID'
+                                    >
+                                </el-option>
+                            </el-select>
+                            <el-select v-if="SelectState" filterable  v-model='detailList.CostTypeId' ref='CostTypeId' :placeholder="$t('rule.qxzfyshuoming')" @change="getCostTypeName(detailList.CostTypeId), getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)"  class="_border_b_1">
+                                <el-option v-for='item in GetCostTypeList'
+                                    :label='item.Name'
+                                    :value='item.ID'
+                                    :key='item.ID'
+                                    :disabled="SelectDisablsed!=item.ID"
+                                    >
                                 </el-option>
                             </el-select>
                         </td>
@@ -649,6 +660,8 @@ export default {
             showDisable:false,
             editTemplateId:-1,
             ZhuiJiaTK: false,
+            SelectDisablsed:0,
+            SelectState:false,
         }
     },
     methods:{
@@ -1269,6 +1282,12 @@ export default {
                         if (!JSON.parse(sessionStorage.getItem("saveGuestInfo"))){
                             this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
                         }
+                        // 判断是否禁用费用说明
+                        if(this.orderObj.SelectState){
+                            this.SelectState=true;
+                            this.SelectDisablsed=Number(this.orderObj.CostType)
+
+                        }
                         if(this.orderObj.CurrencyId){
                             this.detailList.CurrencyId=Number(this.orderObj.CurrencyId);
                             this.detailCurrDis=true;

src/components/administrative/AirticketCommission.vue

@@ -33,6 +33,9 @@
             <el-button type="primary" class="CM_look" @click="goUrl('AirticketCommissionDetail',item.ID)"
               icon="iconfont icon-chakan" circle></el-button>
           </el-tooltip>
+          <el-tooltip class="item" effect="dark" content="制单" placement="top">
+            <el-button type="primary" class="CM_look" @click="goUrlZD" icon="iconfont icon-caidan-fill" circle></el-button>
+          </el-tooltip>
         </td>
       </tr>
     </table>
@@ -63,6 +66,26 @@
       this.getList();
     },
     methods: {
+      goUrlZD(){
+        let orderObj = {
+          OrderID: 0,
+          OrderSource: 8,
+          Obj: {},
+          SourceID: 0,
+          CostType:194,
+          SelectState:true,
+        }
+        let id=[29,31];
+        this.$router.push({
+            name: 'ChoiceAddFinancialDocuments',
+            query: {
+              Type: 2,
+              templateID: JSON.stringify(id),
+              'blank': 'y',
+              'orderObj': JSON.stringify(orderObj)
+            }
+          })
+      },
       handleCurrentChange(val) {
         this.msg.PageIndex = val;
         this.getList();

src/components/administrative/DjCommissionsmangment.vue

@@ -7,13 +7,14 @@
 </style>
 <template>
   <div class="flexOne">
-    <!-- <div class="query-box">
+    <div class="query-box">
       <ul>
         <li>
-            <input type="button" class="normalBtn" @click="generateTable" value="生成提成报表"/>
+            <input type="button" class="normalBtn" @click="goUrlZD(195)" value="签证制单"/>
+            <input type="button" class="normalBtn" @click="goUrlZD(196)" value="地接制单"/>
         </li>
       </ul>
-    </div> -->
+    </div>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
       <tr>
         <th>期数</th>
@@ -66,6 +67,26 @@
       this.getList();
     },
     methods: {
+      goUrlZD(num){
+        let orderObj = {
+          OrderID: 0,
+          OrderSource: 8,
+          Obj: {},
+          SourceID: 0,
+          CostType: num,
+          SelectState:true,
+        }
+        let id=[29,31];
+        this.$router.push({
+            name: 'ChoiceAddFinancialDocuments',
+            query: {
+              Type: 2,
+              templateID: JSON.stringify(id),
+              'blank': 'y',
+              'orderObj': JSON.stringify(orderObj)
+            }
+          })
+      },
       handleCurrentChange(val) {
         this.msg.PageIndex = val;
         this.getList();

src/components/index.vue

@@ -28,13 +28,13 @@
     padding:0 40px;
     top:110px;
     text-align: left;
-    text-overflow: -o-ellipsis-lastline;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    line-clamp: 2;
-    -webkit-box-orient: vertical;
+    word-break:break-all;
+    text-overflow:ellipsis;
+    display:-webkit-box;
+    height:40px;
+    -webkit-box-orient:vertical!important;
+    -webkit-line-clamp:2;
+    overflow:hidden;
     color:#4E4E4C;
     font-size:14px;
   }