Commit 3c4bdd277c0f77da168d52d3475ce7f57d7e97ca

Authored by 史婷婷
1 parent 9c80d966

feat: 产品试样确认单-审核详情

@@ -57,7 +57,8 @@ export default { @@ -57,7 +57,8 @@ export default {
57 // todo 等下还原 57 // todo 等下还原
58 // canEdit: !e && m.showAudit || false, 58 // canEdit: !e && m.showAudit || false,
59 canEdit: true, 59 canEdit: true,
60 - canAudit: e === 'AUDIT' && m.showExamine || false, 60 + // canAudit: e === 'AUDIT' && m.showExamine || false,
  61 + canAudit: true,
61 canAuditDetail: !!e || false, 62 canAuditDetail: !!e || false,
62 } 63 }
63 }, 64 },
@@ -3,23 +3,30 @@ @@ -3,23 +3,30 @@
3 <scroll-view class="scroll" scroll-y> 3 <scroll-view class="scroll" scroll-y>
4 <view class="detail-page"> 4 <view class="detail-page">
5 <view class="section"> 5 <view class="section">
6 - <text class="row company">{{ form.purchaseOrderName }}</text>  
7 - <view class="row"><text class="label">补货单编号</text><text class="value">{{ form.code }}</text></view> 6 + <text class="row company">{{ form.orderingUnitName }}</text>
  7 + <view :class="['status', `status_${form.status}`]" />
  8 + <view class="row"><text class="label">试样种类</text><text class="value">{{ form.sampleTypeName }}</text></view>
  9 + <view class="row"><text class="label">客户类型</text><text class="value">{{ form.customerTypeName }}</text></view>
8 <view class="row"><text class="label">分厂</text><text class="value">{{ form.workshopName }}</text></view> 10 <view class="row"><text class="label">分厂</text><text class="value">{{ form.workshopName }}</text></view>
9 - <view class="row"><text class="label">办事处</text><text class="value">{{ form.deptName }}</text></view>  
10 - <view class="row"><text class="label">区域</text><text class="value">{{ form.regionName }}</text></view>  
11 - <view class="row"><text class="label">购货单位</text><text class="value">{{ form.customerName }}</text></view>  
12 - <view class="row"><text class="label">原计划发货日期</text><text class="value">{{ form.originPlanShipDate }}</text></view> 11 + <view class="row"><text class="label">所属品种</text><text class="value">{{ form.belongingBreed }}</text></view>
  12 + <view class="row"><text class="label">原供货同行</text><text class="value">{{ form.originalSupplierPeer }}</text>
  13 + </view>
13 </view> 14 </view>
14 15
15 <!-- 产品 --> 16 <!-- 产品 -->
16 <view class="section2"> 17 <view class="section2">
17 - <Product mode="view" :list="form.replenishmentOrderLineList"  
18 - :orderDate="form.orderDate"  
19 - :totalQuantity="form.totalQuantity"  
20 - :totalShippedQuantity="form.totalShippedQuantity"  
21 - :totalSupplementaryQuantity="form.totalSupplementaryQuantity"  
22 - /> 18 + <Product mode="view" :list="form.productSampleConfirmationSlipDetailList" />
  19 + </view>
  20 +
  21 + <view class="section">
  22 + <view class="row"><text class="label">数量</text><text class="value">{{ form.totalQuantity }}</text></view>
  23 + <view class="row"><text class="label">本次试样数量是否超规定</text><text class="value">{{ form.sampleQuantityRegulation ?
  24 + '是' : '否' }}</text></view>
  25 + <view class="row"><text class="label">试样规格个数是否超规定</text><text class="value">{{
  26 + form.specificationQuantityRegulation ? '是' : '否' }}</text></view>
  27 + <view class="row"><text class="label">试样次数</text><text class="value">{{ form.sampleFrequency }}</text></view>
  28 + <view class="row"><text class="label">前期不合格描述</text><text class="value">{{ form.earlyNonconformityDescription
  29 + }}</text></view>
23 </view> 30 </view>
24 </view> 31 </view>
25 </scroll-view> 32 </scroll-view>
@@ -27,11 +34,11 @@ @@ -27,11 +34,11 @@
27 </template> 34 </template>
28 35
29 <script> 36 <script>
30 -import { getDetailApi } from '@/api/replenishment_order.js' 37 +import { getDetailApi } from '@/api/confirmation_form.js'
31 import Product from './product.vue' 38 import Product from './product.vue'
32 39
33 export default { 40 export default {
34 - name: 'ReplenishmentOrderViewer', 41 + name: 'ConfirmationFormViewer',
35 components: { Product }, 42 components: { Product },
36 props: { id: { type: [String, Number], default: '' } }, 43 props: { id: { type: [String, Number], default: '' } },
37 data() { 44 data() {
@@ -107,7 +114,8 @@ export default { @@ -107,7 +114,8 @@ export default {
107 } 114 }
108 115
109 .label { 116 .label {
110 - width: 240rpx; 117 + max-width: 400rpx;
  118 + margin-right: 20rpx;
111 line-height: 32rpx; 119 line-height: 32rpx;
112 font-size: 28rpx; 120 font-size: 28rpx;
113 color: rgba(0, 0, 0, 0.6); 121 color: rgba(0, 0, 0, 0.6);
@@ -12,6 +12,8 @@ import RestockApprovalViewer from '@/pages/replenishment_order/viewer.vue' @@ -12,6 +12,8 @@ import RestockApprovalViewer from '@/pages/replenishment_order/viewer.vue'
12 import RestockApprovalApprove from '@/pages/replenishment_order/approve.vue' 12 import RestockApprovalApprove from '@/pages/replenishment_order/approve.vue'
13 import DraftOrderViewer from '@/pages/draft_order/viewer.vue' 13 import DraftOrderViewer from '@/pages/draft_order/viewer.vue'
14 import DelayedShipmentViewer from '@/pages/delay_invoice/viewer.vue' 14 import DelayedShipmentViewer from '@/pages/delay_invoice/viewer.vue'
  15 +import ConfirmationDormViewer from '@/pages/confirmation_form/viewer.vue'
  16 +import ConfirmationDormApprove from '@/pages/confirmation_form/approve.vue'
15 17
16 export default function registerComponents(Vue) { 18 export default function registerComponents(Vue) {
17 Vue.component('CustomerDevelopViewer', CustomerDevelopViewer) 19 Vue.component('CustomerDevelopViewer', CustomerDevelopViewer)
@@ -28,4 +30,6 @@ export default function registerComponents(Vue) { @@ -28,4 +30,6 @@ export default function registerComponents(Vue) {
28 Vue.component('RestockApprovalApprove', RestockApprovalApprove) 30 Vue.component('RestockApprovalApprove', RestockApprovalApprove)
29 Vue.component('DraftOrderViewer', DraftOrderViewer) 31 Vue.component('DraftOrderViewer', DraftOrderViewer)
30 Vue.component('DelayedShipmentViewer', DelayedShipmentViewer) 32 Vue.component('DelayedShipmentViewer', DelayedShipmentViewer)
  33 + Vue.component('ConfirmationDormViewer', ConfirmationDormViewer)
  34 + Vue.component('ConfirmationDormApprove', ConfirmationDormApprove)
31 } 35 }
@@ -79,6 +79,11 @@ export const getSysFlowComponentPath = (bizFlag) => { @@ -79,6 +79,11 @@ export const getSysFlowComponentPath = (bizFlag) => {
79 break; 79 break;
80 case 'DELAYED_SHIPMENT_EDIT': // 延期发货单 80 case 'DELAYED_SHIPMENT_EDIT': // 延期发货单
81 componentPath = 'DelayedShipmentViewer'; // 延期发货单-审批 81 componentPath = 'DelayedShipmentViewer'; // 延期发货单-审批
  82 + case 'CONFIRMATION_SLIP': // 产品试样确认单
  83 + componentPath = 'ConfirmationDormViewer'; // 产品试样确认单-审批详情
  84 + break;
  85 + case 'CONFIRMATION_SLIP_EDIT': // 产品试样确认单
  86 + componentPath = 'ConfirmationDormApprove'; // 产品试样确认单-审批
82 break; 87 break;
83 } 88 }
84 return componentPath; 89 return componentPath;