whm
/
BookingHeChuanFront
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuanFront

Browse Source
szh_zidingyibiaoti
lilu 2 years ago
parent 09abefbeb0 93a1176951
commit 32b9c685ed
7 changed files with 2773 additions and 18 deletions
Show Stats Download Patch File Download Diff File

3
.env
Unescape Escape View File

@ -1,5 +1,6 @@
NODE_ENV=production NODE_ENV=production
VUE_APP_PREVIEW=true 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://127.0.0.1:5000
VUE_APP_API_BASE_URL=http://60.209.125.238:25805 VUE_APP_API_BASE_URL=http://60.209.125.238:25805
//VUE_APP_API_BASE_URL=http://127.0.0.1:5000 # VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api

2
.env.development
Unescape Escape View File

@ -3,6 +3,8 @@ VUE_APP_PREVIEW=true
VUE_APP_API_BASE_URL=http://60.209.125.238:25805 VUE_APP_API_BASE_URL=http://60.209.125.238:25805
VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:25805 VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:25805
# process.env.VUE_APP_API_BASE_URL
# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api # VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api
# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api # VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api

4
src/views/main/BookingLedger/detail/modules/operationArea.vue
Unescape Escape View File

@ -1036,9 +1036,9 @@ export default {
} else { } else {
// this.$message.success(res.data) // this.$message.success(res.data)
if (this.PrintType == 1) { if (this.PrintType == 1) {
window.open(` http://60.209.125.238:25805/BookingOrder/ViewPrintPdf/${res.data}`, '_blank') window.open(` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/ViewPrintPdf/${res.data}`, '_blank')
} else { } else {
window.open(` http://60.209.125.238:25805/BookingOrder/downloadPrint?filename=${res.data}`, '_blank') window.open(` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/downloadPrint?filename=${res.data}`, '_blank')
} }
} }
}) })

7
src/views/main/BookingLedger/detail/modules/sedOperationArea.vue
Unescape Escape View File

@ -155,9 +155,12 @@ export default {
} else { } else {
// this.$message.success(res.data) // this.$message.success(res.data)
if (this.PrintType == 1) { if (this.PrintType == 1) {
window.open(` http://60.209.125.238:25805/BookingOrder/ViewPrintPdf/${res.data}`, '_blank') window.open(` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/ViewPrintPdf/${res.data}`, '_blank')
} else { } else {
window.open(` http://60.209.125.238:25805/BookingOrder/downloadPrint?filename=${res.data}`, '_blank') window.open(
` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/downloadPrint?filename=${res.data}`,
'_blank'
)
} }
} }
}) })

42
src/views/main/BookingLedger/list/index.vue
Unescape Escape View File

@ -300,9 +300,13 @@
> >
<p>{{ item.fieldName }}:</p> <p>{{ item.fieldName }}:</p>
<p>{{ item.reqVal }}</p> <p>{{ item.reqVal }}</p>
<p>{{ item.msg }}</p> <p v-if="item.msg">
<a-icon type="close" :style="{ color: 'red' }" />
</p>
<p v-else><a-icon type="check" :style="{ color: 'green' }" /></p>
<p>{{ item.fieldName }}:</p> <p>{{ item.fieldName }}:</p>
<p v-html="item.mergeHtml"></p> <p v-if="!isDiff" v-html="item.mergeHtml"></p>
<p v-else>{{ item.targetVal }}</p>
</div> </div>
</div> </div>
<div class="TaskShippingOrderCompareMain"> <div class="TaskShippingOrderCompareMain">
@ -325,9 +329,13 @@
> >
<p>{{ item.fieldName }}:</p> <p>{{ item.fieldName }}:</p>
<p>{{ item.reqVal }}</p> <p>{{ item.reqVal }}</p>
<p>{{ item.msg }}</p> <p v-if="item.msg">
<a-icon type="close" :style="{ color: 'red' }" />
</p>
<p v-else><a-icon type="check" :style="{ color: 'green' }" /></p>
<p>{{ item.fieldName }}:</p> <p>{{ item.fieldName }}:</p>
<p v-html="item.mergeHtml"></p> <p v-if="!isDiff" v-html="item.mergeHtml"></p>
<p v-else>{{ item.targetVal }}</p>
</div> </div>
</div> </div>
</div> </div>
@ -2667,7 +2675,8 @@ export default {
} }
.TaskShippingOrderCompareP { .TaskShippingOrderCompareP {
border-bottom: 1px solid #000; border-bottom: 1px solid #000;
padding-bottom: 5px; padding: 5px;
background: #0000000e;
.TaskShippingOrderCompareSpan { .TaskShippingOrderCompareSpan {
font-weight: bolder; font-weight: bolder;
color: red; color: red;
@ -2703,13 +2712,22 @@ export default {
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
> p { > p {
flex: 1; flex: 1;
&:nth-child(3) { // &:nth-child(3) {
flex: 2; // flex: 2;
background: #facd91; // margin: 0 1rem;
border: 1px solid red; // padding-left: 0.5rem;
margin: 0 1rem; // &.TaskShippingOrderCompareMainThird {
padding-left: 0.5rem; // background: #facd91;
} // border: 1px solid red;
// }
// }
// &.TaskShippingOrderCompareMainThird {
// flex: 2;
// background: #facd91;
// border: 1px solid red;
// margin: 0 1rem;
// padding-left: 0.5rem;
// }
} }
&.BoxNo { &.BoxNo {
padding-top: 0.5rem; padding-top: 0.5rem;

2731
src/views/main/BookingLedger/list/index_zth.vue
View File

File diff suppressed because it is too large Load Diff

2
src/views/main/Printing/index.vue
Unescape Escape View File

@ -474,7 +474,7 @@ export default {
return Text return Text
}, },
FnDFile(Data) { FnDFile(Data) {
window.open(` http://60.209.125.238:25805/BookingPrintTemplate/download?id=${Data.id}`, '_blank') window.open(` ${process.env.VUE_APP_API_BASE_URL}/BookingPrintTemplate/download?id=${Data.id}`, '_blank')
}, },
columnChange(data) { columnChange(data) {
this.ColumnsQuery = [...data] this.ColumnsQuery = [...data]

Write Preview
Loading…
Cancel
Save