修改领队报报账页面bug、优惠

38dfdd7a · 华国豪 · f21e1742 · 38dfdd7a · 38dfdd7a · 38dfdd7a
Commit 38dfdd7a authored Apr 19, 2019 by 华国豪 🙄
6 changed files
--- a/src/components/PrintPage.vue
+++ b/src/components/PrintPage.vue
@@ -73,8 +73,7 @@ export default {
        'my-HB-Bill':myhrBill,
        'my-GZ-Bill': myGZBill
    },methods:{
-        numAdd(){
-            alert(111)
+        numAdd(){ 
            this.num = this.num + 1
        }
    },mounted(){

--- a/src/components/SalesModule/Lowpricemanagement.vue
+++ b/src/components/SalesModule/Lowpricemanagement.vue
@@ -39,16 +39,22 @@
        <td>{{item.Reasons}}</td>
        <td>{{item.ApplyReason}}</td>
        <td>
-          <el-row>
+          <el-row v-if="item.ApplyState === 0">
            <button class="normalBtn" type="primary" @click="outerVisible = true,dialogTitle='审核理由',addMsg.ID=item.ID,addMsg.ApplyState= 1,addMsg.Reasons=item.Reasons">同意</button>
            <button class="hollowFixedBtn" @click="outerVisible = true,dialogTitle='拒绝理由',addMsg.ID=item.ID,addMsg.ApplyState= 2,addMsg.Reasons=item.ApplyReason">拒绝</button>
          </el-row>
        </td>
      </tr>
    </table>
-
+    <div class="noDataNotice" v-if="dataList.length<1">
+      <i class="iconfont icon-kong"></i>
+      <p>{{$t("active.ld_noData")}}</p>
+    </div>
    <el-dialog custom-class='w450' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
      <el-form  :rules="rules" ref="addMsg" label-width="100px">
+        <el-form-item label="优惠金额" prop="Description">
+          <el-input  class='w217' v-model="addMsg.ApplyPrice"></el-input>
+        </el-form-item>
        <el-form-item :label="$t('system.label_info')" prop="Description">
          <el-input maxlength='250' class='w217' type="textarea" v-model="addMsg.Reasons"></el-input>
        </el-form-item>
@@ -80,7 +86,8 @@
        addMsg: {
          Reasons: '',
          ApplyState:"",
-          ID:''
+          ID:'',
+          ApplyPrice: '',
        },
        rules: {
          Name: [{
@@ -125,19 +132,24 @@
      closeChangeMachie(done) {  //  转交窗口关闭
        done();
      },
-      submitForm(){
-        console.log(this.addMsg.Description)
+      submitForm(){ 
+        if (!this.addMsg.ApplyPrice || this.addMsg.ApplyPrice < 0) {
+          this.$message.error('请填写大于等于0的金额')
+          return
+        }
        this.apipost("lessprice_post_UpdateLesspriceOrder", this.addMsg, res => {
          if (res.data.resultCode == 1) {
            this.$message.success(res.data.message)
            this.outerVisible = false;
            this.addMsg.Reasons = '';
+            this.addMsg.ApplyPrice = '';
            this.getList()
          }
          else {
            this.$message.error(res.data.message)
            this.outerVisible = false;
            this.addMsg.Reasons = '';
+            this.addMsg.ApplyPrice = '';
          }
        }, err => {})
      }

--- a/src/components/SalesModule/groupTourOrder.vue
+++ b/src/components/SalesModule/groupTourOrder.vue
@@ -1263,8 +1263,8 @@
              <em style="font-size: 12px !important;color: #606266;line-height: 34px">订单当前单价</em>
              <em style=" display: inline-block;padding: 0 10px;height: 34px;line-height: 34px;text-align: left;font-size: 16px;border-radius: 3px;background-color: #E5E5E5;vertical-align: top;" class='w150'>{{SOMsg.OrderUnitPrice}}</em>

-              <em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >优惠金额</em>
-              <el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150' ></el-input>
+              <!-- <em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >优惠金额</em>
+              <el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150' ></el-input> -->

              <em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >审核人</em>
              <el-select  placeholder="请选择" v-model="SOMsg.UpdateBy">
@@ -3161,7 +3161,7 @@
        this.remarksMsg.isOrder = '1'
        this.SpecialOffer = false
        this.SOMsg.UpdateBy=''
-        this.SOMsg.ApplyPrice=''
+        this.SOMsg.ApplyPrice=0
        this.SOMsg.ApplyReason=''
    },
      clearMsg () {
@@ -3596,10 +3596,10 @@
      },
      //申请优惠
      Preservation(){
-        if(this.SOMsg.ApplyPrice < 0 ){
-          this.$message.error('请填写大于等于0的金额')
-          return
-        }
+        // if(this.SOMsg.ApplyPrice <= 0 ){
+        //   this.$message.error('请填写大于等于0的金额')
+        //   return
+        // }
        var numReg = /^[0-9]+$/
        var numRe = new RegExp(numReg)
        if (!numRe.test(this.SOMsg.ApplyPrice)) {
@@ -3622,13 +3622,13 @@
              this.$message.success(res.data.message)
              this.SpecialOffer =false;
              this.SOMsg.UpdateBy=''
-              this.SOMsg.ApplyPrice=''
+              this.SOMsg.ApplyPrice=0
              this.SOMsg.ApplyReason=''
            }else {
              this.$message.error(res.data.message)
              this.SpecialOffer =false;
              this.SOMsg.UpdateBy=''
-              this.SOMsg.ApplyPrice=''
+              this.SOMsg.ApplyPrice=0
              this.SOMsg.ApplyReason=''
            }
          },

--- a/src/components/SalesModule/groupTourOrderByTuan.vue
+++ b/src/components/SalesModule/groupTourOrderByTuan.vue
@@ -2172,8 +2172,8 @@
                <em style="font-size: 12px !important;color: #606266;line-height: 34px">订单当前单价</em>
                <em style=" display: inline-block;padding: 0 10px;height: 34px;line-height: 34px;text-align: left;font-size: 16px;border-radius: 3px;background-color: #E5E5E5;vertical-align: top;" class='w150'>{{SOMsg.OrderUnitPrice}}</em>

-                <em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >优惠金额</em>
-                <el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150' ></el-input>
+                <!-- <em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >优惠金额</em>
+                <el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150' ></el-input> -->

                <em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >审核人</em>
                <el-select  placeholder="请选择" v-model="SOMsg.UpdateBy">
@@ -3590,7 +3590,7 @@ submitYSZEForm(){
      this.remarksMsg.isOrder=1;
      this.SpecialOffer = false;
      this.SOMsg.UpdateBy=''
-      this.SOMsg.ApplyPrice=''
+      this.SOMsg.ApplyPrice=0
      this.SOMsg.ApplyReason=''
    },
    houseSubmit: function (){
@@ -4129,10 +4129,10 @@ submitYSZEForm(){
    },
    //申请优惠
    Preservation(){
-      if(this.SOMsg.ApplyPrice < 0 ){
-        this.$message.error('请填写大于等于0的金额')
-        return
-      }
+      // if(this.SOMsg.ApplyPrice < 0 ){
+      //   this.$message.error('请填写大于等于0的金额')
+      //   return
+      // }
      var numReg = /^[0-9]+$/
      var numRe = new RegExp(numReg)
      if (!numRe.test(this.SOMsg.ApplyPrice)) {
@@ -4155,13 +4155,13 @@ submitYSZEForm(){
            this.$message.success(res.data.message)
            this.SpecialOffer =false;
            this.SOMsg.UpdateBy=''
-            this.SOMsg.ApplyPrice=''
-            this.SOMsg.ApplyReason=''
+            this.SOMsg.ApplyPrice=0
+            this.SOMsg.ApplyReason=0
          }else {
            this.$message.error(res.data.message)
            this.SpecialOffer =false;
            this.SOMsg.UpdateBy=''
-            this.SOMsg.ApplyPrice=''
+            this.SOMsg.ApplyPrice=0
            this.SOMsg.ApplyReason=''
          }
        },

--- a/src/components/TravelManager/TravelList/RegistrationList.vue
+++ b/src/components/TravelManager/TravelList/RegistrationList.vue
@@ -2595,8 +2595,8 @@
                style=" display: inline-block;padding: 0 10px;height: 34px;line-height: 34px;text-align: left;font-size: 16px;border-radius: 3px;background-color: #E5E5E5;vertical-align: top;"
                class='w150'>{{SOMsg.OrderUnitPrice}}</em>

-              <em style="margin-left: 100px;font-size: 12px !important;color: #606266;">优惠金额</em>
-              <el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150'></el-input>
+              <!-- <em style="margin-left: 100px;font-size: 12px !important;color: #606266;">优惠金额</em>
+              <el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150'></el-input> -->

              <em style="margin-left: 100px;font-size: 12px !important;color: #606266;">审核人</em>
              <el-select placeholder="请选择" v-model="SOMsg.UpdateBy">
@@ -3885,7 +3885,7 @@
        this.remarksMsg.OrderId = "0";
        this.SpecialOffer = false;
        this.SOMsg.UpdateBy = ''
-        this.SOMsg.ApplyPrice = ''
+        this.SOMsg.ApplyPrice = 0
        this.SOMsg.ApplyReason = ''

      },
@@ -4649,10 +4649,10 @@
      },
      //申请优惠
      Preservation() {
-        if (this.SOMsg.ApplyPrice < 0) {
-          this.$message.error('请填写大于等于0的金额')
-          return
-        }
+        // if (this.SOMsg.ApplyPrice < 0) {
+        //   this.$message.error('请填写大于等于0的金额')
+        //   return
+        // }
        var numReg = /^[0-9]+$/
        var numRe = new RegExp(numReg)
        if (!numRe.test(this.SOMsg.ApplyPrice)) {
@@ -4675,13 +4675,13 @@
              this.$message.success(res.data.message)
              this.SpecialOffer = false;
              this.SOMsg.UpdateBy = ''
-              this.SOMsg.ApplyPrice = ''
+              this.SOMsg.ApplyPrice = 0
              this.SOMsg.ApplyReason = ''
            } else {
              this.$message.error(res.data.message)
              this.SpecialOffer = false;
              this.SOMsg.UpdateBy = ''
-              this.SOMsg.ApplyPrice = ''
+              this.SOMsg.ApplyPrice = 0
              this.SOMsg.ApplyReason = ''
            }
          },

--- a/src/components/leaderPay2.vue
+++ b/src/components/leaderPay2.vue
@@ -239,7 +239,7 @@
                    <th>领队退款</th>
                </tr>
                <tr v-for="item in TotalPriceData" v-if="item.PlanPrice > 0 || item.PlanTotalPrice > 0 || item.ExpendTotalPrice > 0">
-                    <td>{{moneyFormat(item.CurrencyStr)}}</td>
+                    <td>{{item.CurrencyStr}}</td>
                    <td>{{moneyFormat(item.PlanPrice)}}</td>
                    <td>{{moneyFormat(item.PlanTotalPrice)}}</td>
                    <td>{{moneyFormat(item.ExpendTotalPrice)}}</td>
@@ -256,6 +256,7 @@
                <input type="button" class="leader2Btn" value="查看详情" @click="Lookdetails()">
            </div>
        </div>
+        <a :href='blankUrl' id='blankLink' target="_blank" style="display:none">1</a>
    </div>
 </template>
 <script>
@@ -283,6 +284,7 @@ export default {
            totalList:[],
            isShowRemark:false,
            TotalPriceData: [],
+            blankUrl:'',
        }
 	},
    methods: {
@@ -380,17 +382,21 @@ export default {
      Lookdetails(){
          console.log(this.$route.query.id);
          console.log(this.$route.query.NewCombinationNum);
-
-        this.$router.push({
-          name: 'leaderPay',
-          query: {
-            "id": this.$route.query.id,
-            NewCombinationNum:this.$route.query.NewCombinationNum,
-            isUpdate: true,
-            blank: 'y',
-            tab: '领队报账'
-          }
-        })
+          let fullPath = `/leaderPay?id=${this.$route.query.id}&NewCombinationNum=${this.$route.query.NewCombinationNum}&isUpdate=${true}&blank=y&tab=领队报账`
+        let dom = document.querySelector("#blankLink")
+        dom.href=`http://${window.location.host}/#${fullPath}`
+        //console.log(that.$refs.blankLink.click())
+        dom.click()
+        // this.$router.push({
+        //   name: 'leaderPay',
+        //   query: {
+        //     id: this.$route.query.id,
+        //     NewCombinationNum:this.$route.query.NewCombinationNum,
+        //     isUpdate: true,
+        //     blank: 'y',
+        //     tab: '领队报账'
+        //   }
+        // })
      }

    },