朱园亮 / erp-mobile · Commits

Commit 952d74a975dcfc77564763ade9d195a024804904

Authored by gesilong
1 parent 343ca1b1

commit: bug修复

Inline Side-by-side
Showing 20 changed files with 63 additions and 26 deletions
@@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
123 </uni-list-item> 123 </uni-list-item>
124 <uni-list-item title="备注"> 124 <uni-list-item title="备注">
125 <template v-slot:footer> 125 <template v-slot:footer>
126 - <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" /> 126 + <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000"/>
127 </template> 127 </template>
128 </uni-list-item> 128 </uni-list-item>
129 <view class="quality"> 129 <view class="quality">
@@ -121,7 +121,7 @@ @@ -121,7 +121,7 @@
121 </uni-list-item> 121 </uni-list-item>
122 <uni-list-item title="备注"> 122 <uni-list-item title="备注">
123 <template v-slot:footer> 123 <template v-slot:footer>
124 - <uni-easyinput v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" /> 124 + <uni-easyinput v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
125 </template> 125 </template>
126 </uni-list-item> 126 </uni-list-item>
127 127
@@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
123 </uni-list-item> 123 </uni-list-item>
124 <uni-list-item title="备注"> 124 <uni-list-item title="备注">
125 <template v-slot:footer> 125 <template v-slot:footer>
126 - <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" /> 126 + <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
127 </template> 127 </template>
128 </uni-list-item> 128 </uni-list-item>
129 <view class="quality"> 129 <view class="quality">
@@ -4,8 +4,13 @@ @@ -4,8 +4,13 @@
4 <view class="detail-page"> 4 <view class="detail-page">
5 <view class="section"> 5 <view class="section">
6 <text class="row customer">{{ detail.code }}</text> 6 <text class="row customer">{{ detail.code }}</text>
7 - <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'"><text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text><text class="value"><span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span></text></view>  
8 - <view class="row" v-if="detail.status === 'STANDARD'"><text class="label">合同状态</text><text class="value"><span class="info-status" :style="detail.shippingStatusName ? getShippingStatusName(detail.shippingStatusName) : { color: '#000'}" >{{ detail.shippingStatusName || '-' }}</span></text></view> 7 + <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'">
  8 + <text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text>
  9 + <text class="value">
  10 + <span v-if="detail.status === 'STANDARD'" class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>
  11 + <span v-if="detail.status === 'FORMAL'" class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
  12 + </text>
  13 + </view> <view class="row" v-if="detail.status === 'STANDARD'"><text class="label">合同状态</text><text class="value"><span class="info-status" :style="detail.shippingStatusName ? getShippingStatusName(detail.shippingStatusName) : { color: '#000'}" >{{ detail.shippingStatusName || '-' }}</span></text></view>
9 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-' 14 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
10 }}</text></view> 15 }}</text></view>
11 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-' 16 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
@@ -119,7 +124,7 @@ import ProductRel from './productRel.vue' @@ -119,7 +124,7 @@ import ProductRel from './productRel.vue'
119 import DetailButtons from '@/components/detail-buttons/index.vue' 124 import DetailButtons from '@/components/detail-buttons/index.vue'
120 import FileUpload from '@/components/file-upload/index.vue' 125 import FileUpload from '@/components/file-upload/index.vue'
121 import SingleSelectSheet from '@/components/single-select/index.vue' 126 import SingleSelectSheet from '@/components/single-select/index.vue'
122 -import { fillStandardApprovedName } from '@/utils/dic.js' 127 +import { fillStandardApprovedName, fillFormalApprovedName } from '@/utils/dic.js'
123 128
124 export default { 129 export default {
125 name: 'ContractForeignStockDetail', 130 name: 'ContractForeignStockDetail',
@@ -466,6 +471,7 @@ export default { @@ -466,6 +471,7 @@ export default {
466 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '', 471 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',
467 } 472 }
468 this.detail = await fillStandardApprovedName(this.detail) 473 this.detail = await fillStandardApprovedName(this.detail)
  474 + this.detail = await fillFormalApprovedName(this.detail)
469 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : [] 475 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
470 this.productList = lines 476 this.productList = lines
471 } catch (e) { 477 } catch (e) {
@@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
123 </uni-list-item> 123 </uni-list-item>
124 <uni-list-item title="备注"> 124 <uni-list-item title="备注">
125 <template v-slot:footer> 125 <template v-slot:footer>
126 - <uni-easyinput v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" /> 126 + <uni-easyinput v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
127 </template> 127 </template>
128 </uni-list-item> 128 </uni-list-item>
129 129
@@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
123 </uni-list-item> 123 </uni-list-item>
124 <uni-list-item title="备注"> 124 <uni-list-item title="备注">
125 <template v-slot:footer> 125 <template v-slot:footer>
126 - <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" /> 126 + <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
127 </template> 127 </template>
128 </uni-list-item> 128 </uni-list-item>
129 <view class="quality"> 129 <view class="quality">
@@ -4,8 +4,15 @@ @@ -4,8 +4,15 @@
4 <view class="detail-page"> 4 <view class="detail-page">
5 <view class="section"> 5 <view class="section">
6 <text class="row customer">{{ detail.code }}</text> 6 <text class="row customer">{{ detail.code }}</text>
7 - <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'"><text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text><text class="value"><span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span></text></view>  
8 - <view class="row" v-if="detail.status === 'STANDARD'"><text class="label">合同状态</text><text class="value"><span class="info-status" :style="detail.shippingStatusName ? getShippingStatusName(detail.shippingStatusName) : { color: '#000'}" >{{ detail.shippingStatusName || '-' }}</span></text></view> 7 + <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'">
  8 + <text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text>
  9 + <text class="value">
  10 +
  11 + <span v-if="detail.status === 'STANDARD'" class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>
  12 + <span v-if="detail.status === 'FORMAL'" class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
  13 +
  14 + </text>
  15 + </view> <view class="row" v-if="detail.status === 'STANDARD'"><text class="label">合同状态</text><text class="value"><span class="info-status" :style="detail.shippingStatusName ? getShippingStatusName(detail.shippingStatusName) : { color: '#000'}" >{{ detail.shippingStatusName || '-' }}</span></text></view>
9 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-' 16 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
10 }}</text></view> 17 }}</text></view>
11 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-' 18 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
@@ -120,7 +127,7 @@ import ProductRel from './productRel.vue' @@ -120,7 +127,7 @@ import ProductRel from './productRel.vue'
120 import DetailButtons from '@/components/detail-buttons/index.vue' 127 import DetailButtons from '@/components/detail-buttons/index.vue'
121 import FileUpload from '@/components/file-upload/index.vue' 128 import FileUpload from '@/components/file-upload/index.vue'
122 import SingleSelectSheet from '@/components/single-select/index.vue' 129 import SingleSelectSheet from '@/components/single-select/index.vue'
123 -import { fillStandardApprovedName } from '@/utils/dic.js' 130 +import { fillStandardApprovedName, fillFormalApprovedName } from '@/utils/dic.js'
124 131
125 export default { 132 export default {
126 name: 'ContractForeignUnplanDetail', 133 name: 'ContractForeignUnplanDetail',
@@ -478,6 +485,7 @@ export default { @@ -478,6 +485,7 @@ export default {
478 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '', 485 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',
479 } 486 }
480 this.detail = await fillStandardApprovedName(this.detail) 487 this.detail = await fillStandardApprovedName(this.detail)
  488 + this.detail = await fillFormalApprovedName(this.detail)
481 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : [] 489 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
482 this.productList = lines 490 this.productList = lines
483 } catch (e) { 491 } catch (e) {
@@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
123 </uni-list-item> 123 </uni-list-item>
124 <uni-list-item title="备注"> 124 <uni-list-item title="备注">
125 <template v-slot:footer> 125 <template v-slot:footer>
126 - <uni-easyinput v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" /> 126 + <uni-easyinput v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
127 </template> 127 </template>
128 </uni-list-item> 128 </uni-list-item>
129 129
@@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
123 </uni-list-item> 123 </uni-list-item>
124 <uni-list-item title="备注"> 124 <uni-list-item title="备注">
125 <template v-slot:footer> 125 <template v-slot:footer>
126 - <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" /> 126 + <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
127 </template> 127 </template>
128 </uni-list-item> 128 </uni-list-item>
129 <view class="quality"> 129 <view class="quality">
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 <text>订单总额</text><text class="amount" :style="{ color: '#b67a76' }">{{ item.totalAmountIncludingTax ? '¥' : '' }}{{ formatAmount(item.totalAmountIncludingTax) || '-' }}</text> 61 <text>订单总额</text><text class="amount" :style="{ color: '#b67a76' }">{{ item.totalAmountIncludingTax ? '¥' : '' }}{{ formatAmount(item.totalAmountIncludingTax) || '-' }}</text>
62 </view> 62 </view>
63 <view class="info-row" v-if="item.status === 'STANDARD'"> 63 <view class="info-row" v-if="item.status === 'STANDARD'">
64 - <text>正式合同规范性审核状态</text><span class="info-status" :style="item.standardApprovedName ? getStatusCss(item.standardApprovedName) : ''">{{ item.standardApprovedName || '-' }}</span> 64 + <text>标准合同规范性审核状态</text><span class="info-status" :style="item.standardApprovedName ? getStatusCss(item.standardApprovedName) : ''">{{ item.standardApprovedName || '-' }}</span>
65 </view> 65 </view>
66 <view class="info-row"> 66 <view class="info-row">
67 <text>订货日期</text><text>{{ item.orderDate }}</text> 67 <text>订货日期</text><text>{{ item.orderDate }}</text>
@@ -124,7 +124,7 @@ @@ -124,7 +124,7 @@
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="form.remarks" placeholder="请输入备注" :inputBorder="false" /> 127 + <uni-easyinput v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
128 </template> 128 </template>
129 </uni-list-item> 129 </uni-list-item>
130 130
@@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
123 </uni-list-item> 123 </uni-list-item>
124 <uni-list-item title="备注"> 124 <uni-list-item title="备注">
125 <template v-slot:footer> 125 <template v-slot:footer>
126 - <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" /> 126 + <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
127 </template> 127 </template>
128 </uni-list-item> 128 </uni-list-item>
129 <view class="quality"> 129 <view class="quality">
@@ -124,7 +124,7 @@ @@ -124,7 +124,7 @@
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="form.remarks" placeholder="请输入备注" :inputBorder="false" /> 127 + <uni-easyinput v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
128 </template> 128 </template>
129 </uni-list-item> 129 </uni-list-item>
130 130
@@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
123 </uni-list-item> 123 </uni-list-item>
124 <uni-list-item title="备注"> 124 <uni-list-item title="备注">
125 <template v-slot:footer> 125 <template v-slot:footer>
126 - <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" /> 126 + <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
127 </template> 127 </template>
128 </uni-list-item> 128 </uni-list-item>
129 <view class="quality"> 129 <view class="quality">
@@ -4,8 +4,15 @@ @@ -4,8 +4,15 @@
4 <view class="detail-page"> 4 <view class="detail-page">
5 <view class="section"> 5 <view class="section">
6 <text class="row customer">{{ detail.code }}</text> 6 <text class="row customer">{{ detail.code }}</text>
7 - <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'"><text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text><text class="value"><span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span></text></view>  
8 - <view class="row" v-if="detail.status === 'STANDARD'"><text class="label">合同状态</text><text class="value"><span class="info-status" :style="detail.shippingStatusName ? getShippingStatusName(detail.shippingStatusName) : { color: '#000'}" >{{ detail.shippingStatusName || '-' }}</span></text></view> 7 + <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'">
  8 + <text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text>
  9 + <text class="value">
  10 +
  11 + <span v-if="detail.status === 'STANDARD'" class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>
  12 + <span v-if="detail.status === 'FORMAL'" class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
  13 +
  14 + </text>
  15 + </view> <view class="row" v-if="detail.status === 'STANDARD'"><text class="label">合同状态</text><text class="value"><span class="info-status" :style="detail.shippingStatusName ? getShippingStatusName(detail.shippingStatusName) : { color: '#000'}" >{{ detail.shippingStatusName || '-' }}</span></text></view>
9 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-' 16 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
10 }}</text></view> 17 }}</text></view>
11 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-' 18 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
@@ -110,7 +117,7 @@ @@ -110,7 +117,7 @@
110 117
111 <script> 118 <script>
112 import { getContractApi, deleteContractApi, uploadFormalContract, uploadStandardContract, statusStyle, statusMap } from '@/api/contract' 119 import { getContractApi, deleteContractApi, uploadFormalContract, uploadStandardContract, statusStyle, statusMap } from '@/api/contract'
113 -import { fillStandardApprovedName } from '@/utils/dic.js' 120 +import { fillStandardApprovedName, fillFormalApprovedName } from '@/utils/dic.js'
114 import ProductRel from './productRel.vue' 121 import ProductRel from './productRel.vue'
115 import DetailButtons from '@/components/detail-buttons/index.vue' 122 import DetailButtons from '@/components/detail-buttons/index.vue'
116 import FileUpload from '@/components/file-upload/index.vue' 123 import FileUpload from '@/components/file-upload/index.vue'
@@ -436,6 +443,7 @@ export default { @@ -436,6 +443,7 @@ export default {
436 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '', 443 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',
437 } 444 }
438 this.detail = await fillStandardApprovedName(this.detail) 445 this.detail = await fillStandardApprovedName(this.detail)
  446 + this.detail = await fillFormalApprovedName(this.detail)
439 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : [] 447 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
440 this.productList = lines 448 this.productList = lines
441 } catch (e) { 449 } catch (e) {
@@ -124,7 +124,7 @@ @@ -124,7 +124,7 @@
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="form.remarks" placeholder="请输入备注" :inputBorder="false" /> 127 + <uni-easyinput v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
128 </template> 128 </template>
129 </uni-list-item> 129 </uni-list-item>
130 130
@@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
123 </uni-list-item> 123 </uni-list-item>
124 <uni-list-item title="备注"> 124 <uni-list-item title="备注">
125 <template v-slot:footer> 125 <template v-slot:footer>
126 - <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" /> 126 + <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
127 </template> 127 </template>
128 </uni-list-item> 128 </uni-list-item>
129 <view class="quality"> 129 <view class="quality">
@@ -4,7 +4,15 @@ @@ -4,7 +4,15 @@
4 <view class="detail-page"> 4 <view class="detail-page">
5 <view class="section"> 5 <view class="section">
6 <text class="row customer">{{ detail.code }}</text> 6 <text class="row customer">{{ detail.code }}</text>
7 - <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'"><text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text><text class="value"><span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span></text></view> 7 + <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'">
  8 + <text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text>
  9 + <text class="value">
  10 +
  11 + <span v-if="detail.status === 'STANDARD'" class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>
  12 + <span v-if="detail.status === 'FORMAL'" class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
  13 +
  14 + </text>
  15 + </view>
8 <view class="row" v-if="detail.status === 'STANDARD'"><text class="label">合同状态</text><text class="value"><span class="info-status" :style="detail.shippingStatusName ? getShippingStatusName(detail.shippingStatusName) :{ color: '#000'}" >{{ detail.shippingStatusName || '-' }}</span></text></view> 16 <view class="row" v-if="detail.status === 'STANDARD'"><text class="label">合同状态</text><text class="value"><span class="info-status" :style="detail.shippingStatusName ? getShippingStatusName(detail.shippingStatusName) :{ color: '#000'}" >{{ detail.shippingStatusName || '-' }}</span></text></view>
9 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-' 17 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
10 }}</text></view> 18 }}</text></view>
@@ -120,7 +128,7 @@ import ProductRel from './productRel.vue' @@ -120,7 +128,7 @@ import ProductRel from './productRel.vue'
120 import DetailButtons from '@/components/detail-buttons/index.vue' 128 import DetailButtons from '@/components/detail-buttons/index.vue'
121 import FileUpload from '@/components/file-upload/index.vue' 129 import FileUpload from '@/components/file-upload/index.vue'
122 import SingleSelectSheet from '@/components/single-select/index.vue' 130 import SingleSelectSheet from '@/components/single-select/index.vue'
123 -import { fillStandardApprovedName } from '@/utils/dic.js' 131 +import { fillStandardApprovedName, fillFormalApprovedName } from '@/utils/dic.js'
124 132
125 export default { 133 export default {
126 name: 'ContractUnplanDetail', 134 name: 'ContractUnplanDetail',
@@ -467,6 +475,7 @@ export default { @@ -467,6 +475,7 @@ export default {
467 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '', 475 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',
468 } 476 }
469 this.detail = await fillStandardApprovedName(this.detail) 477 this.detail = await fillStandardApprovedName(this.detail)
  478 + this.detail = await fillFormalApprovedName(this.detail)
470 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : [] 479 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
471 this.productList = lines 480 this.productList = lines
472 } catch (e) { 481 } catch (e) {
@@ -124,7 +124,7 @@ @@ -124,7 +124,7 @@
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="form.remarks" placeholder="请输入备注" :inputBorder="false" /> 127 + <uni-easyinput v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
128 </template> 128 </template>
129 </uni-list-item> 129 </uni-list-item>
130 130
@@ -53,3 +53,9 @@ export async function fillStandardApprovedName(detail = {}) { @@ -53,3 +53,9 @@ export async function fillStandardApprovedName(detail = {}) {
53 const name = getAuditStatusName(detail && detail.standardApproved, items); 53 const name = getAuditStatusName(detail && detail.standardApproved, items);
54 return { ...detail, standardApprovedName: name }; 54 return { ...detail, standardApprovedName: name };
55 } 55 }
  56 +
  57 +export async function fillFormalApprovedName(detail = {}) {
  58 + const items = await getAuditStatusOptions();
  59 + const name = getAuditStatusName(detail && detail.formalApproved, items);
  60 + return { ...detail, formalApprovedName: name };
  61 +}