朱园亮 / erp-mobile · Commits

Commit 646e2b55fb4e96565446395dc6d3bc9c83e86008

Authored by gesilong
1 parent 278f1615

Changes：bug修复

Inline Side-by-side
Showing 24 changed files with 65 additions and 35 deletions
@@ -555,7 +555,7 @@ export default { @@ -555,7 +555,7 @@ export default {
555 async onSubmit() { 555 async onSubmit() {
556 if (!this.validateRequired()) return 556 if (!this.validateRequired()) return
557 const confirmRes = await new Promise(resolve => { 557 const confirmRes = await new Promise(resolve => {
558 - uni.showModal({ title: '提示', content: '确定新增经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve }) 558 + uni.showModal({ title: '提示', content: '确定新增外贸标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
559 }) 559 })
560 if (!(confirmRes && confirmRes.confirm)) return 560 if (!(confirmRes && confirmRes.confirm)) return
561 const clean = (obj) => { 561 const clean = (obj) => {
@@ -483,6 +483,8 @@ export default { @@ -483,6 +483,8 @@ export default {
483 text-align: right; 483 text-align: right;
484 color: rgba(0, 0, 0, 0.9); 484 color: rgba(0, 0, 0, 0.9);
485 font-size: 28rpx; 485 font-size: 28rpx;
  486 + white-space: pre-wrap;
  487 + word-break: break-all;
486 } 488 }
487 489
488 .customer { 490 .customer {
@@ -531,7 +531,7 @@ export default { @@ -531,7 +531,7 @@ export default {
531 console.log('onSubmit__payload', payload) 531 console.log('onSubmit__payload', payload)
532 if (!this.validateRequired()) return 532 if (!this.validateRequired()) return
533 const confirmRes = await new Promise(resolve => { 533 const confirmRes = await new Promise(resolve => {
534 - uni.showModal({ title: '提示', content: '确定保存当前经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve }) 534 + uni.showModal({ title: '提示', content: '确定保存当前外贸标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
535 }) 535 })
536 if (!(confirmRes && confirmRes.confirm)) return 536 if (!(confirmRes && confirmRes.confirm)) return
537 const clean = (obj) => { 537 const clean = (obj) => {
@@ -189,7 +189,7 @@ @@ -189,7 +189,7 @@
189 <div class="total-text"> 189 <div class="total-text">
190 合计 190 合计
191 </div> 191 </div>
192 - <div class="total-item"> 192 + <div class="total-item" style="padding: 20rpx 0;">
193 <div class="total-item-text"> 193 <div class="total-item-text">
194 数量 194 数量
195 </div> 195 </div>
@@ -205,14 +205,14 @@ @@ -205,14 +205,14 @@
205 ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }} 205 ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
206 </div> 206 </div>
207 </div> --> 207 </div> -->
208 - <div class="total-item"> 208 + <!-- <div class="total-item">
209 <div class="total-item-text"> 209 <div class="total-item-text">
210 总金额 210 总金额
211 </div> 211 </div>
212 <div class="total-item-price text-red"> 212 <div class="total-item-price text-red">
213 - ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }} 213 + -
214 </div> 214 </div>
215 - </div> 215 + </div> -->
216 </div> 216 </div>
217 <button class="btn submit" type="primary" @click="onSubmit">提交</button> 217 <button class="btn submit" type="primary" @click="onSubmit">提交</button>
218 </view> 218 </view>
@@ -575,6 +575,8 @@ export default { @@ -575,6 +575,8 @@ export default {
575 text-align: right; 575 text-align: right;
576 color: rgba(0, 0, 0, 0.9); 576 color: rgba(0, 0, 0, 0.9);
577 font-size: 28rpx; 577 font-size: 28rpx;
  578 + white-space: pre-wrap;
  579 + word-break: break-all;
578 } 580 }
579 581
580 .customer { 582 .customer {
@@ -92,12 +92,12 @@ @@ -92,12 +92,12 @@
92 @blur="onNumberBlur(idx, 'unitPrice', 0)" /> 92 @blur="onNumberBlur(idx, 'unitPrice', 0)" />
93 </template> 93 </template>
94 </uni-list-item> 94 </uni-list-item>
95 - <uni-list-item title="不含税金额"> 95 + <!-- <uni-list-item title="不含税金额">
96 <template v-slot:footer> 96 <template v-slot:footer>
97 <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" 97 <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false"
98 disabled placeholder="" /> 98 disabled placeholder="" />
99 </template> 99 </template>
100 - </uni-list-item> 100 + </uni-list-item> -->
101 <uni-list-item title="总金额"> 101 <uni-list-item title="总金额">
102 <template v-slot:footer> 102 <template v-slot:footer>
103 <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled 103 <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled
@@ -188,7 +188,7 @@ @@ -188,7 +188,7 @@
188 <view class="footer"> 188 <view class="footer">
189 <div class="total"> 189 <div class="total">
190 <div class="total-text">合计</div> 190 <div class="total-text">合计</div>
191 - <div class="total-item"> 191 + <div class="total-item" style="padding: 20rpx 0;">
192 <div class="total-item-text">数量</div> 192 <div class="total-item-text">数量</div>
193 <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div> 193 <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div>
194 </div> 194 </div>
@@ -196,10 +196,10 @@ @@ -196,10 +196,10 @@
196 <div class="total-item-text">不含税金额</div> 196 <div class="total-item-text">不含税金额</div>
197 <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div> 197 <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div>
198 </div> --> 198 </div> -->
199 - <div class="total-item"> 199 + <!-- <div class="total-item">
200 <div class="total-item-text">总金额</div> 200 <div class="total-item-text">总金额</div>
201 <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div> 201 <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div>
202 - </div> 202 + </div> -->
203 </div> 203 </div>
204 <button class="btn submit" type="primary" @click="onSubmit">保存</button> 204 <button class="btn submit" type="primary" @click="onSubmit">保存</button>
205 </view> 205 </view>
@@ -116,7 +116,7 @@ @@ -116,7 +116,7 @@
116 </uni-list-item> 116 </uni-list-item>
117 <uni-list-item title="单价"> 117 <uni-list-item title="单价">
118 <template v-slot:footer> 118 <template v-slot:footer>
119 - <uni-easyinput v-model="item.unitPrice" disabled type="number" :inputBorder="false" placeholder="请输入单价" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'unitPrice', 9)" /> 119 + <uni-easyinput placeholder="-" disabled type="number" :inputBorder="false" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'unitPrice', 9)" />
120 </template> 120 </template>
121 </uni-list-item> 121 </uni-list-item>
122 <uni-list-item title="外贸加工费"> 122 <uni-list-item title="外贸加工费">
@@ -131,7 +131,7 @@ @@ -131,7 +131,7 @@
131 </uni-list-item> --> 131 </uni-list-item> -->
132 <uni-list-item title="总金额"> 132 <uni-list-item title="总金额">
133 <template v-slot:footer> 133 <template v-slot:footer>
134 - <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="" /> 134 + <uni-easyinput :inputBorder="false" disabled placeholder="-" />
135 </template> 135 </template>
136 </uni-list-item> 136 </uni-list-item>
137 <uni-list-item title="发货日期"> 137 <uni-list-item title="发货日期">
@@ -587,6 +587,8 @@ export default { @@ -587,6 +587,8 @@ export default {
587 text-align: right; 587 text-align: right;
588 color: rgba(0, 0, 0, 0.9); 588 color: rgba(0, 0, 0, 0.9);
589 font-size: 28rpx; 589 font-size: 28rpx;
  590 + white-space: pre-wrap;
  591 + word-break: break-all;
590 } 592 }
591 593
592 .customer { 594 .customer {
@@ -120,6 +120,8 @@ export default { @@ -120,6 +120,8 @@ export default {
120 font-size: 28rpx; 120 font-size: 28rpx;
121 color: rgba(0, 0, 0, 0.9); 121 color: rgba(0, 0, 0, 0.9);
122 text-align: right; 122 text-align: right;
  123 + white-space: pre-wrap;
  124 + word-break: break-all;
123 } 125 }
124 } 126 }
125 </style> 127 </style>
@@ -568,7 +568,7 @@ export default { @@ -568,7 +568,7 @@ export default {
568 async onSubmit() { 568 async onSubmit() {
569 if (!this.validateRequired()) return 569 if (!this.validateRequired()) return
570 const confirmRes = await new Promise(resolve => { 570 const confirmRes = await new Promise(resolve => {
571 - uni.showModal({ title: '提示', content: '确定新增经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve }) 571 + uni.showModal({ title: '提示', content: '确定新增加工标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
572 }) 572 })
573 if (!(confirmRes && confirmRes.confirm)) return 573 if (!(confirmRes && confirmRes.confirm)) return
574 const clean = (obj) => { 574 const clean = (obj) => {
@@ -466,6 +466,8 @@ export default { @@ -466,6 +466,8 @@ export default {
466 text-align: right; 466 text-align: right;
467 color: rgba(0, 0, 0, 0.9); 467 color: rgba(0, 0, 0, 0.9);
468 font-size: 28rpx; 468 font-size: 28rpx;
  469 + white-space: pre-wrap;
  470 + word-break: break-all;
469 } 471 }
470 472
471 .customer { 473 .customer {
@@ -513,7 +513,7 @@ export default { @@ -513,7 +513,7 @@ export default {
513 console.log('onSubmit__payload', payload) 513 console.log('onSubmit__payload', payload)
514 if (!this.validateRequired()) return 514 if (!this.validateRequired()) return
515 const confirmRes = await new Promise(resolve => { 515 const confirmRes = await new Promise(resolve => {
516 - uni.showModal({ title: '提示', content: '确定保存当前经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve }) 516 + uni.showModal({ title: '提示', content: '确定保存当前加工标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
517 }) 517 })
518 if (!(confirmRes && confirmRes.confirm)) return 518 if (!(confirmRes && confirmRes.confirm)) return
519 const clean = (obj) => { 519 const clean = (obj) => {
@@ -63,9 +63,9 @@ @@ -63,9 +63,9 @@
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="原材料与产品数量比备注" v-if="item.materialProductRatio === '10'">
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" :inputBorder="false" placeholder="请输入原材料与产品数量比备注" />
69 </template> 69 </template>
70 </uni-list-item> 70 </uni-list-item>
71 71
@@ -496,6 +496,8 @@ export default { @@ -496,6 +496,8 @@ export default {
496 text-align: right; 496 text-align: right;
497 color: rgba(0, 0, 0, 0.9); 497 color: rgba(0, 0, 0, 0.9);
498 font-size: 28rpx; 498 font-size: 28rpx;
  499 + white-space: pre-wrap;
  500 + word-break: break-all;
499 } 501 }
500 502
501 .customer { 503 .customer {
@@ -527,7 +527,7 @@ export default { @@ -527,7 +527,7 @@ export default {
527 console.log('onSubmit__payload', payload) 527 console.log('onSubmit__payload', payload)
528 if (!this.validateRequired()) return 528 if (!this.validateRequired()) return
529 const confirmRes = await new Promise(resolve => { 529 const confirmRes = await new Promise(resolve => {
530 - uni.showModal({ title: '提示', content: '确定保存当前经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve }) 530 + uni.showModal({ title: '提示', content: '确定保存当前经销标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
531 }) 531 })
532 if (!(confirmRes && confirmRes.confirm)) return 532 if (!(confirmRes && confirmRes.confirm)) return
533 const clean = (obj) => { 533 const clean = (obj) => {
@@ -181,7 +181,7 @@ @@ -181,7 +181,7 @@
181 <div class="total-text"> 181 <div class="total-text">
182 合计 182 合计
183 </div> 183 </div>
184 - <div class="total-item"> 184 + <div class="total-item" style="padding: 20rpx 0;">
185 <div class="total-item-text"> 185 <div class="total-item-text">
186 数量 186 数量
187 </div> 187 </div>
@@ -189,7 +189,7 @@ @@ -189,7 +189,7 @@
189 {{ (totalQuantity || 0).toFixed(2) }}kg 189 {{ (totalQuantity || 0).toFixed(2) }}kg
190 </div> 190 </div>
191 </div> 191 </div>
192 - <div class="total-item"> 192 + <!-- <div class="total-item">
193 <div class="total-item-text"> 193 <div class="total-item-text">
194 不含税金额 194 不含税金额
195 </div> 195 </div>
@@ -204,7 +204,7 @@ @@ -204,7 +204,7 @@
204 <div class="total-item-price text-red"> 204 <div class="total-item-price text-red">
205 ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }} 205 ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
206 </div> 206 </div>
207 - </div> 207 + </div> -->
208 </div> 208 </div>
209 <button class="btn submit" type="primary" @click="onSubmit">提交</button> 209 <button class="btn submit" type="primary" @click="onSubmit">提交</button>
210 </view> 210 </view>
@@ -550,7 +550,7 @@ export default { @@ -550,7 +550,7 @@ export default {
550 async onSubmit() { 550 async onSubmit() {
551 if (!this.validateRequired()) return 551 if (!this.validateRequired()) return
552 const confirmRes = await new Promise(resolve => { 552 const confirmRes = await new Promise(resolve => {
553 - uni.showModal({ title: '提示', content: '确定新增经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve }) 553 + uni.showModal({ title: '提示', content: '确定新增经销库存合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
554 }) 554 })
555 if (!(confirmRes && confirmRes.confirm)) return 555 if (!(confirmRes && confirmRes.confirm)) return
556 const clean = (obj) => { 556 const clean = (obj) => {
@@ -549,6 +549,8 @@ export default { @@ -549,6 +549,8 @@ export default {
549 text-align: right; 549 text-align: right;
550 color: rgba(0, 0, 0, 0.9); 550 color: rgba(0, 0, 0, 0.9);
551 font-size: 28rpx; 551 font-size: 28rpx;
  552 + white-space: pre-wrap;
  553 + word-break: break-all;
552 } 554 }
553 555
554 .customer { 556 .customer {
@@ -117,7 +117,10 @@ @@ -117,7 +117,10 @@
117 <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled /> 117 <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled />
118 </template> 118 </template>
119 </uni-list-item> 119 </uni-list-item>
120 - <view class="footer"> 120 +
  121 + </uni-list>
  122 + </view>
  123 + <view class="footer">
121 <div class="total"> 124 <div class="total">
122 <div class="total-text"> 125 <div class="total-text">
123 合计 126 合计
@@ -127,7 +130,7 @@ @@ -127,7 +130,7 @@
127 数量 130 数量
128 </div> 131 </div>
129 <div class="total-item-price"> 132 <div class="total-item-price">
130 - {{ (totalQuantity || 0).toFixed(2) }}t 133 + {{ (totalQuantity || 0).toFixed(2) }}kg
131 </div> 134 </div>
132 </div> 135 </div>
133 <div class="total-item"> 136 <div class="total-item">
@@ -140,7 +143,7 @@ @@ -140,7 +143,7 @@
140 </div> 143 </div>
141 <div class="total-item"> 144 <div class="total-item">
142 <div class="total-item-text"> 145 <div class="total-item-text">
143 - 总金额 146 + 总金额111
144 </div> 147 </div>
145 <div class="total-item-price text-red"> 148 <div class="total-item-price text-red">
146 ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }} 149 ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
@@ -149,8 +152,6 @@ @@ -149,8 +152,6 @@
149 </div> 152 </div>
150 <button class="btn submit" type="primary" @click="onSubmit">提交</button> 153 <button class="btn submit" type="primary" @click="onSubmit">提交</button>
151 </view> 154 </view>
152 - </uni-list>  
153 - </view>  
154 </view> 155 </view>
155 </scroll-view> 156 </scroll-view>
156 157
@@ -183,18 +183,18 @@ @@ -183,18 +183,18 @@
183 <view class="footer"> 183 <view class="footer">
184 <div class="total"> 184 <div class="total">
185 <div class="total-text">合计</div> 185 <div class="total-text">合计</div>
186 - <div class="total-item"> 186 + <div class="total-item" style="padding: 20rpx 0;">
187 <div class="total-item-text">数量</div> 187 <div class="total-item-text">数量</div>
188 <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div> 188 <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div>
189 </div> 189 </div>
190 - <div class="total-item"> 190 + <!-- <div class="total-item">
191 <div class="total-item-text">不含税金额</div> 191 <div class="total-item-text">不含税金额</div>
192 <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div> 192 <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div>
193 </div> 193 </div>
194 <div class="total-item"> 194 <div class="total-item">
195 <div class="total-item-text">总金额</div> 195 <div class="total-item-text">总金额</div>
196 <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div> 196 <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div>
197 - </div> 197 + </div> -->
198 </div> 198 </div>
199 <button class="btn submit" type="primary" @click="onSubmit">保存</button> 199 <button class="btn submit" type="primary" @click="onSubmit">保存</button>
200 </view> 200 </view>
@@ -519,7 +519,7 @@ export default { @@ -519,7 +519,7 @@ export default {
519 console.log('onSubmit__payload', payload) 519 console.log('onSubmit__payload', payload)
520 if (!this.validateRequired()) return 520 if (!this.validateRequired()) return
521 const confirmRes = await new Promise(resolve => { 521 const confirmRes = await new Promise(resolve => {
522 - uni.showModal({ title: '提示', content: '确定保存当前经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve }) 522 + uni.showModal({ title: '提示', content: '确定保存当前经销库存合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
523 }) 523 })
524 if (!(confirmRes && confirmRes.confirm)) return 524 if (!(confirmRes && confirmRes.confirm)) return
525 const clean = (obj) => { 525 const clean = (obj) => {
@@ -114,17 +114,17 @@ @@ -114,17 +114,17 @@
114 </uni-list-item> 114 </uni-list-item>
115 <uni-list-item title="单价"> 115 <uni-list-item title="单价">
116 <template v-slot:footer> 116 <template v-slot:footer>
117 - <uni-easyinput v-model="item.unitPrice" type="digit" :inputBorder="false" disabled placeholder="请输入销售价格" @input="onNonNegativeInput(idx, 'unitPrice')" @blur="onNonNegativeBlur(idx, 'unitPrice', 9)" /> 117 + <uni-easyinput v-model="item.unitPrice" type="digit" placeholder="-" :inputBorder="false" disabled @input="onNonNegativeInput(idx, 'unitPrice')" @blur="onNonNegativeBlur(idx, 'unitPrice', 9)" />
118 </template> 118 </template>
119 </uni-list-item> 119 </uni-list-item>
120 <uni-list-item title="不含税金额"> 120 <uni-list-item title="不含税金额">
121 <template v-slot:footer> 121 <template v-slot:footer>
122 - <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="" /> 122 + <uni-easyinput :inputBorder="false" disabled 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.totalAmount" type="number" :inputBorder="false" disabled placeholder="" /> 127 + <uni-easyinput :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="发货日期">
@@ -183,6 +183,8 @@ export default { @@ -183,6 +183,8 @@ export default {
183 font-size: 28rpx; 183 font-size: 28rpx;
184 color: rgba(0, 0, 0, 0.9); 184 color: rgba(0, 0, 0, 0.9);
185 text-align: right; 185 text-align: right;
  186 + white-space: pre-wrap;
  187 + word-break: break-all;
186 } 188 }
187 } 189 }
188 </style> 190 </style>
@@ -519,6 +519,8 @@ export default { @@ -519,6 +519,8 @@ export default {
519 let config = {} 519 let config = {}
520 if (fieldKey === 'buyer') { 520 if (fieldKey === 'buyer') {
521 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 521 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  522 + }else if (fieldKey === 'stockUpCompanyId') {
  523 + config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
522 } 524 }
523 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : [] 525 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
524 this.sheet.visible = false 526 this.sheet.visible = false
@@ -529,7 +531,16 @@ export default { @@ -529,7 +531,16 @@ export default {
529 const _fieldKey = this.relate.fieldKey 531 const _fieldKey = this.relate.fieldKey
530 const first = (items && items.length > 0) ? items[0] : null 532 const first = (items && items.length > 0) ? items[0] : null
531 this.form[_fieldKey] = (first && first.id) ? first.id : '' 533 this.form[_fieldKey] = (first && first.id) ? first.id : ''
532 - this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : '' 534 + if (_fieldKey === 'stockUpCompanyId') {
  535 + this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
  536 + } else {
  537 + this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
  538 + }
  539 +
  540 + if (_fieldKey === 'buyer') {
  541 + this.form.stockUpCompanyId = (first && first.id) ? first.id : ''
  542 + this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
  543 + }
533 }, 544 },
534 onRadioSelect(field, nameField, opt) { 545 onRadioSelect(field, nameField, opt) {
535 const val = opt && opt.value != null ? opt.value : '' 546 const val = opt && opt.value != null ? opt.value : ''
@@ -569,6 +569,8 @@ export default { @@ -569,6 +569,8 @@ export default {
569 text-align: right; 569 text-align: right;
570 color: rgba(0, 0, 0, 0.9); 570 color: rgba(0, 0, 0, 0.9);
571 font-size: 28rpx; 571 font-size: 28rpx;
  572 + white-space: pre-wrap;
  573 + word-break: break-all;
572 } 574 }
573 575
574 .customer { 576 .customer {