朱园亮 / erp-mobile · Commits

Commit 532b6a4032a8b3fffe031551c0e6dc56fa241184

Authored by 史婷婷
2 parents 6f64d0a1 4e8b0b53

Merge branch 'cjerp-1.0' of http://gitlab.qgutech.com/zhuyuanliang/erp-mobile into cjerp-1.0

Inline Side-by-side
Showing 15 changed files with 127 additions and 126 deletions
@@ -236,7 +236,7 @@ export default { @@ -236,7 +236,7 @@ export default {
236 includesPackagingFeeName: '', 236 includesPackagingFeeName: '',
237 includesTransportFee: false, 237 includesTransportFee: false,
238 includesTransportFeeName: '', 238 includesTransportFeeName: '',
239 - unit: '元、公斤、元/公斤', 239 + unit: '美元、公斤、元美/公斤',
240 totalAmountCapital: '', 240 totalAmountCapital: '',
241 destinationId: [], 241 destinationId: [],
242 destinationLabel: '', 242 destinationLabel: '',
@@ -223,7 +223,7 @@ export default { @@ -223,7 +223,7 @@ export default {
223 includesPackagingFeeName: '', 223 includesPackagingFeeName: '',
224 includesTransportFee: false, 224 includesTransportFee: false,
225 includesTransportFeeName: '', 225 includesTransportFeeName: '',
226 - unit: '元、公斤、元/公斤', 226 + unit: '美元、公斤、美元/公斤',
227 totalAmountCapital: '', 227 totalAmountCapital: '',
228 depositInfo: '', 228 depositInfo: '',
229 packagingRequirements: '', 229 packagingRequirements: '',
@@ -53,53 +53,53 @@ @@ -53,53 +53,53 @@
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="厚度mm"> 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="厚度公差(单项+)mm"> 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="厚度公差(单项-)mm"> 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="宽度mm"> 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="宽度公差(单项+)mm"> 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="宽度公差(单项-)mm"> 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="长度mm"> 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="长度公差(单项+)mm"> 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="长度公差(单项-)mm"> 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)" />
103 </template> 103 </template>
104 </uni-list-item> 104 </uni-list-item>
105 <uni-list-item title="状态"> 105 <uni-list-item title="状态">
@@ -236,7 +236,7 @@ export default { @@ -236,7 +236,7 @@ export default {
236 includesPackagingFeeName: '', 236 includesPackagingFeeName: '',
237 includesTransportFee: false, 237 includesTransportFee: false,
238 includesTransportFeeName: '', 238 includesTransportFeeName: '',
239 - unit: '元、公斤、元/公斤', 239 + unit: '美元、公斤、美元/公斤',
240 totalAmountCapital: '', 240 totalAmountCapital: '',
241 destinationId: [], 241 destinationId: [],
242 destinationLabel: '', 242 destinationLabel: '',
@@ -225,7 +225,7 @@ export default { @@ -225,7 +225,7 @@ export default {
225 includesPackagingFeeName: '', 225 includesPackagingFeeName: '',
226 includesTransportFee: false, 226 includesTransportFee: false,
227 includesTransportFeeName: '', 227 includesTransportFeeName: '',
228 - unit: '元、公斤、元/公斤', 228 + unit: '美元、公斤、美元/公斤',
229 totalAmountCapital: '', 229 totalAmountCapital: '',
230 depositInfo: '', 230 depositInfo: '',
231 packagingRequirements: '', 231 packagingRequirements: '',
@@ -53,53 +53,53 @@ @@ -53,53 +53,53 @@
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="厚度mm"> 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="厚度公差(单项+)mm"> 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="厚度公差(单项-)mm"> 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="宽度mm"> 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="宽度公差(单项+)mm"> 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="宽度公差(单项-)mm"> 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="长度mm"> 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="长度公差(单项+)mm"> 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="长度公差(单项-)mm"> 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)" />
103 </template> 103 </template>
104 </uni-list-item> 104 </uni-list-item>
105 <uni-list-item title="状态"> 105 <uni-list-item title="状态">
@@ -216,15 +216,6 @@ export default { @@ -216,15 +216,6 @@ export default {
216 sheet: { visible: false, title: '请选择产品', options: [], value: '', idx: -1 } 216 sheet: { visible: false, title: '请选择产品', options: [], value: '', idx: -1 }
217 } 217 }
218 }, 218 },
219 - computed: {  
220 - selectOptions() {  
221 - const list = Array.isArray(this.options) ? this.options : []  
222 - return list.map(o => ({  
223 - label: o.label != null ? o.label : (o.text != null ? o.text : (o.name != null ? o.name : '')),  
224 - value: o.value != null ? o.value : (o.id != null ? o.id : o.productId)  
225 - }))  
226 - }  
227 - },  
228 watch: { 219 watch: {
229 items: { 220 items: {
230 handler() { this.emitChange() }, 221 handler() { this.emitChange() },
@@ -246,6 +237,13 @@ export default { @@ -246,6 +237,13 @@ export default {
246 this.recalculateAll() 237 this.recalculateAll()
247 }, 238 },
248 computed: { 239 computed: {
  240 + selectOptions() {
  241 + const list = Array.isArray(this.options) ? this.options : []
  242 + return list.map(o => ({
  243 + label: o.label != null ? o.label : (o.text != null ? o.text : (o.name != null ? o.name : '')),
  244 + value: o.value != null ? o.value : (o.id != null ? o.id : o.productId)
  245 + }))
  246 + },
249 minDeliveryDate() { 247 minDeliveryDate() {
250 const s = this.deliveryDate 248 const s = this.deliveryDate
251 if (!s) return '' 249 if (!s) return ''
@@ -321,9 +319,9 @@ export default { @@ -321,9 +319,9 @@ export default {
321 return [t, w, l].filter(Boolean).join(' × ') 319 return [t, w, l].filter(Boolean).join(' × ')
322 }, 320 },
323 openProductSheet(idx) { 321 openProductSheet(idx) {
324 - const opts = this.selectOptions 322 + const opts = Array.isArray(this.selectOptions) ? this.selectOptions : []
325 const current = this.items[idx] && this.items[idx].productId 323 const current = this.items[idx] && this.items[idx].productId
326 - const match = opts.find(o => o.value === current) 324 + const match = (opts || []).find(o => String(o.value) === String(current))
327 this.sheet = { ...this.sheet, visible: true, title: '请选择产品', options: opts, idx, value: match ? match.value : '' } 325 this.sheet = { ...this.sheet, visible: true, title: '请选择产品', options: opts, idx, value: match ? match.value : '' }
328 }, 326 },
329 onProductConfirm({ value, label }) { 327 onProductConfirm({ value, label }) {
@@ -236,7 +236,7 @@ export default { @@ -236,7 +236,7 @@ export default {
236 includesPackagingFeeName: '', 236 includesPackagingFeeName: '',
237 includesTransportFee: false, 237 includesTransportFee: false,
238 includesTransportFeeName: '', 238 includesTransportFeeName: '',
239 - unit: '元、公斤、元/公斤', 239 + unit: '美元、公斤、美元/公斤',
240 totalAmountCapital: '', 240 totalAmountCapital: '',
241 destinationId: [], 241 destinationId: [],
242 destinationLabel: '', 242 destinationLabel: '',
@@ -225,7 +225,7 @@ export default { @@ -225,7 +225,7 @@ export default {
225 includesPackagingFeeName: '', 225 includesPackagingFeeName: '',
226 includesTransportFee: false, 226 includesTransportFee: false,
227 includesTransportFeeName: '', 227 includesTransportFeeName: '',
228 - unit: '元、公斤、元/公斤', 228 + unit: '美元、公斤、美元/公斤',
229 totalAmountCapital: '', 229 totalAmountCapital: '',
230 depositInfo: '', 230 depositInfo: '',
231 packagingRequirements: '', 231 packagingRequirements: '',
@@ -53,53 +53,53 @@ @@ -53,53 +53,53 @@
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="厚度mm"> 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="厚度公差(单项+)mm"> 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="厚度公差(单项-)mm"> 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="宽度mm"> 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="宽度公差(单项+)mm"> 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="宽度公差(单项-)mm"> 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="长度mm"> 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="长度公差(单项+)mm"> 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="长度公差(单项-)mm"> 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)" />
103 </template> 103 </template>
104 </uni-list-item> 104 </uni-list-item>
105 <uni-list-item title="状态"> 105 <uni-list-item title="状态">
@@ -306,8 +306,8 @@ export default { @@ -306,8 +306,8 @@ export default {
306 const o = Array.isArray(oldVal) ? oldVal : [] 306 const o = Array.isArray(oldVal) ? oldVal : []
307 const changed = [] 307 const changed = []
308 for (let i = 0; i < n.length; i++) { 308 for (let i = 0; i < n.length; i++) {
309 - const ni = n[i] && n[i].productId  
310 - const oi = o[i] && o[i].productId 309 + const ni = n[i] && n[i].rawProductId
  310 + const oi = o[i] && o[i].rawProductId
311 if (ni !== oi && ni !== undefined) changed.push(ni) 311 if (ni !== oi && ni !== undefined) changed.push(ni)
312 } 312 }
313 if (changed.length && this.form.buyer) { 313 if (changed.length && this.form.buyer) {
@@ -319,11 +319,11 @@ export default { @@ -319,11 +319,11 @@ export default {
319 }, 319 },
320 methods: { 320 methods: {
321 getHistory() { 321 getHistory() {
322 - console.log('this.productLineList', this.productLineList[0].productId)  
323 - if (!this.productLineList.length || !this.productLineList[0].productId) { 322 + console.log('this.productLineList', this.productLineList[0].rawProductId)
  323 + if (!this.productLineList.length || !this.productLineList[0].rawProductId) {
324 return; 324 return;
325 } 325 }
326 - const id = this.productLineList.map(it => it.productId).join('') 326 + const id = this.productLineList.map(it => it.rawProductId).join('')
327 this.fetchCustomerQualityRequirements(id) 327 this.fetchCustomerQualityRequirements(id)
328 }, 328 },
329 async fetchCustomerQualityRequirements(id) { 329 async fetchCustomerQualityRequirements(id) {
@@ -85,53 +85,53 @@ @@ -85,53 +85,53 @@
85 </template> 85 </template>
86 </uni-list-item> 86 </uni-list-item>
87 87
88 - <uni-list-item title="厚度mm"> 88 + <uni-list-item title="厚度(mm)">
89 <template v-slot:footer> 89 <template v-slot:footer>
90 <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)" />
91 </template> 91 </template>
92 </uni-list-item> 92 </uni-list-item>
93 - <uni-list-item title="厚度公差(单项+)mm"> 93 + <uni-list-item title="厚度公差上限(mm)">
94 <template v-slot:footer> 94 <template v-slot:footer>
95 <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false" 95 <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
96 - placeholder="请输入厚度公差(单项+)" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" /> 96 + placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
97 </template> 97 </template>
98 </uni-list-item> 98 </uni-list-item>
99 - <uni-list-item title="厚度公差(单项-)mm"> 99 + <uni-list-item title="厚度公差下限(mm)">
100 <template v-slot:footer> 100 <template v-slot:footer>
101 <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false" 101 <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"
102 - placeholder="请输入厚度公差(单项-)" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" /> 102 + placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
103 </template> 103 </template>
104 </uni-list-item> 104 </uni-list-item>
105 - <uni-list-item title="宽度mm"> 105 + <uni-list-item title="宽度(mm)">
106 <template v-slot:footer> 106 <template v-slot:footer>
107 <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)" />
108 </template> 108 </template>
109 </uni-list-item> 109 </uni-list-item>
110 - <uni-list-item title="宽度公差(单项+)mm"> 110 + <uni-list-item title="宽度公差上限(mm)">
111 <template v-slot:footer> 111 <template v-slot:footer>
112 - <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)" />
113 </template> 113 </template>
114 </uni-list-item> 114 </uni-list-item>
115 - <uni-list-item title="宽度公差(单项-)mm"> 115 + <uni-list-item title="宽度公差下限(mm)">
116 <template v-slot:footer> 116 <template v-slot:footer>
117 - <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)" />
118 </template> 118 </template>
119 </uni-list-item> 119 </uni-list-item>
120 - <uni-list-item title="长度mm"> 120 + <uni-list-item title="长度(mm)">
121 <template v-slot:footer> 121 <template v-slot:footer>
122 <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)" />
123 </template> 123 </template>
124 </uni-list-item> 124 </uni-list-item>
125 - <uni-list-item title="长度公差(单项+)mm"> 125 + <uni-list-item title="长度公差上限(mm)">
126 <template v-slot:footer> 126 <template v-slot:footer>
127 <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false" 127 <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
128 - placeholder="请输入长度公差(单项+)" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" /> 128 + placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
129 </template> 129 </template>
130 </uni-list-item> 130 </uni-list-item>
131 - <uni-list-item title="长度公差(单项-)mm"> 131 + <uni-list-item title="长度公差下限(mm)">
132 <template v-slot:footer> 132 <template v-slot:footer>
133 <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false" 133 <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
134 - placeholder="请输入长度公差(单项-)" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" /> 134 + placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />
135 </template> 135 </template>
136 </uni-list-item> 136 </uni-list-item>
137 <uni-list-item title="定作物数量"> 137 <uni-list-item title="定作物数量">
@@ -53,53 +53,53 @@ @@ -53,53 +53,53 @@
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="厚度mm"> 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="厚度公差(单项+)mm"> 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="厚度公差(单项-)mm"> 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="宽度mm"> 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="宽度公差(单项+)mm"> 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="宽度公差(单项-)mm"> 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="长度mm"> 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="长度公差(单项+)mm"> 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="长度公差(单项-)mm"> 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)" />
103 </template> 103 </template>
104 </uni-list-item> 104 </uni-list-item>
105 <uni-list-item title="状态"> 105 <uni-list-item title="状态">
@@ -53,53 +53,53 @@ @@ -53,53 +53,53 @@
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="厚度mm"> 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="厚度公差(单项+)mm"> 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="厚度公差(单项-)mm"> 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="宽度mm"> 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="宽度公差(单项+)mm"> 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="宽度公差(单项-)mm"> 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="长度mm"> 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="长度公差(单项+)mm"> 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="长度公差(单项-)mm"> 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)" />
103 </template> 103 </template>
104 </uni-list-item> 104 </uni-list-item>
105 <uni-list-item title="状态"> 105 <uni-list-item title="状态">
@@ -301,6 +301,8 @@ export default { @@ -301,6 +301,8 @@ export default {
301 productLineList: { 301 productLineList: {
302 deep: true, 302 deep: true,
303 handler(newVal, oldVal) { 303 handler(newVal, oldVal) {
  304 + console.log('newVal', newVal)
  305 + console.log('oldVal', oldVal)
304 const n = Array.isArray(newVal) ? newVal : [] 306 const n = Array.isArray(newVal) ? newVal : []
305 const o = Array.isArray(oldVal) ? oldVal : [] 307 const o = Array.isArray(oldVal) ? oldVal : []
306 const changed = [] 308 const changed = []
@@ -357,6 +359,7 @@ export default { @@ -357,6 +359,7 @@ export default {
357 }); 359 });
358 }, 360 },
359 onProductsChange(products) { 361 onProductsChange(products) {
  362 + console.log('products', products)
360 const list = Array.isArray(products) ? products : [] 363 const list = Array.isArray(products) ? products : []
361 const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0) 364 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) 365 const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
@@ -53,53 +53,53 @@ @@ -53,53 +53,53 @@
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="厚度mm"> 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="厚度公差(单项+)mm"> 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="厚度公差(单项-)mm"> 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="宽度mm"> 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="宽度公差(单项+)mm"> 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="宽度公差(单项-)mm"> 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="长度mm"> 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="长度公差(单项+)mm"> 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="长度公差(单项-)mm"> 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)" />
103 </template> 103 </template>
104 </uni-list-item> 104 </uni-list-item>
105 <uni-list-item title="状态"> 105 <uni-list-item title="状态">