朱园亮 / erp-mobile · Commits

Commit 2c076879cd6517159466da15671faa75c441bd76

Authored by gesilong
1 parent 415962d4

commit：修复bug

Inline Side-by-side
Showing 10 changed files with 15 additions and 17 deletions
@@ -559,7 +559,7 @@ export default { @@ -559,7 +559,7 @@ export default {
559 async onSubmit() { 559 async onSubmit() {
560 if (!this.validateRequired()) return 560 if (!this.validateRequired()) return
561 const confirmRes = await new Promise(resolve => { 561 const confirmRes = await new Promise(resolve => {
562 - uni.showModal({ title: '提示', content: '确定新增经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve }) 562 + uni.showModal({ title: '提示', content: '确定新增外贸库存合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
563 }) 563 })
564 if (!(confirmRes && confirmRes.confirm)) return 564 if (!(confirmRes && confirmRes.confirm)) return
565 const clean = (obj) => { 565 const clean = (obj) => {
@@ -534,7 +534,7 @@ export default { @@ -534,7 +534,7 @@ export default {
534 console.log('onSubmit__payload', payload) 534 console.log('onSubmit__payload', payload)
535 if (!this.validateRequired()) return 535 if (!this.validateRequired()) return
536 const confirmRes = await new Promise(resolve => { 536 const confirmRes = await new Promise(resolve => {
537 - uni.showModal({ title: '提示', content: '确定保存当前经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve }) 537 + uni.showModal({ title: '提示', content: '确定保存当前外贸库存合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
538 }) 538 })
539 if (!(confirmRes && confirmRes.confirm)) return 539 if (!(confirmRes && confirmRes.confirm)) return
540 const clean = (obj) => { 540 const clean = (obj) => {
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
111 </uni-list-item> 111 </uni-list-item>
112 <uni-list-item title="数量"> 112 <uni-list-item title="数量">
113 <template v-slot:footer> 113 <template v-slot:footer>
114 - <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" /> 114 + <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
115 </template> 115 </template>
116 </uni-list-item> 116 </uni-list-item>
117 <uni-list-item title="单价"> 117 <uni-list-item title="单价">
@@ -557,7 +557,7 @@ export default { @@ -557,7 +557,7 @@ export default {
557 if (this.$refs.productRel && !this.$refs.productRel.validate()) return 557 if (this.$refs.productRel && !this.$refs.productRel.validate()) return
558 if (!this.validateRequired()) return 558 if (!this.validateRequired()) return
559 const confirmRes = await new Promise(resolve => { 559 const confirmRes = await new Promise(resolve => {
560 - uni.showModal({ title: '提示', content: '确定新增经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve }) 560 + uni.showModal({ title: '提示', content: '确定新增外贸未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
561 }) 561 })
562 if (!(confirmRes && confirmRes.confirm)) return 562 if (!(confirmRes && confirmRes.confirm)) return
563 const clean = (obj) => { 563 const clean = (obj) => {
@@ -533,7 +533,7 @@ export default { @@ -533,7 +533,7 @@ export default {
533 if (!this.validateRequired()) return 533 if (!this.validateRequired()) return
534 if (this.$refs.productRel && !this.$refs.productRel.validate()) return 534 if (this.$refs.productRel && !this.$refs.productRel.validate()) return
535 const confirmRes = await new Promise(resolve => { 535 const confirmRes = await new Promise(resolve => {
536 - uni.showModal({ title: '提示', content: '确定保存当前经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve }) 536 + uni.showModal({ title: '提示', content: '确定保存当前外贸未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
537 }) 537 })
538 if (!(confirmRes && confirmRes.confirm)) return 538 if (!(confirmRes && confirmRes.confirm)) return
539 const clean = (obj) => { 539 const clean = (obj) => {
@@ -61,13 +61,13 @@ @@ -61,13 +61,13 @@
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', 9)" /> 64 + placeholder="请输入厚度公差上限" @input="onNumberInput(idx, 'thicknessTolPos')" @blur="onNumberBlur(idx, 'thicknessTolPos', 9)" />
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', 9)" /> 70 + placeholder="请输入厚度公差下限" @input="onNumberInput(idx, 'thicknessTolNeg')" @blur="onNumberBlur(idx, 'thicknessTolNeg', 9)" />
71 </template> 71 </template>
72 </uni-list-item> 72 </uni-list-item>
73 <uni-list-item title="宽度(mm)"> 73 <uni-list-item title="宽度(mm)">
@@ -77,12 +77,12 @@ @@ -77,12 +77,12 @@
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', 9)" /> 80 + <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNumberInput(idx, 'widthTolPos')" @blur="onNumberBlur(idx, 'widthTolPos', 9)" />
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', 9)" /> 85 + <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNumberInput(idx, 'widthTolNeg')" @blur="onNumberBlur(idx, 'widthTolNeg', 9)" />
86 </template> 86 </template>
87 </uni-list-item> 87 </uni-list-item>
88 <uni-list-item title="长度(mm)"> 88 <uni-list-item title="长度(mm)">
@@ -93,13 +93,13 @@ @@ -93,13 +93,13 @@
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', 9)" /> 96 + placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 9)" />
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', 9)" /> 102 + placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
103 </template> 103 </template>
104 </uni-list-item> 104 </uni-list-item>
105 <uni-list-item title="状态"> 105 <uni-list-item title="状态">
@@ -399,7 +399,7 @@ export default { @@ -399,7 +399,7 @@ export default {
399 this.emitChange() 399 this.emitChange()
400 }, 400 },
401 recalculate(idx) { 401 recalculate(idx) {
402 - const TAX_RATE = 0.13 402 + // const TAX_RATE = 0.13
403 const it = this.items[idx] 403 const it = this.items[idx]
404 if (!it) return 404 if (!it) return
405 const qty = this.toNumber(it.quantity) 405 const qty = this.toNumber(it.quantity)
@@ -595,9 +595,6 @@ export default { @@ -595,9 +595,6 @@ export default {
595 totalAmountIncludingTax: this.totalAmountIncludingTax, 595 totalAmountIncludingTax: this.totalAmountIncludingTax,
596 contractStdProcessingLineList: lines.map(it => ({ 596 contractStdProcessingLineList: lines.map(it => ({
597 ...it, 597 ...it,
598 - productId: it.rawProductId || '',  
599 - productName: it.rawProductName || '',  
600 - productGrade: it.rawProductGrade || '',  
601 })) 598 }))
602 }) 599 })
603 console.log('onSubmit__payload', payload) 600 console.log('onSubmit__payload', payload)
@@ -396,6 +396,7 @@ export default { @@ -396,6 +396,7 @@ export default {
396 this.specialTermsList = c1.map(it => ({ label: it.name, value: it.code })) 396 this.specialTermsList = c1.map(it => ({ label: it.name, value: it.code }))
397 this.executionStandardList = c2.map(it => ({ label: it.name, value: it.code })) 397 this.executionStandardList = c2.map(it => ({ label: it.name, value: it.code }))
398 this.productList = c3.map(it => ({ label: it.name, value: it.code })) 398 this.productList = c3.map(it => ({ label: it.name, value: it.code }))
  399 + console.log('c5', c5)
399 this.rawProductList = c5.map(it => ({ label: it.name, value: it.code })) 400 this.rawProductList = c5.map(it => ({ label: it.name, value: it.code }))
400 this.rawProductGradeList = c6.map(it => ({ label: it.name, value: it.code })) 401 this.rawProductGradeList = c6.map(it => ({ label: it.name, value: it.code }))
401 } catch (e) { 402 } catch (e) {
@@ -291,7 +291,7 @@ export default { @@ -291,7 +291,7 @@ export default {
291 }, 291 },
292 list: { 292 list: {
293 handler(v) { 293 handler(v) {
294 - this.items = v.map(x => ({ ...this.defaultItem(), ...x, productName: this.selectOptions.find(o => o.value === x.productId)?.label || '', collapsed: true })) 294 + this.items = v.map(x => ({ ...this.defaultItem(), ...x, collapsed: true }))
295 console.log('v', v) 295 console.log('v', v)
296 }, 296 },
297 deep: true 297 deep: true
@@ -107,7 +107,7 @@ @@ -107,7 +107,7 @@
107 <uni-easyinput v-model="item.status" :inputBorder="false" placeholder="请输入状态" /> 107 <uni-easyinput v-model="item.status" :inputBorder="false" placeholder="请输入状态" />
108 </template> 108 </template>
109 </uni-list-item> 109 </uni-list-item>
110 - <uni-list-item title="数量kg"> 110 + <uni-list-item title="数量">
111 <template v-slot:footer> 111 <template v-slot:footer>
112 <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" /> 112 <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
113 </template> 113 </template>