|
|
@@ -324,6 +324,17 @@
|
|
|
{{ scope.row.is_reservation === "true" ? "是" : "否" }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column label="自动升学" width="80">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{
|
|
|
+ scope.row.is_reservation === "true"
|
|
|
+ ? scope.row.is_auto_adjust_study_phase === "true"
|
|
|
+ ? "是"
|
|
|
+ : "否"
|
|
|
+ : ""
|
|
|
+ }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="goods_study_phase_name"
|
|
|
label="学段"
|
|
|
@@ -483,7 +494,7 @@
|
|
|
<el-table-column
|
|
|
fixed="right"
|
|
|
label="操作"
|
|
|
- :width="isPhone ? '50' : '110'"
|
|
|
+ :width="isPhone ? '50' : '130'"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<template v-if="isPhone">
|
|
|
@@ -512,6 +523,13 @@
|
|
|
"
|
|
|
>查看</el-dropdown-item
|
|
|
>
|
|
|
+ <el-dropdown-item
|
|
|
+ @click.native.prevent="
|
|
|
+ handleEditInfo(scope.row, scope.$index)
|
|
|
+ "
|
|
|
+ v-if="scope.row.is_reservation === 'true'"
|
|
|
+ >修改</el-dropdown-item
|
|
|
+ >
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
</template>
|
|
|
@@ -537,6 +555,17 @@
|
|
|
>
|
|
|
查看
|
|
|
</el-button>
|
|
|
+ <el-button
|
|
|
+ type="text"
|
|
|
+ size="small"
|
|
|
+ class="primary-btn"
|
|
|
+ @click.native.prevent="
|
|
|
+ handleEditInfo(scope.row, scope.$index)
|
|
|
+ "
|
|
|
+ v-if="scope.row.is_reservation === 'true'"
|
|
|
+ >
|
|
|
+ 修改
|
|
|
+ </el-button>
|
|
|
<!-- <el-button
|
|
|
@click.native.prevent="handleUp(scope.row, scope.$index)"
|
|
|
type="text"
|
|
|
@@ -705,6 +734,7 @@
|
|
|
title="已上架物品列表"
|
|
|
:visible.sync="shelveVisible"
|
|
|
:width="isPhone ? '100%' : '500px'"
|
|
|
+ v-if="orderInfo"
|
|
|
>
|
|
|
<el-table :data="goodsListShelve" style="width: 100%">
|
|
|
<el-table-column type="index" label="#" width="54"> </el-table-column>
|
|
|
@@ -731,12 +761,65 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
+ <template
|
|
|
+ v-if="
|
|
|
+ orderInfo.sale_model === 0 &&
|
|
|
+ orderInfo.is_reservation === 'true' &&
|
|
|
+ orderInfo.is_auto_adjust_study_phase === 'true'
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <h4>
|
|
|
+ 年预定【{{
|
|
|
+ orderInfo.is_auto_adjust_study_phase === "true"
|
|
|
+ ? "自动升学"
|
|
|
+ : "不自动升学"
|
|
|
+ }}】
|
|
|
+ </h4>
|
|
|
+ <p>
|
|
|
+ {{
|
|
|
+ orderInfo.valid_period_1_study_phase_name +
|
|
|
+ " " +
|
|
|
+ orderInfo.valid_period_1_begin_date +
|
|
|
+ " 至 " +
|
|
|
+ orderInfo.valid_period_1_end_date
|
|
|
+ }}
|
|
|
+ </p>
|
|
|
+ <p v-if="orderInfo.valid_period_2_study_phase !== 0">
|
|
|
+ {{
|
|
|
+ orderInfo.valid_period_2_study_phase_name +
|
|
|
+ " " +
|
|
|
+ orderInfo.valid_period_2_begin_date +
|
|
|
+ " 至 " +
|
|
|
+ orderInfo.valid_period_2_end_date
|
|
|
+ }}
|
|
|
+ </p>
|
|
|
+ </template>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button size="small" type="primary" @click="shelveVisible = false"
|
|
|
>确 定</el-button
|
|
|
>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
+ <el-dialog
|
|
|
+ title="修改"
|
|
|
+ :visible.sync="editInfoFlag"
|
|
|
+ :width="isPhone ? '100%' : '500px'"
|
|
|
+ >
|
|
|
+ <el-form :model="editInfo">
|
|
|
+ <el-form-item label="自动升学">
|
|
|
+ <el-radio-group v-model="editInfo.is_auto_adjust_study_phase">
|
|
|
+ <el-radio label="false">否</el-radio>
|
|
|
+ <el-radio label="true">是</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button size="small" @click="editInfoFlag = false">取 消</el-button>
|
|
|
+ <el-button size="small" type="primary" @click="sureIsAuto"
|
|
|
+ >确 定</el-button
|
|
|
+ >
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -1000,7 +1083,12 @@ export default {
|
|
|
isPhone: false,
|
|
|
showSearch: true,
|
|
|
goodsListShelve: [], // 已上架物品列表
|
|
|
+ orderInfo: null, // 订单详情
|
|
|
shelveVisible: false,
|
|
|
+ editInfoFlag: false,
|
|
|
+ editInfo: {
|
|
|
+ is_auto_adjust_study_phase: "false",
|
|
|
+ },
|
|
|
};
|
|
|
},
|
|
|
//计算属性 类似于data概念
|
|
|
@@ -1332,6 +1420,7 @@ export default {
|
|
|
// 查看已上架物品
|
|
|
handleLookInfo(row, index) {
|
|
|
this.goodsListShelve = [];
|
|
|
+ this.orderInfo = null;
|
|
|
let Mnames = "/ShopServer/Manager/FinanceManager/GetOrderInfo";
|
|
|
let datas = {
|
|
|
id: row.id,
|
|
|
@@ -1339,10 +1428,32 @@ export default {
|
|
|
getLogin(Mnames, datas).then((res) => {
|
|
|
if (res.status === 1) {
|
|
|
this.goodsListShelve = res.goods_list_shelve;
|
|
|
+ this.orderInfo = res.order_info;
|
|
|
this.shelveVisible = true;
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+ // 点击修改按钮
|
|
|
+ handleEditInfo(row) {
|
|
|
+ this.editInfo = {
|
|
|
+ is_auto_adjust_study_phase: row.is_auto_adjust_study_phase,
|
|
|
+ id: row.id,
|
|
|
+ };
|
|
|
+ this.editInfoFlag = true;
|
|
|
+ },
|
|
|
+ // 确定修改自动升学属性
|
|
|
+ sureIsAuto() {
|
|
|
+ let Mnames =
|
|
|
+ "ShopServer/Manager/FinanceManager/SetIsAutoAdjustStudayPhase_YearReservationOrder";
|
|
|
+
|
|
|
+ getLogin(Mnames, this.editInfo).then((res) => {
|
|
|
+ if (res.status === 1) {
|
|
|
+ this.$message.success("操作成功");
|
|
|
+ this.getList();
|
|
|
+ this.editInfoFlag = false;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
},
|
|
|
//生命周期 - 创建完成(可以访问当前this实例)
|
|
|
created() {
|