1

src/components/administrative/ConfirmationAdui.vue

@@ -35,12 +35,13 @@
           <span><em>团号</em></span>
           <el-input class='w200' v-model='msg.TCNUM'></el-input>
         </li>
-        <li v-show="!isOwn">
-          <span><em>人员选择</em></span>
-          <el-select class='w200' v-model="msg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
-            <el-option label='不限' value='-1'></el-option>
-            <el-option v-for='item in employeeList' :label='item.name' :value='item.empId' :key='item.empId'>
-            </el-option>
+         <li>
+          <span><em>确认函状态</em></span>
+          <el-select v-model='msg.OperationState' filterable :placeholder="$t('pub.pleaseSel')"  class='w200'>
+            <el-option label="不限" value='-1'></el-option>
+            <el-option label="待审核" value='0'></el-option>
+            <el-option label="已通过" value='1'></el-option>
+            <el-option label="已拒绝" value='2'></el-option>
           </el-select>
         </li>
         <li>
@@ -199,9 +200,9 @@
         <td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
         <td class="_icon_btn" style="    border-bottom: 1px solid #cccccc;">
           <el-tooltip class="item" effect="dark" content="通过"  placement="top">
-            <i class="iconfont icon-duigou" @click="UpdateOrderConfirmation(1, item.orderId)"></i> 
+            <i class="iconfont icon-duigou" v-if="item.operationState === 0" @click="UpdateOrderConfirmation(1, item.orderId)"></i> 
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" content="拒绝"  placement="top">
+          <el-tooltip class="item" effect="dark" v-if="item.operationState === 0" content="拒绝"  placement="top">
             <i class="iconfont icon-quxiao1" @click="UpdateOrderConfirmation(2, item.orderId)"></i> 
           </el-tooltip>
           <el-tooltip class="item" effect="dark" content="查看"  placement="top">
@@ -210,7 +211,7 @@
         </td>
       </tr>
       <tr style="height:20px">
-        <td colspan="15" class="RL_Order" style="height:20px">
+        <td colspan="16" class="RL_Order" style="height:20px">
           <span style="font-size: 14px;color: #333333">名单:</span>
           <span v-for="(childItem) in item.guestList" style="font-size: 14px;color: blue">{{childItem.userName}}&nbsp;&nbsp;</span>
           <!--            <span v-else>暂无名单</span>-->
@@ -341,7 +342,8 @@
           GroupType: '-1',
           TCNUM: '',
           BranchId:'-1',
-          IsOneDay: '-1'
+          IsOneDay: '-1',
+          OperationState: '-1',
         },
         employeeMsg: {
           RB_Group_id: "0",

src/components/confirmationOrder.vue

@@ -6,8 +6,9 @@
         class="confirmationOrderNormalBtn"
         @click="SetOrderConfirmation()"
       >申请</span>
+      <!--       v-if="ConfirmationDetails.OperationState === 1" -->
       <span
-        v-if="ConfirmationDetails.OperationState === 1"
+         v-if="ConfirmationDetails.OperationState === 1"
         class="confirmationOrderNormalBtn"
         @click="toPDF('旅游行程确认件')"
       >下载PDF</span>
@@ -28,8 +29,8 @@
         <table class="confirmationOrderTable" border="0" cellspacing="0" cellpadding="0">
           <tr>
             <td width="20" rowspan="3">甲方</td>
-            <td width="125" rowspan="3">委托社名称及许可证号</td>
-            <td width="260" rowspan="3">
+            <td width="170" rowspan="3">委托社名称及许可证号</td>
+            <td width="160" rowspan="3">
               <!-- <input v-if='!isPrint' class="wp100" v-model="list.CustomerName" type="text">
               <span  v-if='isPrint'>{{list.CustomerName}}</span>-->
               <span class="__input" :contenteditable="true">{{list.CustomerName}}</span>
@@ -39,7 +40,7 @@
               <span class="__input" :contenteditable="true">{{list.Contact}}</span>
             </td>
             <td width="60">电话</td>
-            <td>
+            <td width="110">
               <span class="__input" :contenteditable="true">{{list.ContactNumber}}</span>
             </td>
           </tr>
@@ -154,20 +155,20 @@
               <p>
                 <span>甲方同意本订单所有费用在出发前支付到乙方指定账户:</span>
                 <!-- && !isSave -->
-                <select
-                  v-if="printShow===true&&!isPrint "
+                <el-select
+                  v-if="printShow===true"
                   class="wp40 accountList"
                   v-model="accountNum"
                   @change="accountChange"
                   placeholder="请选择"
                 >
-                  <option
+                  <el-option
                     v-for="(item,index) in accountList"
                     :key="index"
                     :label="item.BankSubName"
                     :value="index"
-                  ></option>
-                </select>
+                  ></el-option>
+                </el-select>
               </p>
               <p class="fnormal">
                 户名:
@@ -225,7 +226,6 @@
 					<span>账户:</span>
 					<!-- && !isSave -->
 					<el-select
-						v-if="printShow===true&&!isPrint "
 						class="wp40 accountList"
 						v-model="accountNum"
 						@change="accountChange()"
@@ -363,7 +363,7 @@ export default {
             this.accountChange();
             setTimeout(() => {
 							this.setHtml();
-							if (data.OperationState === 0 && this.$route.query.isShen) {
+							if (data.OperationState === 1 || data.OperationState === 0 || this.$route.query.isShen) {
 								let ele=document.getElementsByClassName('__input')
 								for(var i=0;i<ele.length;i++){
 									ele[i].contentEditable = false
@@ -380,6 +380,7 @@ export default {
     // 保存确认函
     SetOrderConfirmation: function() {
       this.isSave = true;
+      this.printShow = false
       setTimeout(() => {
         let msg = {
           ID: this.ConfirmationDetails.ID,