朱园亮 / 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 123 </uni-list-item>
124 124 <uni-list-item title="备注">
125 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 127 </template>
128 128 </uni-list-item>
129 129 <view class="quality">
... ...
... ... @@ -121,7 +121,7 @@
121 121 </uni-list-item>
122 122 <uni-list-item title="备注">
123 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 125 </template>
126 126 </uni-list-item>
127 127
... ...
... ... @@ -123,7 +123,7 @@
123 123 </uni-list-item>
124 124 <uni-list-item title="备注">
125 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 127 </template>
128 128 </uni-list-item>
129 129 <view class="quality">
... ...
... ... @@ -4,8 +4,13 @@
4 4 <view class="detail-page">
5 5 <view class="section">
6 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 14 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
10 15 }}</text></view>
11 16 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
... ... @@ -119,7 +124,7 @@ import ProductRel from './productRel.vue'
119 124 import DetailButtons from '@/components/detail-buttons/index.vue'
120 125 import FileUpload from '@/components/file-upload/index.vue'
121 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 129 export default {
125 130 name: 'ContractForeignStockDetail',
... ... @@ -466,6 +471,7 @@ export default {
466 471 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',
467 472 }
468 473 this.detail = await fillStandardApprovedName(this.detail)
  474 + this.detail = await fillFormalApprovedName(this.detail)
469 475 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
470 476 this.productList = lines
471 477 } catch (e) {
... ...
... ... @@ -123,7 +123,7 @@
123 123 </uni-list-item>
124 124 <uni-list-item title="备注">
125 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 127 </template>
128 128 </uni-list-item>
129 129
... ...
... ... @@ -123,7 +123,7 @@
123 123 </uni-list-item>
124 124 <uni-list-item title="备注">
125 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 127 </template>
128 128 </uni-list-item>
129 129 <view class="quality">
... ...
... ... @@ -4,8 +4,15 @@
4 4 <view class="detail-page">
5 5 <view class="section">
6 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 16 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
10 17 }}</text></view>
11 18 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
... ... @@ -120,7 +127,7 @@ import ProductRel from './productRel.vue'
120 127 import DetailButtons from '@/components/detail-buttons/index.vue'
121 128 import FileUpload from '@/components/file-upload/index.vue'
122 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 132 export default {
126 133 name: 'ContractForeignUnplanDetail',
... ... @@ -478,6 +485,7 @@ export default {
478 485 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',
479 486 }
480 487 this.detail = await fillStandardApprovedName(this.detail)
  488 + this.detail = await fillFormalApprovedName(this.detail)
481 489 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
482 490 this.productList = lines
483 491 } catch (e) {
... ...
... ... @@ -123,7 +123,7 @@
123 123 </uni-list-item>
124 124 <uni-list-item title="备注">
125 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 127 </template>
128 128 </uni-list-item>
129 129
... ...
... ... @@ -123,7 +123,7 @@
123 123 </uni-list-item>
124 124 <uni-list-item title="备注">
125 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 127 </template>
128 128 </uni-list-item>
129 129 <view class="quality">
... ...
... ... @@ -61,7 +61,7 @@
61 61 <text>订单总额</text><text class="amount" :style="{ color: '#b67a76' }">{{ item.totalAmountIncludingTax ? '¥' : '' }}{{ formatAmount(item.totalAmountIncludingTax) || '-' }}</text>
62 62 </view>
63 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 65 </view>
66 66 <view class="info-row">
67 67 <text>订货日期</text><text>{{ item.orderDate }}</text>
... ...
... ... @@ -124,7 +124,7 @@
124 124 </uni-list-item>
125 125 <uni-list-item title="备注">
126 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 128 </template>
129 129 </uni-list-item>
130 130
... ...
... ... @@ -123,7 +123,7 @@
123 123 </uni-list-item>
124 124 <uni-list-item title="备注">
125 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 127 </template>
128 128 </uni-list-item>
129 129 <view class="quality">
... ...
... ... @@ -124,7 +124,7 @@
124 124 </uni-list-item>
125 125 <uni-list-item title="备注">
126 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 128 </template>
129 129 </uni-list-item>
130 130
... ...
... ... @@ -123,7 +123,7 @@
123 123 </uni-list-item>
124 124 <uni-list-item title="备注">
125 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 127 </template>
128 128 </uni-list-item>
129 129 <view class="quality">
... ...
... ... @@ -4,8 +4,15 @@
4 4 <view class="detail-page">
5 5 <view class="section">
6 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 16 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
10 17 }}</text></view>
11 18 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
... ... @@ -110,7 +117,7 @@
110 117
111 118 <script>
112 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 121 import ProductRel from './productRel.vue'
115 122 import DetailButtons from '@/components/detail-buttons/index.vue'
116 123 import FileUpload from '@/components/file-upload/index.vue'
... ... @@ -436,6 +443,7 @@ export default {
436 443 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',
437 444 }
438 445 this.detail = await fillStandardApprovedName(this.detail)
  446 + this.detail = await fillFormalApprovedName(this.detail)
439 447 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
440 448 this.productList = lines
441 449 } catch (e) {
... ...
... ... @@ -124,7 +124,7 @@
124 124 </uni-list-item>
125 125 <uni-list-item title="备注">
126 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 128 </template>
129 129 </uni-list-item>
130 130
... ...
... ... @@ -123,7 +123,7 @@
123 123 </uni-list-item>
124 124 <uni-list-item title="备注">
125 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 127 </template>
128 128 </uni-list-item>
129 129 <view class="quality">
... ...
... ... @@ -4,7 +4,15 @@
4 4 <view class="detail-page">
5 5 <view class="section">
6 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 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 17 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
10 18 }}</text></view>
... ... @@ -120,7 +128,7 @@ import ProductRel from './productRel.vue'
120 128 import DetailButtons from '@/components/detail-buttons/index.vue'
121 129 import FileUpload from '@/components/file-upload/index.vue'
122 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 133 export default {
126 134 name: 'ContractUnplanDetail',
... ... @@ -467,6 +475,7 @@ export default {
467 475 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',
468 476 }
469 477 this.detail = await fillStandardApprovedName(this.detail)
  478 + this.detail = await fillFormalApprovedName(this.detail)
470 479 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
471 480 this.productList = lines
472 481 } catch (e) {
... ...
... ... @@ -124,7 +124,7 @@
124 124 </uni-list-item>
125 125 <uni-list-item title="备注">
126 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 128 </template>
129 129 </uni-list-item>
130 130
... ...
... ... @@ -53,3 +53,9 @@ export async function fillStandardApprovedName(detail = {}) {
53 53 const name = getAuditStatusName(detail && detail.standardApproved, items);
54 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 +}
... ...