Browse Source

ID1006039 修复bug单

zhangdan 4 years ago
parent
commit
a1ea4fb455

+ 6 - 3
src/views/Service/PurchasedServiceDetail.vue

@@ -21,7 +21,7 @@
 				</span>
 				<span slot="hexiao" slot-scope="text, record, index">
 					<template>
-						<a-button type="primary" v-if="record.isDelay" @click="yanQi(record)">延期</a-button>
+						<a-button type="primary" v-if="record.isDelay" @click="yanQi(record)" id="PurchasedServiceDetail-yanQi">延期</a-button>
 						<span v-else>--</span>
 					</template>
 				</span>
@@ -43,7 +43,7 @@
 		</a-card>
 		<!-- 取消购买 -->
 		<a-card class="detail-card" :bordered="false" style="text-align: center;">
-			<a-button :disabled="verificationList && verificationList.length > 0" type="primary" @click="canselBuy">取消购买</a-button>
+			<a-button v-if="!verificationList && salesChannelSettleStatus== 'NOT_SETTLE' && palyStatus =='已支付' " type="primary" @click="canselBuy" id="PurchasedServiceDetail-canselBuy">取消购买</a-button>
 		</a-card>
 		<!-- 延期弹窗 -->
 		<yanQi-modal :yanQiData="yanQiData" :yanqiModal="yanqiModal" @close="canselYq"></yanQi-modal>
@@ -132,6 +132,7 @@
 				yanQiData: null,
 				hxCustomerBundleItemId: '',
 				dataSourceName: '',
+				salesChannelSettleStatus:'', // 结算状态
 				customer: null,
 				orderBundle: {},
 				payDetail: {},
@@ -264,10 +265,12 @@
 				}).then(res => {
 					if (res.status + '' === '200') {
 						const _data = res.data
+						console.log(_data)
 						_this.orderBundleId = _data.orderBundleId
 						console.log(_data, _this.orderBundleId)
 						_this.customer = _data.customer
 						_this.dataSourceName = _data.dataSourceName
+						_this.salesChannelSettleStatus=_data.salesChannelSettleStatus
 						_this.orderBundle = _data.orderBundle
 						if (_data.paymentDetailList && _data.paymentDetailList.length) {
 							_this.paymentDetailList = _data.paymentDetailList[0]
@@ -308,7 +311,7 @@
 						}).then(res => {
 							if (res.status == 200) {
 								this.$message.info(res.message)
-								// this.isShow = false
+								this.$router.push({name: "PurchasedServiceList"});
 							}
 						})
 					},

+ 10 - 10
src/views/Service/PurchasedServiceList.vue

@@ -6,24 +6,24 @@
 				<a-row :gutter="48">
 					<a-col :lg="6" :sm="12">
 						<a-form-item label="订单编号:" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-							<a-input class="full-width" v-model.trim="queryParam.number" placeholder="订单编号" allowClear />
+							<a-input class="full-width" id="PurchasedServiceList-number" v-model.trim="queryParam.number" placeholder="订单编号" allowClear />
 						</a-form-item>
 					</a-col>
 					<a-col :lg="6" :sm="12">
 						<a-form-item label="下单时间:" :label-col="{ span: 7 }" :wrapper-col="{ span: 17}">
-							<a-range-picker style="width:100%" id="releaseRecordList-queryOrderDate" :disabledDate="disabledDate" v-model="queryOrderDate"
+							<a-range-picker style="width:100%" id="PurchasedServiceList-queryOrderDate" :disabledDate="disabledDate" v-model="queryOrderDate"
 							 :format="dateFormat" :placeholder="['开始时间', '结束时间']" />
 						</a-form-item>
 					</a-col>
 					<a-col :lg="6" :sm="12">
 						<a-form-item label="结算状态:" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-							<v-select code="SETTLE_STATUS_ALL" ref="salesChannelSettleStatus" v-model="queryParam.salesChannelSettleStatus"
+							<v-select code="SETTLE_STATUS_ALL" id="PurchasedServiceList-salesChannelSettleStatus" ref="salesChannelSettleStatus" v-model="queryParam.salesChannelSettleStatus"
 							 allowClear></v-select>
 						</a-form-item>
 					</a-col>
 					<a-col :lg="6" :sm="12">
 						<a-form-item label="销售合作商" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-							<a-select id="purchasedSetmeal-dataSourceNo" allowClear option-filter-prop="children" placeholder="请选择销售合作商"
+							<a-select id="PurchasedServiceList-dataSourceNo" allowClear option-filter-prop="children" placeholder="请选择销售合作商"
 							 v-model="queryParam.dataSourceNo">
 								<a-select-option v-for="(item,index) in dataSourceNoList" :key="index" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
 							</a-select>
@@ -33,18 +33,18 @@
 				<a-row :gutter="48">
 					<a-col :lg="6" :sm="12">
 						<a-form-item label="客户信息" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-							<a-input class="full-width" v-model.trim="queryParam.custMobile" :maxLength="11" placeholder="客户信息" allowClear />
+							<a-input class="full-width" id="PurchasedServiceList-custMobile" v-model.trim="queryParam.custMobile" :maxLength="11" placeholder="客户信息" allowClear />
 						</a-form-item>
 					</a-col>
 					<a-col :lg="6" :sm="12">
 						<a-form-item label="服务名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-							<a-input class="full-width" v-model.trim="queryParam.bundleName" placeholder="服务名称" allowClear />
+							<a-input class="full-width" id="PurchasedServiceList-bundleName" v-model.trim="queryParam.bundleName" placeholder="服务名称" allowClear />
 						</a-form-item>
 					</a-col>
 					<a-col :lg="6" :sm="12">
-						<a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-						<a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-						<a-button style="margin-left: 8px" class="export-btn" @click="handleExport">导出</a-button>
+						<a-button type="primary" @click="$refs.table.refresh(true)" id="PurchasedServiceList-search">查询</a-button>
+						<a-button style="margin-left: 8px" @click="resetSearchForm" id="PurchasedServiceList-resetSearchForm">重置</a-button>
+						<a-button style="margin-left: 8px" class="export-btn" @click="handleExport" id="PurchasedServiceList-handleExport">导出</a-button>
 					</a-col>
 				</a-row>
 			</a-form>
@@ -60,7 +60,7 @@
 				<span slot="salesChannelSettleStatus" slot-scope="text, record">{{ $refs.salesChannelSettleStatus.getNameByCode(record.salesChannelSettleStatus) }}</span>
 				<!-- 操作 -->
 				<span slot="action" slot-scope="text, record">
-					<a-button type="primary" style="margin: 5px;" @click="handleDetail(record)">详情</a-button>
+					<a-button type="primary" style="margin: 5px;" @click="handleDetail(record)" id="PurchasedServiceList-handleDetail">详情</a-button>
 					</a-button>
 				</span>
 				<template slot="userInfo" slot-scope="text, record">

+ 5 - 2
src/views/SetmealSales/VerificationRecords.vue

@@ -71,7 +71,7 @@
           <span v-if="record.custMobile">{{ record.custMobile }}</span>
           <span v-if="record.vehicleNum">{{ record.vehicleNum }}</span>
         </div>
-        <span v-if="!record.custMobile && !record.vehicleNum">--</span>
+        <span v-if="!(record.custMobile && record.vehicleNum)">--</span>
       </template>
     </s-table>
   </a-card>
@@ -155,7 +155,10 @@ export default {
         title: '套餐名称',
         dataIndex: 'bundName',
         width: 150,
-        align: 'center'
+        align: 'center',
+		customRender: function(text) {
+			return (text || '--')
+		}
       },
       {
         title: '结算金额(¥)',