代码提交

test
zhangdi 1 year ago
parent 1bc3529a1a
commit 0889a9083d
  1. 12
      api/api.js
  2. 6
      pages/inspection/quest.vue
  3. 5
      pages/inspection/questDetails.vue
  4. 7
      pages/submission/evaluate.vue

@ -317,23 +317,23 @@ const install = (Vue, vm) => {
authorizations: true, authorizations: true,
isparams: false isparams: false
}) })
// 客户 确认完成 lab-ops/maintenance/repair-custome-refuse-finish // 客户 确认完成
let repairConfirmFinish = (params) => http.post('/lab-ops/maintenance/repair-custome-confirm-finish', params, { let repairConfirmFinish = (params) => http.post('/lab-ops/maintenance/repair-customer-confirm-finish', params, {
authorizations: true, authorizations: true,
isparams: false isparams: false
}) })
// 客户 确认未完成 // 客户 确认未完成
let repairRefuseFinish = (params) => http.post('/lab-ops/maintenance/repair-custome-refuse-finish', params, { let repairRefuseFinish = (params) => http.post('/lab-ops/maintenance/repair-customer-refuse-finish', params, {
authorizations: true, authorizations: true,
isparams: false isparams: false
}) })
// 客服 确认付款 lab-ops/maintenance/repair-service-confirm-invoic // 客服 确认付款
let confirmInvoic = (params) => http.post('/lab-ops/maintenance/repair-service-confirm-invoic', params, { let confirmPayment = (params) => http.post('/lab-ops/maintenance/repair-service-confirm', params, {
authorizations: true, authorizations: true,
isparams: false isparams: false
}) })
// 将各个定义的接口名称,统一放进对象挂载到vm.$u.api(因为vm就是this,也即this.$u.api)下 // 将各个定义的接口名称,统一放进对象挂载到vm.$u.api(因为vm就是this,也即this.$u.api)下
vm.$u.api = { getTenantInfo, login, logout, registerUser, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList, workOrderSave, getWorkOrderRecords, getBreakdownInfo, workOrderupdate, evaluateSign, getRepairPersons, getGoodsList, getDictionaryList, getUserList, workList, deviceList, upkeepStat, pieStat, getUserInfo, overview, sendOrders, cloneOrder, editData, repairReject, applySave, sendVerify, serviceman, servicemanReceive, servicemanSubmit, supervisorReject, supervisorconfirm, customerConfirm, customerReject, servicemanRepairSubmit, evaluateRepairReject, getDeviceDetail, getTaskPage, getTaskDetail, taskSupervisorconfirm, taskServicemanreceive, updateCoordinate, taskServicemanUpdateTime, getPlanDetail, getRepairPage, updateDetaile, taskServicemanSubmit, taskCustomerConfirm, taskCustomerRefuse, taskSolutionSave, taskSolutionSubmit, repairSolutionSupervisor, repairSolutionRefuse, repairSolutionCustomer, repairCustomerRefuse, repairServicemanSubmit,repairConfirmFinish,repairRefuseFinish ,confirmInvoic}; vm.$u.api = { getTenantInfo, login, logout, registerUser, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList, workOrderSave, getWorkOrderRecords, getBreakdownInfo, workOrderupdate, evaluateSign, getRepairPersons, getGoodsList, getDictionaryList, getUserList, workList, deviceList, upkeepStat, pieStat, getUserInfo, overview, sendOrders, cloneOrder, editData, repairReject, applySave, sendVerify, serviceman, servicemanReceive, servicemanSubmit, supervisorReject, supervisorconfirm, customerConfirm, customerReject, servicemanRepairSubmit, evaluateRepairReject, getDeviceDetail, getTaskPage, getTaskDetail, taskSupervisorconfirm, taskServicemanreceive, updateCoordinate, taskServicemanUpdateTime, getPlanDetail, getRepairPage, updateDetaile, taskServicemanSubmit, taskCustomerConfirm, taskCustomerRefuse, taskSolutionSave, taskSolutionSubmit, repairSolutionSupervisor, repairSolutionRefuse, repairSolutionCustomer, repairCustomerRefuse, repairServicemanSubmit,repairConfirmFinish,repairRefuseFinish ,confirmPayment};
} }
export default { export default {

@ -281,7 +281,7 @@ export default {
type: 'view' type: 'view'
} }
uni.navigateTo({ uni.navigateTo({
url: `/pages/inspection/questOrder${this.$u.queryParams(param)}`, url: `/pages/inspection/questDetails${this.$u.queryParams(param)}`,
}); });
}, },
// //
@ -359,7 +359,7 @@ export default {
} }
this.BetLoading.show(); this.BetLoading.show();
this.$u.api.confirmInvoic(query).then(res => { this.$u.api.confirmPayment(query).then(res => {
this.paymentShow = false this.paymentShow = false
this.BetLoading.hide(); this.BetLoading.hide();
if (res.code == 200) { if (res.code == 200) {
@ -427,7 +427,7 @@ export default {
if ((item == 5 && this.dataTypes == 3) || (item == 5 && this.dataTypes == 4)) { if ((item == 5 && this.dataTypes == 3) || (item == 5 && this.dataTypes == 4)) {
return '维修完成' return '维修完成'
} }
if ((item == 6 && this.dataTypes == 3) || (item == 6 && this.dataTypes == 2)) { if ((item == 6 && this.dataTypes == 3) || (item == 6 && this.dataTypes == 2)||(item == 6 && this.dataTypes == 1)) {
return '待付款' return '待付款'
} }

@ -34,10 +34,7 @@
<view class="info_title">巡检任务</view> <view class="info_title">巡检任务</view>
<detailsCollapse></detailsCollapse> <detailsCollapse></detailsCollapse>
</view> </view>
<view class="repair-btn" style="margin-right: 32rpx;width:100%">
<u-button size="medium">保存</u-button>
<u-button size="medium" type="primary">提交</u-button>
</view>
</view> </view>
</template> </template>
<script> <script>

@ -90,7 +90,8 @@ export default {
}, },
onLoad(options) { onLoad(options) {
this.id = options.id this.id = options.id
if (options.istask == true) { console.log(111111,options.istask == 'true')
if (options.istask == 'true') {
this.istask = options.istask this.istask = options.istask
} }
}, },
@ -119,7 +120,7 @@ export default {
this.uploadFile(this.image2) this.uploadFile(this.image2)
} else {// evaluateRepairReject } else {// evaluateRepairReject
if (this.istask == true) { if (this.istask == 'true') {
this.$u.api.repairRefuseFinish(query_).then(res => { this.$u.api.repairRefuseFinish(query_).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.BetLoading.hide() this.BetLoading.hide()
@ -181,7 +182,7 @@ export default {
signaturePerson: this.userInfo.user_name, // signaturePerson: this.userInfo.user_name, //
signatureTime: dateFormat("yyyy-MM-dd hh:mm:ss", new Date()), // signatureTime: dateFormat("yyyy-MM-dd hh:mm:ss", new Date()), //
} }
if (this.istask == true) { if (this.istask == 'true') {
this.$u.api.repairConfirmFinish(query_).then(res => { this.$u.api.repairConfirmFinish(query_).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.BetLoading.hide() this.BetLoading.hide()

Loading…
Cancel
Save