朱园亮 / erp-mobile · Commits

Commit 4f8e700b1358b83168e97b9dab0b22fc733a212c

Authored by gesilong
1 parent efa1bbda

Fix: bug修复1

Inline Side-by-side
Showing 16 changed files with 192 additions and 167 deletions
@@ -53,50 +53,50 @@ @@ -53,50 +53,50 @@
53 <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" /> 53 <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" />
54 </template> 54 </template>
55 </uni-list-item> 55 </uni-list-item>
56 - <uni-list-item title="厚度"> 56 + <uni-list-item title="厚度mm">
57 <template v-slot:footer> 57 <template v-slot:footer>
58 <uni-easyinput v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" /> 58 <uni-easyinput v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" />
59 </template> 59 </template>
60 </uni-list-item> 60 </uni-list-item>
61 - <uni-list-item title="厚度公差(单项+)"> 61 + <uni-list-item title="厚度公差(单项+)mm">
62 <template v-slot:footer> 62 <template v-slot:footer>
63 <uni-easyinput v-model="item.thicknessTolPos" :inputBorder="false" 63 <uni-easyinput v-model="item.thicknessTolPos" :inputBorder="false"
64 placeholder="请输入厚度公差(单项+)" /> 64 placeholder="请输入厚度公差(单项+)" />
65 </template> 65 </template>
66 </uni-list-item> 66 </uni-list-item>
67 - <uni-list-item title="厚度公差(单项-)"> 67 + <uni-list-item title="厚度公差(单项-)mm">
68 <template v-slot:footer> 68 <template v-slot:footer>
69 <uni-easyinput v-model="item.thicknessTolNeg" :inputBorder="false" 69 <uni-easyinput v-model="item.thicknessTolNeg" :inputBorder="false"
70 placeholder="请输入厚度公差(单项-)" /> 70 placeholder="请输入厚度公差(单项-)" />
71 </template> 71 </template>
72 </uni-list-item> 72 </uni-list-item>
73 - <uni-list-item title="宽度"> 73 + <uni-list-item title="宽度mm">
74 <template v-slot:footer> 74 <template v-slot:footer>
75 <uni-easyinput v-model="item.width" :inputBorder="false" placeholder="请输入宽度" /> 75 <uni-easyinput v-model="item.width" :inputBorder="false" placeholder="请输入宽度" />
76 </template> 76 </template>
77 </uni-list-item> 77 </uni-list-item>
78 - <uni-list-item title="宽度公差(单项+)"> 78 + <uni-list-item title="宽度公差(单项+)mm">
79 <template v-slot:footer> 79 <template v-slot:footer>
80 <uni-easyinput v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" /> 80 <uni-easyinput v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" />
81 </template> 81 </template>
82 </uni-list-item> 82 </uni-list-item>
83 - <uni-list-item title="宽度公差(单项-)"> 83 + <uni-list-item title="宽度公差(单项-)mm">
84 <template v-slot:footer> 84 <template v-slot:footer>
85 <uni-easyinput v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" /> 85 <uni-easyinput v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" />
86 </template> 86 </template>
87 </uni-list-item> 87 </uni-list-item>
88 - <uni-list-item title="长度"> 88 + <uni-list-item title="长度mm">
89 <template v-slot:footer> 89 <template v-slot:footer>
90 <uni-easyinput v-model="item.length" :inputBorder="false" placeholder="请输入长度" /> 90 <uni-easyinput v-model="item.length" :inputBorder="false" placeholder="请输入长度" />
91 </template> 91 </template>
92 </uni-list-item> 92 </uni-list-item>
93 - <uni-list-item title="长度公差(单项+)"> 93 + <uni-list-item title="长度公差(单项+)mm">
94 <template v-slot:footer> 94 <template v-slot:footer>
95 <uni-easyinput v-model="item.lengthTolPos" :inputBorder="false" 95 <uni-easyinput v-model="item.lengthTolPos" :inputBorder="false"
96 placeholder="请输入长度公差(单项+)" /> 96 placeholder="请输入长度公差(单项+)" />
97 </template> 97 </template>
98 </uni-list-item> 98 </uni-list-item>
99 - <uni-list-item title="长度公差(单项-)"> 99 + <uni-list-item title="长度公差(单项-)mm">
100 <template v-slot:footer> 100 <template v-slot:footer>
101 <uni-easyinput v-model="item.lengthTolNeg" :inputBorder="false" 101 <uni-easyinput v-model="item.lengthTolNeg" :inputBorder="false"
102 placeholder="请输入长度公差(单项-)" /> 102 placeholder="请输入长度公差(单项-)" />
@@ -176,14 +176,14 @@ @@ -176,14 +176,14 @@
176 {{ (totalQuantity || 0).toFixed(2) }}kg 176 {{ (totalQuantity || 0).toFixed(2) }}kg
177 </div> 177 </div>
178 </div> 178 </div>
179 - <div class="total-item"> 179 + <!-- <div class="total-item">
180 <div class="total-item-text"> 180 <div class="total-item-text">
181 不含税金额 181 不含税金额
182 </div> 182 </div>
183 <div class="total-item-price text-red"> 183 <div class="total-item-price text-red">
184 ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }} 184 ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
185 </div> 185 </div>
186 - </div> 186 + </div> -->
187 <div class="total-item"> 187 <div class="total-item">
188 <div class="total-item-text"> 188 <div class="total-item-text">
189 总金额 189 总金额
@@ -257,7 +257,7 @@ export default { @@ -257,7 +257,7 @@ export default {
257 sheet: { visible: false, title: '请选择', field: '', options: [], value: '' }, 257 sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
258 relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' }, 258 relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
259 totalQuantity: 0, 259 totalQuantity: 0,
260 - totalAmountExcludingTax: 0, 260 + // totalAmountExcludingTax: 0,
261 totalAmountIncludingTax: 0, 261 totalAmountIncludingTax: 0,
262 productLineList: [], 262 productLineList: [],
263 productList: [], 263 productList: [],
@@ -358,10 +358,10 @@ export default { @@ -358,10 +358,10 @@ export default {
358 onProductsChange(products) { 358 onProductsChange(products) {
359 const list = Array.isArray(products) ? products : [] 359 const list = Array.isArray(products) ? products : []
360 const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0) 360 const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
361 - const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0) 361 + // const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
362 const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0) 362 const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
363 this.totalQuantity = sumQ 363 this.totalQuantity = sumQ
364 - this.totalAmountExcludingTax = sumE 364 + // this.totalAmountExcludingTax = sumE
365 this.totalAmountIncludingTax = sumT 365 this.totalAmountIncludingTax = sumT
366 this.form.totalAmountCapital = formatCurrencyToChinese(sumT) 366 this.form.totalAmountCapital = formatCurrencyToChinese(sumT)
367 this.productLineList = list 367 this.productLineList = list
@@ -513,7 +513,7 @@ export default { @@ -513,7 +513,7 @@ export default {
513 destination, 513 destination,
514 type: 'INTL_STD_CONTRACT', 514 type: 'INTL_STD_CONTRACT',
515 totalQuantity: this.totalQuantity, 515 totalQuantity: this.totalQuantity,
516 - totalAmountExcludingTax: this.totalAmountExcludingTax, 516 + // totalAmountExcludingTax: this.totalAmountExcludingTax,
517 totalAmountIncludingTax: this.totalAmountIncludingTax, 517 totalAmountIncludingTax: this.totalAmountIncludingTax,
518 contractDistributorLineList: lines 518 contractDistributorLineList: lines
519 }) 519 })
@@ -168,10 +168,10 @@ @@ -168,10 +168,10 @@
168 <div class="total-item-text">数量</div> 168 <div class="total-item-text">数量</div>
169 <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div> 169 <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div>
170 </div> 170 </div>
171 - <div class="total-item"> 171 + <!-- <div class="total-item">
172 <div class="total-item-text">不含税金额</div> 172 <div class="total-item-text">不含税金额</div>
173 <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div> 173 <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div>
174 - </div> 174 + </div> -->
175 <div class="total-item"> 175 <div class="total-item">
176 <div class="total-item-text">总金额</div> 176 <div class="total-item-text">总金额</div>
177 <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div> 177 <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div>
@@ -247,7 +247,7 @@ export default { @@ -247,7 +247,7 @@ export default {
247 sheet: { visible: false, title: '请选择', field: '', options: [], value: '' }, 247 sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
248 relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' }, 248 relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
249 totalQuantity: 0, 249 totalQuantity: 0,
250 - totalAmountExcludingTax: 0, 250 + // totalAmountExcludingTax: 0,
251 totalAmountIncludingTax: 0, 251 totalAmountIncludingTax: 0,
252 productLineList: [], 252 productLineList: [],
253 newProductLineList: [], 253 newProductLineList: [],
@@ -337,10 +337,10 @@ export default { @@ -337,10 +337,10 @@ export default {
337 const list = Array.isArray(products) ? products : [] 337 const list = Array.isArray(products) ? products : []
338 this.newProductLineList = list 338 this.newProductLineList = list
339 const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0) 339 const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
340 - const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0) 340 + // const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
341 const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0) 341 const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
342 this.totalQuantity = sumQ 342 this.totalQuantity = sumQ
343 - this.totalAmountExcludingTax = sumE 343 + // this.totalAmountExcludingTax = sumE
344 this.totalAmountIncludingTax = sumT 344 this.totalAmountIncludingTax = sumT
345 this.form.totalAmountCapital = formatCurrencyToChinese(sumT) 345 this.form.totalAmountCapital = formatCurrencyToChinese(sumT)
346 }, 346 },
@@ -495,7 +495,7 @@ export default { @@ -495,7 +495,7 @@ export default {
495 destination, 495 destination,
496 type: 'INTL_STD_CONTRACT', 496 type: 'INTL_STD_CONTRACT',
497 totalQuantity: this.totalQuantity, 497 totalQuantity: this.totalQuantity,
498 - totalAmountExcludingTax: this.totalAmountExcludingTax, 498 + // totalAmountExcludingTax: this.totalAmountExcludingTax,
499 totalAmountIncludingTax: this.totalAmountIncludingTax, 499 totalAmountIncludingTax: this.totalAmountIncludingTax,
500 contractDistributorLineList: lines 500 contractDistributorLineList: lines
501 }) 501 })
@@ -53,50 +53,50 @@ @@ -53,50 +53,50 @@
53 <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" /> 53 <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" />
54 </template> 54 </template>
55 </uni-list-item> 55 </uni-list-item>
56 - <uni-list-item title="厚度"> 56 + <uni-list-item title="厚度mm">
57 <template v-slot:footer> 57 <template v-slot:footer>
58 <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" /> 58 <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
59 </template> 59 </template>
60 </uni-list-item> 60 </uni-list-item>
61 - <uni-list-item title="厚度公差(单项+)"> 61 + <uni-list-item title="厚度公差(单项+)mm">
62 <template v-slot:footer> 62 <template v-slot:footer>
63 <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false" 63 <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
64 placeholder="请输入厚度公差(单项+)" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" /> 64 placeholder="请输入厚度公差(单项+)" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
65 </template> 65 </template>
66 </uni-list-item> 66 </uni-list-item>
67 - <uni-list-item title="厚度公差(单项-)"> 67 + <uni-list-item title="厚度公差(单项-)mm">
68 <template v-slot:footer> 68 <template v-slot:footer>
69 <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false" 69 <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"
70 placeholder="请输入厚度公差(单项-)" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" /> 70 placeholder="请输入厚度公差(单项-)" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
71 </template> 71 </template>
72 </uni-list-item> 72 </uni-list-item>
73 - <uni-list-item title="宽度"> 73 + <uni-list-item title="宽度mm">
74 <template v-slot:footer> 74 <template v-slot:footer>
75 <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" /> 75 <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
76 </template> 76 </template>
77 </uni-list-item> 77 </uni-list-item>
78 - <uni-list-item title="宽度公差(单项+)"> 78 + <uni-list-item title="宽度公差(单项+)mm">
79 <template v-slot:footer> 79 <template v-slot:footer>
80 <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" /> 80 <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
81 </template> 81 </template>
82 </uni-list-item> 82 </uni-list-item>
83 - <uni-list-item title="宽度公差(单项-)"> 83 + <uni-list-item title="宽度公差(单项-)mm">
84 <template v-slot:footer> 84 <template v-slot:footer>
85 <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" /> 85 <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" />
86 </template> 86 </template>
87 </uni-list-item> 87 </uni-list-item>
88 - <uni-list-item title="长度"> 88 + <uni-list-item title="长度mm">
89 <template v-slot:footer> 89 <template v-slot:footer>
90 <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" /> 90 <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
91 </template> 91 </template>
92 </uni-list-item> 92 </uni-list-item>
93 - <uni-list-item title="长度公差(单项+)"> 93 + <uni-list-item title="长度公差(单项+)mm">
94 <template v-slot:footer> 94 <template v-slot:footer>
95 <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false" 95 <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
96 placeholder="请输入长度公差(单项+)" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" /> 96 placeholder="请输入长度公差(单项+)" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
97 </template> 97 </template>
98 </uni-list-item> 98 </uni-list-item>
99 - <uni-list-item title="长度公差(单项-)"> 99 + <uni-list-item title="长度公差(单项-)mm">
100 <template v-slot:footer> 100 <template v-slot:footer>
101 <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false" 101 <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
102 placeholder="请输入长度公差(单项-)" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" /> 102 placeholder="请输入长度公差(单项-)" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />
@@ -122,11 +122,11 @@ @@ -122,11 +122,11 @@
122 <uni-easyinput v-model="item.processingFee" type="number" :inputBorder="false" placeholder="请输入外贸加工费" /> 122 <uni-easyinput v-model="item.processingFee" type="number" :inputBorder="false" placeholder="请输入外贸加工费" />
123 </template> 123 </template>
124 </uni-list-item> 124 </uni-list-item>
125 - <uni-list-item title="不含税金额"> 125 + <!-- <uni-list-item title="不含税金额">
126 <template v-slot:footer> 126 <template v-slot:footer>
127 <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="自动计算" /> 127 <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="自动计算" />
128 </template> 128 </template>
129 - </uni-list-item> 129 + </uni-list-item> -->
130 <uni-list-item title="总金额"> 130 <uni-list-item title="总金额">
131 <template v-slot:footer> 131 <template v-slot:footer>
132 <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="自动计算" /> 132 <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="自动计算" />
@@ -185,9 +185,9 @@ @@ -185,9 +185,9 @@
185 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice) 185 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
186 }}</text> 186 }}</text>
187 </view> 187 </view>
188 - <view class="row"><text class="label">不含税金额</text><text class="value">{{ 188 + <!-- <view class="row"><text class="label">不含税金额</text><text class="value">{{
189 formatCurrency(item.amountExcludingTax) 189 formatCurrency(item.amountExcludingTax)
190 - }}</text></view> 190 + }}</text></view> -->
191 <view class="row"><text class="label">总金额</text><text class="value">{{ formatCurrency(item.totalAmount) 191 <view class="row"><text class="label">总金额</text><text class="value">{{ formatCurrency(item.totalAmount)
192 }}</text></view> 192 }}</text></view>
193 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text></view> 193 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text></view>
@@ -262,7 +262,7 @@ export default { @@ -262,7 +262,7 @@ export default {
262 }, 262 },
263 methods: { 263 methods: {
264 defaultItem() { 264 defaultItem() {
265 - return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '',processingFee: undefined, status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' } 265 + return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '',processingFee: undefined, status: '', quantity: '', unitPrice: '', totalAmount: 0, deliveryDate: '' }
266 }, 266 },
267 onNonNegativeInput(idx, field) { 267 onNonNegativeInput(idx, field) {
268 const it = this.items[idx] 268 const it = this.items[idx]
@@ -338,8 +338,8 @@ export default { @@ -338,8 +338,8 @@ export default {
338 const qty = this.toNumber(it.quantity) 338 const qty = this.toNumber(it.quantity)
339 const price = this.toNumber(it.unitPrice) 339 const price = this.toNumber(it.unitPrice)
340 const total = this.round(qty * price, 2) 340 const total = this.round(qty * price, 2)
341 - const excl = this.round(total / (1 + TAX_RATE), 2)  
342 - const next = { ...it, totalAmount: total, amountExcludingTax: excl } 341 + // const excl = this.round(total / (1 + TAX_RATE), 2)
  342 + const next = { ...it, totalAmount: total }
343 this.$set(this.items, idx, next) 343 this.$set(this.items, idx, next)
344 }, 344 },
345 recalculateAll() { 345 recalculateAll() {
@@ -176,14 +176,14 @@ @@ -176,14 +176,14 @@
176 {{ (totalQuantity || 0).toFixed(2) }}kg 176 {{ (totalQuantity || 0).toFixed(2) }}kg
177 </div> 177 </div>
178 </div> 178 </div>
179 - <div class="total-item"> 179 + <!-- <div class="total-item">
180 <div class="total-item-text"> 180 <div class="total-item-text">
181 不含税金额 181 不含税金额
182 </div> 182 </div>
183 <div class="total-item-price text-red"> 183 <div class="total-item-price text-red">
184 ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }} 184 ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
185 </div> 185 </div>
186 - </div> 186 + </div> -->
187 <div class="total-item"> 187 <div class="total-item">
188 <div class="total-item-text"> 188 <div class="total-item-text">
189 总金额 189 总金额
@@ -257,7 +257,7 @@ export default { @@ -257,7 +257,7 @@ export default {
257 sheet: { visible: false, title: '请选择', field: '', options: [], value: '' }, 257 sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
258 relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' }, 258 relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
259 totalQuantity: 0, 259 totalQuantity: 0,
260 - totalAmountExcludingTax: 0, 260 + // totalAmountExcludingTax: 0,
261 totalAmountIncludingTax: 0, 261 totalAmountIncludingTax: 0,
262 productLineList: [], 262 productLineList: [],
263 productList: [], 263 productList: [],
@@ -360,10 +360,10 @@ export default { @@ -360,10 +360,10 @@ export default {
360 onProductsChange(products) { 360 onProductsChange(products) {
361 const list = Array.isArray(products) ? products : [] 361 const list = Array.isArray(products) ? products : []
362 const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0) 362 const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
363 - const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0) 363 + // const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
364 const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0) 364 const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
365 this.totalQuantity = sumQ 365 this.totalQuantity = sumQ
366 - this.totalAmountExcludingTax = sumE 366 + // this.totalAmountExcludingTax = sumE
367 this.totalAmountIncludingTax = sumT 367 this.totalAmountIncludingTax = sumT
368 this.form.totalAmountCapital = formatCurrencyToChinese(sumT) 368 this.form.totalAmountCapital = formatCurrencyToChinese(sumT)
369 this.productLineList = list 369 this.productLineList = list
@@ -515,7 +515,7 @@ export default { @@ -515,7 +515,7 @@ export default {
515 destination, 515 destination,
516 type: 'INTL_INVENTORY_AGMT', 516 type: 'INTL_INVENTORY_AGMT',
517 totalQuantity: this.totalQuantity, 517 totalQuantity: this.totalQuantity,
518 - totalAmountExcludingTax: this.totalAmountExcludingTax, 518 + // totalAmountExcludingTax: this.totalAmountExcludingTax,
519 totalAmountIncludingTax: this.totalAmountIncludingTax, 519 totalAmountIncludingTax: this.totalAmountIncludingTax,
520 contractDistributorLineList: lines 520 contractDistributorLineList: lines
521 }) 521 })
@@ -111,14 +111,14 @@ @@ -111,14 +111,14 @@
111 {{ (totalQuantity || 0).toFixed(2) }}kg 111 {{ (totalQuantity || 0).toFixed(2) }}kg
112 </div> 112 </div>
113 </div> 113 </div>
114 - <div class="total-item"> 114 + <!-- <div class="total-item">
115 <div class="total-item-text"> 115 <div class="total-item-text">
116 不含税金额 116 不含税金额
117 </div> 117 </div>
118 <div class="total-item-price text-red"> 118 <div class="total-item-price text-red">
119 ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }} 119 ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
120 </div> 120 </div>
121 - </div> 121 + </div> -->
122 <div class="total-item"> 122 <div class="total-item">
123 <div class="total-item-text"> 123 <div class="total-item-text">
124 总金额 124 总金额
@@ -151,10 +151,10 @@ export default { @@ -151,10 +151,10 @@ export default {
151 const qty = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.quantity), 0) 151 const qty = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.quantity), 0)
152 return this.round(qty, 2) 152 return this.round(qty, 2)
153 }, 153 },
154 - totalAmountExcludingTax() {  
155 - const sum = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.amountExcludingTax), 0)  
156 - return this.round(sum, 2)  
157 - }, 154 + // totalAmountExcludingTax() {
  155 + // const sum = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.amountExcludingTax), 0)
  156 + // return this.round(sum, 2)
  157 + // },
158 totalAmountIncludingTax() { return this.totalAmount }, 158 totalAmountIncludingTax() { return this.totalAmount },
159 totalAmount() { 159 totalAmount() {
160 let sum = 0 160 let sum = 0
@@ -213,7 +213,7 @@ export default { @@ -213,7 +213,7 @@ export default {
213 status: v.status || '', 213 status: v.status || '',
214 quantity: v.productQuantity || v.quantity || '', 214 quantity: v.productQuantity || v.quantity || '',
215 unitPrice: v.unitPrice || '', 215 unitPrice: v.unitPrice || '',
216 - amountExcludingTax: v.amountExcludingTax || 0, 216 + // amountExcludingTax: v.amountExcludingTax || 0,
217 totalAmount: v.totalAmount || 0, 217 totalAmount: v.totalAmount || 0,
218 deliveryDate: v.deliveryDate || '', 218 deliveryDate: v.deliveryDate || '',
219 specDisplay: '' 219 specDisplay: ''
@@ -255,8 +255,8 @@ export default { @@ -255,8 +255,8 @@ export default {
255 const qty = this.toNumber(it.quantity) 255 const qty = this.toNumber(it.quantity)
256 const price = this.toNumber(it.unitPrice) 256 const price = this.toNumber(it.unitPrice)
257 const total = this.round(qty * price, 2) 257 const total = this.round(qty * price, 2)
258 - const excl = this.round(total / (1 + TAX_RATE), 2)  
259 - it.amountExcludingTax = excl 258 + // const excl = this.round(total / (1 + TAX_RATE), 2)
  259 + // it.amountExcludingTax = excl
260 it.totalAmount = total 260 it.totalAmount = total
261 this.$set(this.items, idx, it) 261 this.$set(this.items, idx, it)
262 }, 262 },
@@ -292,7 +292,7 @@ export default { @@ -292,7 +292,7 @@ export default {
292 ...it, 292 ...it,
293 quantity: '', 293 quantity: '',
294 unitPrice: '', 294 unitPrice: '',
295 - amountExcludingTax: 0 295 + // amountExcludingTax: 0
296 })) 296 }))
297 }, 297 },
298 async onSubmit() { 298 async onSubmit() {
@@ -301,12 +301,12 @@ export default { @@ -301,12 +301,12 @@ export default {
301 const qty = this.toNumber(it.quantity) 301 const qty = this.toNumber(it.quantity)
302 const price = this.toNumber(it.unitPrice) 302 const price = this.toNumber(it.unitPrice)
303 const total = this.toNumber(it.totalAmount) 303 const total = this.toNumber(it.totalAmount)
304 - const excl = this.toNumber(it.amountExcludingTax) 304 + // const excl = this.toNumber(it.amountExcludingTax)
305 if (Object.prototype.hasOwnProperty.call(raw, 'productQuantity')) raw.productQuantity = qty 305 if (Object.prototype.hasOwnProperty.call(raw, 'productQuantity')) raw.productQuantity = qty
306 else raw.quantity = qty 306 else raw.quantity = qty
307 raw.unitPrice = price 307 raw.unitPrice = price
308 raw.totalAmount = total 308 raw.totalAmount = total
309 - raw.amountExcludingTax = excl 309 + // raw.amountExcludingTax = excl
310 return raw 310 return raw
311 }) 311 })
312 if (!selected.length) { 312 if (!selected.length) {
@@ -325,7 +325,7 @@ export default { @@ -325,7 +325,7 @@ export default {
325 const payload = { 325 const payload = {
326 id: this.id, 326 id: this.id,
327 totalAmountCapital: formatCurrencyToChinese(this.sumTotal), 327 totalAmountCapital: formatCurrencyToChinese(this.sumTotal),
328 - totalAmountExcludingTax: this.totalAmountExcludingTax, 328 + // totalAmountExcludingTax: this.totalAmountExcludingTax,
329 totalAmountIncludingTax: this.totalAmountIncludingTax, 329 totalAmountIncludingTax: this.totalAmountIncludingTax,
330 totalQuantity: this.totalQuantity, 330 totalQuantity: this.totalQuantity,
331 type:'INTL_INVENTORY_AGMT', 331 type:'INTL_INVENTORY_AGMT',
@@ -170,10 +170,10 @@ @@ -170,10 +170,10 @@
170 <div class="total-item-text">数量</div> 170 <div class="total-item-text">数量</div>
171 <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div> 171 <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div>
172 </div> 172 </div>
173 - <div class="total-item"> 173 + <!-- <div class="total-item">
174 <div class="total-item-text">不含税金额</div> 174 <div class="total-item-text">不含税金额</div>
175 <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div> 175 <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div>
176 - </div> 176 + </div> -->
177 <div class="total-item"> 177 <div class="total-item">
178 <div class="total-item-text">总金额</div> 178 <div class="total-item-text">总金额</div>
179 <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div> 179 <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div>
@@ -249,7 +249,7 @@ export default { @@ -249,7 +249,7 @@ export default {
249 sheet: { visible: false, title: '请选择', field: '', options: [], value: '' }, 249 sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
250 relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' }, 250 relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
251 totalQuantity: 0, 251 totalQuantity: 0,
252 - totalAmountExcludingTax: 0, 252 + // totalAmountExcludingTax: 0,
253 totalAmountIncludingTax: 0, 253 totalAmountIncludingTax: 0,
254 productLineList: [], 254 productLineList: [],
255 newProductLineList: [], 255 newProductLineList: [],
@@ -339,10 +339,10 @@ export default { @@ -339,10 +339,10 @@ export default {
339 const list = Array.isArray(products) ? products : [] 339 const list = Array.isArray(products) ? products : []
340 this.newProductLineList = list 340 this.newProductLineList = list
341 const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0) 341 const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
342 - const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0) 342 + // const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
343 const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0) 343 const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
344 this.totalQuantity = sumQ 344 this.totalQuantity = sumQ
345 - this.totalAmountExcludingTax = sumE 345 + // this.totalAmountExcludingTax = sumE
346 this.totalAmountIncludingTax = sumT 346 this.totalAmountIncludingTax = sumT
347 this.form.totalAmountCapital = formatCurrencyToChinese(sumT) 347 this.form.totalAmountCapital = formatCurrencyToChinese(sumT)
348 }, 348 },
@@ -495,7 +495,7 @@ export default { @@ -495,7 +495,7 @@ export default {
495 destination, 495 destination,
496 type: 'INTL_INVENTORY_AGMT', 496 type: 'INTL_INVENTORY_AGMT',
497 totalQuantity: this.totalQuantity, 497 totalQuantity: this.totalQuantity,
498 - totalAmountExcludingTax: this.totalAmountExcludingTax, 498 + // totalAmountExcludingTax: this.totalAmountExcludingTax,
499 totalAmountIncludingTax: this.totalAmountIncludingTax, 499 totalAmountIncludingTax: this.totalAmountIncludingTax,
500 contractDistributorLineList: lines 500 contractDistributorLineList: lines
501 }) 501 })
@@ -53,50 +53,50 @@ @@ -53,50 +53,50 @@
53 <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" /> 53 <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" />
54 </template> 54 </template>
55 </uni-list-item> 55 </uni-list-item>
56 - <uni-list-item title="厚度"> 56 + <uni-list-item title="厚度mm">
57 <template v-slot:footer> 57 <template v-slot:footer>
58 <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" /> 58 <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
59 </template> 59 </template>
60 </uni-list-item> 60 </uni-list-item>
61 - <uni-list-item title="厚度公差(单项+)"> 61 + <uni-list-item title="厚度公差(单项+)mm">
62 <template v-slot:footer> 62 <template v-slot:footer>
63 <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false" 63 <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
64 placeholder="请输入厚度公差(单项+)" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" /> 64 placeholder="请输入厚度公差(单项+)" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
65 </template> 65 </template>
66 </uni-list-item> 66 </uni-list-item>
67 - <uni-list-item title="厚度公差(单项-)"> 67 + <uni-list-item title="厚度公差(单项-)mm">
68 <template v-slot:footer> 68 <template v-slot:footer>
69 <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false" 69 <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"
70 placeholder="请输入厚度公差(单项-)" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" /> 70 placeholder="请输入厚度公差(单项-)" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
71 </template> 71 </template>
72 </uni-list-item> 72 </uni-list-item>
73 - <uni-list-item title="宽度"> 73 + <uni-list-item title="宽度mm">
74 <template v-slot:footer> 74 <template v-slot:footer>
75 <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" /> 75 <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
76 </template> 76 </template>
77 </uni-list-item> 77 </uni-list-item>
78 - <uni-list-item title="宽度公差(单项+)"> 78 + <uni-list-item title="宽度公差(单项+)mm">
79 <template v-slot:footer> 79 <template v-slot:footer>
80 <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" /> 80 <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
81 </template> 81 </template>
82 </uni-list-item> 82 </uni-list-item>
83 - <uni-list-item title="宽度公差(单项-)"> 83 + <uni-list-item title="宽度公差(单项-)mm">
84 <template v-slot:footer> 84 <template v-slot:footer>
85 <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" /> 85 <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" />
86 </template> 86 </template>
87 </uni-list-item> 87 </uni-list-item>
88 - <uni-list-item title="长度"> 88 + <uni-list-item title="长度mm">
89 <template v-slot:footer> 89 <template v-slot:footer>
90 <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" /> 90 <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
91 </template> 91 </template>
92 </uni-list-item> 92 </uni-list-item>
93 - <uni-list-item title="长度公差(单项+)"> 93 + <uni-list-item title="长度公差(单项+)mm">
94 <template v-slot:footer> 94 <template v-slot:footer>
95 <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false" 95 <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
96 placeholder="请输入长度公差(单项+)" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" /> 96 placeholder="请输入长度公差(单项+)" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
97 </template> 97 </template>
98 </uni-list-item> 98 </uni-list-item>
99 - <uni-list-item title="长度公差(单项-)"> 99 + <uni-list-item title="长度公差(单项-)mm">
100 <template v-slot:footer> 100 <template v-slot:footer>
101 <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false" 101 <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
102 placeholder="请输入长度公差(单项-)" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" /> 102 placeholder="请输入长度公差(单项-)" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />
@@ -122,11 +122,11 @@ @@ -122,11 +122,11 @@
122 <uni-easyinput v-model="item.processingFee" type="number" :inputBorder="false" placeholder="请输入外贸加工费" /> 122 <uni-easyinput v-model="item.processingFee" type="number" :inputBorder="false" placeholder="请输入外贸加工费" />
123 </template> 123 </template>
124 </uni-list-item> 124 </uni-list-item>
125 - <uni-list-item title="不含税金额"> 125 + <!-- <uni-list-item title="不含税金额">
126 <template v-slot:footer> 126 <template v-slot:footer>
127 <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="自动计算" /> 127 <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="自动计算" />
128 </template> 128 </template>
129 - </uni-list-item> 129 + </uni-list-item> -->
130 <uni-list-item title="总金额"> 130 <uni-list-item title="总金额">
131 <template v-slot:footer> 131 <template v-slot:footer>
132 <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="自动计算" /> 132 <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="自动计算" />
@@ -185,9 +185,9 @@ @@ -185,9 +185,9 @@
185 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice) 185 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
186 }}</text> 186 }}</text>
187 </view> 187 </view>
188 - <view class="row"><text class="label">不含税金额</text><text class="value">{{ 188 + <!-- <view class="row"><text class="label">不含税金额</text><text class="value">{{
189 formatCurrency(item.amountExcludingTax) 189 formatCurrency(item.amountExcludingTax)
190 - }}</text></view> 190 + }}</text></view> -->
191 <view class="row"><text class="label">总金额</text><text class="value">{{ formatCurrency(item.totalAmount) 191 <view class="row"><text class="label">总金额</text><text class="value">{{ formatCurrency(item.totalAmount)
192 }}</text></view> 192 }}</text></view>
193 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text></view> 193 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text></view>
@@ -264,7 +264,7 @@ export default { @@ -264,7 +264,7 @@ export default {
264 }, 264 },
265 methods: { 265 methods: {
266 defaultItem() { 266 defaultItem() {
267 - return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', processingFee: undefined, amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' } 267 + return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', processingFee: undefined, totalAmount: 0, deliveryDate: '' }
268 }, 268 },
269 onNonNegativeInput(idx, field) { 269 onNonNegativeInput(idx, field) {
270 const it = this.items[idx] 270 const it = this.items[idx]
@@ -337,14 +337,14 @@ export default { @@ -337,14 +337,14 @@ export default {
337 this.emitChange() 337 this.emitChange()
338 }, 338 },
339 recalculate(idx) { 339 recalculate(idx) {
340 - const TAX_RATE = 0.13 340 + // const TAX_RATE = 0.13
341 const it = this.items[idx] 341 const it = this.items[idx]
342 if (!it) return 342 if (!it) return
343 const qty = this.toNumber(it.quantity) 343 const qty = this.toNumber(it.quantity)
344 const price = this.toNumber(it.unitPrice) 344 const price = this.toNumber(it.unitPrice)
345 const total = this.round(qty * price, 2) 345 const total = this.round(qty * price, 2)
346 - const excl = this.round(total / (1 + TAX_RATE), 2)  
347 - const next = { ...it, totalAmount: total, amountExcludingTax: excl } 346 + // const excl = this.round(total / (1 + TAX_RATE), 2)
  347 + const next = { ...it, totalAmount: total }
348 this.$set(this.items, idx, next) 348 this.$set(this.items, idx, next)
349 }, 349 },
350 recalculateAll() { 350 recalculateAll() {
@@ -176,14 +176,14 @@ @@ -176,14 +176,14 @@
176 {{ (totalQuantity || 0).toFixed(2) }}kg 176 {{ (totalQuantity || 0).toFixed(2) }}kg
177 </div> 177 </div>
178 </div> 178 </div>
179 - <div class="total-item"> 179 + <!-- <div class="total-item">
180 <div class="total-item-text"> 180 <div class="total-item-text">
181 不含税金额 181 不含税金额
182 </div> 182 </div>
183 <div class="total-item-price text-red"> 183 <div class="total-item-price text-red">
184 ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }} 184 ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
185 </div> 185 </div>
186 - </div> 186 + </div> -->
187 <div class="total-item"> 187 <div class="total-item">
188 <div class="total-item-text"> 188 <div class="total-item-text">
189 总金额 189 总金额
@@ -257,7 +257,7 @@ export default { @@ -257,7 +257,7 @@ export default {
257 sheet: { visible: false, title: '请选择', field: '', options: [], value: '' }, 257 sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
258 relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' }, 258 relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
259 totalQuantity: 0, 259 totalQuantity: 0,
260 - totalAmountExcludingTax: 0, 260 + // totalAmountExcludingTax: 0,
261 totalAmountIncludingTax: 0, 261 totalAmountIncludingTax: 0,
262 productLineList: [], 262 productLineList: [],
263 productList: [], 263 productList: [],
@@ -359,10 +359,10 @@ export default { @@ -359,10 +359,10 @@ export default {
359 onProductsChange(products) { 359 onProductsChange(products) {
360 const list = Array.isArray(products) ? products : [] 360 const list = Array.isArray(products) ? products : []
361 const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0) 361 const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
362 - const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0) 362 + // const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
363 const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0) 363 const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
364 this.totalQuantity = sumQ 364 this.totalQuantity = sumQ
365 - this.totalAmountExcludingTax = sumE 365 + // this.totalAmountExcludingTax = sumE
366 this.totalAmountIncludingTax = sumT 366 this.totalAmountIncludingTax = sumT
367 this.form.totalAmountCapital = formatCurrencyToChinese(sumT) 367 this.form.totalAmountCapital = formatCurrencyToChinese(sumT)
368 this.productLineList = list 368 this.productLineList = list
@@ -514,7 +514,7 @@ export default { @@ -514,7 +514,7 @@ export default {
514 destination, 514 destination,
515 type: 'INTL_OPEN_SPEC_AGMT', 515 type: 'INTL_OPEN_SPEC_AGMT',
516 totalQuantity: this.totalQuantity, 516 totalQuantity: this.totalQuantity,
517 - totalAmountExcludingTax: this.totalAmountExcludingTax, 517 + // totalAmountExcludingTax: this.totalAmountExcludingTax,
518 totalAmountIncludingTax: this.totalAmountIncludingTax, 518 totalAmountIncludingTax: this.totalAmountIncludingTax,
519 contractDistributorLineList: lines 519 contractDistributorLineList: lines
520 }) 520 })
@@ -59,11 +59,11 @@ @@ -59,11 +59,11 @@
59 <uni-easyinput v-model="item.unitPrice" type="number" :inputBorder="false" placeholder="请输入单价" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'unitPrice', 0)" /> 59 <uni-easyinput v-model="item.unitPrice" type="number" :inputBorder="false" placeholder="请输入单价" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'unitPrice', 0)" />
60 </template> 60 </template>
61 </uni-list-item> 61 </uni-list-item>
62 - <uni-list-item title="不含税金额"> 62 + <!-- <uni-list-item title="不含税金额">
63 <template v-slot:footer> 63 <template v-slot:footer>
64 <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="自动计算" /> 64 <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="自动计算" />
65 </template> 65 </template>
66 - </uni-list-item> 66 + </uni-list-item> -->
67 <uni-list-item title="总金额"> 67 <uni-list-item title="总金额">
68 <template v-slot:footer> 68 <template v-slot:footer>
69 <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="自动计算" /> 69 <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="自动计算" />
@@ -110,14 +110,14 @@ @@ -110,14 +110,14 @@
110 {{ (totalQuantity || 0).toFixed(2) }}kg 110 {{ (totalQuantity || 0).toFixed(2) }}kg
111 </div> 111 </div>
112 </div> 112 </div>
113 - <div class="total-item"> 113 + <!-- <div class="total-item">
114 <div class="total-item-text"> 114 <div class="total-item-text">
115 不含税金额 115 不含税金额
116 </div> 116 </div>
117 <div class="total-item-price text-red"> 117 <div class="total-item-price text-red">
118 ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }} 118 ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
119 </div> 119 </div>
120 - </div> 120 + </div> -->
121 <div class="total-item"> 121 <div class="total-item">
122 <div class="total-item-text"> 122 <div class="total-item-text">
123 总金额 123 总金额
@@ -150,10 +150,10 @@ export default { @@ -150,10 +150,10 @@ export default {
150 const qty = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.quantity), 0) 150 const qty = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.quantity), 0)
151 return this.round(qty, 2) 151 return this.round(qty, 2)
152 }, 152 },
153 - totalAmountExcludingTax() {  
154 - const sum = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.amountExcludingTax), 0)  
155 - return this.round(sum, 2)  
156 - }, 153 + // totalAmountExcludingTax() {
  154 + // const sum = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.amountExcludingTax), 0)
  155 + // return this.round(sum, 2)
  156 + // },
157 totalAmountIncludingTax() { return this.totalAmount }, 157 totalAmountIncludingTax() { return this.totalAmount },
158 totalAmount() { 158 totalAmount() {
159 let sum = 0 159 let sum = 0
@@ -212,7 +212,7 @@ export default { @@ -212,7 +212,7 @@ export default {
212 status: v.status || '', 212 status: v.status || '',
213 quantity: v.productQuantity || v.quantity || '', 213 quantity: v.productQuantity || v.quantity || '',
214 unitPrice: v.unitPrice || '', 214 unitPrice: v.unitPrice || '',
215 - amountExcludingTax: v.amountExcludingTax || 0, 215 + // amountExcludingTax: v.amountExcludingTax || 0,
216 totalAmount: v.totalAmount || 0, 216 totalAmount: v.totalAmount || 0,
217 deliveryDate: v.deliveryDate || '', 217 deliveryDate: v.deliveryDate || '',
218 specDisplay: '' 218 specDisplay: ''
@@ -248,14 +248,14 @@ export default { @@ -248,14 +248,14 @@ export default {
248 this.recalculate(idx) 248 this.recalculate(idx)
249 }, 249 },
250 recalculate(idx) { 250 recalculate(idx) {
251 - const TAX_RATE = 0.13 251 + // const TAX_RATE = 0.13
252 const it = this.items[idx] 252 const it = this.items[idx]
253 if (!it) return 253 if (!it) return
254 const qty = this.toNumber(it.quantity) 254 const qty = this.toNumber(it.quantity)
255 const price = this.toNumber(it.unitPrice) 255 const price = this.toNumber(it.unitPrice)
256 const total = this.round(qty * price, 2) 256 const total = this.round(qty * price, 2)
257 - const excl = this.round(total / (1 + TAX_RATE), 2)  
258 - it.amountExcludingTax = excl 257 + // const excl = this.round(total / (1 + TAX_RATE), 2)
  258 + // it.amountExcludingTax = excl
259 it.totalAmount = total 259 it.totalAmount = total
260 this.$set(this.items, idx, it) 260 this.$set(this.items, idx, it)
261 }, 261 },
@@ -291,7 +291,7 @@ export default { @@ -291,7 +291,7 @@ export default {
291 ...it, 291 ...it,
292 quantity: '', 292 quantity: '',
293 unitPrice: '', 293 unitPrice: '',
294 - amountExcludingTax: 0 294 + // amountExcludingTax: 0,
295 })) 295 }))
296 }, 296 },
297 async onSubmit() { 297 async onSubmit() {
@@ -300,12 +300,12 @@ export default { @@ -300,12 +300,12 @@ export default {
300 const qty = this.toNumber(it.quantity) 300 const qty = this.toNumber(it.quantity)
301 const price = this.toNumber(it.unitPrice) 301 const price = this.toNumber(it.unitPrice)
302 const total = this.toNumber(it.totalAmount) 302 const total = this.toNumber(it.totalAmount)
303 - const excl = this.toNumber(it.amountExcludingTax) 303 + // const excl = this.toNumber(it.amountExcludingTax)
304 if (Object.prototype.hasOwnProperty.call(raw, 'productQuantity')) raw.productQuantity = qty 304 if (Object.prototype.hasOwnProperty.call(raw, 'productQuantity')) raw.productQuantity = qty
305 else raw.quantity = qty 305 else raw.quantity = qty
306 raw.unitPrice = price 306 raw.unitPrice = price
307 raw.totalAmount = total 307 raw.totalAmount = total
308 - raw.amountExcludingTax = excl 308 + // raw.amountExcludingTax = excl
309 return raw 309 return raw
310 }) 310 })
311 if (!selected.length) { 311 if (!selected.length) {
@@ -325,7 +325,7 @@ export default { @@ -325,7 +325,7 @@ export default {
325 const payload = { 325 const payload = {
326 id: this.id, 326 id: this.id,
327 totalAmountCapital: formatCurrencyToChinese(this.sumTotal), 327 totalAmountCapital: formatCurrencyToChinese(this.sumTotal),
328 - totalAmountExcludingTax: this.totalAmountExcludingTax, 328 + // totalAmountExcludingTax: this.totalAmountExcludingTax,
329 totalAmountIncludingTax: this.totalAmountIncludingTax, 329 totalAmountIncludingTax: this.totalAmountIncludingTax,
330 totalQuantity: this.totalQuantity, 330 totalQuantity: this.totalQuantity,
331 type:'INTL_OPEN_SPEC_AGMT', 331 type:'INTL_OPEN_SPEC_AGMT',
@@ -170,10 +170,10 @@ @@ -170,10 +170,10 @@
170 <div class="total-item-text">数量</div> 170 <div class="total-item-text">数量</div>
171 <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div> 171 <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div>
172 </div> 172 </div>
173 - <div class="total-item"> 173 + <!-- <div class="total-item">
174 <div class="total-item-text">不含税金额</div> 174 <div class="total-item-text">不含税金额</div>
175 <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div> 175 <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div>
176 - </div> 176 + </div> -->
177 <div class="total-item"> 177 <div class="total-item">
178 <div class="total-item-text">总金额</div> 178 <div class="total-item-text">总金额</div>
179 <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div> 179 <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div>
@@ -249,7 +249,7 @@ export default { @@ -249,7 +249,7 @@ export default {
249 sheet: { visible: false, title: '请选择', field: '', options: [], value: '' }, 249 sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
250 relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' }, 250 relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
251 totalQuantity: 0, 251 totalQuantity: 0,
252 - totalAmountExcludingTax: 0, 252 + // totalAmountExcludingTax: 0,
253 totalAmountIncludingTax: 0, 253 totalAmountIncludingTax: 0,
254 productLineList: [], 254 productLineList: [],
255 newProductLineList: [], 255 newProductLineList: [],
@@ -339,10 +339,10 @@ export default { @@ -339,10 +339,10 @@ export default {
339 const list = Array.isArray(products) ? products : [] 339 const list = Array.isArray(products) ? products : []
340 this.newProductLineList = list 340 this.newProductLineList = list
341 const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0) 341 const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
342 - const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0) 342 + // const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
343 const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0) 343 const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
344 this.totalQuantity = sumQ 344 this.totalQuantity = sumQ
345 - this.totalAmountExcludingTax = sumE 345 + // this.totalAmountExcludingTax = sumE
346 this.totalAmountIncludingTax = sumT 346 this.totalAmountIncludingTax = sumT
347 this.form.totalAmountCapital = formatCurrencyToChinese(sumT) 347 this.form.totalAmountCapital = formatCurrencyToChinese(sumT)
348 }, 348 },
@@ -496,7 +496,7 @@ export default { @@ -496,7 +496,7 @@ export default {
496 destination, 496 destination,
497 type: 'INTL_OPEN_SPEC_AGMT', 497 type: 'INTL_OPEN_SPEC_AGMT',
498 totalQuantity: this.totalQuantity, 498 totalQuantity: this.totalQuantity,
499 - totalAmountExcludingTax: this.totalAmountExcludingTax, 499 + // totalAmountExcludingTax: this.totalAmountExcludingTax,
500 totalAmountIncludingTax: this.totalAmountIncludingTax, 500 totalAmountIncludingTax: this.totalAmountIncludingTax,
501 contractDistributorLineList: lines 501 contractDistributorLineList: lines
502 }) 502 })
@@ -53,50 +53,50 @@ @@ -53,50 +53,50 @@
53 <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" /> 53 <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" />
54 </template> 54 </template>
55 </uni-list-item> 55 </uni-list-item>
56 - <uni-list-item title="厚度"> 56 + <uni-list-item title="厚度mm">
57 <template v-slot:footer> 57 <template v-slot:footer>
58 <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" /> 58 <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
59 </template> 59 </template>
60 </uni-list-item> 60 </uni-list-item>
61 - <uni-list-item title="厚度公差(单项+)"> 61 + <uni-list-item title="厚度公差(单项+)mm">
62 <template v-slot:footer> 62 <template v-slot:footer>
63 <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false" 63 <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
64 placeholder="请输入厚度公差(单项+)" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" /> 64 placeholder="请输入厚度公差(单项+)" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
65 </template> 65 </template>
66 </uni-list-item> 66 </uni-list-item>
67 - <uni-list-item title="厚度公差(单项-)"> 67 + <uni-list-item title="厚度公差(单项-)mm">
68 <template v-slot:footer> 68 <template v-slot:footer>
69 <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false" 69 <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"
70 placeholder="请输入厚度公差(单项-)" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" /> 70 placeholder="请输入厚度公差(单项-)" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
71 </template> 71 </template>
72 </uni-list-item> 72 </uni-list-item>
73 - <uni-list-item title="宽度"> 73 + <uni-list-item title="宽度mm">
74 <template v-slot:footer> 74 <template v-slot:footer>
75 <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" /> 75 <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
76 </template> 76 </template>
77 </uni-list-item> 77 </uni-list-item>
78 - <uni-list-item title="宽度公差(单项+)"> 78 + <uni-list-item title="宽度公差(单项+)mm">
79 <template v-slot:footer> 79 <template v-slot:footer>
80 <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" /> 80 <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
81 </template> 81 </template>
82 </uni-list-item> 82 </uni-list-item>
83 - <uni-list-item title="宽度公差(单项-)"> 83 + <uni-list-item title="宽度公差(单项-)mm">
84 <template v-slot:footer> 84 <template v-slot:footer>
85 <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" /> 85 <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" />
86 </template> 86 </template>
87 </uni-list-item> 87 </uni-list-item>
88 - <uni-list-item title="长度"> 88 + <uni-list-item title="长度mm">
89 <template v-slot:footer> 89 <template v-slot:footer>
90 <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" /> 90 <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
91 </template> 91 </template>
92 </uni-list-item> 92 </uni-list-item>
93 - <uni-list-item title="长度公差(单项+)"> 93 + <uni-list-item title="长度公差(单项+)mm">
94 <template v-slot:footer> 94 <template v-slot:footer>
95 <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false" 95 <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
96 placeholder="请输入长度公差(单项+)" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" /> 96 placeholder="请输入长度公差(单项+)" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
97 </template> 97 </template>
98 </uni-list-item> 98 </uni-list-item>
99 - <uni-list-item title="长度公差(单项-)"> 99 + <uni-list-item title="长度公差(单项-)mm">
100 <template v-slot:footer> 100 <template v-slot:footer>
101 <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false" 101 <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
102 placeholder="请输入长度公差(单项-)" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" /> 102 placeholder="请输入长度公差(单项-)" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />
@@ -122,11 +122,11 @@ @@ -122,11 +122,11 @@
122 <uni-easyinput v-model="item.processingFee" type="number" :inputBorder="false" placeholder="请输入外贸加工费" /> 122 <uni-easyinput v-model="item.processingFee" type="number" :inputBorder="false" placeholder="请输入外贸加工费" />
123 </template> 123 </template>
124 </uni-list-item> 124 </uni-list-item>
125 - <uni-list-item title="不含税金额"> 125 + <!-- <uni-list-item title="不含税金额">
126 <template v-slot:footer> 126 <template v-slot:footer>
127 <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="自动计算" /> 127 <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="自动计算" />
128 </template> 128 </template>
129 - </uni-list-item> 129 + </uni-list-item> -->
130 <uni-list-item title="总金额"> 130 <uni-list-item title="总金额">
131 <template v-slot:footer> 131 <template v-slot:footer>
132 <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="自动计算" /> 132 <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="自动计算" />
@@ -185,9 +185,9 @@ @@ -185,9 +185,9 @@
185 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice) 185 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
186 }}</text> 186 }}</text>
187 </view> 187 </view>
188 - <view class="row"><text class="label">不含税金额</text><text class="value">{{ 188 + <!-- <view class="row"><text class="label">不含税金额</text><text class="value">{{
189 formatCurrency(item.amountExcludingTax) 189 formatCurrency(item.amountExcludingTax)
190 - }}</text></view> 190 + }}</text></view> -->
191 <view class="row"><text class="label">总金额</text><text class="value">{{ formatCurrency(item.totalAmount) 191 <view class="row"><text class="label">总金额</text><text class="value">{{ formatCurrency(item.totalAmount)
192 }}</text></view> 192 }}</text></view>
193 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text></view> 193 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text></view>
@@ -262,7 +262,7 @@ export default { @@ -262,7 +262,7 @@ export default {
262 }, 262 },
263 methods: { 263 methods: {
264 defaultItem() { 264 defaultItem() {
265 - return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' } 265 + return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', totalAmount: 0, deliveryDate: '' }
266 }, 266 },
267 onNonNegativeInput(idx, field) { 267 onNonNegativeInput(idx, field) {
268 const it = this.items[idx] 268 const it = this.items[idx]
@@ -338,8 +338,8 @@ export default { @@ -338,8 +338,8 @@ export default {
338 const qty = this.toNumber(it.quantity) 338 const qty = this.toNumber(it.quantity)
339 const price = this.toNumber(it.unitPrice) 339 const price = this.toNumber(it.unitPrice)
340 const total = this.round(qty * price, 2) 340 const total = this.round(qty * price, 2)
341 - const excl = this.round(total / (1 + TAX_RATE), 2)  
342 - const next = { ...it, totalAmount: total, amountExcludingTax: excl } 341 + // const excl = this.round(total / (1 + TAX_RATE), 2)
  342 + const next = { ...it, totalAmount: total }
343 this.$set(this.items, idx, next) 343 this.$set(this.items, idx, next)
344 }, 344 },
345 recalculateAll() { 345 recalculateAll() {
@@ -58,67 +58,83 @@ @@ -58,67 +58,83 @@
58 <uni-easyinput v-model="item.supplyTime" :inputBorder="false" placeholder="请输入原材料提供时间" /> 58 <uni-easyinput v-model="item.supplyTime" :inputBorder="false" placeholder="请输入原材料提供时间" />
59 </template> 59 </template>
60 </uni-list-item> 60 </uni-list-item>
61 - <uni-list-item class="select-item" :class="item.rawToProdRatioName ? 'is-filled' : 'is-empty'" clickable @click="openRawToProdRatioSheet(idx)" :rightText="item.rawToProdRatioName || '请选择原材料到产品的转换比例'" showArrow> 61 + <uni-list-item class="select-item" :class="item.rawToProdRatioName ? 'is-filled' : 'is-empty'" clickable @click="openRawToProdRatioSheet(idx)" :rightText="item.rawToProdRatioName || '请选择原材料与产品数量比'" showArrow>
62 <template v-slot:body> 62 <template v-slot:body>
63 - <view class="item-title"><text>原材料到产品的转换比例</text></view> 63 + <view class="item-title"><text>原材料与产品数量比</text></view>
64 </template> 64 </template>
65 </uni-list-item> 65 </uni-list-item>
66 - <uni-list-item title="原材料到产品的转换比例备注"> 66 + <uni-list-item title="原材料与产品数量比备注">
67 <template v-slot:footer> 67 <template v-slot:footer>
68 - <uni-easyinput v-model="item.materialProductRatioRemarks" :disabled="item.materialProductRatio !== '10'" :inputBorder="false" placeholder="请输入原材料到产品的转换比例备注" /> 68 + <uni-easyinput v-model="item.materialProductRatioRemarks" :disabled="item.materialProductRatio !== '10'" :inputBorder="false" placeholder="请输入原材料与产品数量比备注" />
  69 + </template>
  70 + </uni-list-item>
  71 +
  72 + <uni-list-item class="select-item" :class="item.productName ? 'is-filled' : 'is-empty'" clickable @click="openProductTargetSheet(idx)" :rightText="item.productName || '请选择定作物名称'" showArrow>
  73 + <template v-slot:body>
  74 + <view class="item-title"><text>定作物名称</text></view>
  75 + </template>
  76 + </uni-list-item>
  77 + <uni-list-item title="定作物牌号">
  78 + <template v-slot:footer>
  79 + <uni-easyinput v-model="item.productGrade" :inputBorder="false" placeholder="请输入定作物牌号" />
  80 + </template>
  81 + </uni-list-item>
  82 + <uni-list-item title="状态">
  83 + <template v-slot:footer>
  84 + <uni-easyinput v-model="item.productStatus" :inputBorder="false" placeholder="请输入状态" />
69 </template> 85 </template>
70 </uni-list-item> 86 </uni-list-item>
71 87
72 - <uni-list-item title="厚度"> 88 + <uni-list-item title="厚度mm">
73 <template v-slot:footer> 89 <template v-slot:footer>
74 <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" /> 90 <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
75 </template> 91 </template>
76 </uni-list-item> 92 </uni-list-item>
77 - <uni-list-item title="厚度公差(单项+)"> 93 + <uni-list-item title="厚度公差(单项+)mm">
78 <template v-slot:footer> 94 <template v-slot:footer>
79 <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false" 95 <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
80 placeholder="请输入厚度公差(单项+)" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" /> 96 placeholder="请输入厚度公差(单项+)" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
81 </template> 97 </template>
82 </uni-list-item> 98 </uni-list-item>
83 - <uni-list-item title="厚度公差(单项-)"> 99 + <uni-list-item title="厚度公差(单项-)mm">
84 <template v-slot:footer> 100 <template v-slot:footer>
85 <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false" 101 <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"
86 placeholder="请输入厚度公差(单项-)" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" /> 102 placeholder="请输入厚度公差(单项-)" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
87 </template> 103 </template>
88 </uni-list-item> 104 </uni-list-item>
89 - <uni-list-item title="宽度"> 105 + <uni-list-item title="宽度mm">
90 <template v-slot:footer> 106 <template v-slot:footer>
91 <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" /> 107 <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
92 </template> 108 </template>
93 </uni-list-item> 109 </uni-list-item>
94 - <uni-list-item title="宽度公差(单项+)"> 110 + <uni-list-item title="宽度公差(单项+)mm">
95 <template v-slot:footer> 111 <template v-slot:footer>
96 <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" /> 112 <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
97 </template> 113 </template>
98 </uni-list-item> 114 </uni-list-item>
99 - <uni-list-item title="宽度公差(单项-)"> 115 + <uni-list-item title="宽度公差(单项-)mm">
100 <template v-slot:footer> 116 <template v-slot:footer>
101 <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" /> 117 <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" />
102 </template> 118 </template>
103 </uni-list-item> 119 </uni-list-item>
104 - <uni-list-item title="长度"> 120 + <uni-list-item title="长度mm">
105 <template v-slot:footer> 121 <template v-slot:footer>
106 <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" /> 122 <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
107 </template> 123 </template>
108 </uni-list-item> 124 </uni-list-item>
109 - <uni-list-item title="长度公差(单项+)"> 125 + <uni-list-item title="长度公差(单项+)mm">
110 <template v-slot:footer> 126 <template v-slot:footer>
111 <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false" 127 <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
112 placeholder="请输入长度公差(单项+)" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" /> 128 placeholder="请输入长度公差(单项+)" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
113 </template> 129 </template>
114 </uni-list-item> 130 </uni-list-item>
115 - <uni-list-item title="长度公差(单项-)"> 131 + <uni-list-item title="长度公差(单项-)mm">
116 <template v-slot:footer> 132 <template v-slot:footer>
117 <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false" 133 <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
118 placeholder="请输入长度公差(单项-)" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" /> 134 placeholder="请输入长度公差(单项-)" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />
119 </template> 135 </template>
120 </uni-list-item> 136 </uni-list-item>
121 - <uni-list-item title="定做物数量"> 137 + <uni-list-item title="定作物数量">
122 <template v-slot:footer> 138 <template v-slot:footer>
123 <uni-easyinput v-model="item.productQuantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'productQuantity')" @blur="onNonNegativeBlur(idx, 'productQuantity', 2)" /> 139 <uni-easyinput v-model="item.productQuantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'productQuantity')" @blur="onNonNegativeBlur(idx, 'productQuantity', 2)" />
124 </template> 140 </template>
@@ -161,7 +177,7 @@ @@ -161,7 +177,7 @@
161 <view class="row"><text class="label">原材料名称</text><text class="value">{{ item.rawProductName }}</text></view> 177 <view class="row"><text class="label">原材料名称</text><text class="value">{{ item.rawProductName }}</text></view>
162 <view class="row"><text class="label">原材料牌号</text><text class="value">{{ item.rawProductGrade }}</text></view> 178 <view class="row"><text class="label">原材料牌号</text><text class="value">{{ item.rawProductGrade }}</text></view>
163 <view class="row"><text class="label">原材料提供时间</text><text class="value">{{ item.rawProductProvideDate }}</text></view> 179 <view class="row"><text class="label">原材料提供时间</text><text class="value">{{ item.rawProductProvideDate }}</text></view>
164 - <view class="row"><text class="label">原材料到产品的转换比例</text><text class="value">{{ item.rawToProdRatioName }}</text></view> 180 + <view class="row"><text class="label">原材料产品数量比</text><text class="value">{{ item.rawToProdRatioName }}</text></view>
165 <view class="row"><text class="label">行业</text><text class="value">{{ item.industry }}</text></view> 181 <view class="row"><text class="label">行业</text><text class="value">{{ item.industry }}</text></view>
166 <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view> 182 <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view>
167 <!-- 厚（公差） * 宽（公差） * 长（公差） --> 183 <!-- 厚（公差） * 宽（公差） * 长（公差） -->
@@ -277,7 +293,7 @@ export default { @@ -277,7 +293,7 @@ export default {
277 }, 293 },
278 methods: { 294 methods: {
279 defaultItem() { 295 defaultItem() {
280 - return { rawProductId: '', rawProductName: '', rawProductGrade: '', industry: '',materialProductRatioRemarks:'', supplyTime: '存料加工', materialProductRatio: '', rawToProdRatioName: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', productQuantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' } 296 + return { productId:'', productName:'', productGrade:'', productStatus:'', rawProductId: '', rawProductName: '', rawProductGrade: '', industry: '',materialProductRatioRemarks:'', supplyTime: '存料加工', materialProductRatio: '', rawToProdRatioName: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', productQuantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' }
281 }, 297 },
282 onNonNegativeInput(idx, field) { 298 onNonNegativeInput(idx, field) {
283 const it = this.items[idx] 299 const it = this.items[idx]
@@ -355,6 +371,12 @@ export default { @@ -355,6 +371,12 @@ export default {
355 const match = opts.find(o => String(o.value) === String(current)) 371 const match = opts.find(o => String(o.value) === String(current))
356 this.sheet = { ...this.sheet, visible: true, title: '请选择原材料名称', options: opts, idx, value: match ? match.value : '', mode: 'product' } 372 this.sheet = { ...this.sheet, visible: true, title: '请选择原材料名称', options: opts, idx, value: match ? match.value : '', mode: 'product' }
357 }, 373 },
  374 + openProductTargetSheet(idx) {
  375 + const opts = this.selectOptions
  376 + const current = this.items[idx] && this.items[idx].productId
  377 + const match = opts.find(o => String(o.value) === String(current))
  378 + this.sheet = { ...this.sheet, visible: true, title: '请选择定作物名称', options: opts, idx, value: match ? match.value : '', mode: 'target' }
  379 + },
358 openRawToProdRatioSheet(idx) { 380 openRawToProdRatioSheet(idx) {
359 const opts = this.ratioOptions 381 const opts = this.ratioOptions
360 const current = this.items[idx] && this.items[idx].materialProductRatio 382 const current = this.items[idx] && this.items[idx].materialProductRatio
@@ -368,9 +390,12 @@ export default { @@ -368,9 +390,12 @@ export default {
368 if (this.sheet.mode === 'ratio') { 390 if (this.sheet.mode === 'ratio') {
369 it.materialProductRatio = value 391 it.materialProductRatio = value
370 it.rawToProdRatioName = label || '' 392 it.rawToProdRatioName = label || ''
371 - } else { 393 + } else if (this.sheet.mode === 'product') {
372 it.rawProductId = value 394 it.rawProductId = value
373 it.rawProductName = label || '' 395 it.rawProductName = label || ''
  396 + } else if (this.sheet.mode === 'target') {
  397 + it.productId = value
  398 + it.productName = label || ''
374 } 399 }
375 this.$set(this.items, idx, it) 400 this.$set(this.items, idx, it)
376 this.sheet.visible = false 401 this.sheet.visible = false
@@ -53,50 +53,50 @@ @@ -53,50 +53,50 @@
53 <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" /> 53 <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" />
54 </template> 54 </template>
55 </uni-list-item> 55 </uni-list-item>
56 - <uni-list-item title="厚度"> 56 + <uni-list-item title="厚度mm">
57 <template v-slot:footer> 57 <template v-slot:footer>
58 <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" /> 58 <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
59 </template> 59 </template>
60 </uni-list-item> 60 </uni-list-item>
61 - <uni-list-item title="厚度公差(单项+)"> 61 + <uni-list-item title="厚度公差(单项+)mm">
62 <template v-slot:footer> 62 <template v-slot:footer>
63 <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false" 63 <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
64 placeholder="请输入厚度公差(单项+)" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" /> 64 placeholder="请输入厚度公差(单项+)" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
65 </template> 65 </template>
66 </uni-list-item> 66 </uni-list-item>
67 - <uni-list-item title="厚度公差(单项-)"> 67 + <uni-list-item title="厚度公差(单项-)mm">
68 <template v-slot:footer> 68 <template v-slot:footer>
69 <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false" 69 <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"
70 placeholder="请输入厚度公差(单项-)" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" /> 70 placeholder="请输入厚度公差(单项-)" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
71 </template> 71 </template>
72 </uni-list-item> 72 </uni-list-item>
73 - <uni-list-item title="宽度"> 73 + <uni-list-item title="宽度mm">
74 <template v-slot:footer> 74 <template v-slot:footer>
75 <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" /> 75 <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
76 </template> 76 </template>
77 </uni-list-item> 77 </uni-list-item>
78 - <uni-list-item title="宽度公差(单项+)"> 78 + <uni-list-item title="宽度公差(单项+)mm">
79 <template v-slot:footer> 79 <template v-slot:footer>
80 <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" /> 80 <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
81 </template> 81 </template>
82 </uni-list-item> 82 </uni-list-item>
83 - <uni-list-item title="宽度公差(单项-)"> 83 + <uni-list-item title="宽度公差(单项-)mm">
84 <template v-slot:footer> 84 <template v-slot:footer>
85 <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" /> 85 <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" />
86 </template> 86 </template>
87 </uni-list-item> 87 </uni-list-item>
88 - <uni-list-item title="长度"> 88 + <uni-list-item title="长度mm">
89 <template v-slot:footer> 89 <template v-slot:footer>
90 <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" /> 90 <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
91 </template> 91 </template>
92 </uni-list-item> 92 </uni-list-item>
93 - <uni-list-item title="长度公差(单项+)"> 93 + <uni-list-item title="长度公差(单项+)mm">
94 <template v-slot:footer> 94 <template v-slot:footer>
95 <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false" 95 <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
96 placeholder="请输入长度公差(单项+)" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" /> 96 placeholder="请输入长度公差(单项+)" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
97 </template> 97 </template>
98 </uni-list-item> 98 </uni-list-item>
99 - <uni-list-item title="长度公差(单项-)"> 99 + <uni-list-item title="长度公差(单项-)mm">
100 <template v-slot:footer> 100 <template v-slot:footer>
101 <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false" 101 <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
102 placeholder="请输入长度公差(单项-)" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" /> 102 placeholder="请输入长度公差(单项-)" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />
@@ -53,50 +53,50 @@ @@ -53,50 +53,50 @@
53 <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" /> 53 <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" />
54 </template> 54 </template>
55 </uni-list-item> 55 </uni-list-item>
56 - <uni-list-item title="厚度"> 56 + <uni-list-item title="厚度mm">
57 <template v-slot:footer> 57 <template v-slot:footer>
58 <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" /> 58 <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
59 </template> 59 </template>
60 </uni-list-item> 60 </uni-list-item>
61 - <uni-list-item title="厚度公差(单项+)"> 61 + <uni-list-item title="厚度公差(单项+)mm">
62 <template v-slot:footer> 62 <template v-slot:footer>
63 <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false" 63 <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
64 placeholder="请输入厚度公差(单项+)" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" /> 64 placeholder="请输入厚度公差(单项+)" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
65 </template> 65 </template>
66 </uni-list-item> 66 </uni-list-item>
67 - <uni-list-item title="厚度公差(单项-)"> 67 + <uni-list-item title="厚度公差(单项-)mm">
68 <template v-slot:footer> 68 <template v-slot:footer>
69 <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false" 69 <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"
70 placeholder="请输入厚度公差(单项-)" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" /> 70 placeholder="请输入厚度公差(单项-)" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
71 </template> 71 </template>
72 </uni-list-item> 72 </uni-list-item>
73 - <uni-list-item title="宽度"> 73 + <uni-list-item title="宽度mm">
74 <template v-slot:footer> 74 <template v-slot:footer>
75 <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" /> 75 <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
76 </template> 76 </template>
77 </uni-list-item> 77 </uni-list-item>
78 - <uni-list-item title="宽度公差(单项+)"> 78 + <uni-list-item title="宽度公差(单项+)mm">
79 <template v-slot:footer> 79 <template v-slot:footer>
80 <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" /> 80 <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
81 </template> 81 </template>
82 </uni-list-item> 82 </uni-list-item>
83 - <uni-list-item title="宽度公差(单项-)"> 83 + <uni-list-item title="宽度公差(单项-)mm">
84 <template v-slot:footer> 84 <template v-slot:footer>
85 <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" /> 85 <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" />
86 </template> 86 </template>
87 </uni-list-item> 87 </uni-list-item>
88 - <uni-list-item title="长度"> 88 + <uni-list-item title="长度mm">
89 <template v-slot:footer> 89 <template v-slot:footer>
90 <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" /> 90 <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
91 </template> 91 </template>
92 </uni-list-item> 92 </uni-list-item>
93 - <uni-list-item title="长度公差(单项+)"> 93 + <uni-list-item title="长度公差(单项+)mm">
94 <template v-slot:footer> 94 <template v-slot:footer>
95 <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false" 95 <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
96 placeholder="请输入长度公差(单项+)" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" /> 96 placeholder="请输入长度公差(单项+)" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
97 </template> 97 </template>
98 </uni-list-item> 98 </uni-list-item>
99 - <uni-list-item title="长度公差(单项-)"> 99 + <uni-list-item title="长度公差(单项-)mm">
100 <template v-slot:footer> 100 <template v-slot:footer>
101 <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false" 101 <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
102 placeholder="请输入长度公差(单项-)" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" /> 102 placeholder="请输入长度公差(单项-)" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />
@@ -53,50 +53,50 @@ @@ -53,50 +53,50 @@
53 <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" /> 53 <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" />
54 </template> 54 </template>
55 </uni-list-item> 55 </uni-list-item>
56 - <uni-list-item title="厚度"> 56 + <uni-list-item title="厚度mm">
57 <template v-slot:footer> 57 <template v-slot:footer>
58 <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" /> 58 <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
59 </template> 59 </template>
60 </uni-list-item> 60 </uni-list-item>
61 - <uni-list-item title="厚度公差(单项+)"> 61 + <uni-list-item title="厚度公差(单项+)mm">
62 <template v-slot:footer> 62 <template v-slot:footer>
63 <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false" 63 <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
64 placeholder="请输入厚度公差(单项+)" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" /> 64 placeholder="请输入厚度公差(单项+)" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
65 </template> 65 </template>
66 </uni-list-item> 66 </uni-list-item>
67 - <uni-list-item title="厚度公差(单项-)"> 67 + <uni-list-item title="厚度公差(单项-)mm">
68 <template v-slot:footer> 68 <template v-slot:footer>
69 <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false" 69 <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"
70 placeholder="请输入厚度公差(单项-)" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" /> 70 placeholder="请输入厚度公差(单项-)" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
71 </template> 71 </template>
72 </uni-list-item> 72 </uni-list-item>
73 - <uni-list-item title="宽度"> 73 + <uni-list-item title="宽度mm">
74 <template v-slot:footer> 74 <template v-slot:footer>
75 <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" /> 75 <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
76 </template> 76 </template>
77 </uni-list-item> 77 </uni-list-item>
78 - <uni-list-item title="宽度公差(单项+)"> 78 + <uni-list-item title="宽度公差(单项+)mm">
79 <template v-slot:footer> 79 <template v-slot:footer>
80 <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" /> 80 <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
81 </template> 81 </template>
82 </uni-list-item> 82 </uni-list-item>
83 - <uni-list-item title="宽度公差(单项-)"> 83 + <uni-list-item title="宽度公差(单项-)mm">
84 <template v-slot:footer> 84 <template v-slot:footer>
85 <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" /> 85 <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" />
86 </template> 86 </template>
87 </uni-list-item> 87 </uni-list-item>
88 - <uni-list-item title="长度"> 88 + <uni-list-item title="长度mm">
89 <template v-slot:footer> 89 <template v-slot:footer>
90 <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" /> 90 <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
91 </template> 91 </template>
92 </uni-list-item> 92 </uni-list-item>
93 - <uni-list-item title="长度公差(单项+)"> 93 + <uni-list-item title="长度公差(单项+)mm">
94 <template v-slot:footer> 94 <template v-slot:footer>
95 <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false" 95 <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
96 placeholder="请输入长度公差(单项+)" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" /> 96 placeholder="请输入长度公差(单项+)" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
97 </template> 97 </template>
98 </uni-list-item> 98 </uni-list-item>
99 - <uni-list-item title="长度公差(单项-)"> 99 + <uni-list-item title="长度公差(单项-)mm">
100 <template v-slot:footer> 100 <template v-slot:footer>
101 <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false" 101 <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
102 placeholder="请输入长度公差(单项-)" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" /> 102 placeholder="请输入长度公差(单项-)" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />