朱园亮 / erp-mobile · Commits

Commit 0a75fcfd7c53e945009a5a2a952f4adbc7ae3d80

Authored by 史婷婷
1 parent 0aed8e89

feat: 撤销单-审批&审批详情

Inline Side-by-side
Showing 4 changed files with 14 additions and 64 deletions
... ... @@ -154,7 +154,6 @@ export default {
154 154 font-size: 36rpx;
155 155 font-weight: 600;
156 156 color: rgba(0, 0, 0, 0.9);
157   - padding-top: 32rpx;
158 157 line-height: 50rpx;
159 158 }
160 159
... ...
... ... @@ -2,51 +2,25 @@
2 2 <view class="detail-page">
3 3 <view class="section">
4 4 <text class="row company">{{ form.orderNo }}</text>
5   - <view class="row"><text class="label">供货单位</text><text class="value">{{ getDicName('SUPPLIER',
6   - form.supplyUnit, dicOptions.SUPPLIER) }}</text></view>
7 5 <view class="row"><text class="label">订货单位</text><text class="value">{{ form.orderingUnitName }}</text>
8 6 </view>
9 7 <view class="row"><text class="label">订货日期</text><text class="value">{{ form.orderDate }}</text></view>
10   - <view class="row"><text class="label">生产厂</text><text class="value">{{ form.workshopName }}</text></view>
11   - <view class="row"><text class="label">结算方式或期限</text><text class="value">{{ form.settlementTerms }}</text>
  8 + <view class="row"><text class="label">申请撤单日期</text><text class="value">{{ form.documentPreparationDate }}</text></view>
  9 + <view class="row"><text class="label">所属办</text><text class="value">{{ form.deptName }}</text>
12 10 </view>
13   - <view class="row"><text class="label">交货方式</text><text class="value">{{ form.deliveryMethod }}</text></view>
14 11 </view>
15 12
16   - <!-- 产品-变更前 -->
17 13 <view class="mgb10">
18   - <Product title="变更前" mode="view" :options="genderOptions" :list="form.beforeChangeSpecList"
19   - :totalQuantity="form.totalQuantity || 0" />
20   - </view>
21   -
22   - <!-- 产品-变更后 -->
23   - <view class="mgb10">
24   - <Product title="变更后" mode="view" :options="genderOptions" :list="form.afterChangeSpecList"
25   - :totalQuantity="form.afterTotalQuantity || 0" />
  14 + <Product mode="view" :list="form.purchaseOrderRevokeLineList"
  15 + :totalQuantity="form.totalQuantity || 0" :totalRevokeQuantity="form.totalRevokeQuantity || 0" />
26 16 </view>
27 17
28 18 <view class="section">
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>
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">{{ form.packagingFee }}</text></view>
33   - <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
34   - form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
  19 + <view class="row"><text class="label">撤销原因</text><text class="value">{{ form.revokeReason }}</text></view>
35 20 </view>
36 21
37   - <view class="title-header">
38   - <image class="title-header_icon" src="/static/images/title.png" />
39   - <span>具体质量要求</span>
40   - </view>
41 22 <view class="section">
42   - <view class="row"><text class="label">件重条头</text><text class="value">{{ form.pieceWeightHeader }}</text>
43   - </view>
44   - <view class="row"><text class="label">表面</text><text class="value">{{ form.surface }}</text></view>
45   - <view class="row"><text class="label">公差</text><text class="value">{{ form.tolerance }}</text></view>
46   - <view class="row"><text class="label">性能</text><text class="value">{{ form.performance }}</text></view>
47   - <view class="row"><text class="label">成分</text><text class="value">{{ form.element }}</text></view>
48   - <view class="row"><text class="label">包装</text><text class="value">{{ form.packaging }}</text></view>
49   - <view class="row"><text class="label">备注</text><text class="value">{{ form.remarks }}</text></view>
  23 + <view class="row"><text class="label">撤销确认凭证</text><text class="value act">{{ form.confirmationVoucherFileName }}</text></view>
50 24 </view>
51 25
52 26 </view>
... ... @@ -55,12 +29,6 @@
55 29 <script>
56 30 import { getDetailApi } from '@/api/revoke_list.js'
57 31 import Product from './product.vue'
58   -import {
59   - getDicName
60   -} from '@/utils/dic.js'
61   -import {
62   - getDicByCodes
63   -} from '@/utils/dic'
64 32
65 33 export default {
66 34 name: 'RevokeListViewer',
... ... @@ -69,15 +37,6 @@ export default {
69 37 data() {
70 38 return {
71 39 form: {},
72   - enterpriseTypeOptions: [],
73   - genderOptions: [],
74   - categoryOptions: [],
75   - historyList: [],
76   - dicOptions: {
77   - AUDIT_STATUS: [],
78   - SUPPLIER: [],
79   - APPLICABLE_STANDARD: [],
80   - },
81 40 }
82 41 },
83 42 watch: {
... ... @@ -102,21 +61,6 @@ export default {
102 61 this.form = {}
103 62 }
104 63 },
105   - loadAllDicData() {
106   - const dicCodes = ['AUDIT_STATUS', 'SUPPLIER', 'APPLICABLE_STANDARD']
107   - return getDicByCodes(dicCodes).then(results => {
108   - this.dicOptions.AUDIT_STATUS = results.AUDIT_STATUS.data || []
109   - this.dicOptions.SUPPLIER = results.SUPPLIER.data || []
110   - this.dicOptions.APPLICABLE_STANDARD = results.APPLICABLE_STANDARD.data || []
111   - }).catch(() => {
112   - this.dicOptions = {
113   - AUDIT_STATUS: [],
114   - SUPPLIER: [],
115   - APPLICABLE_STANDARD: [],
116   - }
117   - })
118   - },
119   - getDicName: getDicName,
120 64 getFormValues() {
121 65 const m = this.form || {}
122 66 return JSON.parse(JSON.stringify(m))
... ... @@ -154,7 +98,6 @@ export default {
154 98 font-size: 36rpx;
155 99 font-weight: 600;
156 100 color: rgba(0, 0, 0, 0.9);
157   - padding-top: 32rpx;
158 101 line-height: 50rpx;
159 102 }
160 103
... ...
... ... @@ -6,6 +6,7 @@ import ProcessStdAgmtViewer from '@/pages/contract_process/processStdAgmtViewer.
6 6 import OrderListApprove from '@/pages/order_list/approve.vue'
7 7 import OrderListViewer from '@/pages/order_list/viewer.vue'
8 8 import ChangeListViewer from '@/pages/change_list/viewer.vue'
  9 +import RevokeListViewer from '@/pages/revoke_list/viewer.vue'
9 10
10 11 export default function registerComponents(Vue) {
11 12 Vue.component('CustomerDevelopViewer', CustomerDevelopViewer)
... ... @@ -16,4 +17,5 @@ export default function registerComponents(Vue) {
16 17 Vue.component('OrderListApprove', OrderListApprove)
17 18 Vue.component('OrderListViewer', OrderListViewer)
18 19 Vue.component('ChangeListViewer', ChangeListViewer)
  20 + Vue.component('RevokeListViewer', RevokeListViewer)
19 21 }
\ No newline at end of file
... ...
... ... @@ -56,6 +56,12 @@ export const getSysFlowComponentPath = (bizFlag) => {
56 56 case 'SPEC_CHANGE_CONFIRM_EDIT': // 规格变更单确认
57 57 componentPath = 'ChangeListViewer'; // 规格变更单-审批
58 58 break;
  59 + case 'ORDER_CANCELLATION': // 订单撤销
  60 + componentPath = 'RevokeListViewer'; // 订单撤销-审批详情
  61 + break;
  62 + case 'ORDER_CANCELLATION_EDIT': // 订单撤销
  63 + componentPath = 'RevokeListViewer'; // 订单撤销-审批
  64 + break;
59 65 }
60 66 return componentPath;
61 67 };
\ No newline at end of file
... ...