朱园亮 / erp-mobile · Commits

Commit 7ac45fac0292e35533333c4bf66f115fdf380562

Authored by gesilong
1 parent dc89491d

commit: 优化，修复

Inline Side-by-side
Showing 20 changed files with 275 additions and 39 deletions
... ... @@ -233,10 +233,10 @@ export default {
233 233 executionStandardName: '',
234 234 executionStandardRemarks: '',
235 235 includesPackagingFee: false,
236   - includesPackagingFeeName: '',
  236 + includesPackagingFeeName: '否',
237 237 includesTransportFee: false,
238   - includesTransportFeeName: '',
239   - unit: '美元、公斤、元美/公斤',
  238 + includesTransportFeeName: '否',
  239 + unit: '美元、公斤、美元/公斤',
240 240 totalAmountCapital: '',
241 241 destinationId: [],
242 242 destinationLabel: '',
... ...
... ... @@ -61,7 +61,7 @@
61 61 <text>订单总额</text><text class="amount" :style="{ color: '#b67a76' }">{{ item.totalAmountIncludingTax ? '¥' : '' }}{{ formatAmount(item.totalAmountIncludingTax) || '-' }}</text>
62 62 </view>
63 63 <view class="info-row" v-if="item.status === 'STANDARD'">
64   - <text>正式合同规范性审核状态</text><span class="info-status" :style="item.standardApprovedName ? getStatusCss(item.standardApprovedName) : ''">{{ item.standardApprovedName || '-' }}</span>
  64 + <text>标准合同规范性审核状态</text><span class="info-status" :style="item.standardApprovedName ? getStatusCss(item.standardApprovedName) : ''">{{ item.standardApprovedName || '-' }}</span>
65 65 </view>
66 66 <view class="info-row">
67 67 <text>订货日期</text><text>{{ item.orderDate }}</text>
... ...
... ... @@ -220,9 +220,9 @@ export default {
220 220 executionStandardName: '',
221 221 executionStandardRemarks: '',
222 222 includesPackagingFee: false,
223   - includesPackagingFeeName: '',
  223 + includesPackagingFeeName: '否',
224 224 includesTransportFee: false,
225   - includesTransportFeeName: '',
  225 + includesTransportFeeName: '否',
226 226 unit: '美元、公斤、美元/公斤',
227 227 totalAmountCapital: '',
228 228 depositInfo: '',
... ...
... ... @@ -233,9 +233,9 @@ export default {
233 233 executionStandardName: '',
234 234 executionStandardRemarks: '',
235 235 includesPackagingFee: false,
236   - includesPackagingFeeName: '',
  236 + includesPackagingFeeName: '否',
237 237 includesTransportFee: false,
238   - includesTransportFeeName: '',
  238 + includesTransportFeeName: '否',
239 239 unit: '美元、公斤、美元/公斤',
240 240 totalAmountCapital: '',
241 241 destinationId: [],
... ...
... ... @@ -40,9 +40,30 @@
40 40 <uni-easyinput v-model="item.quality" placeholder="请输入品质" :clearable="false" disabled />
41 41 </template>
42 42 </uni-list-item>
43   - <uni-list-item title="规格">
  43 + <uni-list-item title="规格(mm)">
44 44 <template v-slot:footer>
45   - <uni-easyinput v-model="item.specDisplay" placeholder="自动拼接规格" :clearable="false" disabled />
  45 + <!-- <uni-easyinput v-model="item.specDisplay" placeholder="自动拼接规格" :clearable="false" disabled /> -->
  46 + <view class="value value-spec">
  47 + <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
  48 + <view v-if="item.thickness" class="value-spec_box">
  49 + <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
  50 + </view>
  51 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }}
  52 + </view>
  53 + </view>
  54 + <view v-if="item.width" class="value-spec_val p12">*</view>
  55 + <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
  56 + <view v-if="item.width" class="value-spec_box">
  57 + <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
  58 + <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view>
  59 + </view>
  60 + <view v-if="item.length" class="value-spec_val p12">*</view>
  61 + <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
  62 + <view v-if="item.length" class="value-spec_box">
  63 + <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
  64 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view>
  65 + </view>
  66 + </view>
46 67 </template>
47 68 </uni-list-item>
48 69 <uni-list-item title="状态">
... ... @@ -699,4 +720,42 @@ export default {
699 720 background: $theme-primary;
700 721 color: #fff;
701 722 }
  723 + .value-spec {
  724 + height: 48rpx;
  725 + display: flex;
  726 + align-items: center;
  727 + color: #000000;
  728 + // justify-content: end;
  729 + &_box {
  730 + position: relative;
  731 + width: 60rpx;
  732 + height: 48rpx;
  733 +
  734 + &_1 {
  735 + font-size: 16rpx;
  736 + position: absolute;
  737 + top: -10rpx;
  738 + left: 0;
  739 + }
  740 +
  741 + &_2 {
  742 + font-size: 16rpx;
  743 + position: absolute;
  744 + bottom: -10rpx;
  745 + left: 0;
  746 + }
  747 + }
  748 +
  749 + &_val {
  750 + font-size: 28rpx;
  751 +
  752 + &.p12 {
  753 + padding-right: 12rpx;
  754 + }
  755 + }
  756 + }
  757 + .row-spec {
  758 + height: 60rpx;
  759 + align-items: center;
  760 + }
702 761 </style>
\ No newline at end of file
... ...
... ... @@ -222,9 +222,9 @@ export default {
222 222 executionStandardName: '',
223 223 executionStandardRemarks: '',
224 224 includesPackagingFee: false,
225   - includesPackagingFeeName: '',
  225 + includesPackagingFeeName: '否',
226 226 includesTransportFee: false,
227   - includesTransportFeeName: '',
  227 + includesTransportFeeName: '否',
228 228 unit: '美元、公斤、美元/公斤',
229 229 totalAmountCapital: '',
230 230 depositInfo: '',
... ...
... ... @@ -233,9 +233,9 @@ export default {
233 233 executionStandardName: '',
234 234 executionStandardRemarks: '',
235 235 includesPackagingFee: false,
236   - includesPackagingFeeName: '',
  236 + includesPackagingFeeName: '否',
237 237 includesTransportFee: false,
238   - includesTransportFeeName: '',
  238 + includesTransportFeeName: '否',
239 239 unit: '美元、公斤、美元/公斤',
240 240 totalAmountCapital: '',
241 241 destinationId: [],
... ...
... ... @@ -39,9 +39,30 @@
39 39 <uni-easyinput v-model="item.quality" placeholder="请输入品质" :clearable="false" disabled />
40 40 </template>
41 41 </uni-list-item>
42   - <uni-list-item title="规格">
  42 + <uni-list-item title="规格(mm)">
43 43 <template v-slot:footer>
44   - <uni-easyinput v-model="item.specDisplay" placeholder="自动拼接规格" :clearable="false" disabled />
  44 + <!-- <uni-easyinput v-model="item.specDisplay" placeholder="自动拼接规格" :clearable="false" disabled /> -->
  45 + <view class="value value-spec">
  46 + <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
  47 + <view v-if="item.thickness" class="value-spec_box">
  48 + <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
  49 + </view>
  50 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }}
  51 + </view>
  52 + </view>
  53 + <view v-if="item.width" class="value-spec_val p12">*</view>
  54 + <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
  55 + <view v-if="item.width" class="value-spec_box">
  56 + <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
  57 + <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view>
  58 + </view>
  59 + <view v-if="item.length" class="value-spec_val p12">*</view>
  60 + <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
  61 + <view v-if="item.length" class="value-spec_box">
  62 + <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
  63 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view>
  64 + </view>
  65 + </view>
45 66 </template>
46 67 </uni-list-item>
47 68 <uni-list-item title="状态">
... ... @@ -699,4 +720,42 @@ export default {
699 720 background: $theme-primary;
700 721 color: #fff;
701 722 }
  723 +.value-spec {
  724 + height: 48rpx;
  725 + display: flex;
  726 + align-items: center;
  727 + color: #000000;
  728 + // justify-content: end;
  729 + &_box {
  730 + position: relative;
  731 + width: 60rpx;
  732 + height: 48rpx;
  733 +
  734 + &_1 {
  735 + font-size: 16rpx;
  736 + position: absolute;
  737 + top: -10rpx;
  738 + left: 0;
  739 + }
  740 +
  741 + &_2 {
  742 + font-size: 16rpx;
  743 + position: absolute;
  744 + bottom: -10rpx;
  745 + left: 0;
  746 + }
  747 + }
  748 +
  749 + &_val {
  750 + font-size: 28rpx;
  751 +
  752 + &.p12 {
  753 + padding-right: 12rpx;
  754 + }
  755 + }
  756 + }
  757 + .row-spec {
  758 + height: 60rpx;
  759 + align-items: center;
  760 + }
702 761 </style>
\ No newline at end of file
... ...
... ... @@ -222,9 +222,9 @@ export default {
222 222 executionStandardName: '',
223 223 executionStandardRemarks: '',
224 224 includesPackagingFee: false,
225   - includesPackagingFeeName: '',
  225 + includesPackagingFeeName: '否',
226 226 includesTransportFee: false,
227   - includesTransportFeeName: '',
  227 + includesTransportFeeName: '否',
228 228 unit: '美元、公斤、美元/公斤',
229 229 totalAmountCapital: '',
230 230 depositInfo: '',
... ...
... ... @@ -233,9 +233,9 @@ export default {
233 233 executionStandardName: '',
234 234 executionStandardRemarks: '',
235 235 includesPackagingFee: false,
236   - includesPackagingFeeName: '',
  236 + includesPackagingFeeName: '否',
237 237 includesTransportFee: false,
238   - includesTransportFeeName: '',
  238 + includesTransportFeeName: '否',
239 239 unit: '元、公斤、元/公斤',
240 240 totalAmountCapital: '',
241 241 destinationId: [],
... ...
... ... @@ -223,9 +223,9 @@ export default {
223 223 executionStandardName: '',
224 224 executionStandardRemarks: '',
225 225 includesPackagingFee: false,
226   - includesPackagingFeeName: '',
  226 + includesPackagingFeeName: '否',
227 227 includesTransportFee: false,
228   - includesTransportFeeName: '',
  228 + includesTransportFeeName: '否',
229 229 unit: '元、公斤、元/公斤',
230 230 totalAmountCapital: '',
231 231 depositInfo: '',
... ...
... ... @@ -233,9 +233,9 @@ export default {
233 233 executionStandardName: '',
234 234 executionStandardRemarks: '',
235 235 includesPackagingFee: false,
236   - includesPackagingFeeName: '',
  236 + includesPackagingFeeName: '否',
237 237 includesTransportFee: false,
238   - includesTransportFeeName: '',
  238 + includesTransportFeeName: '否',
239 239 unit: '元、公斤、元/公斤',
240 240 totalAmountCapital: '',
241 241 destinationId: [],
... ...
... ... @@ -61,7 +61,7 @@
61 61 <text>订单总额</text><text class="amount" :style="{ color: '#b67a76' }">{{ item.totalAmountIncludingTax ? '¥' : '' }}{{ formatAmount(item.totalAmountIncludingTax) || '-' }}</text>
62 62 </view>
63 63 <view class="info-row" v-if="item.status === 'STANDARD'">
64   - <text>正式合同规范性审核状态</text><span class="info-status" :style="item.standardApprovedName ? getStatusCss(item.standardApprovedName) : ''">{{ item.standardApprovedName || '-' }}</span>
  64 + <text>标准合同规范性审核状态</text><span class="info-status" :style="item.standardApprovedName ? getStatusCss(item.standardApprovedName) : ''">{{ item.standardApprovedName || '-' }}</span>
65 65 </view>
66 66 <view class="info-row">
67 67 <text>订货日期</text><text>{{ item.orderDate }}</text>
... ...
... ... @@ -223,9 +223,9 @@ export default {
223 223 executionStandardName: '',
224 224 executionStandardRemarks: '',
225 225 includesPackagingFee: false,
226   - includesPackagingFeeName: '',
  226 + includesPackagingFeeName: '否',
227 227 includesTransportFee: false,
228   - includesTransportFeeName: '',
  228 + includesTransportFeeName: '否',
229 229 unit: '元、公斤、元/公斤',
230 230 totalAmountCapital: '',
231 231 depositInfo: '',
... ...
... ... @@ -233,9 +233,9 @@ export default {
233 233 executionStandardName: '',
234 234 executionStandardRemarks: '',
235 235 includesPackagingFee: false,
236   - includesPackagingFeeName: '',
  236 + includesPackagingFeeName: '否',
237 237 includesTransportFee: false,
238   - includesTransportFeeName: '',
  238 + includesTransportFeeName: '否',
239 239 unit: '元、公斤、元/公斤',
240 240 totalAmountCapital: '',
241 241 destinationId: [],
... ...
... ... @@ -40,9 +40,30 @@
40 40 <uni-easyinput v-model="item.quality" placeholder="请输入品质" :clearable="false" disabled />
41 41 </template>
42 42 </uni-list-item>
43   - <uni-list-item title="规格">
  43 + <uni-list-item title="规格(mm)">
44 44 <template v-slot:footer>
45   - <uni-easyinput v-model="item.specDisplay" placeholder="自动拼接规格" :clearable="false" disabled />
  45 + <!-- <uni-easyinput v-model="item.specDisplay" placeholder="自动拼接规格" :clearable="false" disabled /> -->
  46 + <view class="value value-spec">
  47 + <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
  48 + <view v-if="item.thickness" class="value-spec_box">
  49 + <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
  50 + </view>
  51 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }}
  52 + </view>
  53 + </view>
  54 + <view v-if="item.width" class="value-spec_val p12">*</view>
  55 + <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
  56 + <view v-if="item.width" class="value-spec_box">
  57 + <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
  58 + <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view>
  59 + </view>
  60 + <view v-if="item.length" class="value-spec_val p12">*</view>
  61 + <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
  62 + <view v-if="item.length" class="value-spec_box">
  63 + <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
  64 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view>
  65 + </view>
  66 + </view>
46 67 </template>
47 68 </uni-list-item>
48 69 <uni-list-item title="状态">
... ... @@ -699,4 +720,42 @@ export default {
699 720 background: $theme-primary;
700 721 color: #fff;
701 722 }
  723 +.value-spec {
  724 + height: 48rpx;
  725 + display: flex;
  726 + align-items: center;
  727 + color: #000000;
  728 + // justify-content: end;
  729 + &_box {
  730 + position: relative;
  731 + width: 60rpx;
  732 + height: 48rpx;
  733 +
  734 + &_1 {
  735 + font-size: 16rpx;
  736 + position: absolute;
  737 + top: -10rpx;
  738 + left: 0;
  739 + }
  740 +
  741 + &_2 {
  742 + font-size: 16rpx;
  743 + position: absolute;
  744 + bottom: -10rpx;
  745 + left: 0;
  746 + }
  747 + }
  748 +
  749 + &_val {
  750 + font-size: 28rpx;
  751 +
  752 + &.p12 {
  753 + padding-right: 12rpx;
  754 + }
  755 + }
  756 + }
  757 + .row-spec {
  758 + height: 60rpx;
  759 + align-items: center;
  760 + }
702 761 </style>
\ No newline at end of file
... ...
... ... @@ -223,9 +223,9 @@ export default {
223 223 executionStandardName: '',
224 224 executionStandardRemarks: '',
225 225 includesPackagingFee: false,
226   - includesPackagingFeeName: '',
  226 + includesPackagingFeeName: '否',
227 227 includesTransportFee: false,
228   - includesTransportFeeName: '',
  228 + includesTransportFeeName: '否',
229 229 unit: '元、公斤、元/公斤',
230 230 totalAmountCapital: '',
231 231 depositInfo: '',
... ...
... ... @@ -233,9 +233,9 @@ export default {
233 233 executionStandardName: '',
234 234 executionStandardRemarks: '',
235 235 includesPackagingFee: false,
236   - includesPackagingFeeName: '',
  236 + includesPackagingFeeName: '否',
237 237 includesTransportFee: false,
238   - includesTransportFeeName: '',
  238 + includesTransportFeeName: '否',
239 239 unit: '元、公斤、元/公斤',
240 240 totalAmountCapital: '',
241 241 destinationId: [],
... ...
... ... @@ -39,9 +39,30 @@
39 39 <uni-easyinput v-model="item.quality" placeholder="请输入品质" :clearable="false" disabled />
40 40 </template>
41 41 </uni-list-item>
42   - <uni-list-item title="规格">
  42 + <uni-list-item title="规格(mm)">
43 43 <template v-slot:footer>
44   - <uni-easyinput v-model="item.specDisplay" placeholder="自动拼接规格" :clearable="false" disabled />
  44 + <!-- <uni-easyinput v-model="item.specDisplay" placeholder="自动拼接规格" :clearable="false" disabled /> -->
  45 + <view class="value value-spec">
  46 + <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
  47 + <view v-if="item.thickness" class="value-spec_box">
  48 + <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
  49 + </view>
  50 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }}
  51 + </view>
  52 + </view>
  53 + <view v-if="item.width" class="value-spec_val p12">*</view>
  54 + <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
  55 + <view v-if="item.width" class="value-spec_box">
  56 + <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
  57 + <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view>
  58 + </view>
  59 + <view v-if="item.length" class="value-spec_val p12">*</view>
  60 + <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
  61 + <view v-if="item.length" class="value-spec_box">
  62 + <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
  63 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view>
  64 + </view>
  65 + </view>
45 66 </template>
46 67 </uni-list-item>
47 68 <uni-list-item title="状态">
... ... @@ -699,4 +720,42 @@ export default {
699 720 background: $theme-primary;
700 721 color: #fff;
701 722 }
  723 +.value-spec {
  724 + height: 48rpx;
  725 + display: flex;
  726 + align-items: center;
  727 + color: #000000;
  728 + // justify-content: end;
  729 + &_box {
  730 + position: relative;
  731 + width: 60rpx;
  732 + height: 48rpx;
  733 +
  734 + &_1 {
  735 + font-size: 16rpx;
  736 + position: absolute;
  737 + top: -10rpx;
  738 + left: 0;
  739 + }
  740 +
  741 + &_2 {
  742 + font-size: 16rpx;
  743 + position: absolute;
  744 + bottom: -10rpx;
  745 + left: 0;
  746 + }
  747 + }
  748 +
  749 + &_val {
  750 + font-size: 28rpx;
  751 +
  752 + &.p12 {
  753 + padding-right: 12rpx;
  754 + }
  755 + }
  756 + }
  757 + .row-spec {
  758 + height: 60rpx;
  759 + align-items: center;
  760 + }
702 761 </style>
\ No newline at end of file
... ...
... ... @@ -223,9 +223,9 @@ export default {
223 223 executionStandardName: '',
224 224 executionStandardRemarks: '',
225 225 includesPackagingFee: false,
226   - includesPackagingFeeName: '',
  226 + includesPackagingFeeName: '否',
227 227 includesTransportFee: false,
228   - includesTransportFeeName: '',
  228 + includesTransportFeeName: '否',
229 229 unit: '元、公斤、元/公斤',
230 230 totalAmountCapital: '',
231 231 depositInfo: '',
... ...