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

Compare commits

base: dianliang:54f0c8049605d6772d6db219f01abedda6928697
Branches Tags
dianliang:master
dianliang:driver
dianliang:insp
dianliang:repair
dianliang:dev
..
compare: dianliang:0103ae66125bcfcaf5c9e2468b89cd3298cedade
Branches Tags
dianliang:driver
dianliang:insp
dianliang:master
dianliang:repair
dianliang:dev

No commits in common. "54f0c8049605d6772d6db219f01abedda6928697" and "0103ae66125bcfcaf5c9e2468b89cd3298cedade" have entirely different histories.
54f0c80496 ... 0103ae6612

2 changed files with 3 additions and 9 deletions
Show Stats Expand all files Collapse all files

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

@ -70,12 +70,11 @@
<!-- <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-button @click="handleReTake(scope.row)" size="mini" type="text" icon="el-icon-refresh"
v-if="(userRole === 'repair_staff' ? (leader ? !isFinish : false) : false) && !(scope.row.ticketsWorkStatus !== '01' && userRole === 'repair_staff' && !isFinish)">
<el-button @click="handleReTake(scope.row)" size="mini" type="text" icon="el-icon-refresh" v-if="(userRole === 'repair_staff' ? leader : false) && !(scope.row.ticketsWorkStatus !== '01' && userRole === 'repair_staff' && !isFinish)">
重新指派
</el-button>
<el-dropdown
v-if="scope.row.ticketsWorkStatus !== '01' && ((userRole === 'service_advisor' || userRole === 'general_inspection') && !isFinish)"
v-if="scope.row.ticketsWorkStatus !== '01'"
@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">
@ -146,6 +145,7 @@ import {getPageType, updateTake, getTicketsById} from "@/api/repair/tickets/Tick
import TicketsShow from "@/views/repair/tickets/Components/TicketsShow.vue";
import UpdateRepair from "@/views/repair/tickets/form/UpdateRepair.vue";
import TWOperate from "@/views/repair/tickets/form/TWOperate.vue";
import {listTwItem} from "@/api/repair/tickets/TWItem";
import {createUniqueCodeByHead} from "@/utils/createUniqueCode";
import {updateTicketWares} from "@/api/repair/tickets/TicketWares";
import {getIfLeader} from "@/api/repair/repairworker";
@ -163,9 +163,6 @@ export default {
type: String,
default: '',
required: true
},
isType:{
type: String,
}
},
data() {

3
src/views/repair/tickets/TicketManager.vue
View File

@ -16,9 +16,6 @@
<el-tab-pane label="退料确认" name="finishBackWares" v-if="userRole === 'repair_staff'">
<GetAndBackWares :type="false" />
</el-tab-pane>
<el-tab-pane label="待总检工单" name="unInspection" v-if="userRole === 'general_inspection'">
<TicketManagerItem :user-role="userRole" :is-finish="false"/>
</el-tab-pane>
<!-- <el-tab-pane label="退料申请单" name="backApply">-->
<!-- <TicketWares :type="false" :user-role="userRole"/>-->
<!-- </el-tab-pane>-->