Skip to content

html / small-program-web

Go to a project
Commit 628cdf18 by duanguohui
Options

这个产品有毛病

parent 5dc4b6bc
Showing with 56 additions and 11 deletions
src/views/flowerManage/flowerAdd.vue
......@@ -55,7 +55,7 @@
<el-col :span="24">
<quill-editor
class="edit_class"
v-model="addForm.sourceInfo"
v-model="addForm.description"
ref="myQuillEditor"
@change="onEditorChange($event)">
</quill-editor>
......@@ -97,9 +97,9 @@ export default {
var params = {
id: this.addForm.id,
imgUrl: this.imageUrl,
message: this.addForm.sourceInfo
message: this.addForm.description
}
if (!this.imageUrl || !this.addForm.sourceInfo) {
if (!this.imageUrl || !this.addForm.description) {
this.$message.error('请填写完整信息')
return
}
......
src/views/orderList/OrderDetail.vue
......@@ -37,7 +37,7 @@
<el-col :span="3" class="align-right padding-right10">用餐人数：</el-col>
<el-col :span="5">{{orderObg.cook.num}}</el-col>
<el-col :span="3" class="align-right padding-right10">状态：</el-col>
<el-col :span="5">{{renderStatus(orderObg.status)}}</el-col>
<el-col :span="5">{{renderStatus(orderObg.status, orderObg.type)}}</el-col>
</el-row>
<el-row v-if="orderObg.type == 'CSSM'">
<el-col :span="3" class="align-right padding-right10">预约时间：</el-col>
......@@ -50,17 +50,39 @@
<el-col :span="5">{{orderObg.cook.message}}</el-col>
</el-row>
<el-row v-if="orderObg.type == 'WX'">
<el-col :span="3" class="align-right padding-right10">类型：</el-col>
<el-col :span="5">维修</el-col>
<el-col :span="3" class="align-right padding-right10">维修员：</el-col>
<el-col :span="5">{{orderObg.repairAndCleaning.name}}</el-col>
</el-row>
<el-row v-if="orderObg.type == 'BJ'">
<el-col :span="3" class="align-right padding-right10">类型：</el-col>
<el-col :span="5">保洁</el-col>
<el-col :span="3" class="align-right padding-right10">保洁员：</el-col>
<el-col :span="5">{{orderObg.repairAndCleaning.name}}</el-col>
</el-row>
<el-row v-if="orderObg.type == 'WX' || orderObg.type == 'BJ' || orderObg.type == 'CSSM'">
<el-col :span="3" class="align-right padding-right10">联系人：</el-col>
<el-col :span="5">{{orderObg.contactsName}}</el-col>
<el-col :span="3" class="align-right padding-right10">联系电话：</el-col>
<el-col :span="5">{{orderObg.contactsPhone}}</el-col>
</el-row>
<el-row v-if="orderObg.type == 'BJ' || orderObg.type == 'WX'">
<el-col :span="3" class="align-right padding-right10">{{orderObg.type == 'WX' ? '维修范围' : '服务范围'}}：</el-col>
<el-row v-if="orderObg.type == 'WX'">
<el-col :span="3" class="align-right padding-right10">维修类型：</el-col>
<el-col :span="5">{{orderObg.service}}</el-col>
<el-col :span="3" class="align-right padding-right10">状态：</el-col>
<el-col :span="5">{{renderStatus(orderObg.status, orderObg.type)}}</el-col>
</el-row>
<el-row v-if="orderObg.type == 'BJ'">
<el-col :span="3" class="align-right padding-right10">服务范围：</el-col>
<el-col :span="5">{{orderObg.service}}</el-col>
<el-col :span="3" class="align-right padding-right10">{{orderObg.type == 'WX' ? '维修人数' : '服务人数'}}：</el-col>
<el-col :span="5">{{orderObg.num ? orderObg.num : '1人'}}</el-col>
<el-col :span="3" class="align-right padding-right10">服务人数：</el-col>
<el-col :span="5">{{orderObg.num}}</el-col>
</el-row>
<el-row v-if="orderObg.type == 'BJ'">
<el-col :span="3" class="align-right padding-right10">状态：</el-col>
<el-col :span="20">{{renderStatus(orderObg.status, orderObg.type)}}</el-col>
</el-row>
<el-row v-if="orderObg.type == 'WX' || orderObg.type == 'BJ'">
<el-col :span="5" class="align-right">{{orderObg.type == 'WX' ? '维修事项' : '保洁内容'}}(简要描述): </el-col>
......@@ -182,7 +204,7 @@ export default {
}
},
computed: {
renderStatus (status) {
renderStatus (status, type) {
return function (status) {
if (status === 'DQR') {
return '待确认'
......@@ -190,6 +212,14 @@ export default {
return '已取消'
} else if (status === 'YWC') {
return '已完成'
} else if (status === 'YQR') {
var test = ''
if (type == "CS") test = '待发货'
if (type == "WM") test = '待取餐'
if (type == "BJ" || type == "WX" || type == "CSSM") test = '处理中'
return test
} else if (status === 'FH') {
return '已发货'
}
}
},
......
src/views/orderList/OrderList.vue
......@@ -117,7 +117,16 @@
width="120"
align="center"
label="操作">
<template slot-scope="scope" v-if="scope.row.type == 'CS' || scope.row.type == 'WM'">
<template slot-scope="scope" v-if="scope.row.type == 'WM'">
<a href="javascript:;" v-if="scope.row.status == 'DQR'" @click="orderConfirm(scope.row.id, $event)" class="btn_edit">确认订单</a>
<a href="javascript:;" v-if="scope.row.status == 'YQR'" @click="orderComplete(scope.row.id, $event)" class="btn_delete">完成</a>
</template>
<template slot-scope="scope" v-if="scope.row.type == 'CS'">
<a href="javascript:;" v-if="scope.row.status == 'DQR'" @click="orderConfirm(scope.row.id, $event)" class="btn_edit">确认订单</a>
<a href="javascript:;" v-if="scope.row.status == 'YQR'" @click="orderFH(scope.row.id, $event)" class="btn_delete">发货</a>
<a href="javascript:;" v-if="scope.row.status == 'FH'" @click="orderComplete(scope.row.id, $event)" class="btn_delete">完成</a>
</template>
<template slot-scope="scope" v-if="scope.row.type == 'WX' || scope.row.type == 'BJ' || scope.row.type == 'CSSM'">
<a href="javascript:;" v-if="scope.row.status == 'DQR'" @click="orderConfirm(scope.row.id, $event)" class="btn_edit">确认订单</a>
<a href="javascript:;" v-if="scope.row.status == 'YQR'" @click="orderComplete(scope.row.id, $event)" class="btn_delete">完成</a>
</template>
......@@ -360,7 +369,13 @@ export default {
} else if (status === 'YWC') {
return '已完成'
} else if (status === 'YQR') {
return type == "CS" ? '待发货' : '待取餐'
var test = ''
if (type == "CS") test = '待发货'
if (type == "WM") test = '待取餐'
if (type == "BJ" || type == "WX" || type == "CSSM") test = '处理中'
return test
} else if (status === 'FH') {
return '已发货'
}
}
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment