朱园亮 / erp-mobile · Commits

Commit ac5a2cf6f61d5df1f2e1bd2de19e261449306833

Authored by 史婷婷
1 parent 1b9c088d

feat: 订货单详情-审核状态样式与列表保持一致

Inline Side-by-side
Showing 2 changed files with 43 additions and 27 deletions
@@ -2,28 +2,7 @@ @@ -2,28 +2,7 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="22e3db16-f3f9-44cc-b7ca-0b5f75df2820" name="Changes" comment=""> 4 <list default="true" id="22e3db16-f3f9-44cc-b7ca-0b5f75df2820" name="Changes" comment="">
5 - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />  
6 - <change beforePath="$PROJECT_DIR$/components/relate-select/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/components/relate-select/index.vue" afterDir="false" />  
7 - <change beforePath="$PROJECT_DIR$/pages/car_request_order/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/car_request_order/index.vue" afterDir="false" />  
8 - <change beforePath="$PROJECT_DIR$/pages/change_list/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/change_list/index.vue" afterDir="false" />  
9 - <change beforePath="$PROJECT_DIR$/pages/contract_foreign_std/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/contract_foreign_std/index.vue" afterDir="false" />  
10 - <change beforePath="$PROJECT_DIR$/pages/contract_foreign_stock/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/contract_foreign_stock/index.vue" afterDir="false" />  
11 - <change beforePath="$PROJECT_DIR$/pages/contract_foreign_unplan/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/contract_foreign_unplan/index.vue" afterDir="false" />  
12 - <change beforePath="$PROJECT_DIR$/pages/contract_framework/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/contract_framework/index.vue" afterDir="false" />  
13 - <change beforePath="$PROJECT_DIR$/pages/contract_process/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/contract_process/index.vue" afterDir="false" />  
14 - <change beforePath="$PROJECT_DIR$/pages/contract_retail/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/contract_retail/index.vue" afterDir="false" />  
15 - <change beforePath="$PROJECT_DIR$/pages/contract_stock/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/contract_stock/index.vue" afterDir="false" />  
16 - <change beforePath="$PROJECT_DIR$/pages/contract_unlocked_operation/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/contract_unlocked_operation/index.vue" afterDir="false" />  
17 - <change beforePath="$PROJECT_DIR$/pages/contract_unplan/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/contract_unplan/index.vue" afterDir="false" />  
18 - <change beforePath="$PROJECT_DIR$/pages/credit_manage/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/credit_manage/index.vue" afterDir="false" />  
19 - <change beforePath="$PROJECT_DIR$/pages/customer/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/customer/index.vue" afterDir="false" />  
20 - <change beforePath="$PROJECT_DIR$/pages/delay_invoice/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/delay_invoice/index.vue" afterDir="false" />  
21 - <change beforePath="$PROJECT_DIR$/pages/dev_manage/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/dev_manage/index.vue" afterDir="false" />  
22 - <change beforePath="$PROJECT_DIR$/pages/draft_order/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/draft_order/index.vue" afterDir="false" />  
23 - <change beforePath="$PROJECT_DIR$/pages/invoice/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/invoice/index.vue" afterDir="false" />  
24 - <change beforePath="$PROJECT_DIR$/pages/order_list/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/order_list/index.vue" afterDir="false" />  
25 - <change beforePath="$PROJECT_DIR$/pages/replenishment_order/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/replenishment_order/index.vue" afterDir="false" />  
26 - <change beforePath="$PROJECT_DIR$/pages/revoke_list/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/revoke_list/index.vue" afterDir="false" /> 5 + <change beforePath="$PROJECT_DIR$/pages/order_list/detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/order_list/detail.vue" afterDir="false" />
27 </list> 6 </list>
28 <option name="SHOW_DIALOG" value="false" /> 7 <option name="SHOW_DIALOG" value="false" />
29 <option name="HIGHLIGHT_CONFLICTS" value="true" /> 8 <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -5,8 +5,15 @@ @@ -5,8 +5,15 @@
5 <view class="section"> 5 <view class="section">
6 <text class="row company">{{ form.orderNo }}</text> 6 <text class="row company">{{ form.orderNo }}</text>
7 <view :class="['status', `status_${form.status}`]" /> 7 <view :class="['status', `status_${form.status}`]" />
8 - <view class="row"><text class="label">审核状态</text><text class="value act">{{ getDicName('AUDIT_STATUS',  
9 - form.examineStatus, dicOptions.AUDIT_STATUS) }}</text></view> 8 + <view class="row">
  9 + <text class="label">审核状态</text>
  10 + <text class="value" :class="['status2', `status2_${form.examineStatus}`]">
  11 + <text :class="['status2', `status2_${form.examineStatus}`]">
  12 + {{ getDicName('AUDIT_STATUS',form.examineStatus, dicOptions.AUDIT_STATUS) }}
  13 + </text>
  14 + </text>
  15 +
  16 + </view>
10 <view class="row"><text class="label">供货单位</text><text class="value">{{ getDicName('SUPPLIER', 17 <view class="row"><text class="label">供货单位</text><text class="value">{{ getDicName('SUPPLIER',
11 form.supplyUnit, dicOptions.SUPPLIER) }}</text></view> 18 form.supplyUnit, dicOptions.SUPPLIER) }}</text></view>
12 <view class="row"><text class="label">订货单位</text><text class="value">{{ form.orderingUnitName }}</text> 19 <view class="row"><text class="label">订货单位</text><text class="value">{{ form.orderingUnitName }}</text>
@@ -311,9 +318,39 @@ export default { @@ -311,9 +318,39 @@ export default {
311 color: rgba(0, 0, 0, 0.9); 318 color: rgba(0, 0, 0, 0.9);
312 text-align: right; 319 text-align: right;
313 320
314 - &.act {  
315 - color: $theme-primary;  
316 - } 321 + .status2 {
  322 + display: inline-block;
  323 + padding: 4rpx 12rpx;
  324 + border-radius: 6rpx;
  325 + font-size: 24rpx;
  326 + color: #fff;
  327 + line-height: 40rpx;
  328 +
  329 + // 审核中
  330 + &.status2_AUDIT {
  331 + background: rgb(242, 243, 255);
  332 + color: $theme-primary;
  333 +
  334 + }
  335 +
  336 + // 审核通过
  337 + &.status2_PASS {
  338 + color: rgb(43, 164, 113);
  339 + background-color: rgb(227, 249, 233);
  340 + }
  341 +
  342 + // 已驳回
  343 + &.status2_REFUSE {
  344 + color: rgb(213, 73, 65);
  345 + background-color: rgb(255, 240, 237);
  346 + }
  347 +
  348 + // 已取消
  349 + &.status2_CANCEL {
  350 + background: #e7e7e7;
  351 + color: rgba(0, 0, 0, 0.6);
  352 + }
  353 + }
317 354
318 .category { 355 .category {
319 display: inline-block; 356 display: inline-block;