朱园亮 / erp-mobile · Commits

Commit ed46d051fb7af8a1ddcfa5fd0e979009fce427b9

Authored by gesilong
1 parent 3429c884

commit： bug修复

Inline Side-by-side
Showing 22 changed files with 402 additions and 318 deletions
... ... @@ -52,7 +52,7 @@
52 52 }}</text></view>
53 53 </view>
54 54
55   - <view class="section" v-if="status === 'STANDARD'">
  55 + <view class="section" v-if="detail.status === 'FORMAL'">
56 56 <view class="row"><text class="label">正式规范性合同</text><text class="value" style="color: #3D48A3;">{{
57 57 detail.standardFileName || '-' }}</text></view>
58 58 <view class="row"><text class="label">正式合同是否规范</text><text class="value">{{ detail.standardStandardized ?
... ...
... ... @@ -153,28 +153,32 @@
153 153 <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view>
154 154 <!-- 厚（公差） * 宽（公差） * 长（公差） -->
155 155 <view class="row row-spec"><text class="label">规格(mm)</text>
156   - <view class="value value-spec">
157   - <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
158   - <view v-if="item.thickness" class="value-spec_box">
159   - <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
160   - </view>
161   - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }}
162   - </view>
  156 + <view class="value value-spec">
  157 + <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
  158 + <view v-if="item.thickness" class="value-spec_box">
  159 + <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{ item.thicknessTolPos > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos }}
163 160 </view>
164   - <view v-if="item.width" class="value-spec_val p12">*</view>
165   - <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
166   - <view v-if="item.width" class="value-spec_box">
167   - <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
168   - <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view>
  161 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg }}
169 162 </view>
170   - <view v-if="item.length" class="value-spec_val p12">*</view>
171   - <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
172   - <view v-if="item.length" class="value-spec_box">
173   - <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
174   - <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view>
  163 + </view>
  164 + <view v-if="item.width" class="value-spec_val p12">*</view>
  165 + <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
  166 + <view v-if="item.width" class="value-spec_box">
  167 + <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ? '+' + item.widthTolPos : item.widthTolPos }}
  168 + </view>
  169 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ? '+' + item.widthTolNeg : item.widthTolNeg }}
  170 + </view>
  171 + </view>
  172 + <view v-if="item.length" class="value-spec_val p12">*</view>
  173 + <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
  174 + <view v-if="item.length" class="value-spec_box">
  175 + <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0 ? '+' + item.lengthTolPos : item.lengthTolPos }}
  176 + </view>
  177 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0 ? '+' + item.lengthTolNeg : item.lengthTolNeg }}
175 178 </view>
176 179 </view>
177 180 </view>
  181 + </view>
178 182 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
179 183 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
180 184 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
... ...
... ... @@ -52,7 +52,7 @@
52 52 }}</text></view>
53 53 </view>
54 54
55   - <view class="section" v-if="status === 'STANDARD'">
  55 + <view class="section" v-if="detail.status === 'STANDARD'">
56 56 <view class="row"><text class="label">标准规范性合同</text><text class="value" style="color: #3D48A3;">{{
57 57 detail.standardFileName || '-' }}</text></view>
58 58 <view class="row"><text class="label">标准合同是否规范</text><text class="value">{{ detail.standardStandardized ?
... ...
... ... @@ -296,7 +296,7 @@ export default {
296 296 })
297 297 return
298 298 }
299   - if (!this.standardStandardized && this.uploadType === 'standard') {
  299 + if (!this.standardStandardized && this.standardStandardized !== false && this.uploadType === 'standard') {
300 300 uni.showToast({
301 301 title: '请选择合同是否规范',
302 302 icon: 'error'
... ...
... ... @@ -157,29 +157,33 @@
157 157 <view class="row"><text class="label">牌号</text><text class="value">{{ item.brand }}</text></view>
158 158 <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view>
159 159 <!-- 厚（公差） * 宽（公差） * 长（公差） -->
160   - <view class="row row-spec"><text class="label">规格(mm)</text>
161   - <view class="value value-spec">
162   - <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
163   - <view v-if="item.thickness" class="value-spec_box">
164   - <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
165   - </view>
166   - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}
167   - </view>
  160 + <view class="row row-spec"><text class="label">规格(mm)</text>
  161 + <view class="value value-spec">
  162 + <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
  163 + <view v-if="item.thickness" class="value-spec_box">
  164 + <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{ item.thicknessTolPos > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos }}
168 165 </view>
169   - <view v-if="item.width" class="value-spec_val p12">*</view>
170   - <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
171   - <view v-if="item.width" class="value-spec_box">
172   - <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
173   - <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
  166 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg }}
174 167 </view>
175   - <view v-if="item.length" class="value-spec_val p12">*</view>
176   - <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
177   - <view v-if="item.length" class="value-spec_box">
178   - <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
179   - <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>
  168 + </view>
  169 + <view v-if="item.width" class="value-spec_val p12">*</view>
  170 + <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
  171 + <view v-if="item.width" class="value-spec_box">
  172 + <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ? '+' + item.widthTolPos : item.widthTolPos }}
  173 + </view>
  174 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ? '+' + item.widthTolNeg : item.widthTolNeg }}
  175 + </view>
  176 + </view>
  177 + <view v-if="item.length" class="value-spec_val p12">*</view>
  178 + <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
  179 + <view v-if="item.length" class="value-spec_box">
  180 + <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0 ? '+' + item.lengthTolPos : item.lengthTolPos }}
  181 + </view>
  182 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0 ? '+' + item.lengthTolNeg : item.lengthTolNeg }}
180 183 </view>
181 184 </view>
182 185 </view>
  186 + </view>
183 187 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
184 188 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
185 189 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
... ...
... ... @@ -366,7 +366,7 @@ export default {
366 366 })
367 367 return
368 368 }
369   - if (!this.standardStandardized && this.uploadType !== 'seal') {
  369 + if (!this.standardStandardized && this.standardStandardized !== false && this.uploadType !== 'seal') {
370 370 uni.showToast({
371 371 title: '请选择合同是否规范',
372 372 icon: 'error'
... ...
... ... @@ -4,14 +4,9 @@
4 4 <view class="lock-page">
5 5 <view class="block" v-for="(item, idx) in items" :key="idx">
6 6 <view class="block-header">
7   - <uni-data-checkbox
8   - multiple
9   - mode="default"
10   - :localdata="[{ text: '锁价', value: 'LOCKED' }]"
11   - :modelValue="item.locked ? ['LOCKED'] : []"
12   - :disabled="true"
13   - @change="onLockChange(idx, $event)"
14   - />
  7 + <uni-data-checkbox multiple mode="default" :localdata="[{ text: '锁价', value: 'LOCKED' }]"
  8 + :modelValue="item.locked ? ['LOCKED'] : []" :disabled="true"
  9 + @change="onLockChange(idx, $event)" />
15 10 <view class="ops" @click="toggleItem(idx)">
16 11 <image class="opIcon"
17 12 :src="item.collapsed ? '/static/images/up.png' : '/static/images/down.png'" />
... ... @@ -22,12 +17,14 @@
22 17 <uni-list v-show="item.collapsed">
23 18 <uni-list-item title="产品名称">
24 19 <template v-slot:footer>
25   - <uni-easyinput v-model="item.productName" placeholder="请输入产品名称" :clearable="false" disabled />
  20 + <uni-easyinput v-model="item.productName" placeholder="请输入产品名称" :clearable="false"
  21 + disabled />
26 22 </template>
27 23 </uni-list-item>
28 24 <uni-list-item title="行业">
29 25 <template v-slot:footer>
30   - <uni-easyinput v-model="item.industry" placeholder="请输入行业" :clearable="false" disabled />
  26 + <uni-easyinput v-model="item.industry" placeholder="请输入行业" :clearable="false"
  27 + disabled />
31 28 </template>
32 29 </uni-list-item>
33 30 <uni-list-item title="牌号">
... ... @@ -42,28 +39,39 @@
42 39 </uni-list-item>
43 40 <uni-list-item title="规格(mm)">
44 41 <template v-slot:footer>
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 }}
  42 + <view class="value value-spec">
  43 + <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
  44 + <view v-if="item.thickness" class="value-spec_box">
  45 + <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{
  46 + item.thicknessTolPos > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos
  47 + }}
  48 + </view>
  49 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{
  50 + item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg
  51 + }}
  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 > 0 ?
  58 + '+' + item.widthTolPos : item.widthTolPos }}
  59 + </view>
  60 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ?
  61 + '+' + item.widthTolNeg : item.widthTolNeg }}
  62 + </view>
  63 + </view>
  64 + <view v-if="item.length" class="value-spec_val p12">*</view>
  65 + <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
  66 + <view v-if="item.length" class="value-spec_box">
  67 + <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0
  68 + ? '+' + item.lengthTolPos : item.lengthTolPos }}
  69 + </view>
  70 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0
  71 + ? '+' + item.lengthTolNeg : item.lengthTolNeg }}
  72 + </view>
  73 + </view>
50 74 </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>
67 75 </template>
68 76 </uni-list-item>
69 77 <uni-list-item title="状态">
... ... @@ -73,27 +81,32 @@
73 81 </uni-list-item>
74 82 <uni-list-item title="数量">
75 83 <template v-slot:footer>
76   - <uni-easyinput v-model="item.quantity" type="number" :inputBorder="false" disabled placeholder="不可编辑" />
  84 + <uni-easyinput v-model="item.quantity" type="number" :inputBorder="false" disabled
  85 + placeholder="不可编辑" />
77 86 </template>
78 87 </uni-list-item>
79 88 <uni-list-item title="单价">
80 89 <template v-slot:footer>
81   - <uni-easyinput v-model="item.unitPrice" type="number" :inputBorder="false" placeholder="请输入单价" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'unitPrice', 0)" />
  90 + <uni-easyinput v-model="item.unitPrice" type="number" :inputBorder="false"
  91 + placeholder="请输入单价" @input="onImmediateChange(idx)"
  92 + @blur="onNumberBlur(idx, 'unitPrice', 0)" />
82 93 </template>
83 94 </uni-list-item>
84 95 <uni-list-item title="不含税金额">
85 96 <template v-slot:footer>
86   - <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="" />
  97 + <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false"
  98 + disabled placeholder="" />
87 99 </template>
88 100 </uni-list-item>
89 101 <uni-list-item title="总金额">
90 102 <template v-slot:footer>
91   - <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="" />
  103 + <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled
  104 + placeholder="" />
92 105 </template>
93 106 </uni-list-item>
94 107 <uni-list-item title="发货日期">
95 108 <template v-slot:footer>
96   - <uni-easyinput v-model="item.deliveryDate" :inputBorder="false" disabled />
  109 + <uni-easyinput v-model="item.deliveryDate" :inputBorder="false" disabled />
97 110 </template>
98 111 </uni-list-item>
99 112 </uni-list>
... ... @@ -101,12 +114,14 @@
101 114 <uni-list v-show="!item.collapsed">
102 115 <uni-list-item title="产品名称">
103 116 <template v-slot:footer>
104   - <uni-easyinput v-model="item.productName" placeholder="请输入产品名称" :clearable="false" disabled />
  117 + <uni-easyinput v-model="item.productName" placeholder="请输入产品名称" :clearable="false"
  118 + disabled />
105 119 </template>
106 120 </uni-list-item>
107 121 <uni-list-item title="行业">
108 122 <template v-slot:footer>
109   - <uni-easyinput v-model="item.industry" placeholder="请输入行业" :clearable="false" disabled />
  123 + <uni-easyinput v-model="item.industry" placeholder="请输入行业" :clearable="false"
  124 + disabled />
110 125 </template>
111 126 </uni-list-item>
112 127 <uni-list-item title="牌号">
... ... @@ -151,7 +166,7 @@
151 166 </view>
152 167 </scroll-view>
153 168
154   -
  169 +
155 170 </view>
156 171 </template>
157 172
... ... @@ -168,7 +183,7 @@ export default {
168 183 planQty: 30,
169 184 }
170 185 },
171   - computed: {
  186 + computed: {
172 187 totalQuantity() {
173 188 const qty = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.quantity), 0)
174 189 return this.round(qty, 2)
... ... @@ -337,7 +352,7 @@ export default {
337 352 }
338 353 const invalid = selected.find(r => {
339 354 const p = this.toNumber(r.unitPrice)
340   - return !( p > 0)
  355 + return !(p > 0)
341 356 })
342 357 if (invalid) {
343 358 uni.showToast({ title: '请填写单价', icon: 'none' })
... ... @@ -350,7 +365,7 @@ export default {
350 365 // totalAmountExcludingTax: this.totalAmountExcludingTax,
351 366 totalAmountIncludingTax: this.totalAmountIncludingTax,
352 367 totalQuantity: this.totalQuantity,
353   - type:'INTL_INVENTORY_AGMT',
  368 + type: 'INTL_INVENTORY_AGMT',
354 369 contractDistributorLineList: selected
355 370 }
356 371
... ... @@ -365,7 +380,7 @@ export default {
365 380 uni.navigateTo({ url: '/pages/contract_foreign_stock/index' })
366 381 }, 500)
367 382 }).catch((err) => {
368   - uni.showToast({ title: err.msg ||'提交失败', icon: 'none' })
  383 + uni.showToast({ title: err.msg || '提交失败', icon: 'none' })
369 384 })
370 385 }
371 386 }
... ... @@ -424,6 +439,7 @@ export default {
424 439 width: 36rpx;
425 440 height: 36rpx;
426 441 }
  442 +
427 443 .block-header ::v-deep .uni-data-checklist .checklist-text {
428 444 font-size: 28rpx;
429 445 margin-left: 12rpx;
... ... @@ -556,6 +572,7 @@ export default {
556 572 ::v-deep .is-disabled {
557 573 background-color: transparent !important;
558 574 }
  575 +
559 576 // ::v-deep .uni-list-item__content-title {
560 577 // font-size: 28rpx;
561 578 // color: rgba(0, 0, 0, 0.9);
... ... @@ -721,42 +738,45 @@ export default {
721 738 background: $theme-primary;
722 739 color: #fff;
723 740 }
724   - .value-spec {
  741 +
  742 +.value-spec {
  743 + height: 48rpx;
  744 + display: flex;
  745 + align-items: center;
  746 + color: #000000;
  747 +
  748 + // justify-content: end;
  749 + &_box {
  750 + position: relative;
  751 + width: 60rpx;
725 752 height: 48rpx;
726   - display: flex;
727   - align-items: center;
728   - color: #000000;
729   - // justify-content: end;
730   - &_box {
731   - position: relative;
732   - width: 60rpx;
733   - height: 48rpx;
734   -
735   - &_1 {
736   - font-size: 16rpx;
737   - position: absolute;
738   - top: -10rpx;
739   - left: 0;
740   - }
741 753
742   - &_2 {
743   - font-size: 16rpx;
744   - position: absolute;
745   - bottom: -10rpx;
746   - left: 0;
747   - }
  754 + &_1 {
  755 + font-size: 16rpx;
  756 + position: absolute;
  757 + top: -10rpx;
  758 + left: 0;
748 759 }
749 760
750   - &_val {
751   - font-size: 28rpx;
752   -
753   - &.p12 {
754   - padding-right: 12rpx;
755   - }
  761 + &_2 {
  762 + font-size: 16rpx;
  763 + position: absolute;
  764 + bottom: -10rpx;
  765 + left: 0;
756 766 }
757 767 }
758   - .row-spec {
759   - height: 60rpx;
760   - align-items: center;
  768 +
  769 + &_val {
  770 + font-size: 28rpx;
  771 +
  772 + &.p12 {
  773 + padding-right: 12rpx;
761 774 }
  775 + }
  776 +}
  777 +
  778 +.row-spec {
  779 + height: 60rpx;
  780 + align-items: center;
  781 +}
762 782 </style>
\ No newline at end of file
... ...
... ... @@ -159,29 +159,33 @@
159 159 <view class="row"><text class="label">牌号</text><text class="value">{{ item.brand }}</text></view>
160 160 <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view>
161 161 <!-- 厚（公差） * 宽（公差） * 长（公差） -->
162   - <view class="row row-spec"><text class="label">规格(mm)</text>
163   - <view class="value value-spec">
164   - <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
165   - <view v-if="item.thickness" class="value-spec_box">
166   - <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
167   - </view>
168   - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}
169   - </view>
  162 + <view class="row row-spec"><text class="label">规格(mm)</text>
  163 + <view class="value value-spec">
  164 + <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
  165 + <view v-if="item.thickness" class="value-spec_box">
  166 + <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{ item.thicknessTolPos > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos }}
170 167 </view>
171   - <view v-if="item.width" class="value-spec_val p12">*</view>
172   - <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
173   - <view v-if="item.width" class="value-spec_box">
174   - <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
175   - <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
  168 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg }}
176 169 </view>
177   - <view v-if="item.length" class="value-spec_val p12">*</view>
178   - <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
179   - <view v-if="item.length" class="value-spec_box">
180   - <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
181   - <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>
  170 + </view>
  171 + <view v-if="item.width" class="value-spec_val p12">*</view>
  172 + <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
  173 + <view v-if="item.width" class="value-spec_box">
  174 + <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ? '+' + item.widthTolPos : item.widthTolPos }}
  175 + </view>
  176 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ? '+' + item.widthTolNeg : item.widthTolNeg }}
  177 + </view>
  178 + </view>
  179 + <view v-if="item.length" class="value-spec_val p12">*</view>
  180 + <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
  181 + <view v-if="item.length" class="value-spec_box">
  182 + <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0 ? '+' + item.lengthTolPos : item.lengthTolPos }}
  183 + </view>
  184 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0 ? '+' + item.lengthTolNeg : item.lengthTolNeg }}
182 185 </view>
183 186 </view>
184 187 </view>
  188 + </view>
185 189 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
186 190 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
187 191 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
... ...
... ... @@ -385,7 +385,7 @@ export default {
385 385 })
386 386 return
387 387 }
388   - if (!this.standardStandardized && this.uploadType !== 'seal') {
  388 + if (!this.standardStandardized && this.standardStandardized !== false && this.uploadType !== 'seal') {
389 389 uni.showToast({
390 390 title: '请选择合同是否规范',
391 391 icon: 'error'
... ...
... ... @@ -4,13 +4,8 @@
4 4 <view class="lock-page">
5 5 <view class="block" v-for="(item, idx) in items" :key="idx">
6 6 <view class="block-header">
7   - <uni-data-checkbox
8   - multiple
9   - mode="default"
10   - :localdata="[{ text: '锁规', value: 'LOCKED' }]"
11   - :modelValue="item.locked ? ['LOCKED'] : []"
12   - @change="onLockChange(idx, $event)"
13   - />
  7 + <uni-data-checkbox multiple mode="default" :localdata="[{ text: '锁规', value: 'LOCKED' }]"
  8 + :modelValue="item.locked ? ['LOCKED'] : []" @change="onLockChange(idx, $event)" />
14 9 <view class="ops" @click="toggleItem(idx)">
15 10 <image class="opIcon"
16 11 :src="item.collapsed ? '/static/images/up.png' : '/static/images/down.png'" />
... ... @@ -21,12 +16,14 @@
21 16 <uni-list v-show="item.collapsed">
22 17 <uni-list-item title="产品名称">
23 18 <template v-slot:footer>
24   - <uni-easyinput v-model="item.productName" placeholder="请输入产品名称" :clearable="false" disabled />
  19 + <uni-easyinput v-model="item.productName" placeholder="请输入产品名称" :clearable="false"
  20 + disabled />
25 21 </template>
26 22 </uni-list-item>
27 23 <uni-list-item title="行业">
28 24 <template v-slot:footer>
29   - <uni-easyinput v-model="item.industry" placeholder="请输入行业" :clearable="false" disabled />
  25 + <uni-easyinput v-model="item.industry" placeholder="请输入行业" :clearable="false"
  26 + disabled />
30 27 </template>
31 28 </uni-list-item>
32 29 <uni-list-item title="牌号">
... ... @@ -41,28 +38,39 @@
41 38 </uni-list-item>
42 39 <uni-list-item title="规格(mm)">
43 40 <template v-slot:footer>
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 }}
  41 + <view class="value value-spec">
  42 + <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
  43 + <view v-if="item.thickness" class="value-spec_box">
  44 + <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{
  45 + item.thicknessTolPos > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos
  46 + }}
  47 + </view>
  48 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{
  49 + item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg
  50 + }}
  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 > 0 ?
  57 + '+' + item.widthTolPos : item.widthTolPos }}
  58 + </view>
  59 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ?
  60 + '+' + item.widthTolNeg : item.widthTolNeg }}
  61 + </view>
  62 + </view>
  63 + <view v-if="item.length" class="value-spec_val p12">*</view>
  64 + <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
  65 + <view v-if="item.length" class="value-spec_box">
  66 + <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0
  67 + ? '+' + item.lengthTolPos : item.lengthTolPos }}
  68 + </view>
  69 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0
  70 + ? '+' + item.lengthTolNeg : item.lengthTolNeg }}
  71 + </view>
  72 + </view>
49 73 </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>
66 74 </template>
67 75 </uni-list-item>
68 76 <uni-list-item title="状态">
... ... @@ -72,12 +80,16 @@
72 80 </uni-list-item>
73 81 <uni-list-item title="数量">
74 82 <template v-slot:footer>
75   - <uni-easyinput v-model="item.quantity" type="number" :inputBorder="false" placeholder="请输入数量" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'quantity', 0)" />
  83 + <uni-easyinput v-model="item.quantity" type="number" :inputBorder="false"
  84 + placeholder="请输入数量" @input="onImmediateChange(idx)"
  85 + @blur="onNumberBlur(idx, 'quantity', 0)" />
76 86 </template>
77 87 </uni-list-item>
78 88 <uni-list-item title="单价">
79 89 <template v-slot:footer>
80   - <uni-easyinput v-model="item.unitPrice" type="number" :inputBorder="false" placeholder="请输入单价" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'unitPrice', 0)" />
  90 + <uni-easyinput v-model="item.unitPrice" type="number" :inputBorder="false"
  91 + placeholder="请输入单价" @input="onImmediateChange(idx)"
  92 + @blur="onNumberBlur(idx, 'unitPrice', 0)" />
81 93 </template>
82 94 </uni-list-item>
83 95 <!-- <uni-list-item title="不含税金额">
... ... @@ -87,12 +99,13 @@
87 99 </uni-list-item> -->
88 100 <uni-list-item title="总金额">
89 101 <template v-slot:footer>
90   - <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="" />
  102 + <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled
  103 + placeholder="" />
91 104 </template>
92 105 </uni-list-item>
93 106 <uni-list-item title="发货日期">
94 107 <template v-slot:footer>
95   - <uni-easyinput v-model="item.deliveryDate" :inputBorder="false" disabled />
  108 + <uni-easyinput v-model="item.deliveryDate" :inputBorder="false" disabled />
96 109 </template>
97 110 </uni-list-item>
98 111 </uni-list>
... ... @@ -100,12 +113,14 @@
100 113 <uni-list v-show="!item.collapsed">
101 114 <uni-list-item title="产品名称">
102 115 <template v-slot:footer>
103   - <uni-easyinput v-model="item.productName" placeholder="请输入产品名称" :clearable="false" disabled />
  116 + <uni-easyinput v-model="item.productName" placeholder="请输入产品名称" :clearable="false"
  117 + disabled />
104 118 </template>
105 119 </uni-list-item>
106 120 <uni-list-item title="行业">
107 121 <template v-slot:footer>
108   - <uni-easyinput v-model="item.industry" placeholder="请输入行业" :clearable="false" disabled />
  122 + <uni-easyinput v-model="item.industry" placeholder="请输入行业" :clearable="false"
  123 + disabled />
109 124 </template>
110 125 </uni-list-item>
111 126 <uni-list-item title="牌号">
... ... @@ -166,7 +181,7 @@ export default {
166 181 planQty: 30,
167 182 }
168 183 },
169   - computed: {
  184 + computed: {
170 185 totalQuantity() {
171 186 const qty = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.quantity), 0)
172 187 return this.round(qty, 2)
... ... @@ -349,7 +364,7 @@ export default {
349 364 // totalAmountExcludingTax: this.totalAmountExcludingTax,
350 365 totalAmountIncludingTax: this.totalAmountIncludingTax,
351 366 totalQuantity: this.totalQuantity,
352   - type:'INTL_OPEN_SPEC_AGMT',
  367 + type: 'INTL_OPEN_SPEC_AGMT',
353 368 contractDistributorLineList: selected
354 369 }
355 370
... ... @@ -364,7 +379,7 @@ export default {
364 379 uni.navigateTo({ url: '/pages/contract_foreign_unplan/index' })
365 380 }, 500)
366 381 }).catch((err) => {
367   - uni.showToast({ title: err.msg ||'提交失败', icon: 'none' })
  382 + uni.showToast({ title: err.msg || '提交失败', icon: 'none' })
368 383 })
369 384 }
370 385 }
... ... @@ -423,6 +438,7 @@ export default {
423 438 width: 36rpx;
424 439 height: 36rpx;
425 440 }
  441 +
426 442 .block-header ::v-deep .uni-data-checklist .checklist-text {
427 443 font-size: 28rpx;
428 444 margin-left: 12rpx;
... ... @@ -555,6 +571,7 @@ export default {
555 571 ::v-deep .is-disabled {
556 572 background-color: transparent !important;
557 573 }
  574 +
558 575 // ::v-deep .uni-list-item__content-title {
559 576 // font-size: 28rpx;
560 577 // color: rgba(0, 0, 0, 0.9);
... ... @@ -720,42 +737,45 @@ export default {
720 737 background: $theme-primary;
721 738 color: #fff;
722 739 }
  740 +
723 741 .value-spec {
  742 + height: 48rpx;
  743 + display: flex;
  744 + align-items: center;
  745 + color: #000000;
  746 +
  747 + // justify-content: end;
  748 + &_box {
  749 + position: relative;
  750 + width: 60rpx;
724 751 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 752
741   - &_2 {
742   - font-size: 16rpx;
743   - position: absolute;
744   - bottom: -10rpx;
745   - left: 0;
746   - }
  753 + &_1 {
  754 + font-size: 16rpx;
  755 + position: absolute;
  756 + top: -10rpx;
  757 + left: 0;
747 758 }
748 759
749   - &_val {
750   - font-size: 28rpx;
751   -
752   - &.p12 {
753   - padding-right: 12rpx;
754   - }
  760 + &_2 {
  761 + font-size: 16rpx;
  762 + position: absolute;
  763 + bottom: -10rpx;
  764 + left: 0;
755 765 }
756 766 }
757   - .row-spec {
758   - height: 60rpx;
759   - align-items: center;
  767 +
  768 + &_val {
  769 + font-size: 28rpx;
  770 +
  771 + &.p12 {
  772 + padding-right: 12rpx;
760 773 }
  774 + }
  775 +}
  776 +
  777 +.row-spec {
  778 + height: 60rpx;
  779 + align-items: center;
  780 +}
761 781 </style>
\ No newline at end of file
... ...
... ... @@ -73,8 +73,8 @@ export default {
73 73 companyName: '',
74 74 materialTypeId: '',
75 75 materialTypeIdName: '',
76   - hasFrameworkAgreement: '',
77   - hasFrameworkAgreementName: '',
  76 + hasFrameworkAgreement: true,
  77 + hasFrameworkAgreementName: '是',
78 78 validityTime: ''
79 79 },
80 80 productVarietyList: [],
... ...
... ... @@ -82,10 +82,20 @@ export default {
82 82
83 83 },
84 84 computed: {
85   -
  85 + extraCombined() {
  86 + return {
  87 + keyword: this.searchKeywordDebounced || undefined
  88 + }
  89 + }
86 90 },
87 91 watch: {
88   -
  92 + extraCombined: {
  93 + deep: true,
  94 + handler(v) {
  95 + this.extraParams = v
  96 + },
  97 + immediate: true
  98 + }
89 99 },
90 100 created() {
91 101 this.getProductVariety();
... ... @@ -128,7 +138,7 @@ export default {
128 138 }
129 139 // 关键字（使用去抖后的值避免频繁触发）
130 140 if (this.searchKeywordDebounced) {
131   - params.customerName = this.searchKeywordDebounced
  141 + params.keyword = this.searchKeywordDebounced
132 142 }
133 143 return queryApi(params)
134 144 .then(res => {
... ...
... ... @@ -285,7 +285,7 @@ export default {
285 285 })
286 286 return
287 287 }
288   - if (!this.standardStandardized) {
  288 + if (!this.standardStandardized && this.standardStandardized !== false) {
289 289 uni.showToast({
290 290 title: '请选择合同是否规范',
291 291 icon: 'error'
... ...
... ... @@ -181,29 +181,33 @@
181 181 <view class="row"><text class="label">行业</text><text class="value">{{ item.industry }}</text></view>
182 182 <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view>
183 183 <!-- 厚（公差） * 宽（公差） * 长（公差） -->
184   - <view class="row row-spec"><text class="label">规格(mm)</text>
185   - <view class="value value-spec">
186   - <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
187   - <view v-if="item.thickness" class="value-spec_box">
188   - <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
189   - </view>
190   - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}
191   - </view>
  184 + <view class="row row-spec"><text class="label">规格(mm)</text>
  185 + <view class="value value-spec">
  186 + <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
  187 + <view v-if="item.thickness" class="value-spec_box">
  188 + <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{ item.thicknessTolPos > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos }}
192 189 </view>
193   - <view v-if="item.width" class="value-spec_val p12">*</view>
194   - <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
195   - <view v-if="item.width" class="value-spec_box">
196   - <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
197   - <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
  190 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg }}
198 191 </view>
199   - <view v-if="item.length" class="value-spec_val p12">*</view>
200   - <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
201   - <view v-if="item.length" class="value-spec_box">
202   - <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
203   - <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>
  192 + </view>
  193 + <view v-if="item.width" class="value-spec_val p12">*</view>
  194 + <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
  195 + <view v-if="item.width" class="value-spec_box">
  196 + <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ? '+' + item.widthTolPos : item.widthTolPos }}
  197 + </view>
  198 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ? '+' + item.widthTolNeg : item.widthTolNeg }}
  199 + </view>
  200 + </view>
  201 + <view v-if="item.length" class="value-spec_val p12">*</view>
  202 + <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
  203 + <view v-if="item.length" class="value-spec_box">
  204 + <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0 ? '+' + item.lengthTolPos : item.lengthTolPos }}
  205 + </view>
  206 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0 ? '+' + item.lengthTolNeg : item.lengthTolNeg }}
204 207 </view>
205 208 </view>
206 209 </view>
  210 + </view>
207 211 <view class="row"><text class="label">定做物数量</text><text class="value">{{ item.productQuantity }}</text></view>
208 212 <view class="row"><text class="label">加工费单价</text><text class="value">{{ formatCurrency(item.unitPrice)
209 213 }}</text>
... ...
... ... @@ -267,7 +267,7 @@ export default {
267 267 })
268 268 return
269 269 }
270   - if (!this.standardStandardized) {
  270 + if (!this.standardStandardized && this.standardStandardized !== false) {
271 271 uni.showToast({
272 272 title: '请选择合同是否规范',
273 273 icon: 'error'
... ...
... ... @@ -152,29 +152,33 @@
152 152 <view class="row"><text class="label">牌号</text><text class="value">{{ item.brand }}</text></view>
153 153 <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view>
154 154 <!-- 厚（公差） * 宽（公差） * 长（公差） -->
155   - <view class="row row-spec"><text class="label">规格(mm)</text>
156   - <view class="value value-spec">
157   - <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
158   - <view v-if="item.thickness" class="value-spec_box">
159   - <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
160   - </view>
161   - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}
162   - </view>
  155 + <view class="row row-spec"><text class="label">规格(mm)</text>
  156 + <view class="value value-spec">
  157 + <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
  158 + <view v-if="item.thickness" class="value-spec_box">
  159 + <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{ item.thicknessTolPos > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos }}
163 160 </view>
164   - <view v-if="item.width" class="value-spec_val p12">*</view>
165   - <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
166   - <view v-if="item.width" class="value-spec_box">
167   - <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
168   - <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
  161 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg }}
169 162 </view>
170   - <view v-if="item.length" class="value-spec_val p12">*</view>
171   - <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
172   - <view v-if="item.length" class="value-spec_box">
173   - <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
174   - <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>
  163 + </view>
  164 + <view v-if="item.width" class="value-spec_val p12">*</view>
  165 + <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
  166 + <view v-if="item.width" class="value-spec_box">
  167 + <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ? '+' + item.widthTolPos : item.widthTolPos }}
  168 + </view>
  169 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ? '+' + item.widthTolNeg : item.widthTolNeg }}
  170 + </view>
  171 + </view>
  172 + <view v-if="item.length" class="value-spec_val p12">*</view>
  173 + <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
  174 + <view v-if="item.length" class="value-spec_box">
  175 + <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0 ? '+' + item.lengthTolPos : item.lengthTolPos }}
  176 + </view>
  177 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0 ? '+' + item.lengthTolNeg : item.lengthTolNeg }}
175 178 </view>
176 179 </view>
177 180 </view>
  181 + </view>
178 182 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
179 183 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
180 184 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
... ...
... ... @@ -344,7 +344,7 @@ export default {
344 344 })
345 345 return
346 346 }
347   - if (!this.standardStandardized) {
  347 + if (!this.standardStandardized && this.standardStandardized !== false) {
348 348 uni.showToast({
349 349 title: '请选择合同是否规范',
350 350 icon: 'error'
... ...
... ... @@ -42,28 +42,31 @@
42 42 </uni-list-item>
43 43 <uni-list-item title="规格(mm)">
44 44 <template v-slot:footer>
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>
  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 > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos }}
53 49 </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>
  50 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg }}
59 51 </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>
  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 > 0 ? '+' + item.widthTolPos : item.widthTolPos }}
  57 + </view>
  58 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ? '+' + item.widthTolNeg : item.widthTolNeg }}
  59 + </view>
  60 + </view>
  61 + <view v-if="item.length" class="value-spec_val p12">*</view>
  62 + <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
  63 + <view v-if="item.length" class="value-spec_box">
  64 + <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0 ? '+' + item.lengthTolPos : item.lengthTolPos }}
  65 + </view>
  66 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0 ? '+' + item.lengthTolNeg : item.lengthTolNeg }}
65 67 </view>
66 68 </view>
  69 + </view>
67 70 </template>
68 71 </uni-list-item>
69 72 <uni-list-item title="状态">
... ...
... ... @@ -152,29 +152,33 @@
152 152 <view class="row"><text class="label">牌号</text><text class="value">{{ item.brand }}</text></view>
153 153 <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view>
154 154 <!-- 厚（公差） * 宽（公差） * 长（公差） -->
155   - <view class="row row-spec"><text class="label">规格(mm)</text>
156   - <view class="value value-spec">
157   - <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
158   - <view v-if="item.thickness" class="value-spec_box">
159   - <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
160   - </view>
161   - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}
162   - </view>
  155 + <view class="row row-spec"><text class="label">规格(mm)</text>
  156 + <view class="value value-spec">
  157 + <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
  158 + <view v-if="item.thickness" class="value-spec_box">
  159 + <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{ item.thicknessTolPos > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos }}
163 160 </view>
164   - <view v-if="item.width" class="value-spec_val p12">*</view>
165   - <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
166   - <view v-if="item.width" class="value-spec_box">
167   - <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
168   - <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
  161 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg }}
169 162 </view>
170   - <view v-if="item.length" class="value-spec_val p12">*</view>
171   - <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
172   - <view v-if="item.length" class="value-spec_box">
173   - <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
174   - <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>
  163 + </view>
  164 + <view v-if="item.width" class="value-spec_val p12">*</view>
  165 + <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
  166 + <view v-if="item.width" class="value-spec_box">
  167 + <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ? '+' + item.widthTolPos : item.widthTolPos }}
  168 + </view>
  169 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ? '+' + item.widthTolNeg : item.widthTolNeg }}
  170 + </view>
  171 + </view>
  172 + <view v-if="item.length" class="value-spec_val p12">*</view>
  173 + <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
  174 + <view v-if="item.length" class="value-spec_box">
  175 + <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0 ? '+' + item.lengthTolPos : item.lengthTolPos }}
  176 + </view>
  177 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0 ? '+' + item.lengthTolNeg : item.lengthTolNeg }}
175 178 </view>
176 179 </view>
177 180 </view>
  181 + </view>
178 182 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
179 183 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
180 184 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
... ...
... ... @@ -365,7 +365,7 @@ export default {
365 365 })
366 366 return
367 367 }
368   - if (!this.standardStandardized) {
  368 + if (!this.standardStandardized && this.standardStandardized !== false) {
369 369 uni.showToast({
370 370 title: '请选择合同是否规范',
371 371 icon: 'error'
... ...
... ... @@ -41,28 +41,31 @@
41 41 </uni-list-item>
42 42 <uni-list-item title="规格(mm)">
43 43 <template v-slot:footer>
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>
  44 + <view class="value value-spec">
  45 + <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
  46 + <view v-if="item.thickness" class="value-spec_box">
  47 + <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{ item.thicknessTolPos > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos }}
52 48 </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>
  49 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg }}
58 50 </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>
  51 + </view>
  52 + <view v-if="item.width" class="value-spec_val p12">*</view>
  53 + <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
  54 + <view v-if="item.width" class="value-spec_box">
  55 + <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ? '+' + item.widthTolPos : item.widthTolPos }}
  56 + </view>
  57 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ? '+' + item.widthTolNeg : item.widthTolNeg }}
  58 + </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 > 0 ? '+' + item.lengthTolPos : item.lengthTolPos }}
  64 + </view>
  65 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0 ? '+' + item.lengthTolNeg : item.lengthTolNeg }}
64 66 </view>
65 67 </view>
  68 + </view>
66 69 </template>
67 70 </uni-list-item>
68 71 <uni-list-item title="状态">
... ...
... ... @@ -152,29 +152,33 @@
152 152 <view class="row"><text class="label">牌号</text><text class="value">{{ item.brand }}</text></view>
153 153 <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view>
154 154 <!-- 厚（公差） * 宽（公差） * 长（公差） -->
155   - <view class="row row-spec"><text class="label">规格(mm)</text>
156   - <view class="value value-spec">
157   - <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
158   - <view v-if="item.thickness" class="value-spec_box">
159   - <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
160   - </view>
161   - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}
162   - </view>
  155 + <view class="row row-spec"><text class="label">规格(mm)</text>
  156 + <view class="value value-spec">
  157 + <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
  158 + <view v-if="item.thickness" class="value-spec_box">
  159 + <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{ item.thicknessTolPos > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos }}
163 160 </view>
164   - <view v-if="item.width" class="value-spec_val p12">*</view>
165   - <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
166   - <view v-if="item.width" class="value-spec_box">
167   - <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
168   - <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
  161 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg }}
169 162 </view>
170   - <view v-if="item.length" class="value-spec_val p12">*</view>
171   - <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
172   - <view v-if="item.length" class="value-spec_box">
173   - <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
174   - <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>
  163 + </view>
  164 + <view v-if="item.width" class="value-spec_val p12">*</view>
  165 + <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
  166 + <view v-if="item.width" class="value-spec_box">
  167 + <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ? '+' + item.widthTolPos : item.widthTolPos }}
  168 + </view>
  169 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ? '+' + item.widthTolNeg : item.widthTolNeg }}
  170 + </view>
  171 + </view>
  172 + <view v-if="item.length" class="value-spec_val p12">*</view>
  173 + <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
  174 + <view v-if="item.length" class="value-spec_box">
  175 + <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0 ? '+' + item.lengthTolPos : item.lengthTolPos }}
  176 + </view>
  177 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0 ? '+' + item.lengthTolNeg : item.lengthTolNeg }}
175 178 </view>
176 179 </view>
177 180 </view>
  181 + </view>
178 182 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
179 183 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
180 184 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
... ...