页面修改

src/components/administrative/ElectronicAudit.vue

@@ -48,6 +48,7 @@
       <el-tab-pane label="其他合同" name="2"></el-tab-pane>
       <el-tab-pane label="出境游合同" name="1"></el-tab-pane>
     </el-tabs>
+    <!--出境合同-->
     <template v-if="activeName==1">
       <div class="ElectronicAudit">
         <div class="query-box">
@@ -55,35 +56,36 @@
             <li>
               <span>
                 <em>合同编号</em>
-                <el-input :placeholder="$t('system.ph_in')" v-model="msgOut.ContractNum" @keyup.native.enter="getList"
-                  class="w210"></el-input>
+                <el-input :placeholder="$t('system.ph_in')" v-model="msgOut.ContractNum"
+                  @keyup.native.enter="resetOutQuery" class="w210" clearable @clear="resetOutQuery"></el-input>
               </span>
             </li>
             <li>
               <span>
                 <em>产品名称</em>
-                <el-input :placeholder="$t('system.ph_in')" v-model="msgOut.ProductName" @keyup.native.enter="getList"
-                  class="w210"></el-input>
+                <el-input :placeholder="$t('system.ph_in')" v-model="msgOut.ProductName"
+                  @keyup.native.enter="resetOutQuery" class="w210" clearable @clear="resetOutQuery"></el-input>
               </span>
             </li>
             <li>
               <span>
                 <em>订单号</em>
-                <el-input :placeholder="$t('system.ph_in')" v-model="msgOut.OrderID" @keyup.native.enter="getList"
-                  class="w210"></el-input>
+                <el-input :placeholder="$t('system.ph_in')" v-model="msgOut.OrderID" @keyup.native.enter="resetOutQuery"
+                  class="w210" clearable @clear="resetOutQuery"></el-input>
               </span>
             </li>
             <li>
               <span>
                 <em>团号</em>
-                <el-input :placeholder="$t('system.ph_in')" v-model="msgOut.TCID" @keyup.native.enter="getList"
-                  class="w210"></el-input>
+                <el-input :placeholder="$t('system.ph_in')" v-model="msgOut.TCID" @keyup.native.enter="resetOutQuery"
+                  class="w210" clearable @clear="resetOutQuery"></el-input>
               </span>
             </li>
             <li>
               <span>
                 <em>状态</em>
-                <el-select v-model='msgOut.AuditContract' filterable :placeholder="$t('pub.pleaseSel')">
+                <el-select v-model='msgOut.AuditContract' filterable :placeholder="$t('pub.pleaseSel')"
+                  @change="resetOutQuery" clearable @clear="resetOutQuery">
                   <el-option label='不限' value=''></el-option>
                   <el-option label='驳回' :value='3'></el-option>
                   <el-option label='待审核' :value='1'></el-option>
@@ -91,18 +93,8 @@
                 </el-select>
               </span>
             </li>
-            <li style="display:none;">
-              <span>
-                <em>日期</em>
-                <el-date-picker v-model='msg.startDate' class='w135' value-format="yyyy-MM-dd" type="date"
-                  :picker-options="pickerBeginDateBefore"></el-date-picker>
-                -
-                <el-date-picker v-model='msg.returnDate' class='w135' value-format="yyyy-MM-dd" type="date"
-                  :picker-options="pickerBeginDateAfter"></el-date-picker>
-              </span>
-            </li>
             <li>
-              <input type="button" class="hollowFixedBtn" value="查询" @click="getListOutTract(),resetOutPage()" />
+              <input type="button" class="hollowFixedBtn" value="查询" @click="resetOutQuery" />
             </li>
           </ul>
         </div>
@@ -176,19 +168,22 @@
         </div>
       </div>
     </template>
+    <!--单项、一日游、境内旅游合同-->
     <template v-else>
       <div class="ContractManage">
         <div class="query-box">
           <ul>
             <li>
               <span><em>合同编号</em>
-                <el-input class="w210" v-model="msg.T_ContractNum" placeholder="请输入合同编号" @keyup.enter.native="getList">
+                <el-input class="w210" v-model="msg.T_ContractNum" placeholder="请输入合同编号"
+                  @keyup.enter.native="resetOtherQuery" clearable @clear="resetOtherQuery">
                 </el-input>
               </span>
             </li>
             <li>
               <span><em>合同类型</em>
-                <el-select v-model="msg.CType" :placeholder="$t('pub.pleaseSel')">
+                <el-select v-model="msg.CType" :placeholder="$t('pub.pleaseSel')" @change="resetOtherQuery" clearable
+                  @clear="resetOtherQuery">
                   <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>
@@ -198,38 +193,43 @@
             </li>
             <li>
               <span><em>甲方名称</em>
-                <el-input class="w210" v-model="msg.Tourists_Name" placeholder="请输入客户名称" @keyup.enter.native="getList">
+                <el-input class="w210" v-model="msg.Tourists_Name" placeholder="请输入客户名称"
+                  @keyup.enter.native="resetOtherQuery" clearable @clear="resetOtherQuery">
                 </el-input>
               </span>
             </li>
             <li>
               <span><em>客户电话</em>
-                <el-input class="w210" v-model="msg.Tourists_Tel" placeholder="请输入客户电话" @keyup.enter.native="getList">
+                <el-input class="w210" v-model="msg.Tourists_Tel" placeholder="请输入客户电话"
+                  @keyup.enter.native="resetOtherQuery" clearable @clear="resetOtherQuery">
                 </el-input>
               </span>
             </li>
             <li>
               <span><em>团号</em>
-                <el-input class="w210" v-model="msg.C_TCNUM" placeholder="请输入团号" @keyup.enter.native="getList">
+                <el-input class="w210" v-model="msg.C_TCNUM" placeholder="请输入团号" @keyup.enter.native="resetOtherQuery"
+                  clearable @clear="resetOtherQuery">
                 </el-input>
               </span>
             </li>
             <li>
               <span><em>线路名称</em>
-                <el-input class="w210" v-model="msg.C_ProductName" placeholder="请输入线路名称" @keyup.enter.native="getList">
+                <el-input class="w210" v-model="msg.C_ProductName" placeholder="请输入线路名称"
+                  @keyup.enter.native="resetOtherQuery" clearable @clear="resetOtherQuery">
                 </el-input>
               </span>
             </li>
             <li>
               <span><em>经办人</em>
                 <el-input class="w210" v-model="msg.TravelAgency_DealMan" placeholder="请输入经办人"
-                  @keyup.enter.native="getList">
+                  @keyup.enter.native="resetOtherQuery" clearable @clear="resetOtherQuery">
                 </el-input>
               </span>
             </li>
             <li>
               <span><em>合同状态</em>
-                <el-select v-model="msg.Status" :placeholder="$t('pub.pleaseSel')">
+                <el-select v-model="msg.Status" :placeholder="$t('pub.pleaseSel')" @change="resetOtherQuery" clearable
+                  @clear="resetOtherQuery">
                   <el-option label="请选择" :value="-1" :key="-1"> </el-option>
                   <el-option label="待审" :value="1" :key="1"> </el-option>
                   <el-option label="审核通过" :value="2" :key="2"> </el-option>
@@ -240,17 +240,16 @@
             <li>
               <span><em>{{ $t("sm.Date") }}</em>
                 <el-date-picker v-model="msg.StartDate" class="w135" value-format="yyyy-MM-dd" type="date"
-                  :picker-options="pickerBeginDateBefore2"></el-date-picker>
+                  :picker-options="pickerBeginDateBefore2" @input="resetOtherQuery" clearable @clear="resetOtherQuery">
+                </el-date-picker>
                 -
                 <el-date-picker v-model="msg.EndDate" class="w135" value-format="yyyy-MM-dd" type="date"
-                  :picker-options="pickerBeginDateAfter2"></el-date-picker>
+                  :picker-options="pickerBeginDateAfter2" @input="resetOtherQuery" clearable @clear="resetOtherQuery">
+                </el-date-picker>
               </span>
             </li>
             <li>
-              <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="
-                      getList();
-                      resetPageIndex();
-                    " />
+              <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="resetOtherQuery" />
             </li>
           </ul>
         </div>
@@ -389,9 +388,8 @@
             return startTime.getTime() >= time.getTime()
           }
         },
-        //切换出境游合同
+        //1-出境合同，2-其它合同
         activeName: '2',
-        //ContractMange参数
         total: 0,
         total2: 0,
         currentPage: 1,
@@ -439,6 +437,18 @@
       };
     },
     methods: {
+      //出境重新查询
+      resetOutQuery() {
+        this.msgOut.PageIndex = 1;
+        this.currentPage2 = 1;
+        this.getListOutTract();
+      },
+      //单项、一日游、境内游合同
+      resetOtherQuery() {
+        this.msg.pageIndex = 1;
+        this.currentPage = 1;
+        this.getOtherList();
+      },
       //关闭合同弹窗
       closeContractDialog() {
         this.auditMsg.Id = 0;
@@ -470,16 +480,12 @@
       },
       //切换
       getSwitch() {
-        if (this.active == 1) {
-          this.getListOutTract();
+        if (this.activeName == 1) {
+          //出境合同
+          this.resetOutQuery();
         } else {
-          this.getList();
-        }
-      },
-      dateChange(val) {
-        if (val) {
-          this.msg.startDate = val[0];
-          this.msg.returnDate = val[1];
+          //其它合同
+          this.resetOtherQuery();
         }
       },
       //跳转至详情
@@ -511,7 +517,6 @@
           }
         });
       },
-
       getDate(date) {
         return moment(date).format("YYYY-MM-DD");
       },
@@ -531,7 +536,7 @@
             res => {
               if (res.data.resultCode == 1) {
                 that.Success(res.data.message);
-                that.getList();
+                that.getOtherList();
               } else {
                 that.Error(res.data.message);
               }
@@ -540,7 +545,8 @@
           );
         });
       },
-      getList() {
+      //单项、一日游、境内旅游合同
+      getOtherList() {
         this.loading = true;
         //获取列表数据
         this.apipost(
@@ -567,18 +573,9 @@
           err => {}
         );
       },
-      resetPageIndex() {
-        this.msg.pageIndex = 1;
-        this.currentPage = 1;
-      },
-      resetOutPage() {
-        this.msgOut.PageIndex = 1;
-        this.currentPage2 = 1;
-      },
-
       handleCurrentChange(val) {
         this.msg.pageIndex = val;
-        this.getList();
+        this.getOtherList();
       },
       handleOutChange(val) {
         this.msgOut.PageIndex = val;
@@ -603,7 +600,7 @@
         this.apipost("travelcontract_post_UpdateTravelContractSignatureService", msg, res => {
           if (res.data.resultCode === 1) {
             this.Success(res.data.message);
-            this.getList();
+            this.getOtherList();
           } else {
             this.Error(res.data.message);
           }
@@ -626,8 +623,7 @@
       },
     },
     mounted() {
-      // this.getListOutTract();
-      this.getList();
+      this.getOtherList();
     }
   };