Skip to content

C
CRM
Commit 455b3618 authored by zhengke's avatar zhengke
Browse files
Options

no message

parent 3bb62464
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 48 deletions
src/components/customerManage/customerOrder.vue
View file @ 455b3618
...@@ -348,11 +348,11 @@ ...@@ -348,11 +348,11 @@
let addList = function(arr) { let addList = function(arr) {
arr.forEach(item => { arr.forEach(item => {
item.More = '' item.More = ''
// item.actuallyReceived = false item.actuallyReceived = false
// item.cost = false item.cost = false
// item.selectedType = '' item.selectedType = ''
// item.checkList = [] item.checkList = []
// item.MultipleChoiceList = [] item.MultipleChoiceList = []
}); });
}; };
addList(data); addList(data);
......
src/components/customerManage/orderList.vue
View file @ 455b3618
...@@ -227,20 +227,21 @@ ...@@ -227,20 +227,21 @@
<el-drawer :with-header="false" size='70%' :visible.sync="drawer" direction="rtl" :before-close="handleClose"> <el-drawer :with-header="false" size='70%' :visible.sync="drawer" direction="rtl" :before-close="handleClose">
<customerInfoBox :CustomerId="CustomerId" /> <customerInfoBox :CustomerId="CustomerId" />
</el-drawer> </el-drawer>
<!-- <el-drawer :with-header="false" size='70%' :visible.sync="orderDrawer" direction="rtl" :before-close="handleClose"> <!-- 单号抽屉 -->
<el-drawer :with-header="false" size='70%' :visible.sync="orderDrawer" direction="rtl" :before-close="handleClose">
<orderDetailsDrawer /> <orderDetailsDrawer />
</el-drawer> --> </el-drawer>
</div> </div>
</template> </template>
<script> <script>
import customerInfoBox from "../guestManagement/customerInfoBox"; import customerInfoBox from "../guestManagement/customerInfoBox";
// import orderDetailsDrawer from "./orderDetailsDrawer"; import orderDetailsDrawer from "./orderDetailsDrawer";
export default { export default {
components: { components: {
customerInfoBox, customerInfoBox,
// orderDetailsDrawer orderDetailsDrawer
}, },
props: { props: {
//订单 //订单
...@@ -290,7 +291,7 @@ ...@@ -290,7 +291,7 @@
}, ], }, ],
clickMore: '', clickMore: '',
drawer: false, drawer: false,
orderDrawer: true, orderDrawer: false,
CustomerId: '', CustomerId: '',
CustomerName: '' CustomerName: ''
}; };
...@@ -314,6 +315,8 @@ ...@@ -314,6 +315,8 @@
$this.dataList[i].checkList = [] $this.dataList[i].checkList = []
$this.dataList[i].MultipleChoiceList = [] $this.dataList[i].MultipleChoiceList = []
$this.dataList[i].selectedType = "" $this.dataList[i].selectedType = ""
$this.dataList[i].actuallyReceived = false
$this.dataList[i].cost = false
} }
}); });
}, },
...@@ -387,7 +390,7 @@ ...@@ -387,7 +390,7 @@
}, },
// 点击单号 // 点击单号
clickSingleNumber(item){ clickSingleNumber(item){
this.orderDrawer = true // this.orderDrawer = true
}, },
handleClose(done) { handleClose(done) {
done(); done();
...@@ -437,44 +440,7 @@ ...@@ -437,44 +440,7 @@
this.$emit('emptyMore') this.$emit('emptyMore')
}, },
// 制作单据 // 制作单据
// makeAdocument(row, num) {
// if (this.superManage) {
// this.makeAdocumentfun(row, num)
// } else {
// if (this.userInfo.EmName != row.EnterName) {
// this.ValidateOperator()
// } else {
// this.makeAdocumentfun(row, num)
// }
// }
// },
// makeAdocumentfun(row, num) {
// if (row.OrderStatus != '2') {
// let type
// type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
// let href
// let url
// if (this.isOnline()) {
// url = 'http://yx.oytour.com/#/'
// } else {
// url = 'http://www.test.com:8080/#/'
// }
// let data = [{
// path: 'ChoiceAddFinancialDocuments',
// type: type,
// OtherType: 55,
// ReFinanceId: row.OrderId,
// ReFinanceId2: num,
// GuestId: row.GuestId
// }]
// href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
// window.open(href);
// }
// },
// 制作单据
makeAdocument(row, index, num) { makeAdocument(row, index, num) {
this.dataList[index].MultipleChoiceList=[] this.dataList[index].MultipleChoiceList=[]
let list = row.OrderType&&row.OrderType.split(',') let list = row.OrderType&&row.OrderType.split(',')
...@@ -554,6 +520,8 @@ ...@@ -554,6 +520,8 @@
this.dataList[i].checkList = [] this.dataList[i].checkList = []
this.dataList[i].MultipleChoiceList = [] this.dataList[i].MultipleChoiceList = []
this.dataList[i].selectedType = "" this.dataList[i].selectedType = ""
this.dataList[i].actuallyReceived = false
this.dataList[i].cost = false
} }
}if(num=='2'){ }if(num=='2'){
let type let type
...@@ -579,6 +547,8 @@ ...@@ -579,6 +547,8 @@
this.dataList[i].checkList = [] this.dataList[i].checkList = []
this.dataList[i].MultipleChoiceList = [] this.dataList[i].MultipleChoiceList = []
this.dataList[i].selectedType = "" this.dataList[i].selectedType = ""
this.dataList[i].actuallyReceived = false
this.dataList[i].cost = false
} }
} }
...@@ -620,6 +590,8 @@ ...@@ -620,6 +590,8 @@
this.dataList[i].checkList = [] this.dataList[i].checkList = []
this.dataList[i].MultipleChoiceList = [] this.dataList[i].MultipleChoiceList = []
this.dataList[i].selectedType = "" this.dataList[i].selectedType = ""
this.dataList[i].actuallyReceived = false
this.dataList[i].cost = false
} }
} }
......
src/components/guestManagement/Agreement.vue
View file @ 455b3618
...@@ -408,6 +408,8 @@ ...@@ -408,6 +408,8 @@
$this.dataList[i].checkList = [] $this.dataList[i].checkList = []
$this.dataList[i].MultipleChoiceList = [] $this.dataList[i].MultipleChoiceList = []
$this.dataList[i].selectedType = "" $this.dataList[i].selectedType = ""
$this.dataList[i].actuallyReceived = false
$this.dataList[i].cost = false
} }
}); });
}, },
...@@ -604,6 +606,8 @@ ...@@ -604,6 +606,8 @@
this.dataList[i].checkList = [] this.dataList[i].checkList = []
this.dataList[i].MultipleChoiceList = [] this.dataList[i].MultipleChoiceList = []
this.dataList[i].selectedType = "" this.dataList[i].selectedType = ""
this.dataList[i].actuallyReceived = false
this.dataList[i].cost = false
} }
}if(num=='2'){ }if(num=='2'){
let type let type
...@@ -629,6 +633,8 @@ ...@@ -629,6 +633,8 @@
this.dataList[i].checkList = [] this.dataList[i].checkList = []
this.dataList[i].MultipleChoiceList = [] this.dataList[i].MultipleChoiceList = []
this.dataList[i].selectedType = "" this.dataList[i].selectedType = ""
this.dataList[i].actuallyReceived = false
this.dataList[i].cost = false
} }
} }
...@@ -670,6 +676,8 @@ ...@@ -670,6 +676,8 @@
this.dataList[i].checkList = [] this.dataList[i].checkList = []
this.dataList[i].MultipleChoiceList = [] this.dataList[i].MultipleChoiceList = []
this.dataList[i].selectedType = "" this.dataList[i].selectedType = ""
this.dataList[i].actuallyReceived = false
this.dataList[i].cost = false
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment