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

src/components/FinancialModule/RecPayQuery.vue

@@ -253,7 +253,7 @@
                       </el-col>
                       <el-col :span="6">
                         <el-form-item label="金额：">
-                          <el-input v-model="msg.sMoney" class="w64d5"></el-input>-<el-input v-model="msg.eMoney" class="w64d5"></el-input>
+                          <el-input v-model="msg.sMoney" class="w64d5" @keyup.native="checkPrice(msg,'sMoney')"></el-input>-<el-input v-model="msg.eMoney" @keyup.native="checkPrice(msg,'eMoney')" class="w64d5"></el-input>
                         </el-form-item>
                       </el-col>
                       <el-col :span="6">

src/components/SalesModule/groupTourOrderOne.vue

@@ -1299,7 +1299,7 @@
         <li>
           <span>
             <em>{{$t('hotel.order_Number')}}</em>
-            <el-input v-model='msg.tempOrderId' class='w150'></el-input>
+            <el-input v-model='msg.tempOrderId' class='w150' @keyup.native="checkInteger(msg,'tempOrderId')"></el-input>
           </span>
         </li>
         <li><span><em>{{$t('scen.sc_ftTime')}}</em>

src/components/SingleContract.vue

@@ -669,7 +669,7 @@
               <tr v-for="(item,index) in CtObj.ContractTicketList" :key="index">
                 <td>{{index+1}}</td>
                 <td>
-                  <span v-if="item.IsShow == 0">{{item.TicketTime}}</span>
+                  <span v-if="item.IsShow == 0">{{item.TicketTime | YMD}}</span>
                   <el-date-picker v-else class="w200" v-model="item.TicketTime" type="datetime"
                     format="yyyy-MM-dd HH:mm" placeholder=''></el-date-picker>
                 </td>
@@ -1404,6 +1404,11 @@
 
       };
     },
+    filters:{
+        YMD(date){
+        return moment(date).format("YYYY-MM-DD HH:mm");
+        }
+    },
     methods: {
       //跳转锚点
       goAnchor(selector) {

src/components/administrative/ContractManage.vue

@@ -43,8 +43,10 @@
           <span><em>合同状态</em>
             <el-select v-model="msg.Status" :placeholder="$t('pub.pleaseSel')">
               <el-option label="请选择" :value="-1" :key="-1"> </el-option>
-              <el-option label="正常" :value="0" :key="0"> </el-option>
-              <el-option label="删除" :value="1" :key="1"> </el-option>
+              <el-option label="草稿" :value="0" :key="0"> </el-option>
+              <el-option label="已取消" :value="1" :key="1"> </el-option>
+              <el-option label="已提交" :value="2" :key="2"> </el-option>
+              <el-option label="已盖章" :value="3" :key="3"> </el-option>
             </el-select>
           </span>
         </li>
@@ -78,7 +80,8 @@
         <th width="130">操作</th>
       </tr>
       <tr v-for="(item, index) in dataList" :key="index">
-        <td>{{ item.ID }}</td>
+        <td>{{ item.ID }}
+        </td>
         <td>
           <template v-if="item.CType == 2">
             境内旅游合同
@@ -91,7 +94,6 @@
           </template>
         </td>
         <td>{{ item.T_ContractNum }}</td>
-
         <td>{{ item.Tourists_Name }}</td>
         <td>{{ item.TravelAgency_Name }}</td>
         <td>{{ item.TravelAgency_DealMan }}</td>
@@ -116,22 +118,22 @@
                 @click="goContract('SingleContract', item.ID, '单项委托合同')"></el-button>
             </template>
           </el-tooltip>
-
           <el-tooltip class="item" effect="dark" content="复制" placement="top-start">
             <el-button type="warning" icon="iconfont icon-copy" circle @click="CopyContract(item)" style="padding:4px;"></el-button>
           </el-tooltip>
-
           <el-tooltip class="item" effect="dark" content="下载" placement="top-start">
             <el-button type="success" icon="el-icon-download" circle @click="DownLoadContract(item)"></el-button>
           </el-tooltip>
-
           <el-tooltip class="item" effect="dark" content="取消" placement="top-start">
             <el-button type="danger" icon="el-icon-close" circle @click="DeleteContract(item)"></el-button>
           </el-tooltip>
+
+          <el-tooltip class="item" effect="dark" content="提交并盖章" placement="top-start">
+            <el-button type="danger" icon="el-icon-close" circle @click="SubmitContract(item)"></el-button>
+          </el-tooltip>
         </td>
       </tr>
     </table>
-
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
       layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
     </el-pagination>
@@ -179,6 +181,28 @@
       this.getList();
     },
     methods: {
+      //提交并盖章
+      SubmitContract(item)
+      {
+        var that = this;
+        this.Confirm("是否提交并盖章此合同?", function () {
+          that.apipost(
+            "travelcontract_post_UpdateTravelContractStatusService", {
+              ID: item.ID,
+              Status:2
+            },
+            res => {
+              if (res.data.resultCode == 1) {
+                that.Success(res.data.message);
+                that.getList();
+              } else {
+                that.Error(res.data.message);
+              }
+            },
+            err => {}
+          );
+        });
+      },
       //复制合同
       CopyContract(item) {
         //获取列表数据
@@ -206,6 +230,7 @@
           ID: item.ID,
           CType: item.CType
         };
+        let urlObj = this.domainManager();
         this.loading = true;
         this.$http({
           headers: {
@@ -219,7 +244,7 @@
         }).then(res => {
           this.loading = false
           if (res.data.resultCode === 1) {
-            let sign = title + "V2"
+            let sign = item.T_ContractNum;
             const a = document.createElement('a');
             a.setAttribute('download', '');
             a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
@@ -237,10 +262,11 @@
         var that = this;
         this.Confirm("是否取消此合同?", function () {
           var msg = {
-            ID: item.ID
+            ID: item.ID,
+            Status:1
           };
           that.apipost(
-            "travelcontract_post_RemoveTravelContractService",
+            "travelcontract_post_UpdateTravelContractStatusService",
             msg,
             res => {
               if (res.data.resultCode == 1) {