修改

src/components/TravelContractConfirm.vue

@@ -987,7 +987,7 @@
                                             <el-col :span="12">乙方签字（盖章）：</el-col>
                                             <el-col :span="12" style="position:relative;">
                                                 {{CtObj.TravelAgency_Name}}
-                                                <img class="signImg" style="position:absolute;right:0;" src="../assets/img/dzht/zhang.png" alt=""/>
+                                                <img class="signImg" v-if="CtObj.IsTravelAgencySignature==1" style="position:absolute;right:0;" src="../assets/img/dzht/zhang.png" alt=""/>
                                             </el-col>
                                         </el-row>
                                     </li>
@@ -1394,7 +1394,7 @@
                                     <li >
                                         <el-row>
                                             <el-col :span="12">出境社盖章：</el-col>
-                                            <el-col :span="12" style="position:relative;"><img class="signImg" style="position:absolute;right:0;" src="../assets/img/dzht/zhang.png" alt=""/></el-col>
+                                            <el-col :span="12" style="position:relative;"><img class="signImg" v-if="CtObj.IsTravelAgencySignature==1" style="position:absolute;right:0;" src="../assets/img/dzht/zhang.png" alt=""/></el-col>
                                         </el-row>
                                     </li>
                                     <li>
@@ -1534,7 +1534,7 @@
                                     <li style="position:relative;">
                                         <el-row>
                                             <el-col :span="12">旅行社：（盖章）</el-col>
-                                            <el-col :span="12"><img style="width:120px;position:absolute;right:0;" src="../assets/img/dzht/zhang.png" alt="" /></el-col>
+                                            <el-col :span="12"><img style="width:120px;position:absolute;right:0;" v-if="CtObj.IsTravelAgencySignature==1" src="../assets/img/dzht/zhang.png" alt="" /></el-col>
                                         </el-row>
                                     </li>
                                     <li>
@@ -1955,7 +1955,7 @@
                                         <el-col :span="12">乙方签字（盖章）：</el-col>
                                         <el-col :span="12" style="position:relative;">
                                             {{CtObj.TravelAgency_Name}}
-                                            <img class="signImg" style="position:absolute;right:0;" src="../assets/img/dzht/zhang.png" alt=""/>
+                                            <img class="signImg" style="position:absolute;right:0;" v-if="CtObj.IsTravelAgencySignature==1" src="../assets/img/dzht/zhang.png" alt=""/>
                                         </el-col>
                                     </el-row>
                                 </li>
@@ -3199,6 +3199,7 @@
           TripType: 0, //行程类型(0-简易行程，1-标准行程)
           Tourists_Sign:'',
           CreateTimeStr:"",
+          IsTravelAgencySignature:0  //判断是否盖章
         },
       };
     },
@@ -3351,6 +3352,7 @@
               this.CtObj.PickUpTotalPrice = tempObj.PickUpTotalPrice;
               this.CtObj.VisaTotalPrice = tempObj.VisaTotalPrice;
               this.CtObj.Tourists_Sign= tempObj.Tourists_Sign;
+              this.CtObj.IsTravelAgencySignature = tempObj.IsTravelAgencySignature;
               this.CtObj.TicketAndHotelTotalPrice =
                 tempObj.TicketAndHotelTotalPrice;
               if (

src/components/TravelContractDetail.vue

@@ -576,7 +576,7 @@
                                     </td>
                                     <td>
                                         <span>{{dataList.company}}</span>
-                                        <img class="esealDiv" src='../assets/img/dzht/zhang.png' alt=""/>
+                                        <img class="esealDiv" v-if="isShowZhang==1" src='../assets/img/dzht/zhang.png' alt=""/>
                                     </td>
                                 </tr>
                                 <tr>
@@ -874,7 +874,8 @@
         returnArriveCityName:'',
         tripList:[],
         //交通
-        trifficList:[]
+        trifficList:[],
+        isShowZhang:0,
       };
     },
     methods: {
@@ -957,6 +958,21 @@
       getDayAddOne(day,num){
           return moment(day).add(num,'days').format('YYYY-MM-DD')
       },
+      //获取是否显示公司章
+      getShow(ID){
+          if(ID!=null&&ID!=undefined){
+            let msg = {
+                ID:ID
+            }
+            this.apipost("travelcontract_post_GetContractService",msg,res => {
+                if (res.data.resultCode === 1) {
+                    this.isShowZhang=res.data.data.IsTravelAgencySignature;
+                } else {
+                    this.Error(res.data.message);
+                }
+            });
+          }
+      },
       //获取大写
       getTotalNum(num) {
         switch (num) {
@@ -1415,7 +1431,9 @@
       this.msg.TCID = this.$route.query.TCID;
       this.msg.orderID = this.$route.query.orderID;
       this.msg.guestId = this.$route.query.guestId;
+      let TID = this.$route.query.ID;
       this.getList();
+      this.getShow(this.TID);
       this.GetTrip(0,this.msg.TCID);
     }
   };

src/components/TravelContractView.vue

@@ -785,7 +785,7 @@
                       <td>受托方（旅行社）签章:</td>
                       <td style="position:relative;">
                         <font>{{CtObj.TravelAgency_Name}}</font>
-                          <img src="../assets/img/dzht/zhang.png" alt=""
+                          <img src="../assets/img/dzht/zhang.png" v-if="CtObj.IsTravelAgencySignature==1" alt=""
                             style="width:120px;heigth:120px;position:absolute;top:0;" />
                       </td>
                     </tr>
@@ -1265,7 +1265,7 @@
                     </td>
                     <td style="width:15%">出境社盖章：</td>
                     <td style="width:35%;position:relative;">
-                      <img src="../assets/img/dzht/zhang.png" alt=""
+                      <img src="../assets/img/dzht/zhang.png" v-if="CtObj.IsTravelAgencySignature==1" alt=""
                         style="width:120px;heigth:120px;position:absolute;top:0;" />
                     </td>
                   </tr>
@@ -1712,7 +1712,7 @@
                       <td>乙方签字（盖章）</td>
                       <td style="position:relative;">
                         <font>{{CtObj.TravelAgency_Name}}</font>
-                        <img src="../assets/img/dzht/zhang.png" alt="" style="width:120px;heigth:120px;position:absolute;top:0;" />
+                        <img src="../assets/img/dzht/zhang.png" v-if="CtObj.IsTravelAgencySignature==1" alt="" style="width:120px;heigth:120px;position:absolute;top:0;" />
                       </td>
                     </tr>
                     <tr>
@@ -2034,6 +2034,7 @@
           TripType: 0, //行程类型(0-简易行程，1-标准行程)
           Tourists_Sign: '',
           CreateTimeStr: "",
+          IsTravelAgencySignature:0   //是否盖章
         },
       };
     },
@@ -2176,6 +2177,7 @@
               this.CtObj.PickUpTotalPrice = tempObj.PickUpTotalPrice;
               this.CtObj.VisaTotalPrice = tempObj.VisaTotalPrice;
               this.CtObj.Tourists_Sign = tempObj.Tourists_Sign;
+              this.CtObj.IsTravelAgencySignature = tempObj.IsTravelAgencySignature;
               this.CtObj.TicketAndHotelTotalPrice =
                 tempObj.TicketAndHotelTotalPrice;
               if (

src/components/administrative/ElectronicAudit.vue

@@ -102,7 +102,7 @@
               </span>
             </li>
             <li>
-              <input type="button" class="hollowFixedBtn" value="查询" @click="getList()" />
+              <input type="button" class="hollowFixedBtn" value="查询" @click="getListOutTract(),resetOutPage()" />
             </li>
           </ul>
         </div>
@@ -116,27 +116,32 @@
               <th>出发日期</th>
               <th>返回日期</th>
               <th>状态</th>
+              <th>是否盖章</th>
               <th width="200">操作</th>
             </tr>
             <tr v-for="item in dataListOut">
-              <td>{{item.contractNum}}</td>
-              <td>{{item.orderId}}</td>
-              <td>{{item.tcid}}</td>
-              <td>{{item.productName}}</td>
+              <td>{{item.ContractNum}}</td>
+              <td>{{item.OrderId}}</td>
+              <td>{{item.TCID}}</td>
+              <td>{{item.ProductName}}</td>
               <td>
-                <template v-if="item.startDate!=null">
-                  {{getDate(item.startDate)}}
+                <template v-if="item.StartDate!=null">
+                  {{getDate(item.StartDate)}}
                 </template>
               </td>
               <td>
-                <template v-if="item.returnDate!=null">
-                  {{getDate(item.returnDate)}}
+                <template v-if="item.ReturnDate!=null">
+                  {{getDate(item.ReturnDate)}}
                 </template>
               </td>
               <td>
-                <span v-if="item.auditContract==3" style="color:red;">已驳回</span>
-                <span v-if="item.auditContract==1" style="color:blue;">待审核</span>
-                <span v-if="item.auditContract==2" style="color:green;">审核通过</span>
+                <span v-if="item.AuditContract==3" style="color:red;">已驳回</span>
+                <span v-if="item.AuditContract==1" style="color:blue;">待审核</span>
+                <span v-if="item.AuditContract==2" style="color:green;">审核通过</span>
+              </td>
+              <td>
+                <span v-if="item.IsTravelAgencySignature==0">未盖章</span>
+                <span v-if="item.IsTravelAgencySignature==1" style="color:green;">已盖章</span>
               </td>
               <td>
                 <el-row>
@@ -144,9 +149,14 @@
                     <el-button type="primary" icon="iconfont icon-shenpi" @click="AuditElec(item,2)" circle></el-button>
                   </el-tooltip>
                   <el-tooltip class="item" effect="dark" content="驳回" placement="top-start">
-                    <el-button type="danger" v-if="item.auditContract!=3" icon="iconfont icon-shenhebohui"
+                    <el-button type="danger" v-if="item.AuditContract!=3" icon="iconfont icon-shenhebohui"
                       @click="AuditElec(item,3)" circle></el-button>
                   </el-tooltip>
+                  <el-tooltip class="item" effect="dark" v-if="item.IsTravelAgencySignature==0" content="盖章" placement="top-start">
+                    <el-button type="success" icon="iconfont icon-gaizhang" circle @click="OutGaiZhang(item.Id)"
+                      style="padding:4px;"></el-button>
+                  </el-tooltip>
+
                   <el-tooltip class="item" effect="dark" content="查看" placement="top-start">
                     <el-button type="danger" icon="iconfont icon-chakan" @click="goToDetail(item)" circle></el-button>
                   </el-tooltip>
@@ -158,6 +168,9 @@
             <i class="iconfont icon-kong" style="font-size:100px;"></i>
             <p>{{$t("active.ld_noData")}}</p>
           </div>
+          <el-pagination background @current-change="handleOutChange" :current-page.sync="currentPage2"
+            layout="total,prev, pager, next, jumper" :page-size="msgOut.PageSize" :total="total2">
+          </el-pagination>
         </div>
       </div>
     </template>
@@ -252,6 +265,7 @@
             <th width="100">合同状态</th>
             <th width="100">创建人</th>
             <th width="120">创建时间</th>
+            <th width="80">是否盖章</th>
             <th width="130">操作</th>
           </tr>
           <tr v-for="(item, index) in dataList" :key="index">
@@ -281,6 +295,10 @@
             </td>
             <td>{{ item.CreateByName }}</td>
             <td>{{ item.CreateTimeStr }}</td>
+            <td>
+                <span v-if="item.IsTravelAgencySignature==0">未盖章</span>
+                <span v-if="item.IsTravelAgencySignature==1" style="color:green;">已盖章</span>
+            </td>
             <td>
               <el-tooltip class="item" effect="dark" content="审核通过" placement="top-start" v-if="item.Status==1">
                 <el-button type="primary" icon="iconfont icon-shenpi" circle @click="SubmitContract(item,2)"></el-button>
@@ -289,6 +307,10 @@
                 <el-button type="info" icon="iconfont icon-shenhebohui" circle @click="SubmitContract(item,3)">
                 </el-button>
               </el-tooltip>
+              <el-tooltip class="item" effect="dark" v-if="item.IsTravelAgencySignature==0" content="盖章" placement="top-start">
+                <el-button type="success" icon="iconfont icon-gaizhang" circle @click="GaiZhang(item.ID)"
+                  style="padding:4px;"></el-button>
+              </el-tooltip>
               <el-tooltip class="item" effect="dark" content="查看" placement="top-start">
                 <el-button type="danger" icon="iconfont icon-chakan" circle @click="ViewContract(item)"
                   style="padding:4px;"></el-button>
@@ -296,7 +318,7 @@
             </td>
           </tr>
         </table>
-        <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
+        <el-pagination background @current-change="handleOutChange" :current-page.sync="currentPage"
           layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
         </el-pagination>
       </div>
@@ -316,7 +338,9 @@
           Tcid: '',
           StartDate: '',
           ReturnDate: '',
-          AuditContract: ''
+          AuditContract: '',
+          PageIndex:1,
+          PageSize:15
         },
         dataListOut: [],
         loadingOut: false,
@@ -340,7 +364,9 @@
         activeName: '1',
         //ContractMange参数
         total: 0,
+        total2: 0,
         currentPage: 1,
+        currentPage2: 1,
         dataList: [],
         loading: false, //页面加载
         msg: {
@@ -396,38 +422,30 @@
         this.$router.push({
           name: 'TravelContractDetail',
           query: {
-            TCID: item.tcid,
-            guestId: item.guestId,
-            orderID: item.orderId,
+            TCID: item.TCID,
+            guestId: item.GuestId,
+            orderID: item.OrderId,
+            ID: item.Id,
             blank: "y",
           }
         });
       },
       getListOutTract() {
         this.loadingOut = true;
-        //travelcontract_post_GetContractPageListService
         this.apipost("travelcontract_post_GetContractPageListService",this.msgOut,res => {
           this.loadingOut = false;
-          console.log(res,'ressss');
           if (res.data.resultCode === 1) {
+            console.log(res,'ressss');
             this.dataListOut = res.data.data.pageData;
+            this.total2=res.data.data.count;
           } else {
             this.Error(res.data.message);
           }
         });
-
-        // this.apiJavaPost("/api/contract/auditContract", this.msgOut, res => {
-        //   this.loadingOut = false;
-        //   if (res.data.resultCode === 1) {
-        //     this.dataListOut = res.data.data;
-        //   } else {
-        //     this.Error(res.data.message);
-        //   }
-        // }, null);
       },
       //审核通过或者驳回
       AuditElec(item, type) {
-        item.auditContract = type;
+        item.AuditContract = type;
         this.apiJavaPost("/api/contract/dosaveOrUpdate", item, res => {
           if (res.data.resultCode === 1) {
             this.Success(res.data.message);
@@ -497,10 +515,19 @@
         this.msg.pageIndex = 1;
         this.currentPage = 1;
       },
+      resetOutPage() {
+        this.msgOut.PageIndex = 1;
+        this.currentPage2 = 1;
+      },
+
       handleCurrentChange(val) {
         this.msg.pageIndex = val;
         this.getList();
       },
+      handleOutChange(val){
+        this.msgOut.PageIndex = val;
+        this.getListOutTract();
+      },
       ViewContract(item) {
         this.$router.push({
           name: "TravelContractView",
@@ -511,6 +538,36 @@
           }
         });
       },
+      //其他合同盖章
+      GaiZhang(ID){
+        let msg={
+          ID:ID,
+          Status:1
+        }
+        this.apipost("travelcontract_post_UpdateTravelContractSignatureService",msg,res => {
+          if (res.data.resultCode === 1) {
+            this.Success(res.data.message);
+            this.getList();
+          } else {
+            this.Error(res.data.message);
+          }
+        });
+      },
+      //出境合同盖章
+      OutGaiZhang(ID){
+        let msg={
+          ID:ID,
+          Status:1
+        }
+        this.apipost("travelcontract_post_UpdateContractSignatureService",msg,res => {
+          if (res.data.resultCode === 1) {
+            this.Success(res.data.message);
+            this.getListOutTract();
+          } else {
+            this.Error(res.data.message);
+          }
+        });
+      },
     },
     mounted() {
       this.getListOutTract();