朱园亮 / erp-mobile · Commits

Commit 97d0692052f6d401b3f788e2373485e9e7df6086

Authored by 史婷婷
1 parent b0496ec5

feat: 全局：开票情况改为开票要求

Inline Side-by-side
Showing 8 changed files with 18 additions and 18 deletions
@@ -53,9 +53,9 @@ @@ -53,9 +53,9 @@
53 <uni-easyinput v-model="form.priceListNo" placeholder="请输入价格表编号" :inputBorder="false" /> 53 <uni-easyinput v-model="form.priceListNo" placeholder="请输入价格表编号" :inputBorder="false" />
54 </template> 54 </template>
55 </uni-list-item> 55 </uni-list-item>
56 - <uni-list-item title="开票情况"> 56 + <uni-list-item title="开票要求">
57 <template v-slot:footer> 57 <template v-slot:footer>
58 - <uni-easyinput v-model="form.invoicingStatus" placeholder="请输入开票情况" :inputBorder="false" /> 58 + <uni-easyinput v-model="form.invoicingStatus" placeholder="请输入开票要求" :inputBorder="false" />
59 </template> 59 </template>
60 </uni-list-item> 60 </uni-list-item>
61 <uni-list-item class="amount-item"> 61 <uni-list-item class="amount-item">
@@ -216,7 +216,7 @@ export default { @@ -216,7 +216,7 @@ export default {
216 const m = res.data || {} 216 const m = res.data || {}
217 const next = { ...this.form, ...m } 217 const next = { ...this.form, ...m }
218 next.id = m.id || m.code || id 218 next.id = m.id || m.code || id
219 - next.purchaseOrderLineList = Array.isArray(m.purchaseOrderLineList) ? m.purchaseOrderLineList.map(x => ({ 219 + next.purchaseOrderLineList = Array.isArray(m.purchaseOrderLineList) ? m.purchaseOrderLineList.map(x => ({
220 ...x, 220 ...x,
221 assessmentExceedsAgreement: Number(x.assessmentExceedsAgreement || 0).toFixed(2) || 0.00, 221 assessmentExceedsAgreement: Number(x.assessmentExceedsAgreement || 0).toFixed(2) || 0.00,
222 })) : [] 222 })) : []
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 27
28 <view class="section"> 28 <view class="section">
29 <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view> 29 <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
30 - <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view> 30 + <view class="row"><text class="label">开票要求</text><text class="value">{{ form.invoicingStatus }}</text></view>
31 <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view> 31 <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view>
32 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD', 32 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
33 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view> 33 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
@@ -52,9 +52,9 @@ @@ -52,9 +52,9 @@
52 <uni-easyinput v-model="form.priceListNo" placeholder="请输入价格表编号" :inputBorder="false" /> 52 <uni-easyinput v-model="form.priceListNo" placeholder="请输入价格表编号" :inputBorder="false" />
53 </template> 53 </template>
54 </uni-list-item> 54 </uni-list-item>
55 - <uni-list-item title="开票情况"> 55 + <uni-list-item title="开票要求">
56 <template v-slot:footer> 56 <template v-slot:footer>
57 - <uni-easyinput v-model="form.invoicingStatus" placeholder="请输入开票情况" :inputBorder="false" /> 57 + <uni-easyinput v-model="form.invoicingStatus" placeholder="请输入开票要求" :inputBorder="false" />
58 </template> 58 </template>
59 </uni-list-item> 59 </uni-list-item>
60 <uni-list-item class="amount-item"> 60 <uni-list-item class="amount-item">
@@ -212,7 +212,7 @@ export default { @@ -212,7 +212,7 @@ export default {
212 const next = { ...this.form, ...m } 212 const next = { ...this.form, ...m }
213 next.id = m.id || m.code || id; 213 next.id = m.id || m.code || id;
214 next.purchaseOrderId = m.orderId || ''; 214 next.purchaseOrderId = m.orderId || '';
215 - next.purchaseOrderLineList = Array.isArray(m.afterChangeSpecList) ? m.afterChangeSpecList.map(x => ({ 215 + next.purchaseOrderLineList = Array.isArray(m.afterChangeSpecList) ? m.afterChangeSpecList.map(x => ({
216 ...x, 216 ...x,
217 assessmentExceedsAgreement: Number(x.assessmentExceedsAgreement || 0).toFixed(2) || 0.00, 217 assessmentExceedsAgreement: Number(x.assessmentExceedsAgreement || 0).toFixed(2) || 0.00,
218 })) : [] 218 })) : []
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 27
28 <view class="section"> 28 <view class="section">
29 <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view> 29 <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
30 - <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view> 30 + <view class="row"><text class="label">开票要求</text><text class="value">{{ form.invoicingStatus }}</text></view>
31 <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view> 31 <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view>
32 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD', 32 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
33 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view> 33 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
@@ -74,9 +74,9 @@ @@ -74,9 +74,9 @@
74 <uni-easyinput v-model="form.priceListNo" placeholder="请输入价格表编号" :inputBorder="false" /> 74 <uni-easyinput v-model="form.priceListNo" placeholder="请输入价格表编号" :inputBorder="false" />
75 </template> 75 </template>
76 </uni-list-item> 76 </uni-list-item>
77 - <uni-list-item title="开票情况"> 77 + <uni-list-item title="开票要求">
78 <template v-slot:footer> 78 <template v-slot:footer>
79 - <uni-easyinput v-model="form.invoicingStatus" placeholder="请输入开票情况" :inputBorder="false" /> 79 + <uni-easyinput v-model="form.invoicingStatus" placeholder="请输入开票要求" :inputBorder="false" />
80 </template> 80 </template>
81 </uni-list-item> 81 </uni-list-item>
82 <uni-list-item class="amount-item"> 82 <uni-list-item class="amount-item">
@@ -191,7 +191,7 @@ @@ -191,7 +191,7 @@
191 191
192 <view class="section"> 192 <view class="section">
193 <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view> 193 <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
194 - <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view> 194 + <view class="row"><text class="label">开票要求</text><text class="value">{{ form.invoicingStatus }}</text></view>
195 <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view> 195 <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view>
196 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD', 196 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
197 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view> 197 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
@@ -331,7 +331,7 @@ export default { @@ -331,7 +331,7 @@ export default {
331 const m = res.data || {} 331 const m = res.data || {}
332 const next = { ...this.form, ...m } 332 const next = { ...this.form, ...m }
333 next.id = m.id || m.code || id 333 next.id = m.id || m.code || id
334 - next.purchaseOrderLineList = Array.isArray(m.purchaseOrderLineList) ? m.purchaseOrderLineList.map(x => ({ 334 + next.purchaseOrderLineList = Array.isArray(m.purchaseOrderLineList) ? m.purchaseOrderLineList.map(x => ({
335 ...x, 335 ...x,
336 assessmentExceedsAgreement: Number(x.assessmentExceedsAgreement || 0).toFixed(2) || 0.00, 336 assessmentExceedsAgreement: Number(x.assessmentExceedsAgreement || 0).toFixed(2) || 0.00,
337 })) : [] 337 })) : []
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 37
38 <view class="section"> 38 <view class="section">
39 <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view> 39 <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
40 - <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view> 40 + <view class="row"><text class="label">开票要求</text><text class="value">{{ form.invoicingStatus }}</text></view>
41 <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view> 41 <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view>
42 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD', 42 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
43 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view> 43 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
@@ -72,9 +72,9 @@ @@ -72,9 +72,9 @@
72 <uni-easyinput v-model="form.priceListNo" placeholder="请输入价格表编号" :inputBorder="false" /> 72 <uni-easyinput v-model="form.priceListNo" placeholder="请输入价格表编号" :inputBorder="false" />
73 </template> 73 </template>
74 </uni-list-item> 74 </uni-list-item>
75 - <uni-list-item title="开票情况"> 75 + <uni-list-item title="开票要求">
76 <template v-slot:footer> 76 <template v-slot:footer>
77 - <uni-easyinput v-model="form.invoicingStatus" placeholder="请输入开票情况" :inputBorder="false" /> 77 + <uni-easyinput v-model="form.invoicingStatus" placeholder="请输入开票要求" :inputBorder="false" />
78 </template> 78 </template>
79 </uni-list-item> 79 </uni-list-item>
80 <uni-list-item class="amount-item"> 80 <uni-list-item class="amount-item">
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
155 155
156 </uni-list> 156 </uni-list>
157 </scroll-view> 157 </scroll-view>
158 - 158 +
159 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" 159 <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
160 @confirm="onSheetConfirm" /> 160 @confirm="onSheetConfirm" />
161 </view> 161 </view>
@@ -230,7 +230,7 @@ export default { @@ -230,7 +230,7 @@ export default {
230 const m = res.data || {} 230 const m = res.data || {}
231 const next = { ...this.form, ...m } 231 const next = { ...this.form, ...m }
232 next.id = m.id || m.code || id 232 next.id = m.id || m.code || id
233 - next.purchaseOrderLineList = Array.isArray(m.purchaseOrderLineList) ? m.purchaseOrderLineList.map(x => ({ 233 + next.purchaseOrderLineList = Array.isArray(m.purchaseOrderLineList) ? m.purchaseOrderLineList.map(x => ({
234 ...x, 234 ...x,
235 assessmentExceedsAgreement: Number(x.assessmentExceedsAgreement || 0).toFixed(2) || 0.00, 235 assessmentExceedsAgreement: Number(x.assessmentExceedsAgreement || 0).toFixed(2) || 0.00,
236 })) : [] 236 })) : []
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 26
27 <view class="section"> 27 <view class="section">
28 <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view> 28 <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
29 - <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view> 29 + <view class="row"><text class="label">开票要求</text><text class="value">{{ form.invoicingStatus }}</text></view>
30 <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view> 30 <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view>
31 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD', 31 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
32 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view> 32 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>