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

src/components/Ticketing/IndividualTicketOrder.vue

@@ -94,7 +94,7 @@
           </span>
         </li>
         <li>
-          <span><em>订单状态</em></span>
+          <span><em>确认状态</em></span>
           <el-select v-model='msg.AirConfirm' filterable :placeholder="$t('pub.pleaseSel')"  style="width:180px">
             <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
             <el-option label="已确认" :value='1'></el-option>

src/components/activity/CouponList.vue

@@ -220,7 +220,14 @@
                   circle
                   @click="deleteItem(item)"
                   ></el-button>
-              </el-tooltip>
+            </el-tooltip>
+
+            <el-tooltip class="item" effect="dark" content="修改当日活动库存" placement="top">
+                  <el-button type="primary" icon="el-icon-edit" circle style="padding:6px;"
+                  @click="updateKucundialog=true"
+                  ></el-button>
+            </el-tooltip>
+
           <!-- </el-button-group> -->
         </td>
       </tr>
@@ -405,6 +412,19 @@
         <button class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
       </div>
     </el-dialog>
+
+    <el-dialog custom-class='w400' title="修改当日活动库存" :visible.sync="updateKucundialog" center>
+        <el-form label-width="150px">
+            <el-form-item label="修改当日活动库存">
+                <el-input class="w180" v-model="upDateKcMsg.number" @keyup.native="checkInteger(upDateKcMsg,'number',true)"></el-input>
+            </el-form-item>
+        </el-form> 
+        <span slot="footer" class="dialog-footer">
+            <el-button size="small" @click="updateKucundialog = false">取 消</el-button>
+            <el-button size="small" type="danger" @click="sureUpdatekucun()">确 定</el-button>
+        </span>
+    </el-dialog>
+
   </div>
 </template>
 <script>
@@ -420,6 +440,7 @@ export default {
       currentPage: 1,
       outerVisible: false,
       innerVisible: false,
+      updateKucundialog:false,
       isRight: true,
       dialogTitle: "",
       insideDialogTxt: "",
@@ -485,6 +506,9 @@ export default {
       groupId: '',
       LineTeamList: [],
       QLineTeamList: [],
+      upDateKcMsg:{
+        number:''
+      }
     };
   },
   mounted() {
@@ -499,6 +523,19 @@ export default {
   },
 
   methods: {
+    //点击确定修改库存
+    sureUpdatekucun(){
+      this.apiJavaPost("/api/appActivity/updateCouponStock", this.upDateKcMsg, res => {
+        if (res.data.resultCode === 1) {
+            this.Success(res.data.message);
+            this.updateKucundialog=false;
+            this.getList();
+            this.upDateKcMsg.number='';
+        } else {
+          this.Error(res.data.message)
+        }
+      }, null);
+    },
     getCompany() {
       this.apipost(
         "admin_get_BranchGetList",