diff --git a/.env b/.env index 40d34d9..313a590 100644 --- a/.env +++ b/.env @@ -1,4 +1,5 @@ NODE_ENV=production VUE_APP_PREVIEW=true -VUE_APP_API_BASE_URL=http://192.168.1.205:25800 +//VUE_APP_API_BASE_URL=http://192.168.1.205:25800 +VUE_APP_API_BASE_URL=http://60.209.125.238:25805 //VUE_APP_API_BASE_URL=http://127.0.0.1:5000 \ No newline at end of file diff --git a/src/views/main/BookingLedger/detail/components/ediMore.vue b/src/views/main/BookingLedger/detail/components/ediMore.vue index 7053604..99ba60b 100644 --- a/src/views/main/BookingLedger/detail/components/ediMore.vue +++ b/src/views/main/BookingLedger/detail/components/ediMore.vue @@ -2,60 +2,50 @@
- - - - - - + - + - + - + - + @@ -66,10 +56,10 @@ /> - + @@ -80,10 +70,10 @@ /> - + @@ -94,10 +84,10 @@ /> - + @@ -108,157 +98,168 @@ /> - + - + - + - + - + - + - + - + - + - + - + - + - + + - + - + + 是 + 否 + - + - + - + - - 是 - 否 - + + + + + + diff --git a/src/views/main/BookingLedger/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue index 1f2c093..839b76b 100644 --- a/src/views/main/BookingLedger/detail/modules/operationArea.vue +++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue @@ -27,8 +27,10 @@
- - + +
@@ -36,7 +38,9 @@ - + @@ -880,7 +884,7 @@ export default { }, checkFun() { - this.$message.loading({ content: '校验中...' }); + this.$message.loading({ content: '校验中...' }) ExcuteRulesOceanBooking(this.id) .then(res => { if (res.success) { @@ -904,10 +908,10 @@ export default { changePage(type) { this.$emit('changePage', type) }, - copyBooking () { + copyBooking() { this.$emit('copy') }, - addChild () { + addChild() { this.$emit('addSedList') } } diff --git a/src/views/main/BookingLedger/detail/modules/rightContent.vue b/src/views/main/BookingLedger/detail/modules/rightContent.vue index 76d31a4..dc91b72 100644 --- a/src/views/main/BookingLedger/detail/modules/rightContent.vue +++ b/src/views/main/BookingLedger/detail/modules/rightContent.vue @@ -4,7 +4,7 @@
注意事项
-
+
@@ -25,7 +25,15 @@
服务项目
-
{{ serive.name }}
+
+ {{ serive.name }} +
@@ -78,7 +86,11 @@
订单及货运动态
-
+
{{ bookingLog.opTime }} @@ -127,15 +139,26 @@ {{ log.createdTime }} - +
-
{{ child.field || '字段' }} : {{ child.oldValue }}
+
+ {{ child.field || '字段' }} : + {{ child.oldValue }} +
改为：
-
{{ child.field || '字段' }}:{{ child.newValue }}
+
+ {{ child.field || '字段' }}:{{ child.newValue }} +
@@ -192,19 +215,19 @@ export default { type: Object, default: () => { return {} - }, + } }, excuteRules: { type: Array, default: () => { return [] - }, + } }, excuteRulesType: { type: String, default: () => { return '' - }, + } } }, data() { @@ -250,14 +273,14 @@ export default { // 备注 - start getRemark() { GetRemark({ - id: this.id, + id: this.id }) - .then((res) => { + .then(res => { if (res.success) { this.remarkList = res.data } }) - .catch((err) => { + .catch(err => { console.log(err) }) }, @@ -268,16 +291,16 @@ export default { handleModelSubmit() { AddRemark({ pId: this.id, - remark: this.remarkVal, + remark: this.remarkVal }) - .then((res) => { + .then(res => { if (res.success) { this.$message.info('备注提交成功') this.handleModelCancel() this.getRemark() } }) - .catch((err) => { + .catch(err => { console.log(err) }) }, @@ -289,14 +312,14 @@ export default { // 附件 - start getFile() { GetFile({ - id: this.id, + id: this.id }) - .then((res) => { + .then(res => { if (res.success) { this.fileList = res.data } }) - .catch((err) => { + .catch(err => { console.log(err) }) }, @@ -343,7 +366,7 @@ export default { formData.append('TypeName', attachName) this.uploading = true AddFile(formData) - .then((res) => { + .then(res => { if (res.success) { this.$message.success('上传成功') this.getFile() @@ -353,7 +376,7 @@ export default { this.uploading = false this.fileModelCancel() }) - .catch((err) => { + .catch(err => { console.log(err) this.$message.error(err.message) }) @@ -363,28 +386,28 @@ export default { // 获取动态 getBookingLog() { GetBookingLog({ - id: this.id, + id: this.id }) - .then((res) => { + .then(res => { if (res.success) { this.bookingLogList = res.data } }) - .catch((err) => { + .catch(err => { console.log(err) }) }, // 获取日志 getLog() { GetLog({ - id: this.id, + id: this.id }) - .then((res) => { + .then(res => { if (res.success) { this.logList = res.data } }) - .catch((err) => { + .catch(err => { console.log(err) }) }, @@ -392,11 +415,11 @@ export default { this.attachCode = this.bookingAttachType[index].code this.attachName = this.bookingAttachType[index].name }, - bookingShow (data) { + bookingShow(data) { data.isChecked = !data.isChecked this.$forceUpdate() }, - showLogMore (index) { + showLogMore(index) { this.logList[index].showMore = !this.logList[index].showMore this.$forceUpdate() }, @@ -410,7 +433,7 @@ export default { this.$set(value, this.id, this.locaService) window.localStorage.setItem('locaService', JSON.stringify(value)) } - }, + } }