朱园亮 / erp-mobile · Commits

Commit 4dd9e29de617f1ab773f3e2613ba7b007e5d4cb5

Authored by 史婷婷
1 parent a4742677

feat: 补货单-详情

Inline Side-by-side
Showing 3 changed files with 92 additions and 44 deletions
@@ -704,6 +704,14 @@ @@ -704,6 +704,14 @@
704 "navigationBarBackgroundColor": "#ffffff", 704 "navigationBarBackgroundColor": "#ffffff",
705 "navigationBarTextStyle": "black" 705 "navigationBarTextStyle": "black"
706 } 706 }
  707 + },
  708 + {
  709 + "path": "pages/replenishment_order/detail",
  710 + "style": {
  711 + "navigationBarTitleText": "补货单详情",
  712 + "navigationBarBackgroundColor": "#ffffff",
  713 + "navigationBarTextStyle": "black"
  714 + }
707 } 715 }
708 ], 716 ],
709 "subPackages": [ 717 "subPackages": [
@@ -3,23 +3,24 @@ @@ -3,23 +3,24 @@
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.orderingUnitName }}</text>  
7 - <view class="row"><text class="label">要车日期</text><text class="value">{{ form.requestCarDate }}</text></view>  
8 - <view class="row"><text class="label">要车办事处</text><text class="value">{{ form.deptName }}</text></view>  
9 - <view class="row"><text class="label">计划装货日期</text><text class="value">{{ form.deliveryDate }}</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.orderNo }}</text></view>  
12 - <view class="row"><text class="label">卸货地点</text><text class="value">{{ form.destination }}</text></view>  
13 - <view class="row"><text class="label">计划吨位(kg)</text><text class="value">{{ form.quantity }}</text></view>  
14 - <view class="row"><text class="label">接货人/联络人</text><text class="value">{{ form.consignee }}</text></view>  
15 - <view class="row"><text class="label">联系电话</text><text class="value">{{ form.phone }}</text></view>  
16 - <view class="row"><text class="label">装货时间</text><text class="value">{{ form.loadingTime }}</text></view>  
17 - <view class="row"><text class="label">外办审核人</text><text class="value">{{ form.externalAuditorName }}</text></view>  
18 - <view class="row"><text class="label">经营办审核人</text><text class="value">{{ form.businessOfficeAuditorName }}</text></view>  
19 - <view class="row"><text class="label">运作科审核人</text><text class="value">{{ form.operationsDepartmentAuditorName }}</text></view>  
20 - <view class="row"><text class="label">回货计划安排</text><text class="value">{{ form.returnPlanArrangement }}</text></view>  
21 - <view class="row"><text class="label">特殊需求、其他等</text><text class="value">{{ form.other }}</text></view>  
22 - <view class="row"><text class="label">装货特别要求/需求</text><text class="value">{{ form.specialLoadingRequirement }}</text></view> 6 + <text class="row company">{{ form.purchaseOrderName }}</text>
  7 + <view :class="['status', `status_${form.status}`]" />
  8 + <view class="row"><text class="label">补货单编号</text><text class="value">{{ form.code }}</text></view>
  9 + <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>
  14 + </view>
  15 +
  16 + <!-- 产品 -->
  17 + <view class="section2">
  18 + <Product mode="view" :list="form.replenishmentOrderLineList" @change="purchaseOrderLineListChange"
  19 + :orderDate="form.orderDate"
  20 + :totalQuantity="form.totalQuantity"
  21 + :totalShippedQuantity="form.totalShippedQuantity"
  22 + :totalSupplementaryQuantity="form.totalSupplementaryQuantity"
  23 + />
23 </view> 24 </view>
24 </view> 25 </view>
25 </scroll-view> 26 </scroll-view>
@@ -27,10 +28,12 @@ @@ -27,10 +28,12 @@
27 </template> 28 </template>
28 29
29 <script> 30 <script>
30 -import { getDetailApi } from '@/api/car_request_order.js' 31 +import { getDetailApi } from '@/api/replenishment_order.js'
  32 +import Product from './product.vue'
31 33
32 export default { 34 export default {
33 - name: 'CarRequestOrderDetail', 35 + name: 'ReplenishmentOrderDetail',
  36 + components: { Product },
34 data() { 37 data() {
35 return { 38 return {
36 form: {}, 39 form: {},
@@ -75,6 +78,34 @@ export default { @@ -75,6 +78,34 @@ export default {
75 background: #fff; 78 background: #fff;
76 margin-bottom: 20rpx; 79 margin-bottom: 20rpx;
77 position: relative; 80 position: relative;
  81 +
  82 + .status {
  83 + position: absolute;
  84 + top: 16rpx;
  85 + right: 52rpx;
  86 + width: 180rpx;
  87 + height: 146rpx;
  88 + background-repeat: no-repeat;
  89 + background-size: 100% 100%;
  90 + background-position: center;
  91 +
  92 + &_AUDIT {
  93 + background-image: url('~@/static/images/dev_manage/status_1.png');
  94 + }
  95 +
  96 + &_PASS {
  97 + background-image: url('~@/static/images/dev_manage/status_2.png');
  98 + }
  99 +
  100 + &_REFUSE {
  101 + background-image: url('~@/static/images/dev_manage/status_3.png');
  102 + }
  103 +
  104 + &_CANCEL {
  105 + background-image: url('~@/static/images/dev_manage/status_4.png');
  106 + }
  107 +
  108 + }
78 } 109 }
79 110
80 .row { 111 .row {
1 <template> 1 <template>
2 - <view class="product" :class="{ 'history': mode == 'history' }"> 2 + <view class="product">
3 3
4 <!-- 新增&详情-产品 --> 4 <!-- 新增&详情-产品 -->
5 <view class="header bp"> 5 <view class="header bp">
@@ -151,8 +151,7 @@ @@ -151,8 +151,7 @@
151 </uni-list-item> 151 </uni-list-item>
152 <uni-list-item title="备注"> 152 <uni-list-item title="备注">
153 <template v-slot:footer> 153 <template v-slot:footer>
154 - <uni-easyinput v-model="item.remarks" placeholder="请输入备注"  
155 - :inputBorder="false" /> 154 + <uni-easyinput v-model="item.remarks" placeholder="请输入备注" :inputBorder="false" />
156 </template> 155 </template>
157 </uni-list-item> 156 </uni-list-item>
158 </view> 157 </view>
@@ -174,8 +173,6 @@ @@ -174,8 +173,6 @@
174 173
175 <view v-else-if="mode === 'view'" class="view-list" v-show="!collapsedView"> 174 <view v-else-if="mode === 'view'" class="view-list" v-show="!collapsedView">
176 <view v-for="(item, idx) in items" :key="'v-' + idx" class="card"> 175 <view v-for="(item, idx) in items" :key="'v-' + idx" class="card">
177 - <view class="row"><text class="label">行业</text><text class="value">{{ item.industry }}</text></view>  
178 - <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view>  
179 <view class="row"><text class="label">牌号</text><text class="value">{{ item.brand }}</text></view> 176 <view class="row"><text class="label">牌号</text><text class="value">{{ item.brand }}</text></view>
180 <!-- 厚（公差） * 宽（公差） * 长（公差） --> 177 <!-- 厚（公差） * 宽（公差） * 长（公差） -->
181 <view class="row row-spec"><text class="label">规格(mm)</text> 178 <view class="row row-spec"><text class="label">规格(mm)</text>
@@ -214,21 +211,26 @@ @@ -214,21 +211,26 @@
214 </view> 211 </view>
215 </view> 212 </view>
216 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view> 213 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
217 - <view class="row"><text class="label">数量kg</text><text class="value">{{ item.quantity }}</text></view>  
218 - <!-- showSalesPrice 判断是否显示 -->  
219 - <view class="row" v-if="item.showSalesPrice"><text class="label">销售价格</text><text class="value">{{  
220 - item.salesPrice }}</text></view> 214 + <view class="row"><text class="label">需发数量(kg)</text><text class="value">{{ item.quantity }}</text></view>
  215 + <view class="row"><text class="label">实发数量(kg)</text><text class="value">{{ item.shippedQuantity }}</text></view>
  216 + <view class="row"><text class="label">需求补货数量(kg)</text><text class="value">{{ item.supplementaryQuantity }}</text></view>
  217 + <view class="row"><text class="label">单价(元/kg)</text><text class="value">{{ item.salesPrice }}</text></view>
221 <view class="row"><text class="label">包装费</text><text class="value">{{ 218 <view class="row"><text class="label">包装费</text><text class="value">{{
222 item.packagingFee }}</text></view> 219 item.packagingFee }}</text></view>
223 - <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text> 220 + <view class="row"><text class="label">生产科（车间）确认交付时间</text><text class="value">{{ item.confirmedDeliveryDate }}</text>
224 </view> 221 </view>
225 - <view class="row"><text class="label">考核超协</text><text class="value">{{ item.assessmentExceedsAgreement  
226 - }}</text></view> 222 + <view class="row"><text class="label">备注</text><text class="value">{{ item.remarks }}</text></view>
227 </view> 223 </view>
228 <view class="view-total"> 224 <view class="view-total">
229 <view class="head">合计</view> 225 <view class="head">合计</view>
230 <view class="row"> 226 <view class="row">
231 - <text class="label">总数量</text><text class="value">{{ totalQuantity }}</text> 227 + <text class="label">需发</text><text class="value">{{ totalQuantity }}</text>
  228 + </view>
  229 + <view class="row">
  230 + <text class="label">实发</text><text class="value">{{ totalShippedQuantity }}</text>
  231 + </view>
  232 + <view class="row">
  233 + <text class="label">需求补货</text><text class="value">{{ totalSupplementaryQuantity }}</text>
232 </view> 234 </view>
233 </view> 235 </view>
234 </view> 236 </view>
@@ -245,6 +247,8 @@ export default { @@ -245,6 +247,8 @@ export default {
245 list: { type: Array, default: () => [] }, 247 list: { type: Array, default: () => [] },
246 max: { type: Number, default: 8 }, 248 max: { type: Number, default: 8 },
247 totalQuantity: { type: Number, default: 0 }, 249 totalQuantity: { type: Number, default: 0 },
  250 + totalShippedQuantity: { type: Number, default: 0 },
  251 + totalSupplementaryQuantity: { type: Number, default: 0 },
248 orderDate: { type: String, default: '' } 252 orderDate: { type: String, default: '' }
249 }, 253 },
250 data() { 254 data() {
@@ -293,27 +297,31 @@ export default { @@ -293,27 +297,31 @@ export default {
293 methods: { 297 methods: {
294 defaultItem() { 298 defaultItem() {
295 return { 299 return {
296 - id: '',  
297 purchaseOrderId: uuid(), 300 purchaseOrderId: uuid(),
298 collapsed: false, 301 collapsed: false,
299 - industry: '',  
300 - quality: '',  
301 - brand: '',  
302 - thickness: '', 302 + id: '',
  303 + // 厚度公差
303 thicknessTolPos: '', 304 thicknessTolPos: '',
304 thicknessTolNeg: '', 305 thicknessTolNeg: '',
305 - width: '', 306 + // 宽度公差
306 widthTolPos: '', 307 widthTolPos: '',
307 widthTolNeg: '', 308 widthTolNeg: '',
308 - length: '', 309 + // 长度公差
309 lengthTolPos: '', 310 lengthTolPos: '',
310 lengthTolNeg: '', 311 lengthTolNeg: '',
  312 + // 其他字段
  313 + industry: '',
  314 + quality: '',
  315 + brand: '',
  316 + thickness: '',
  317 + width: '',
  318 + length: '',
311 status: '', 319 status: '',
312 quantity: '', 320 quantity: '',
313 - salesPrice: '',  
314 - showSalesPrice: false,  
315 - deliveryDate: '',  
316 - assessmentExceedsAgreement: '' 321 + shippedQuantity: '',
  322 + supplementaryQuantity: '',
  323 + confirmedDeliveryDate: '',
  324 + remarks: '',
317 } 325 }
318 }, 326 },
319 327
@@ -768,6 +776,7 @@ export default { @@ -768,6 +776,7 @@ export default {
768 } 776 }
769 } 777 }
770 778
  779 +
771 .view-list { 780 .view-list {
772 padding: 26rpx 32rpx; 781 padding: 26rpx 32rpx;
773 background: #ffffff; 782 background: #ffffff;
@@ -799,7 +808,7 @@ export default { @@ -799,7 +808,7 @@ export default {
799 } 808 }
800 809
801 .label { 810 .label {
802 - width: 140rpx; 811 + width: 200rpx;
803 margin-right: 14rpx; 812 margin-right: 14rpx;
804 color: rgba(0, 0, 0, 0.6); 813 color: rgba(0, 0, 0, 0.6);
805 font-size: 28rpx; 814 font-size: 28rpx;