维修流程修改

test
zhangdi 1 year ago
parent 903b169818
commit 215e6c7689
  1. 11
      config/status.js
  2. 31
      pages/submission/records.vue
  3. 10
      pages/submission/recordsdetails.vue
  4. 92
      pages/submission/sendOrders.vue
  5. 4
      utils/website.js

@ -10,6 +10,10 @@ export const tabList = {
name: "待接单",
key: "101,205",
},
{
name: "确认方案",
key: "301",
},
{
name: "待确认",
key: "405",
@ -23,10 +27,7 @@ export const tabList = {
key: "102,300,400",
},
{
name: "确认方案",
key: "301",
},
{
name: "维修中",
key: "103,404",
@ -112,7 +113,7 @@ export const tabList = {
},
{
name: "已驳回",
key: "102,300,400",
key: "102,400",
},
{
name: "维修完成",

@ -24,7 +24,7 @@
<text class="item-time"> {{ item.fillingTime }}</text>
</view>
<view class="item-left" v-else>
<text class="item-orderNo">{{ item.reportUnit ? item.reportUnit : '单位' }}</text>
<text class="item-orderNo">{{ item.reportUnitName ? item.reportUnitName : '单位' }}</text>
<text class="item-time"> 单号{{ item.requirementCode }}</text>
</view>
<view class="item-right">
@ -70,8 +70,8 @@
<block v-if="dataTypes == 2">
<!-- 查看的提报单 -->
<u-button v-if="item.status == 101 || item.status == 400" size="mini" :plain="true"
style="margin-right:16rpx" @click.stop="sendOrders(item)" type="primary">接单</u-button>
<u-button v-if="item.status == 101 || item.status == 400 || item.status == 205" size="mini"
:plain="true" style="margin-right:16rpx" @click.stop="sendOrders(item)" type="primary">接单</u-button>
<u-button v-if="item.status == 104" size="mini" :plain="true" style="margin-right:16rpx"
@click.stop="openModel(item, 'paymentInfo')" type="primary">确认付款</u-button>
<u-button v-if="item.status == 101" size="mini" plain type="primary" style="margin-right:16rpx"
@ -83,8 +83,8 @@
<block v-if="dataTypes == 3">
<!-- 查看维修详情 -->
<u-button v-if="item.status == 402 || item.status == 300" size="mini" :plain="true"
style="margin-right:16rpx" :hair-line="true" type="primary"
<u-button v-if="item.status == 402 || item.status == 300 || item.status == 102 || item.status == 400"
size="mini" :plain="true" style="margin-right:16rpx" :hair-line="true" type="primary"
@click="orderConfirm(item)">审批</u-button>
</block>
@ -97,9 +97,10 @@
type="primary" @click="openModel(item, 'turn')">驳回</u-button>
<u-button v-if="item.status == 401 || item.status == 300 || item.status == 105" size="mini"
:plain="true" style="margin-right:16rpx" type="primary" @click="orderConfirm(item)">提交</u-button>
<u-button v-if="item.status == 103 || item.status == 401 || item.status == 404" size="mini"
:plain="true" type="primary"
<u-button v-if="item.status == 401 || item.status == 404" size="mini" :plain="true" type="primary"
@click="openModel(item, 'repair')">维修完成</u-button>
<u-button v-if="item.status == 103" size="mini" :plain="true" type="primary"
@click="orderConfirm(item)">维修完成</u-button>
</block>
</view>
@ -230,9 +231,9 @@ export default {
},
dataTypes() {
this.tabList = tabList[this.$store.state.dataType]
if (this.requirementCode != '') {
this.current = this.tabList.length-1
this.current = this.tabList.length - 1
}
return this.$store.state.dataType
@ -261,7 +262,7 @@ export default {
},
onShow() {
this.$nextTick(() => {
this.getMesseageTotal()
if (this.type == '') {
@ -270,14 +271,14 @@ export default {
if (this.requirementCode != '') {
this.searchInfo.requirementCode = this.requirementCode
} else {
if(this.searchInfo.statusSearch == ''){
if (this.searchInfo.statusSearch == '') {
this.searchInfo.statusSearch = this.tabList[0].key == '9999' ? '' : this.tabList[0].key
}else{
} else {
this.searchInfo.statusSearch = this.tabList[0].key == '9999' ? '' : this.searchInfo.statusSearch
}
}
this.getType()
this.getRecordsList()
});
@ -290,7 +291,7 @@ export default {
let query = {
current: this.page.currentPage, //
size: this.page.pageSize, //
dataType:this.userInfo.role_id=='1123598816738675201'?'': this.dataTypes,//
dataType: this.userInfo.role_id == '1123598816738675201' ? '' : this.dataTypes,//
...this.searchInfo
}
this.$u.api.getWorkOrderRecords(query).then(res => {

@ -40,7 +40,7 @@
</view>
<!-- 维修详情 -->
<view class="repair_detail"
v-if="!(detailForm.status == 101||detailForm.status == 100 || detailForm.status == 103 || detailForm.status == 201 || detailForm.status == 401)">
v-if="!(detailForm.status == 101||detailForm.status == 100 || detailForm.status == 201 || detailForm.status == 401)">
<view class="repair_title">维修详情</view>
<view class="detail_item">
<text class="item_left_txt">维修人</text>
@ -58,6 +58,14 @@
<text class="item_left_txt">处理方法</text>
<text class="item_right_txt reason">{{ detailForm.processMethod }}</text>
</view>
<view class="detail_item" style="margin-top: 10rpx;">
<text class="item_left_txt">人工费</text>
<text class="item_right_txt reason">{{ detailForm.laborCost?detailForm.laborCost:'-' }}</text>
</view>
<view class="detail_item" style="margin-top: 10rpx;">
<text class="item_left_txt">差旅费</text>
<text class="item_right_txt reason">{{ detailForm.travelExpense?detailForm.travelExpense:'-' }}</text>
</view>
<view class="detail_item" v-show="detailForm.materials && detailForm.materials.length != 0">
<text class="item_left_txt">维修材料</text>
<view class="item_right_table">

@ -2,7 +2,6 @@
<view class="page-css">
<view class="repair_detail">
<view class="repair_title">提报信息</view>
<!-- <iframe src="http://111.34.85.148:9008/jeewms/loginController.do?login" frameborder="0" ref="refed" width="100%" height="500px"></iframe> -->
<u-form labelPosition="left" :rules="rules" ref="repairDetailsForm" :model="repairDetails"
:label-width="200" class="repair_form">
@ -34,9 +33,9 @@
</u-form-item>
</u-form>
</view>
<!-- 维修人员 接单展示-->
<!-- 客服派单 维修人员 接单展示-->
<view class="repair_detail"
v-if="(dataTypes == 4 || dataTypes == 2) && (detailForm.status == 201 || detailForm.status == 101 || detailForm.status == 400)">
v-if="(dataTypes == 4 || dataTypes == 2) && (detailForm.status == 201 || detailForm.status == 101 || detailForm.status == 400 || detailForm.status == 205)">
<view class="repair_title">派单信息</view>
<u-form labelPosition="left" :rules="sendRules" ref="sendOrderForm" :model="sendOrder" :label-width="200"
class="repair_form">
@ -90,6 +89,7 @@
</u-form-item>
</u-form>
</view>
<!-- 驳回状态展示 -->
<view class="repair_detail"
v-if="detailForm.status == 400 || detailForm.status == 300 || detailForm.status == 102">
<view class="repair_title" v-if="detailForm.status == 400">维修人员驳回</view>
@ -110,7 +110,7 @@
</view>
<!-- 维修详情 待提交维修方案 展示 -->
<view class="repair_detail"
v-if="(dataTypes == 4 && (detailForm.status == 401 || detailForm.status == 300 || detailForm.status == 105)) || (dataTypes == 3 && (detailForm.status == 402 || detailForm.status == 102)) || (dataTypes == 1 && detailForm.status == 301)">
v-if="(dataTypes == 4 && (detailForm.status == 401 || detailForm.status == 300 || detailForm.status == 105)) || (dataTypes == 3 && (detailForm.status == 402 || detailForm.status == 102)) || (dataTypes == 1 && detailForm.status == 301 || detailForm.status == 103)">
<view class="repair_title">维修详情</view>
<u-form labelPosition="left" :rules="repairInfoRules" ref="repairInfoForm" :model="repairInfo"
:label-width="140" class="repair_form">
@ -119,7 +119,7 @@
<u-input v-model="detailForm.repairPersonName" :border="true" placeholder="" :disabled="true"
class="sp-new-input-diabled" />
</u-form-item>
<u-form-item label="设备名称:" prop="deviceName" :border-bottom="false" :required="true">
<u-form-item label="设备名称:" prop="deviceName" :border-bottom="false" :required="false">
<u-input v-model="deviceData.name" :border="true" placeholder="" :disabled="optionDisabled"
:class="optionDisabled ? 'sp-new-input-diabled' : ''" type="select"
@click="deviceShow = true" />
@ -134,6 +134,14 @@
:disabled="optionDisabled" :class="optionDisabled ? 'sp-new-input-diabled' : ''"
:height="120" />
</u-form-item>
<u-form-item label="人工费:" prop="laborCost" :border-bottom="false" :required="false">
<u-input v-model="repairInfo.laborCost" :border="true" placeholder="请输入" :disabled="optionDisabled"
:class="optionDisabled ? 'sp-new-input-diabled' : ''" />
</u-form-item>
<u-form-item label="差旅费:" prop="travelExpense" :border-bottom="false" :required="false">
<u-input v-model="repairInfo.travelExpense" :border="true" placeholder="请输入"
:disabled="optionDisabled" :class="optionDisabled ? 'sp-new-input-diabled' : ''" />
</u-form-item>
<u-form-item label="是否申领物料:" prop="isMaterial" :border-bottom="false" :label-width="200"
:required="true">
<uni-data-checkbox :disabled="optionDisabled" v-model="repairInfo.isMaterial"
@ -177,6 +185,15 @@
</u-form>
</view>
<!-- 维修完成 上传图片 -->
<view class="repair_detail" v-if="(detailForm.status == 103)">
<u-form labelPosition="left" ref="sendOrderForm" :model="detailForm" :label-width="200" class="repair_form">
<u-form-item label="维修完成图片:" prop="completeImgList" :border-bottom="false">
<betone-upload :type="'images'" v-model="detailForm.completeImgList" @changeFile="changePic">
</betone-upload>
</u-form-item>
</u-form>
</view>
<!-- 维修负责人 审批 -->
<view class="repair_detail" v-if="dataTypes == 3 && (detailForm.status == 402 || detailForm.status == 102)">
<view class="repair_title">主管审批</view>
@ -220,7 +237,7 @@
</view>
<!-- 客服派单-->
<view class="repair-btn" style="margin-right: 32rpx;width:100%"
v-if="dataTypes == 2 && (detailForm.status == 101 || detailForm.status == 400)">
v-if="dataTypes == 2 && (detailForm.status == 101 || detailForm.status == 400 || detailForm.status == 205)">
<u-button size="medium" @click="endOrderCancel()">取消</u-button>
<u-button size="medium" type="primary" @click="sendOrderSubmit()">确定派单</u-button>
</view>
@ -242,6 +259,12 @@
<u-button size="medium" @click="endOrderCancel()">取消</u-button>
<u-button size="medium" type="primary" @click="customerSubmit()">提交</u-button>
</view>
<!-- 客户 维修完成 -->
<view class="repair-btn" style="margin-right: 32rpx;width:100%"
v-if="dataTypes == 4 && detailForm.status == 103">
<u-button size="medium" @click="endOrderCancel()">取消</u-button>
<u-button size="medium" type="primary" @click="repairComplete()">维修完成</u-button>
</view>
<!-- 选择维修人员 -->
<u-select v-model="sendOrdersShow" :list="sendOrdersList" @confirm="sendOrdersConfirm" :isShowsearch="true"
value-name="id" title="选择维修人员"></u-select>
@ -319,7 +342,7 @@ export default {
return this.$store.state.dataType == 2 ? false : true
},
optionDisabled() {
return (this.$store.state.dataType == 3 && (this.detailForm.status == 402 || this.detailForm.status == 102)) || (this.$store.state.dataType == 1 && this.detailForm.status == 301) ? true : false
return (this.$store.state.dataType == 3 && (this.detailForm.status == 402 || this.detailForm.status == 102)) || (this.$store.state.dataType == 1 && this.detailForm.status == 301) || (this.$store.state.dataType == 4 && this.detailForm.status == 103) ? true : false
},
optionPiceDisabled() {
return (this.$store.state.dataType == 3 && (this.detailForm.status == 402 || this.detailForm.status == 102)) ? false : true
@ -455,7 +478,8 @@ export default {
repairTypeData: {
name: '',
key: '',
}
},
completeImgList: [],//
}
},
onReady() {
@ -523,6 +547,8 @@ export default {
this.deviceData.repairPerson = ''
this.deviceData.name = ''
}
this.detailForm.laborCost = this.detailForm.status
this.detailForm.travelExpense = this.detailForm.travelExpense
//
let type_ = this.repairTypeList.filter(v => v.dictKey == this.detailForm.repairType)
@ -534,6 +560,40 @@ export default {
}
})
},
//
changePic(file, index) {
this.completeImgList = file
},
//
repairComplete() {
let query = {
id: this.detailForm.id,
repairType: this.detailForm.repairType
}
//
let query1 = {
id: this.detailForm.id,
}
if (this.completeImgList.length > 0) {
query1.completeImgList = JSON.stringify(this.completeImgList)
}
this.$u.api.workOrderupdate(query1).then(res => {
if (res.code == 200) {
this.$u.api.urgentRepairConfirm(query).then(res => {
if (res.code == 200) {
uni.showToast({ title: "操作成功", icon: "none" });
// this.repairConfirmShow = false
// this.getRecordsList()
uni.navigateBack({
delta: 1 // 1退
})
}
})
}
})
},
//
getRepairPersons() {
@ -727,10 +787,10 @@ export default {
uni.showToast({ title: "申领数量不能为0", icon: "none" });
return false
}
if (this.deviceData.name == '') {
uni.showToast({ title: "请选择设备", icon: "none" });
return false
}
// if (this.deviceData.name == '') {
// uni.showToast({ title: "", icon: "none" });
// return false
// }
let data = []
if (this.repairInfo.isMaterial == 1) {
this.sendOrder.materialsData.map(item => {
@ -744,6 +804,7 @@ export default {
materialCount: item.goodsNum,//
orderId: this.detailForm.id,
})
})
}
@ -756,6 +817,8 @@ export default {
deviceId: this.deviceData.repairPerson,
deviceName: this.deviceData.name,
repairType: this.detailForm.repairType,
laborCost: this.repairInfo.laborCost,
travelExpense: this.repairInfo.travelExpense
}
//
@ -771,7 +834,10 @@ export default {
let query1 = {
id: this.detailForm.id,
deviceId: this.deviceData.repairPerson,
deviceName: this.deviceData.name
deviceName: this.deviceData.name,
repairType: this.detailForm.repairType,
laborCost: this.detailForm.laborCost,
travelExpense: this.detailForm.travelExpense
}
this.$u.api.servicemanSubmit(query1).then(res => {

@ -6,8 +6,8 @@ export default {
// baseUrl:'http://192.168.0.118:80', //李庆坤
// baseUrl:'http://192.168.1.103:10001', //李涛
// baseUrl:'http://192.168.1.12:80', //李涛
baseUrl:'http://192.168.0.108:10001', //李庆坤
// baseUrl:'http://124.221.142.15:8088/api',//远程测试地址
// baseUrl:'http://192.168.0.108:10001', //李庆坤
baseUrl:'http://124.221.142.15:8088/api',//远程测试地址
indexTitle: "科研医疗建筑运维平台",
clientId: "saber", // 客户端id
clientSecret: "saber_secret", // 客户端密钥

Loading…
Cancel
Save