diff --git a/build/cp.js b/build/cp.js
index 46a7902..6af675e 100644
--- a/build/cp.js
+++ b/build/cp.js
@@ -9,8 +9,8 @@ var path = require('path');
// https://blog.csdn.net/weixin_42171955/article/details/100156212
var strInputFileName = '../dist/index.html';
-var strOutputFileName = 'E:\\code\\lou\\application\\admin\\view\\order_main\\add.html';
-var strOutputFileName2 = 'E:\\code\\lou\\application\\admin\\view\\order_main\\edit.html';
+var strOutputFileName = 'E:\\code\\lou\\public\\view\\order_main\\add.html';
+var strOutputFileName2 = 'E:\\code\\lou\\public\\view\\order_main\\edit.html';
var fRead = fs.createReadStream(strInputFileName);
var fWrite = fs.createWriteStream(strOutputFileName);
@@ -26,8 +26,8 @@ var objReadline = readline.createInterface({
terminal: false
});
objReadline.on('line', (strLine) => {
- let strTemp = `${strLine}`;
- let strTemp2 = `${strLine}`;
+ let strTemp = `${strLine}`;
+ let strTemp2 = `${strLine}`;
fWrite.write(strTemp);
fWrite2.write(strTemp2);
});
diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue
index de0d7d0..80dd878 100644
--- a/src/components/HelloWorld.vue
+++ b/src/components/HelloWorld.vue
@@ -5,10 +5,11 @@
基本信息
-
-
修改
-
保存
-
取消
+
+ 修改
+
+ 保存
+ 取消
@@ -66,6 +67,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -77,9 +90,11 @@
-
+
-
+
+ 删除
+
-
+
-
+
+ 删除
-
+
提交订单
@@ -148,9 +164,6 @@
user_name: [
{required: true, message: '请输入', trigger: 'blur'},
],
- user_phone: [
- {required: true, message: '请输入', trigger: 'blur'},
- ],
order_memo: [
{required: true, message: '请输入', trigger: 'blur'},
]
@@ -277,7 +290,7 @@
this.$alert('新增成功', '提示', {
confirmButtonText: '确定',
callback: action => {
- Fast.api.close()
+ window.close()
}
});
}).catch((err) => {
@@ -306,6 +319,9 @@
}
this.$alert(res.data.msg, '提示', {
confirmButtonText: '确定',
+ callback: action => {
+ window.close()
+ }
});
}).catch((err) => {
console.log(err)
@@ -420,6 +436,9 @@
if (res.data.flag) {
let orderMain = this.$lo.cloneDeep(res.data.data)
delete orderMain.subOrderList
+ if (orderMain.receipt_order_status != 0) {
+ this.type = 'view'
+ }
this.orderMain = orderMain
this.orderMainCopy = this.$lo.cloneDeep(orderMain)
res.data.data.subOrderList.forEach((item) => { //回显值的处理
@@ -450,4 +469,14 @@
.card {
overflow-x: scroll;
}
+
+ .el-icon-minus {
+ line-height: 30px;
+ height: 30px;
+ }
+
+ .el-icon-plus {
+ line-height: 30px;
+ height: 30px;
+ }
diff --git a/src/components/hotel.vue b/src/components/hotel.vue
index 84d79fa..cf2c510 100644
--- a/src/components/hotel.vue
+++ b/src/components/hotel.vue
@@ -3,7 +3,7 @@
-
{{ '酒店' }}
@@ -11,10 +11,10 @@
-
-
修改
-
保存
-
取消
+
+ 修改
+ 保存
+ 取消
@@ -90,7 +90,7 @@
-
+
-
+
{
+ window.close()
+ }
});
}).catch((err) => {
console.log(err)
@@ -659,7 +659,7 @@
}
- if (this.dataObj.hotel_id && this.dataObj.hotel_id && this.dataObj.hotel_id) {
+ if (this.dataObj.hotel_id && this.dataObj.room_id && this.dataObj.plan_id) {
// let hotel_id = this.dataObj.hotel_id
// let room_id = this.dataObj.room_id
// let plan_id = this.dataObj.plan_id
diff --git a/src/components/hotelother.vue b/src/components/hotelother.vue
index 7cb6556..a238a99 100644
--- a/src/components/hotelother.vue
+++ b/src/components/hotelother.vue
@@ -3,7 +3,7 @@
-
{{'附加项目'}}
@@ -11,10 +11,10 @@
-
-
修改
-
保存
-
取消
+
>
+ 修改
+ 保存
+ 取消
@@ -69,7 +69,7 @@
-
-
+
+
-
-
+
+
{
return item.id == id
})
- console.log(data)
+ console.log('changeItem', data)
data.item_name = data.name
this.dataObjTemp = Object.assign(this.dataObjTemp, data);
},
@@ -522,6 +516,9 @@
}
this.$alert(res.data.msg, '提示', {
confirmButtonText: '确定',
+ callback: action => {
+ window.close()
+ }
});
}).catch((err) => {
console.log(err)
@@ -543,7 +540,9 @@
if (process.env.NODE_ENV !== 'production') {
axios.defaults.baseURL = '/api' //关键代码
}
-
+ if (this.dataObj.item_id) {
+ this.changeItem(this.dataObj.item_id)
+ }
}
}