dianliang/lanan-system-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:5e4b16768414829c41735b20a6c4980f7217864d
Branches Tags
dianliang:master
dianliang:repair
dianliang:rescue
dianliang:insp
dianliang:driver
dianliang:dev
..
compare: dianliang:6b709a76222dbda58f6baad342eba1a3146efd93
Branches Tags
dianliang:master
dianliang:repair
dianliang:rescue
dianliang:insp
dianliang:driver
dianliang:dev

No commits in common. "5e4b16768414829c41735b20a6c4980f7217864d" and "6b709a76222dbda58f6baad342eba1a3146efd93" have entirely different histories.
5e4b167684 ... 6b709a7622

2 changed files with 21 additions and 65 deletions
Show Stats Expand all files Collapse all files

15
src/views/repair/tickets/Components/TicketManagerItem.vue
View File

@ -50,21 +50,16 @@
<el-button v-if="userRole === 'service_advisor' && scope.row.ticketsWorkStatus === '01'" size="mini" type="text" icon="el-icon-check" @click="handleNotify(scope.row)">
通知施工
</el-button>
<el-button size="mini" v-if="userRole === 'repair_staff' && !isFinish" type="text" icon="el-icon-monitor" @click="handleRecord(scope.row, 'sgz')">
<el-button size="mini" v-if="userRole === 'repair_staff'" type="text" icon="el-icon-monitor" @click="handleRecord(scope.row, 'sgz')">
过程记录
</el-button>
<el-button size="mini" v-if="userRole === 'repair_staff' && !isFinish" type="text" icon="el-icon-monitor" @click="handleRecord(scope.row, 'kssg')">
<el-button size="mini" v-if="userRole === 'repair_staff'" type="text" icon="el-icon-monitor" @click="handleRecord(scope.row, 'kssg')">
开始施工
</el-button>
<el-button size="mini" v-if="userRole === 'repair_staff' && !isFinish" type="text" icon="el-icon-monitor" @click="handleRecord(scope.row, 'sgwczj')">
<el-button size="mini" v-if="userRole === 'repair_staff'" type="text" icon="el-icon-monitor" @click="handleRecord(scope.row, 'sgwczj')">
施工完成
</el-button>
<el-button @click="handleRecord(scope.row, 'zj')" size="mini" type="text" icon="el-icon-monitor" v-if="userRole === 'general_inspection' && scope.row.ticketsWorkStatus === '05'">
终检
</el-button>
<el-dropdown
v-if="userRole !== 'general_inspection'"
@command="(command) => handleCommand(command, scope.$index, scope.row)">
<el-dropdown @command="(command) => handleCommand(command, scope.$index, scope.row)">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-if="!isFinish && scope.row.ticketsWorkStatus !== '01' && userRole === 'repair_staff'" command="handleGet" size="mini" type="text" icon="el-icon-document-add"
@ -75,7 +70,7 @@
</el-dropdown-item>
<!-- 还要判断是不是员工 -->
<el-dropdown-item
v-if="(userRole === 'repair_staff' ? leader : true) && !isFinish"
v-if="userRole === 'repair_staff' ? leader : true"
command="handleReTake" size="mini" type="text" icon="el-icon-refresh"
>重新指派
</el-dropdown-item>

71
src/views/repair/tickets/form/UpdateRecord.vue
View File

@ -4,7 +4,7 @@
<el-form :model="formData" ref="formRef" :rules="formRules" :loading="formLoading" :inline="true" label-width="15rem">
<el-row :gutter="1">
<el-col :span="24">
<el-form-item v-if="formData.recordType !== 'zj'" label="维修项目" prop="item.id">
<el-form-item label="维修项目" prop="item.id">
<el-select style="width: 20rem" v-model="formData.item.id" >
<el-option v-for="item in projectList" :key="item.id" :label="item.itemName" :value="item.id" />
</el-select>
@ -29,26 +29,22 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button v-if="formData.recordType !== 'sgwczj'" type="primary" @click="doUpdate">确 定</el-button>
<el-button v-if="formData.recordType === 'sgwczj'" type="primary" @click="doUpdate">部分完成</el-button>
<el-button v-if="formData.recordType === 'sgwczj'" type="success" @click="doFinish">
<el-button v-if="formData.recordType === 'sgwczj'" type="primary">部分完成</el-button>
<el-button v-if="formData.recordType === 'sgwczj'" type="success">
{{isNext ? "整体完成并指派下一项目" : (isEndCheck ? "整体完成并移交总检" : "整体完成")}}
</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</div>
</el-dialog>
<UpdateRepair ref="updateRepair" @success="doUpdate" />
</div>
</template>
<script>
import {getProjectList} from "@/api/repair/tickets/TicketsItem";
import {updateStatus} from "@/api/repair/tickets/Tickets";
import UpdateRepair from "@/views/repair/tickets/form/UpdateRepair.vue";
export default {
name: "UpdateRecord",
components: {UpdateRepair},
data(){
return {
dialogVisible: false,
@ -75,7 +71,6 @@ export default {
isNext: false,
// 是否需要总检
isEndCheck: true,
clickRow: null
}
},
methods:{
@ -95,11 +90,9 @@ export default {
recordType: null,
}
this.projectList = []
this.clickRow = null
},
async open(row){
this.init()
this.clickRow = row
this.isEndCheck = row.endCheck === '1'
this.formData.id = row.id
this.formData.recordType = row.clickType
@ -111,15 +104,16 @@ export default {
this.formLoading = true
const res = await getProjectList(ticketId)
this.projectList = res.data
this.formData.ticketsWorkStatus = "02"
this.formData.item.itemStatus = "02"
if (this.formData.recordType === 'kssg') {
this.formData.ticketsWorkStatus = "02"
this.formData.item.itemStatus = "02"
this.projectList = this.projectList.filter(item => item.itemStatus === '01')
}else if (this.formData.recordType === 'sgz'){
this.formData.ticketsWorkStatus = "02"
this.formData.item.itemStatus = "02"
this.projectList = this.projectList.filter(item => item.itemStatus === '02')
}else {
// 因为自己手里有一个项目，所以是>1
this.isNext = this.projectList.filter(item => item.itemStatus !== '03').length > 1
this.isNext = this.projectList.filter(item => item.itemStatus !== '03').length > 0
this.projectList = this.projectList.filter(item => item.itemStatus === '02')
}
}finally {
@ -128,49 +122,16 @@ export default {
},
async doUpdate(){
try {
if (this.formData.recordType === 'zj'){
this.formData.ticketsWorkStatus = '03'
this.formData['isFinish'] = '1'
}
if (this.formData.recordType !== 'zj'){
await this.$refs.formRef.validate()
this.formLoading = true
await updateStatus(this.formData)
this.$modal.msgSuccess("操作成功")
this.dialogVisible = false
this.$emit("success")
}else {
this.formLoading = true
await updateStatus(this.formData)
this.$modal.msgSuccess("操作成功")
this.dialogVisible = false
this.$emit("success")
}
await this.$refs.formRef.validate()
// this.formData.image = this.formData.image.map(item => item.url).join(",")
this.formLoading = true
await updateStatus(this.formData)
this.$modal.msgSuccess("操作成功")
this.dialogVisible = false
this.$emit("success")
}catch {
}
},
async doFinish(){
try{
await this.$refs.formRef.validate()
this.formLoading = true
// 不论是什么按钮，这个工单子项是完了的
this.formData.item.itemStatus = "03"
// 整体完成并指派下一个人
if (this.isNext){
await this.$refs.updateRepair.open(this.clickRow)
return
}
// 整体完成并移交总检
if (this.isEndCheck){
this.formData.ticketsWorkStatus = "05"
await this.doUpdate();
return
}
// 整体完成,只有没有项目，不需要总检，这个工单才是完了
this.formData.ticketsWorkStatus = "03"
this.formData['isFinish'] = '1'
await this.doUpdate()
}catch{}
}
}
}