Commit 4e3a5c3d087f003faa4aa93f2926b40b7099af8a

Authored by 史婷婷
1 parent 0a75fcfd

feat: 订货单&规格变更单-新增&编辑&查看&审核&审核详情-执行标准-其他-标准字段

@@ -86,6 +86,11 @@ @@ -86,6 +86,11 @@
86 <view class="item-title"><text>执行标准</text></view> 86 <view class="item-title"><text>执行标准</text></view>
87 </template> 87 </template>
88 </uni-list-item> 88 </uni-list-item>
  89 + <uni-list-item title="标准" v-if="form.executionStandard === 'OTHER'">
  90 + <template v-slot:footer>
  91 + <uni-easyinput v-model="form.executionStandardRemarks" placeholder="请输入标准" :inputBorder="false" />
  92 + </template>
  93 + </uni-list-item>
89 </view> 94 </view>
90 95
91 96
@@ -358,7 +363,7 @@ export default { @@ -358,7 +363,7 @@ export default {
358 try { 363 try {
359 await createApi(payload) 364 await createApi(payload)
360 uni.showToast({ title: '保存成功', icon: 'success' }) 365 uni.showToast({ title: '保存成功', icon: 'success' })
361 - setTimeout(() => { uni.redirectTo({ url: '/pages/order_list/index' }) }, 300) 366 + setTimeout(() => { uni.redirectTo({ url: '/pages/change_list/index' }) }, 300)
362 } catch (e) { 367 } catch (e) {
363 uni.showToast({ title: (e && e.msg) || '保存失败', icon: 'none' }) 368 uni.showToast({ title: (e && e.msg) || '保存失败', icon: 'none' })
364 } 369 }
@@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
32 <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view> 32 <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view>
33 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD', 33 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
34 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view> 34 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
  35 + <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text class="value">{{ form.executionStandardRemarks }}</text></view>
35 </view> 36 </view>
36 37
37 <view class="title-header"> 38 <view class="title-header">
@@ -85,6 +85,11 @@ @@ -85,6 +85,11 @@
85 <view class="item-title"><text>执行标准</text></view> 85 <view class="item-title"><text>执行标准</text></view>
86 </template> 86 </template>
87 </uni-list-item> 87 </uni-list-item>
  88 + <uni-list-item title="标准" v-if="form.executionStandard === 'OTHER'">
  89 + <template v-slot:footer>
  90 + <uni-easyinput v-model="form.executionStandardRemarks" placeholder="请输入标准" :inputBorder="false" />
  91 + </template>
  92 + </uni-list-item>
88 </view> 93 </view>
89 94
90 95
@@ -32,6 +32,8 @@ @@ -32,6 +32,8 @@
32 <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view> 32 <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view>
33 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD', 33 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
34 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view> 34 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
  35 + <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text class="value">{{
  36 + form.executionStandardRemarks }}</text></view>
35 </view> 37 </view>
36 38
37 <view class="title-header"> 39 <view class="title-header">
@@ -86,6 +86,11 @@ @@ -86,6 +86,11 @@
86 <view class="item-title"><text>执行标准</text></view> 86 <view class="item-title"><text>执行标准</text></view>
87 </template> 87 </template>
88 </uni-list-item> 88 </uni-list-item>
  89 + <uni-list-item title="标准" v-if="form.executionStandard === 'OTHER'">
  90 + <template v-slot:footer>
  91 + <uni-easyinput v-model="form.executionStandardRemarks" placeholder="请输入标准" :inputBorder="false" />
  92 + </template>
  93 + </uni-list-item>
89 </view> 94 </view>
90 95
91 96
@@ -176,6 +181,7 @@ @@ -176,6 +181,7 @@
176 <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view> 181 <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view>
177 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD', 182 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
178 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view> 183 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
  184 + <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text class="value">{{ form.executionStandardRemarks }}</text></view>
179 </view> 185 </view>
180 186
181 <view class="title-header"> 187 <view class="title-header">
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
29 <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view> 29 <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view>
30 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD', 30 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
31 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view> 31 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
  32 + <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text class="value">{{ form.executionStandardRemarks }}</text></view>
32 </view> 33 </view>
33 34
34 <view class="title-header"> 35 <view class="title-header">
@@ -85,6 +85,11 @@ @@ -85,6 +85,11 @@
85 <view class="item-title"><text>执行标准</text></view> 85 <view class="item-title"><text>执行标准</text></view>
86 </template> 86 </template>
87 </uni-list-item> 87 </uni-list-item>
  88 + <uni-list-item title="标准" v-if="form.executionStandard === 'OTHER'">
  89 + <template v-slot:footer>
  90 + <uni-easyinput v-model="form.executionStandardRemarks" placeholder="请输入标准" :inputBorder="false" />
  91 + </template>
  92 + </uni-list-item>
88 </view> 93 </view>
89 94
90 95
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
27 <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view> 27 <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view>
28 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD', 28 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
29 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view> 29 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
  30 + <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text class="value">{{ form.executionStandardRemarks }}</text></view>
30 </view> 31 </view>
31 32
32 <view class="title-header"> 33 <view class="title-header">
@@ -145,22 +145,6 @@ export default { @@ -145,22 +145,6 @@ export default {
145 const est = (this.dicOptions.APPLICABLE_STANDARD || []).find(o => String(o.code) === String(this.form.executionStandard)) 145 const est = (this.dicOptions.APPLICABLE_STANDARD || []).find(o => String(o.code) === String(this.form.executionStandard))
146 this.form.executionStandardName = est ? (est.name || '') : (this.form.executionStandardName || '') 146 this.form.executionStandardName = est ? (est.name || '') : (this.form.executionStandardName || '')
147 }, 147 },
148 - openSheet(field) {  
149 - if (field === 'executionStandard') {  
150 - const options = (this.dicOptions.APPLICABLE_STANDARD || []).map(it => ({ label: it.name || '', value: it.code || '' }))  
151 - const current = this.form.executionStandard  
152 - const match = options.find(o => String(o.value) === String(current))  
153 - this.sheet = { ...this.sheet, visible: true, title: '执行标准', options, field, value: match ? match.value : '' }  
154 - }  
155 - },  
156 - onSheetConfirm({ value, label }) {  
157 - const field = this.sheet.field  
158 - if (field === 'executionStandard') {  
159 - this.form.executionStandard = value || ''  
160 - this.form.executionStandardName = label || ''  
161 - }  
162 - this.sheet.visible = false  
163 - },  
164 openRelate(fieldKey) { 148 openRelate(fieldKey) {
165 let config = {} 149 let config = {}
166 if (fieldKey === 'orderNo') { 150 if (fieldKey === 'orderNo') {