|
|
@@ -311,11 +311,11 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <Modal v-model="modalUser" :mask-closable="false" :scrollable="true" closable footer-hide title="用户列表"
|
|
|
+ <Modal v-model="modalUser" :mask-closable="false" :scrollable="true" closable footer-hide title="员工列表"
|
|
|
width="950" class-name="user-modal">
|
|
|
<userList v-if="modalUser" ref="users" :uid="userInfo.uid || 0" @getUserId="getUserId"></userList>
|
|
|
</Modal>
|
|
|
- <Modal v-model="modalStaff" :mask-closable="false" :scrollable="true" closable footer-hide title="用户列表"
|
|
|
+ <Modal v-model="modalStaff" :mask-closable="false" :scrollable="true" closable footer-hide title="员工列表"
|
|
|
width="950" class-name="user-modal">
|
|
|
<staffList v-if="modalStaff" ref="users" :uid="staffInfo.uid || 0" @getUserId="getStaffId"></staffList>
|
|
|
</Modal>
|
|
|
@@ -2424,16 +2424,15 @@
|
|
|
if (!this.userInfo.uid)
|
|
|
this.activityFrom.tourist_uid = this.userInfo.touristId;
|
|
|
// activityList(this.activityFrom).then((res) => {
|
|
|
- getServeItem(this.activityFrom).then((res) => {
|
|
|
+ getServeItem({
|
|
|
+ page: 1,
|
|
|
+ limit: 1000
|
|
|
+ }).then((res) => {
|
|
|
let data = res.data;
|
|
|
this.total = data.count;
|
|
|
- if (this.reloading) {
|
|
|
- this.reloading = false;
|
|
|
- this.activityFrom.limit = this.limitTemp;
|
|
|
- this.goodData = data.list;
|
|
|
- } else {
|
|
|
- this.goodData = this.goodData.concat(data.list);
|
|
|
- }
|
|
|
+ this.goodData = data.list;
|
|
|
+ this.reloading = false;
|
|
|
+
|
|
|
});
|
|
|
// } else {
|
|
|
// this.goodFrom.uid = this.userInfo ? this.userInfo.uid : 0;
|
|
|
@@ -2624,9 +2623,9 @@
|
|
|
if(!this.staffInfo.id) {
|
|
|
return this.$Message.error('请选择服务员工');
|
|
|
}
|
|
|
- if(!this.saleInfo.id) {
|
|
|
- return this.$Message.error('请选择销售员工');
|
|
|
- }
|
|
|
+ // if(!this.saleInfo.id) {
|
|
|
+ // return this.$Message.error('请选择销售员工');
|
|
|
+ // }
|
|
|
this.payList.forEach((value, index, arr) => {
|
|
|
value.status = true;
|
|
|
if (value.value === 'yue' && !this.userInfo.uid) {
|
