diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index 90641f6..fe7d39d 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -1412,5 +1412,22 @@ export default { background: #fff; transition: 0.5s all; } +/deep/ form .has-success .ant-input{ + padding-right: 0 !important; + background: #f99 !important; +} +/deep/ form .has-error .ant-input{ + padding-right: 0 !important; + background: #f99 !important; +} +/deep/ form .has-success .ant-calendar-picker-input{ + padding-right: 0 !important; + background: #f99 !important; +} + +/deep/ form .has-feedback .ant-input{ + padding-right: 10px !important; + background: #f99 !important; +} diff --git a/src/views/main/BookingLedger/detail/modules/basicInfo.vue b/src/views/main/BookingLedger/detail/modules/basicInfo.vue index a0287b5..ecc5744 100644 --- a/src/views/main/BookingLedger/detail/modules/basicInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/basicInfo.vue @@ -278,7 +278,7 @@ - W{{ etdWeek || '--' }} + W{{ etdWeek || '--' }} @@ -606,12 +606,12 @@ export default { labelCol: { xs: { span: 24 }, sm: { span: 8 }, - md: { span: 10 } + md: { span: 9 } }, wrapperCol: { xs: { span: 24 }, sm: { span: 15 }, - md: { span: 13 } + md: { span: 15 } }, labelCol2: { xs: { span: 24 }, @@ -1469,17 +1469,17 @@ export default { .week { display: inline-block; - padding: 0 6px; + padding: 0 0px; background: #f6c806; color: #fff; height: 28px; line-height: 28px; border: 4px; - margin-top: 2px; - font-size: 12px; + font-size: 10px; margin-left: 8px; border-radius: 2px; - width: 40px; + width: 32px; + text-align: center; } } @@ -1551,6 +1551,82 @@ export default { color: #999; } } +/deep/ .ant-form-item-children-icon{ + display: none !important; +} +/deep/ .ant-input-suffix{ + right:0 !important; +} + +.has-error{ + .ant-input{ + margin-right: 0 !important; + } + .ant-input-suffix{ + padding-right: 0 !important; + } + .ant-select-selection__rendered{ + margin-right: 0 !important; + } + .ant-select-arrow{ + right: 8px !important; + } +} + +.has-success{ + .ant-input{ + margin-right: 0 !important; + } + .ant-input-suffix{ + padding-right: 0 !important; + } + .ant-select-selection__rendered{ + margin-right: 0 !important; + } + .ant-select-arrow{ + right: 8px !important; + } +} + +/deep/ .has-success .ant-select-selection-selected-value{ + padding-right: 0 !important; +} +/deep/ .has-error .ant-select-selection-selected-value{ + padding-right: 0 !important; +} + +/deep/ .has-success .ant-select-arrow{ + right: 8px !important; +} +/deep/ .has-error .ant-select-arrow{ + right: 8px !important; +} + +/deep/ .has-success .ant-input{ + padding-right: 0 !important; +} +/deep/ .has-error .ant-input{ + padding-right: 0 !important; +} + +/deep/ form .has-success .ant-input{ + padding-right: 0 !important; + background: #f99 !important; +} +/deep/ form .has-error .ant-input{ + padding-right: 0 !important; + background: #f99 !important; +} + +/deep/ form .has-success .ant-calendar-picker-input{ + padding-right: 0 !important; + background: #f99 !important; +} + +/deep/ form .has-feedback input{ + padding-right: 10px !important; + background: #f99 !important; +} // .ant-calendar-picker-input{ // padding: 0 4px; diff --git a/src/views/main/BookingLedger/detail/modules/billInfo.vue b/src/views/main/BookingLedger/detail/modules/billInfo.vue index b05ebfa..0e5092f 100644 --- a/src/views/main/BookingLedger/detail/modules/billInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/billInfo.vue @@ -751,4 +751,47 @@ export default { .ant-collapse-item { border-bottom: none; } +.has-error{ + .ant-input{ + margin-right: 0 !important; + } + .ant-input-suffix{ + padding-right: 0 !important; + } + .ant-select-selection__rendered{ + margin-right: 0 !important; + } + .ant-select-arrow{ + right: 0 !important; + } +} + +.has-success{ + .ant-input{ + margin-right: 0 !important; + } + .ant-input-suffix{ + padding-right: 0 !important; + } + .ant-select-selection__rendered{ + margin-right: 0 !important; + } + .ant-select-arrow{ + right: 0 !important; + } +} + +/deep/ .has-success .ant-select-selection-selected-value{ + padding-right: 0 !important; +} +/deep/ .has-error .ant-select-selection-selected-value{ + padding-right: 0 !important; +} + +/deep/ .has-success .ant-select-arrow{ + right: 8px !important; +} +/deep/ .has-error .ant-select-arrow{ + right: 8px !important; +} diff --git a/src/views/main/BookingLedger/detail/modules/cargoInfo.vue b/src/views/main/BookingLedger/detail/modules/cargoInfo.vue index 186bedd..e2dd300 100644 --- a/src/views/main/BookingLedger/detail/modules/cargoInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/cargoInfo.vue @@ -404,4 +404,48 @@ export default { left: 0; } } + + .has-error{ + .ant-input{ + margin-right: 0 !important; + } + .ant-input-suffix{ + padding-right: 0 !important; + } + .ant-select-selection__rendered{ + margin-right: 0 !important; + } + .ant-select-arrow{ + right: 0 !important; + } +} + +.has-success{ + .ant-input{ + margin-right: 0 !important; + } + .ant-input-suffix{ + padding-right: 0 !important; + } + .ant-select-selection__rendered{ + margin-right: 0 !important; + } + .ant-select-arrow{ + right: 0 !important; + } +} + +/deep/ .has-success .ant-select-selection-selected-value{ + padding-right: 0 !important; +} +/deep/ .has-error .ant-select-selection-selected-value{ + padding-right: 0 !important; +} + +/deep/ .has-success .ant-select-arrow{ + right: 8px !important; +} +/deep/ .has-error .ant-select-arrow{ + right: 8px !important; +} diff --git a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue index cb522e1..1d3ad6c 100644 --- a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue @@ -1904,8 +1904,8 @@ export default { @media (max-width: 1700px) { .feeself { - top: 15px !important; - right: -22px !important; + top: 11px !important; + right: -27px !important; } .yarn-label { position: relative; @@ -1917,4 +1917,49 @@ export default { } } } + +.has-error{ + .ant-input{ + margin-right: 0 !important; + } + .ant-input-suffix{ + padding-right: 0 !important; + } + .ant-select-selection__rendered{ + margin-right: 0 !important; + } + .ant-select-arrow{ + right: 0 !important; + } +} + +.has-success{ + .ant-input{ + margin-right: 0 !important; + } + .ant-input-suffix{ + padding-right: 0 !important; + } + .ant-select-selection__rendered{ + margin-right: 0 !important; + } + .ant-select-arrow{ + right: 0 !important; + } +} + +/deep/ .has-success .ant-select-selection-selected-value{ + padding-right: 0 !important; +} +/deep/ .has-error .ant-select-selection-selected-value{ + padding-right: 0 !important; +} + +/deep/ .has-success .ant-select-arrow{ + right: 8px !important; +} +/deep/ .has-error .ant-select-arrow{ + right: 8px !important; +} + diff --git a/src/views/main/BookingLedger/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue index 555ff22..3346323 100644 --- a/src/views/main/BookingLedger/detail/modules/operationArea.vue +++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue @@ -1351,7 +1351,6 @@ export default { removeModel() { if (this.modelType === 'initCabin') { // 放舱 - debugger this.DelLoading = true DeleteLetterYard(this.id) .then(res => { @@ -1387,7 +1386,6 @@ export default { // } // } // } - debugger SaveBookingLetteryard(this.initCabinFrom) .then(res => { if (res.success) { diff --git a/src/views/main/BookingLedger/detail/modules/remarksInfo.vue b/src/views/main/BookingLedger/detail/modules/remarksInfo.vue index 9402aa1..af9a00e 100644 --- a/src/views/main/BookingLedger/detail/modules/remarksInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/remarksInfo.vue @@ -123,4 +123,48 @@ export default { .ant-form-item{ margin-bottom: 0px !important; } + +.has-error{ + .ant-input{ + margin-right: 0 !important; + } + .ant-input-suffix{ + padding-right: 0 !important; + } + .ant-select-selection__rendered{ + margin-right: 0 !important; + } + .ant-select-arrow{ + right: 0 !important; + } +} + +.has-success{ + .ant-input{ + margin-right: 0 !important; + } + .ant-input-suffix{ + padding-right: 0 !important; + } + .ant-select-selection__rendered{ + margin-right: 0 !important; + } + .ant-select-arrow{ + right: 0 !important; + } +} + +/deep/ .has-success .ant-select-selection-selected-value{ + padding-right: 0 !important; +} +/deep/ .has-error .ant-select-selection-selected-value{ + padding-right: 0 !important; +} + +/deep/ .has-success .ant-select-arrow{ + right: 8px !important; +} +/deep/ .has-error .ant-select-arrow{ + right: 8px !important; +} diff --git a/src/views/main/BookingLedger/detail/modules/rightContent.vue b/src/views/main/BookingLedger/detail/modules/rightContent.vue index 23b84f9..939586d 100644 --- a/src/views/main/BookingLedger/detail/modules/rightContent.vue +++ b/src/views/main/BookingLedger/detail/modules/rightContent.vue @@ -719,7 +719,6 @@ export default { .log { // min-height: 30px; // line-height: 30px; - min-height: 15px; line-height: 15px; font-size: 14px; color: #666; @@ -735,7 +734,8 @@ export default { top: 0; left: 0; // top: 22px; - left: 76px; + // left: 76px; + left: 122px; } i:hover { cursor: inherit !important; @@ -746,13 +746,20 @@ export default { // } // } .log-time { - width: 65px; + // width: 65px; + // text-align: center; + // height: 50px; + // line-height: 15px; + // font-size: 12px; + // color: #999; + // // padding-top: 4px; + // margin-right: 30px; + width: 110px; text-align: center; - height: 50px; + height: 40px; line-height: 15px; font-size: 12px; color: #999; - // padding-top: 4px; margin-right: 30px; } .icon { @@ -763,7 +770,8 @@ export default { cursor: pointer; position: absolute; top: 0; - left: 69.5px; + // left: 69.5px; + left: 115px; } .log-name { flex: 1; @@ -776,6 +784,8 @@ export default { color: #666; display: flex; position: relative; + margin-top: -10px; + &::before { content: ''; position: absolute; @@ -787,7 +797,8 @@ export default { // left: 0; // top: 22px; // left: 77px; - left: 76px; + // left: 76px; + left: 122px; border-right: 1px dashed #ccc; } // &:nth-last-child(1){ @@ -796,13 +807,14 @@ export default { // } // } .log-time { - width: 70px; + // width: 70px; + width: 110px; text-align: left; - height: 50px; + height: 35px; line-height: 15px; font-size: 12px; color: #999; - padding-top: 4px; + // padding-top: 4px; margin-right: 30px; } .icon { @@ -812,7 +824,8 @@ export default { text-align: left; position: absolute; top: 0; - left: 68.5px; + // left: 68.5px; + left: 115px; } .log-name { flex: 1; diff --git a/src/views/main/ContractnoList/index.vue b/src/views/main/ContractnoList/index.vue index 467f561..c8aaf96 100644 --- a/src/views/main/ContractnoList/index.vue +++ b/src/views/main/ContractnoList/index.vue @@ -231,7 +231,6 @@ export default { return Number(item.id) }) console.log(pkIdArr) - debugger DeleteParaContractNoInfo(pkIdArr).then(res => { if (res.success) { this.$message.success('删除成功') @@ -250,7 +249,6 @@ export default { form.validateFields((errors, values) => { if (!errors) { console.log('values', values) - debugger SaveParaContractNoInfo({ id: this.addFromId, contractNo: values.contractNo, diff --git a/src/views/main/ProductCategoryList/index.vue b/src/views/main/ProductCategoryList/index.vue index eb0d15d..554aa65 100644 --- a/src/views/main/ProductCategoryList/index.vue +++ b/src/views/main/ProductCategoryList/index.vue @@ -196,7 +196,6 @@ export default { }) }, removeColumns(data) { - debugger DeleteParaGoodsCategoryInfo(data.id).then((res) => { if (res.success) { this.$message.success('删除成功') @@ -231,7 +230,6 @@ export default { return Number(item.id) }) console.log(pkIdArr) - debugger DeleteParaGoodsCategoryInfo({ Ids: pkIdArr }).then((res) => { diff --git a/src/views/main/ProductNameList/index.vue b/src/views/main/ProductNameList/index.vue index 13a5477..a41b2e5 100644 --- a/src/views/main/ProductNameList/index.vue +++ b/src/views/main/ProductNameList/index.vue @@ -214,7 +214,6 @@ export default { }) }, removeColumns(data) { - debugger DeleteParaGoodsInfo([data.id]).then((res) => { if (res.success) { this.$message.success('删除成功') @@ -249,7 +248,6 @@ export default { return Number(item.id) }) console.log(pkIdArr) - debugger DeleteParaGoodsInfo({ Ids: pkIdArr }).then((res) => {