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

src/components/administrative/ContractManage.vue

@@ -136,7 +136,7 @@
               getList();
               resetPageIndex();
             " />
-        
+
           <el-dropdown size="medium" @command="getImport" split-button type="primary" @click="handleClick"
             style="padding-left:5px;">
             一日游合同
@@ -226,7 +226,7 @@
             <el-button type="info" icon="iconfont icon-copy-l" circle @click="GetQrCode(item)"
               style="padding:4px;background-color:#9266f9;border-color:#9266f9;"></el-button>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" content="取消" placement="top-start" v-if="item.Status==0">
+          <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>
 
@@ -439,17 +439,17 @@
       //删除合同
       DeleteContract(item) {
         var that = this;
-        this.Confirm("是否取消此合同?", function () {
+        this.Confirm("是否作废此合同?", function () {
           var msg = {
             ID: item.ID,
-            Status: 4
+            Status: 5
           };
           that.apipost(
             "travelcontract_post_UpdateTravelContractStatusService",
             msg,
             res => {
               if (res.data.resultCode == 1) {
-                that.Success("取消成功！");
+                that.Success("作废成功！");
                 that.getList();
               } else {
                 that.Error(res.data.message);

src/components/sale/sale.vue

@@ -78,7 +78,7 @@
                           <p>
                             <span>￥</span>
                             <span :class="[isView?'':'HiddenNum']">{{isView?data.totalCommission:'***'}}</span>
-                            <div style="width: 20px;height: auto; position: absolute;right: -30px;top: 15px; cursor: pointer;color: #232323;"
+                            <div style="width: 20px;height: auto; position: absolute;right: -30px;top: -15px; cursor: pointer;color: #232323;"
                             @click.stop="isView=!isView">
                               <el-icon class="iconfont"
                               :class="[isView?'icon-chakan':'icon-yincang']"

src/components/temp/operation.vue

@@ -283,7 +283,7 @@
                           <p>
                             <span>￥</span>
                             <span :class="[isView?'':'HiddenNum']">{{isView?data.OPCommission:'***'}}</span>
-                            <div style="width: 20px;height: auto; position: absolute;right: -30px;top: 15px; cursor: pointer;color: #232323;"
+                            <div style="width: 20px;height: auto; position: absolute;right: -30px;top: -15px; cursor: pointer;color: #232323;"
                             @click.stop="isView=!isView">
                               <el-icon class="iconfont"
                               :class="[isView?'icon-chakan':'icon-yincang']"