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

src/App.vue

@@ -173,7 +173,7 @@ export default {
 }
 </script>
 <style>
-  @import "//at.alicdn.com/t/font_635492_ocvro9vim9q.css";
+  @import "//at.alicdn.com/t/font_635492_rcf1gwtw66.css";
   @import "./assets/css/Semibold.css";
   @import "./assets/css/global/config.css";
   @import "./assets/css/fileIcon.css";

src/components/administrative/ContractManage.vue

@@ -155,7 +155,7 @@
         </td>
         <td>{{ item.T_ContractNum }}</td>
         <td style="text-align:left">
-          <span v-if="item.Tourists_Sign!=''" style="color:green;">【已签字】</span>
+          <span v-if="item.Tourists_Sign&&item.Tourists_Sign!=''" style="color:green;">【已签字】</span>
           <span v-else style="color:red;">【未签字】</span>
           {{ item.Tourists_Name }}
         </td>

src/components/administrative/ElectronicAudit.vue

@@ -55,35 +55,35 @@
             <li>
               <span>
                 <em>合同编号</em>
-                <el-input :placeholder="$t('system.ph_in')" v-model="msg.contractNum" @keyup.native.enter="getList"
+                <el-input :placeholder="$t('system.ph_in')" v-model="msgOut.ContractNum" @keyup.native.enter="getList"
                   class="w210"></el-input>
               </span>
             </li>
             <li>
               <span>
                 <em>产品名称</em>
-                <el-input :placeholder="$t('system.ph_in')" v-model="msg.productName" @keyup.native.enter="getList"
+                <el-input :placeholder="$t('system.ph_in')" v-model="msgOut.ProductName" @keyup.native.enter="getList"
                   class="w210"></el-input>
               </span>
             </li>
             <li>
               <span>
                 <em>订单号</em>
-                <el-input :placeholder="$t('system.ph_in')" v-model="msg.orderID" @keyup.native.enter="getList"
+                <el-input :placeholder="$t('system.ph_in')" v-model="msgOut.OrderID" @keyup.native.enter="getList"
                   class="w210"></el-input>
               </span>
             </li>
             <li>
               <span>
                 <em>团号</em>
-                <el-input :placeholder="$t('system.ph_in')" v-model="msg.tcid" @keyup.native.enter="getList"
+                <el-input :placeholder="$t('system.ph_in')" v-model="msgOut.TCID" @keyup.native.enter="getList"
                   class="w210"></el-input>
               </span>
             </li>
             <li>
               <span>
                 <em>状态</em>
-                <el-select v-model='msg.auditContract' filterable :placeholder="$t('pub.pleaseSel')">
+                <el-select v-model='msgOut.AuditContract' filterable :placeholder="$t('pub.pleaseSel')">
                   <el-option label='不限' value=''></el-option>
                   <el-option label='驳回' :value='3'></el-option>
                   <el-option label='待审核' :value='1'></el-option>
@@ -335,7 +335,7 @@
           ContractNum: '',
           ProductName: '',
           OrderID: '',
-          Tcid: '',
+          TCID: '',
           StartDate: '',
           ReturnDate: '',
           AuditContract: '',