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

Compare commits

base: dianliang:fdf9170e00ce8712d2a518d40e4fbc0fa9115494
Branches Tags
dianliang:master
dianliang:repair
dianliang:dev
..
compare: dianliang:849fbe4585d04383f84c7eeff689ea3cb6f94181
Branches Tags
dianliang:repair
dianliang:dev
dianliang:master

No commits in common. "fdf9170e00ce8712d2a518d40e4fbc0fa9115494" and "849fbe4585d04383f84c7eeff689ea3cb6f94181" have entirely different histories.
fdf9170e00 ... 849fbe4585

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

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

@ -63,7 +63,7 @@
<el-button size="mini" <el-button size="mini"
v-if=" scope.row.ticketsWorkStatus !== '01' && userRole === 'repair_staff' && !isFinish && nowUser.id === scope.row.nowRepairId" v-if=" scope.row.ticketsWorkStatus !== '01' && userRole === 'repair_staff' && !isFinish && nowUser.id === scope.row.nowRepairId"
type="text" icon="el-icon-monitor" @click="handleRecord(scope.row, 'sgz')"> type="text" icon="el-icon-monitor" @click="handleRecord(scope.row, 'sgz')">
过程记录{{scope.row.ticketsWorkStatus !== '01' && ((userRole === 'service_advisor' || userRole === 'general_inspection') && !isFinish)}} 过程记录
</el-button> </el-button>
<el-button size="mini" <el-button size="mini"
v-if="scope.row.ticketsWorkStatus !== '01' && userRole === 'repair_staff' && !isFinish && nowUser.id === scope.row.nowRepairId" v-if="scope.row.ticketsWorkStatus !== '01' && userRole === 'repair_staff' && !isFinish && nowUser.id === scope.row.nowRepairId"
@ -78,7 +78,7 @@
重新指派 重新指派
</el-button> </el-button>
<el-dropdown <el-dropdown
v-if="(scope.row.ticketsWorkStatus !== '01' && ((userRole === 'service_advisor' || userRole === 'general_inspection') && !isFinish)) || (userRole === 'repair_staff' && !isFinish && scope.row.ticketsWorkStatus !== '01')" v-if="scope.row.ticketsWorkStatus !== '01' && ((userRole === 'service_advisor' || userRole === 'general_inspection') && !isFinish)"
@command="(command) => handleCommand(command, scope.$index, scope.row)"> @command="(command) => handleCommand(command, scope.$index, scope.row)">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button> <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">

14
src/views/repair/tickets/Components/TicketWaresShow.vue
View File

@ -168,12 +168,12 @@
<el-table-column label="规格" align="center" prop="wares.model" width="180"/> <el-table-column label="规格" align="center" prop="wares.model" width="180"/>
<el-table-column label="数量" align="center" prop="waresCount" width="180"/> <el-table-column label="数量" align="center" prop="waresCount" width="180"/>
<el-table-column v-if="userRole === 'service_advisor' && type" label="折扣" align="center" prop="itemDiscount" width="180"> <el-table-column v-if="userRole === 'service_advisor' && type" label="折扣" align="center" prop="itemDiscount" width="180">
<!-- <div v-if="formData.status === '01'" class="item" slot-scope="scope">--> <div v-if="formData.status === '01'" class="item" slot-scope="scope">
<!--&lt;!&ndash; <el-input @blur="save(scope.row)" class="item__input" v-model="scope.row.itemDiscount"/>&ndash;&gt;--> <!-- <el-input @blur="save(scope.row)" class="item__input" v-model="scope.row.itemDiscount"/>-->
<!-- <DiscountInput @input-blur="save(scope.row)" class="item__input" v-model="scope.row.itemDiscount" />--> <DiscountInput @input-blur="save(scope.row)" class="item__input" v-model="scope.row.itemDiscount" />
<!-- <span class="item__txt">{{ scope.row.itemDiscount === 1 ? "无折扣" : scope.row.itemDiscount }}</span>--> <span class="item__txt">{{ scope.row.itemDiscount === 1 ? "无折扣" : scope.row.itemDiscount }}</span>
<!-- </div>--> </div>
<div slot-scope="scope"> <div v-else slot-scope="scope">
<span>{{ scope.row.itemDiscount === 1 ? "无折扣" : scope.row.itemDiscount }}</span> <span>{{ scope.row.itemDiscount === 1 ? "无折扣" : scope.row.itemDiscount }}</span>
</div> </div>
</el-table-column> </el-table-column>
@ -221,7 +221,7 @@ export default {
loading: false, loading: false,
formData: {}, formData: {},
clickCellMap: {}, clickCellMap: {},
editProp: [], editProp: ['itemDiscount'],
} }
}, },
methods:{ methods:{