朱园亮 / erp-mobile · Commits

Commit 9e32b803e9ddb3d34a9618249b2bc5343920ba87

Authored by 史婷婷
1 parent 19fc3e4f

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

Inline Side-by-side
Showing 4 changed files with 40 additions and 149 deletions
... ... @@ -792,6 +792,22 @@
792 792 "navigationBarBackgroundColor": "#ffffff",
793 793 "navigationBarTextStyle": "black"
794 794 }
  795 + },
  796 + {
  797 + "path": "pages/confirmation_form/detail",
  798 + "style": {
  799 + "navigationBarTitleText": "产品试样确认单详情",
  800 + "navigationBarBackgroundColor": "#ffffff",
  801 + "navigationBarTextStyle": "black"
  802 + }
  803 + },
  804 + {
  805 + "path": "pages/confirmation_form/modify",
  806 + "style": {
  807 + "navigationBarTitleText": "编辑产品试样确认单",
  808 + "navigationBarBackgroundColor": "#ffffff",
  809 + "navigationBarTextStyle": "black"
  810 + }
795 811 }
796 812 ],
797 813 "subPackages": [
... ...
... ... @@ -3,24 +3,26 @@
3 3 <scroll-view class="scroll" scroll-y>
4 4 <view class="detail-page">
5 5 <view class="section">
6   - <text class="row company">{{ form.purchaseOrderName }}</text>
  6 + <text class="row company">{{ form.orderingUnitName }}</text>
7 7 <view :class="['status', `status_${form.status}`]" />
8   - <view class="row"><text class="label">补货单编号</text><text class="value">{{ form.code }}</text></view>
  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>
9 10 <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.deptName }}</text></view>
11   - <view class="row"><text class="label">区域</text><text class="value">{{ form.regionName }}</text></view>
12   - <view class="row"><text class="label">购货单位</text><text class="value">{{ form.customerName }}</text></view>
13   - <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></view>
14 13 </view>
15 14
16 15 <!-- 产品 -->
17 16 <view class="section2">
18   - <Product mode="view" :list="form.replenishmentOrderLineList"
19   - :orderDate="form.orderDate"
20   - :totalQuantity="form.totalQuantity"
21   - :totalShippedQuantity="form.totalShippedQuantity"
22   - :totalSupplementaryQuantity="form.totalSupplementaryQuantity"
23   - />
  17 + <Product mode="view" :list="form.productSampleConfirmationSlipDetailList" />
  18 + </view>
  19 +
  20 + <view class="section">
  21 + <view class="row"><text class="label">数量</text><text class="value">{{ form.totalQuantity }}</text></view>
  22 + <view class="row"><text class="label">本次试样数量是否超规定</text><text class="value">{{ form.sampleQuantityRegulation ? '是' : '否' }}</text></view>
  23 + <view class="row"><text class="label">试样规格个数是否超规定</text><text class="value">{{ form.specificationQuantityRegulation ? '是' : '否' }}</text></view>
  24 + <view class="row"><text class="label">试样次数</text><text class="value">{{ form.sampleFrequency }}</text></view>
  25 + <view class="row"><text class="label">前期不合格描述</text><text class="value">{{ form.earlyNonconformityDescription }}</text></view>
24 26 </view>
25 27 </view>
26 28 </scroll-view>
... ... @@ -29,12 +31,12 @@
29 31 </template>
30 32
31 33 <script>
32   -import { getDetailApi, cancelApi } from '@/api/replenishment_order.js'
  34 +import { getDetailApi } from '@/api/confirmation_form.js'
33 35 import Product from './product.vue'
34 36 import DetailButtons from '@/components/detail-buttons/index.vue'
35 37
36 38 export default {
37   - name: 'ReplenishmentOrderDetail',
  39 + name: 'ConfirmationFormDetail',
38 40 components: { Product, DetailButtons },
39 41 data() {
40 42 return {
... ... @@ -241,4 +243,8 @@ export default {
241 243 font-weight: 600;
242 244 }
243 245 }
  246 +.section2 {
  247 + background: #f1f1f1;
  248 + margin-bottom: 20rpx;
  249 +}
244 250 </style>
... ...
... ... @@ -305,7 +305,7 @@ export default {
305 305 if (!id) return
306 306 const query = '?id=' + encodeURIComponent(id)
307 307 uni.navigateTo({
308   - url: '/pages/replenishment_order/detail' + query
  308 + url: '/pages/confirmation_form/detail' + query
309 309 })
310 310 },
311 311 onWorkshopChange(e) {
... ...
... ... @@ -174,113 +174,6 @@
174 174 </view>
175 175 </view>
176 176
177   - <view v-else-if="mode === 'fill'" class="section">
178   - <view v-for="(item, idx) in items" :key="'a-' + idx" class="block">
179   - <uni-list class="edit-list">
180   - <uni-list-item title="牌号">
181   - <template v-slot:footer>
182   - <text class="value">{{ item.brand }}</text>
183   - </template>
184   - </uni-list-item>
185   - <!-- 厚（公差） * 宽（公差） * 长（公差） -->
186   - <uni-list-item title="规格(mm)">
187   - <template v-slot:footer>
188   - <view class="value value-spec">
189   - <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
190   - <view v-if="item.thickness" class="value-spec_box">
191   - <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{ item.thicknessTolPos >
192   - 0 ? '+'
193   - +
194   - item.thicknessTolPos : item.thicknessTolPos }}
195   - </view>
196   - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg >
197   - 0 ? '+'
198   - +
199   - item.thicknessTolNeg : item.thicknessTolNeg }}
200   - </view>
201   - </view>
202   - <view v-if="item.width" class="value-spec_val p12">*</view>
203   - <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
204   - <view v-if="item.width" class="value-spec_box">
205   - <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ? '+'
206   - +
207   - item.widthTolPos : item.widthTolPos }}
208   - </view>
209   - <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ? '+'
210   - +
211   - item.widthTolNeg : item.widthTolNeg }}
212   - </view>
213   - </view>
214   - <view v-if="item.length" class="value-spec_val p12">*</view>
215   - <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
216   - <view v-if="item.length" class="value-spec_box">
217   - <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0 ?
218   - '+' +
219   - item.lengthTolPos : item.lengthTolPos }}
220   - </view>
221   - <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0 ?
222   - '+' +
223   - item.lengthTolNeg : item.lengthTolNeg }}
224   - </view>
225   - </view>
226   - </view>
227   - </template>
228   - </uni-list-item>
229   - <view v-show="!item.collapsed">
230   - <uni-list-item title="状态">
231   - <template v-slot:footer>
232   - <text class="value">{{ item.status }}</text>
233   - </template>
234   - </uni-list-item>
235   - <uni-list-item title="需发数量(kg)">
236   - <template v-slot:footer>
237   - <text class="value">{{ item.quantity }}</text>
238   - </template>
239   - </uni-list-item>
240   - <uni-list-item title="实发数量(kg)">
241   - <template v-slot:footer>
242   - <text class="value">{{ item.shippedQuantity }}</text>
243   - </template>
244   - </uni-list-item>
245   - <uni-list-item title="需求补货数量(kg)">
246   - <template v-slot:footer>
247   - <text class="value">{{ item.supplementaryQuantity }}</text>
248   - </template>
249   - </uni-list-item>
250   - <uni-list-item class="amount-item" title="单价(元/kg)">
251   - <template v-slot:footer>
252   - <text class="value">{{ item.salesPrice }}</text>
253   - </template>
254   - </uni-list-item>
255   - <uni-list-item class="amount-item" title="包装费(元/kg)">
256   - <template v-slot:footer>
257   - <text class="value">{{ item.packagingFee }}</text>
258   - </template>
259   - </uni-list-item>
260   - <uni-list-item title="生产科（车间）确认交付时间">
261   - <template v-slot:footer>
262   - <uni-datetime-picker type="date"
263   - v-model="item.confirmedDeliveryDate" />
264   - </template>
265   - </uni-list-item>
266   - <uni-list-item title="备注">
267   - <template v-slot:footer>
268   - <text class="value">{{ item.remarks }}元</text>
269   - </template>
270   - </uni-list-item>
271   - </view>
272   - </uni-list>
273   -
274   - <view class="block-ops">
275   - <div class="toggle" @click="toggleItem(idx)">
276   - <image :src="item.collapsed ? '/static/images/up.png' : '/static/images/down.png'"
277   - class="icon" />
278   - {{ item.collapsed ? '展开' : '收起' }}
279   - </div>
280   - </view>
281   - </view>
282   - </view>
283   -
284 177 <view v-else-if="mode === 'approve'" class="section">
285 178 <view v-for="(item, idx) in items" :key="'a-' + idx" class="block">
286 179 <uni-list class="edit-list">
... ... @@ -432,34 +325,10 @@
432 325 </view>
433 326 </view>
434 327 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
435   - <view class="row"><text class="label">需发数量(kg)</text><text class="value">{{ item.quantity }}</text>
436   - </view>
437   - <view class="row"><text class="label">实发数量(kg)</text><text class="value">{{ item.shippedQuantity
438   - }}</text>
439   - </view>
440   - <view class="row"><text class="label">需求补货数量(kg)</text><text class="value">{{ item.supplementaryQuantity
441   - }}</text></view>
442   - <view class="row"><text class="label">单价(元/kg)</text><text class="value">{{ item.salesPrice }}</text>
443   - </view>
444   - <view class="row"><text class="label">包装费(元/kg)</text><text class="value">{{
445   - item.packagingFee }}</text></view>
446   - <view class="row"><text class="label">生产科（车间）确认交付时间</text><text class="value">{{
447   - item.confirmedDeliveryDate
448   - }}</text>
449   - </view>
450   - <view class="row"><text class="label">备注</text><text class="value">{{ item.remarks }}</text></view>
451   - </view>
452   - <view class="view-total">
453   - <view class="head">合计</view>
454   - <view class="row">
455   - <text class="label">需发</text><text class="value">{{ totalQuantity }}</text>
456   - </view>
457   - <view class="row">
458   - <text class="label">实发</text><text class="value">{{ totalShippedQuantity }}</text>
459   - </view>
460   - <view class="row">
461   - <text class="label">需求补货</text><text class="value">{{ totalSupplementaryQuantity }}</text>
  328 + <view class="row"><text class="label">数量(kg)</text><text class="value">{{ item.quantity }}</text>
462 329 </view>
  330 + <view class="row"><text class="label">是否提供样品</text><text class="value">{{ item.provideSamplesName }}</text></view>
  331 + <view class="row"><text class="label">是否提供明确参数</text><text class="value">{{ item.clearParametersName }}</text></view>
463 332 </view>
464 333 </view>
465 334
... ...