system-clients 3.2.1-27 → 3.2.1-30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/components/Main.vue +2 -2
package/package.json
CHANGED
package/src/components/Main.vue
CHANGED
|
@@ -279,7 +279,7 @@ export default {
|
|
|
279
279
|
this.changeShow()
|
|
280
280
|
this.gotoWorkOrderSite()
|
|
281
281
|
// 获取预约列表
|
|
282
|
-
this.functions.f_role_name.includes(this.config.msgRole) && this.config.isTip && this.getOrderList()
|
|
282
|
+
this.functions.f_role_name && this.functions.f_role_name.includes(this.config.msgRole) && this.config.isTip && this.getOrderList()
|
|
283
283
|
},
|
|
284
284
|
methods: {
|
|
285
285
|
getOrderList(){
|
|
@@ -299,7 +299,7 @@ export default {
|
|
|
299
299
|
let http = new HttpResetClass()
|
|
300
300
|
await http.load('POST', '/rs/sql/singleTable', {data: {
|
|
301
301
|
tablename:'t_order_center',
|
|
302
|
-
condition:` f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and
|
|
302
|
+
condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
|
|
303
303
|
}}, {
|
|
304
304
|
resolveMsg: null,
|
|
305
305
|
rejectMsg: null
|