diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java index 5311187bb..546e36bb8 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java @@ -226,7 +226,6 @@ public class SysOrderServiceImpl implements ISysOrderService { sysOrder.setNutritionistId((sysOrder.getNutritionistIdList() != null && sysOrder.getNutritionistIdList().length > 0) ? sysOrder.getNutritionistIdList()[0] : null); sysOrder.setMainOrderId(0L); sysOrder.setAfterSaleCommissOrder(0); - sysOrder.setPreSaleId(null); sysOrder.setPushPreSaleId(null); sysOrder.setPlannerId(null); sysOrder.setPlannerAssisId(null); @@ -325,7 +324,6 @@ public class SysOrderServiceImpl implements ISysOrderService { if("4".equals(sysOrder.getOrderType())){ sysOrder.setMainOrderId(0L); sysOrder.setAfterSaleCommissOrder(0); - sysOrder.setPreSaleId(null); sysOrder.setPushPreSaleId(null); sysOrder.setPlannerId(null); sysOrder.setPlannerAssisId(null); diff --git a/stdiet-ui/src/components/OrderAdd/index.vue b/stdiet-ui/src/components/OrderAdd/index.vue index cc353e0f0..5854bea79 100644 --- a/stdiet-ui/src/components/OrderAdd/index.vue +++ b/stdiet-ui/src/components/OrderAdd/index.vue @@ -111,6 +111,18 @@ </el-select> </el-form-item> </el-col> + <el-col :span="8" v-show="orderModuleshow.businessAffairShow"> + <el-form-item label="商务" prop="businessAffairId" > + <el-select v-model="form.businessAffairId" placeholder="请选择" filterable clearable> + <el-option + v-for="dict in bdOptions" + :key="dict.dictValue" + :label="dict.dictLabel" + :value="parseInt(dict.dictValue)" + /> + </el-select> + </el-form-item> + </el-col> <el-col :span="8" v-show="orderModuleshow.preSaleShow"> <el-form-item label="售前" prop="preSaleId" > <el-select v-model="form.preSaleId" placeholder="请选择" filterable @@ -124,18 +136,7 @@ </el-select> </el-form-item> </el-col> - <el-col :span="8" v-show="orderModuleshow.businessAffairShow"> - <el-form-item label="商务" prop="businessAffairId" > - <el-select v-model="form.businessAffairId" placeholder="请选择" filterable clearable> - <el-option - v-for="dict in bdOptions" - :key="dict.dictValue" - :label="dict.dictLabel" - :value="parseInt(dict.dictValue)" - /> - </el-select> - </el-form-item> - </el-col> + <el-col :span="8" v-show="orderModuleshow.pushPreSaleShow"> <el-form-item label="售前推送" prop="preSaleId" title="售前推送人就是该客户体验单的销售,只有售中一开单需要选择"> <el-select v-model="form.pushPreSaleId" placeholder="请选择" filterable diff --git a/stdiet-ui/src/components/OrderDetail/index.vue b/stdiet-ui/src/components/OrderDetail/index.vue index b08182be4..6006887d1 100644 --- a/stdiet-ui/src/components/OrderDetail/index.vue +++ b/stdiet-ui/src/components/OrderDetail/index.vue @@ -73,7 +73,7 @@ export default { ["订单类型","审核状态", "成交时间"], ["调理项目","姓名", "手机号"], ["金额","收款方式", "收款账号"], - ["服务时长","赠送时长", "售前/商务"], + ["服务时长","赠送时长", "商务/售前"], ["售前推送","售中","售后"], ["营养师","助理营养师","策划"], ["策划助理","运营","运营助理"], @@ -113,7 +113,7 @@ export default { response.data.weight = response.data.weight != null ? response.data.weight + "斤" : ""; response.data.giveServeDay = response.data.giveServeDay != null ? response.data.giveServeDay + "天" : ""; if(response.data.orderType == 4){ - response.data.preSale = response.data.preSale != null ? response.data.preSale : response.data.businessAffair; + response.data.preSale = (response.data.businessAffair != null ? response.data.businessAffair : "无") + " / " + (response.data.preSale != null ? response.data.preSale : "无"); } for (let i = 0; i < this.orderTitleData.length; i++) { this.orderDetailList.push({ diff --git a/stdiet-ui/src/components/OrderEdit/index.vue b/stdiet-ui/src/components/OrderEdit/index.vue index b237d6cb1..4bde79ec5 100644 --- a/stdiet-ui/src/components/OrderEdit/index.vue +++ b/stdiet-ui/src/components/OrderEdit/index.vue @@ -92,11 +92,12 @@ </el-select> </el-form-item> </el-col> - <el-col :span="8" v-show="orderModuleshow.preSaleShow"> - <el-form-item label="售前" prop="preSaleId"> - <el-select v-model="form.preSaleId" filterable clearable placeholder="请选择"> + + <el-col :span="8" v-show="orderModuleshow.businessAffairShow"> + <el-form-item label="商务" prop="businessAffairId" > + <el-select v-model="form.businessAffairId" placeholder="请选择" filterable clearable> <el-option - v-for="dict in preSaleIdOptions" + v-for="dict in bdOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="parseInt(dict.dictValue)" @@ -104,11 +105,11 @@ </el-select> </el-form-item> </el-col> - <el-col :span="8" v-show="orderModuleshow.businessAffairShow"> - <el-form-item label="商务" prop="businessAffairId" > - <el-select v-model="form.businessAffairId" placeholder="请选择" filterable clearable> + <el-col :span="8" v-show="orderModuleshow.preSaleShow"> + <el-form-item label="售前" prop="preSaleId"> + <el-select v-model="form.preSaleId" filterable clearable placeholder="请选择"> <el-option - v-for="dict in bdOptions" + v-for="dict in preSaleIdOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="parseInt(dict.dictValue)" diff --git a/stdiet-ui/src/utils/orderType.js b/stdiet-ui/src/utils/orderType.js index 0f97a8c75..1f369353b 100644 --- a/stdiet-ui/src/utils/orderType.js +++ b/stdiet-ui/src/utils/orderType.js @@ -227,14 +227,12 @@ export function dealOrderModuleshowByOrderType(orderType, moduleshow, form){ //商务单 case 4: if(addFlag){ - form.preSaleId = null; form.plannerId = null; form.plannerAssisId = null; form.operatorId = null; form.operatorAssisId = null; } moduleshow.onSaleShow = true; - moduleshow.preSaleShow = false; moduleshow.plannerShow = false; moduleshow.plannerAssisShow = false; moduleshow.operatorShow = false; diff --git a/stdiet-ui/src/views/custom/order/index.vue b/stdiet-ui/src/views/custom/order/index.vue index 896ad2903..725efb1f4 100644 --- a/stdiet-ui/src/views/custom/order/index.vue +++ b/stdiet-ui/src/views/custom/order/index.vue @@ -437,7 +437,15 @@ </div> </div> <div v-else-if="scope.row.orderType == 4"> - {{scope.row.businessAffairId ? scope.row.businessAffair : "无"}} + <div> + {{scope.row.preSaleId ? scope.row.preSale : "无" }} + </div> + <div> + {{scope.row.businessAffairId ? scope.row.businessAffair : "无"}} + </div> + <div> + {{scope.row.onSaleId ? scope.row.onSale : "无"}} + </div> </div> <div v-else> {{scope.row.preSaleId ? scope.row.preSale : scope.row.onSale}}