diff --git a/src/api/system/permission.js b/src/api/system/permission.js
index 1eee42a..0bf6f7a 100644
--- a/src/api/system/permission.js
+++ b/src/api/system/permission.js
@@ -42,3 +42,11 @@ export function assignRoleDataScope(data) {
data: data
})
}
+
+// 用来判断角色
+export function checkRole(code){
+ return request({
+ url: '/system/permission/checkRole?code=' + code,
+ method: 'get'
+ })
+}
diff --git a/src/views/repair/tickets/Components/TicketSearch.vue b/src/views/repair/tickets/Components/TicketSearch.vue
index 13d87f8..05d5032 100644
--- a/src/views/repair/tickets/Components/TicketSearch.vue
+++ b/src/views/repair/tickets/Components/TicketSearch.vue
@@ -41,7 +41,7 @@
-
+
@@ -53,6 +53,7 @@ import TicketTable from "@/views/repair/tickets/Components/TicketTable.vue";
import RepairTypeChoose from "@/views/repair/Components/RepairTypeChoose.vue";
import {getTicketsPage} from "@/api/repair/tickets/Tickets";
import CorpChoose from "@/views/repair/Components/CorpChoose.vue";
+import {checkRole} from "@/api/system/permission";
export default {
name: "TicketSearch",
@@ -83,13 +84,20 @@ export default {
},
showSearch: true,
total: 0,
- list: []
+ list: [],
+ isWXCW: false
}
},
mounted() {
this.getPage()
+ this.getIsWXCW()
},
methods: {
+ // 是否是财务
+ async getIsWXCW(){
+ const res = await checkRole("wxcw")
+ this.isWXCW = res.data
+ },
// 类型选择
getRepairType(data){
console.log(data)
diff --git a/src/views/repair/tickets/Components/TicketTable.vue b/src/views/repair/tickets/Components/TicketTable.vue
index e8181c0..15e5a5e 100644
--- a/src/views/repair/tickets/Components/TicketTable.vue
+++ b/src/views/repair/tickets/Components/TicketTable.vue
@@ -104,7 +104,7 @@
查看
- 结算
@@ -145,6 +145,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -164,6 +188,9 @@ export default {
list: {
type: Array,
default: []
+ },
+ isWXCW:{
+ type:Boolean
}
},
data() {
@@ -172,8 +199,13 @@ export default {
formData: {
id: null,
ticketsStatus: null,
- remark: null
- }
+ remark: null,
+ payType: null
+ },
+ formRules:{
+ payType: [{required: true, message: '支付方式不能为空', trigger: 'blur'}]
+ },
+ dialogVisible: false
}
},
methods: {
@@ -218,25 +250,30 @@ export default {
},
handlePaid(row) {
- this.$prompt('结算备注', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- }).then(({value}) => {
- const data = {}
- data['id'] = row.id
- data['remark'] = value
- data['ticketsStatus'] = '02'
- this.doPaid(data)
- }).catch(() => {
- })
- },
- async doPaid(data) {
- try {
- await setTicketsPaid(data)
- this.$modal.msgSuccess("结算成功")
- this.$emit("setVoid")
- } catch {
+ this.formData = {
+ id: null,
+ ticketsStatus: null,
+ remark: null,
+ payType: null
}
+ this.formData['id'] = row.id
+ this.formData['ticketsStatus'] = '02'
+ this.dialogVisible = true
+ },
+ async doPaid() {
+ try {
+ await this.$refs['formRef'].validate()
+ await setTicketsPaid(this.formData)
+ this.$modal.msgSuccess("结算成功")
+ this.dialogVisible = false
+ this.$emit("setVoid")
+ }catch{}
+ // try {
+ // await setTicketsPaid(this.formData)
+ // this.$modal.msgSuccess("结算成功")
+ // this.$emit("setVoid")
+ // } catch {
+ // }
}
}
}
diff --git a/src/views/repair/tickets/Components/TicketWaresShow.vue b/src/views/repair/tickets/Components/TicketWaresShow.vue
index 99bd75e..30566cc 100644
--- a/src/views/repair/tickets/Components/TicketWaresShow.vue
+++ b/src/views/repair/tickets/Components/TicketWaresShow.vue
@@ -147,16 +147,7 @@
{{ scope.$index + 1 }}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+