朱园亮 / erp-mobile · Commits

Commit 333cfff47b27041c86b310602559517fc34fc3c8

Authored by 史婷婷
2 parents bb75c34b db866aa4

Merge remote-tracking branch 'origin/cjerp-1.0_shipping' into test_cjerp

Inline Side-by-side
Showing 15 changed files with 94 additions and 95 deletions
... ... @@ -49,7 +49,7 @@
49 49 <view class="card" @click="goDetail(item)">
50 50 <view class="card-header">
51 51 <text class="title omit2">{{ item.buyerName }}</text>
52   - <text v-if="item.status === 'STANDARD'" :class="['status']" :style="{ background: statusMap[item.shippingStatusName] }">{{ item.shippingStatusName }}</text>
  52 + <text v-if="item.status === 'STANDARD'" :class="['status', 'status_' + item.shippingStatusName]">{{ item.shippingStatusName }}</text>
53 53 </view>
54 54 <view class="info-row">
55 55 <text>编号</text><text>{{ item.code }}</text>
... ... @@ -94,8 +94,7 @@
94 94 <script>
95 95 import CardList from '@/components/card/index.vue'
96 96 import FilterModal from '@/components/filter/index.vue'
97   -import { queryContractApi, statusStyle,statusMap } from '@/api/contract.js'
98   -import { officeQueryApi } from '@/api/devManage.js'
  97 +import { queryContractApi, statusStyle } from '@/api/contract.js'
99 98
100 99 export default {
101 100 components: { CardList, FilterModal },
... ... @@ -118,7 +117,6 @@ export default {
118 117 filterForm: { deptId: '', deptName: '', dateRange: [] },
119 118 deptSelectVisible: false,
120 119 statusStyle,
121   - statusMap,
122 120 }
123 121 },
124 122 computed: {
... ... @@ -329,14 +327,27 @@ export default {
329 327 font-size: 30rpx;
330 328 font-weight: 600;
331 329 position: absolute;
332   - top: -36rpx;
  330 + top: -32rpx;
333 331 right: -12rpx;
334 332 height: 48rpx;
335   - line-height: 48rpx;
  333 + line-height: 50rpx;
336 334 color: #fff;
337 335 font-size: 24rpx;
338 336 padding: 0 14rpx;
339 337 border-radius: 6rpx;
  338 + &_审批中 {
  339 + background: $theme-primary;
  340 + }
  341 + &_生产中 {
  342 + background: #2BA471;
  343 + }
  344 + &_已发货 {
  345 + background: #E37318;
  346 + }
  347 + &_已签收 {
  348 + background: #9E9E9E;
  349 + color: #ffffff;
  350 + }
340 351 }
341 352 }
342 353 .info-row {
... ...
... ... @@ -109,7 +109,7 @@
109 109 </uni-list-item>
110 110 <uni-list-item title="数量">
111 111 <template v-slot:footer>
112   - <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 9)" />
  112 + <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
113 113 </template>
114 114 </uni-list-item>
115 115 <uni-list-item title="单价">
... ...
... ... @@ -49,7 +49,7 @@
49 49 <view class="card" @click="goDetail(item)">
50 50 <view class="card-header">
51 51 <text class="title omit2">{{ item.buyerName }}</text>
52   - <text v-if="item.status === 'STANDARD'" :class="['status']" :style="{ background: statusMap[item.shippingStatusName] }">{{ item.shippingStatusName }}</text>
  52 + <text v-if="item.status === 'STANDARD'" :class="['status', 'status_' + item.shippingStatusName]">{{ item.shippingStatusName }}</text>
53 53 </view>
54 54 <view class="info-row">
55 55 <text>编号</text><text>{{ item.code }}</text>
... ... @@ -96,8 +96,7 @@
96 96 <script>
97 97 import CardList from '@/components/card/index.vue'
98 98 import FilterModal from '@/components/filter/index.vue'
99   -import { queryContractApi, statusStyle,statusMap } from '@/api/contract.js'
100   -import { officeQueryApi } from '@/api/devManage.js'
  99 +import { queryContractApi, statusStyle } from '@/api/contract.js'
101 100
102 101 export default {
103 102 components: { CardList, FilterModal },
... ... @@ -118,7 +117,6 @@ export default {
118 117 filterForm: { deptId: '', deptName: '', dateRange: [] },
119 118 deptSelectVisible: false,
120 119 statusStyle,
121   - statusMap,
122 120 }
123 121 },
124 122 computed: {
... ... @@ -330,26 +328,26 @@ export default {
330 328 font-size: 30rpx;
331 329 font-weight: 600;
332 330 position: absolute;
333   - top: -36rpx;
  331 + top: -32rpx;
334 332 right: -12rpx;
335 333 height: 48rpx;
336   - line-height: 48rpx;
  334 + line-height: 50rpx;
337 335 color: #fff;
338 336 font-size: 24rpx;
339 337 padding: 0 14rpx;
340 338 border-radius: 6rpx;
341   - &.status_1 {
  339 + &_审批中 {
342 340 background: $theme-primary;
343 341 }
344   - &.status_2 {
  342 + &_生产中 {
345 343 background: #2BA471;
346 344 }
347   - &.status_3 {
348   - background: #D54941;
  345 + &_已发货 {
  346 + background: #E37318;
349 347 }
350   - &.status_4 {
351   - background: #E7E7E7;
352   - color: rgba(0,0,0,0.9);
  348 + &_已签收 {
  349 + background: #9E9E9E;
  350 + color: #ffffff;
353 351 }
354 352 }
355 353 }
... ...
... ... @@ -111,7 +111,7 @@
111 111 </uni-list-item>
112 112 <uni-list-item title="数量">
113 113 <template v-slot:footer>
114   - <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 9)" />
  114 + <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
115 115 </template>
116 116 </uni-list-item>
117 117 <uni-list-item title="单价">
... ...
... ... @@ -49,7 +49,7 @@
49 49 <view class="card" @click="goDetail(item)">
50 50 <view class="card-header">
51 51 <text class="title omit2">{{ item.buyerName }}</text>
52   - <text v-if="item.status === 'STANDARD'" :class="['status']" :style="{ background: statusMap[item.shippingStatusName] }">{{ item.shippingStatusName }}</text>
  52 + <text v-if="item.status === 'STANDARD'" :class="['status', 'status_' + item.shippingStatusName]">{{ item.shippingStatusName }}</text>
53 53 </view>
54 54 <view class="info-row">
55 55 <text>编号</text><text>{{ item.code }}</text>
... ... @@ -96,8 +96,7 @@
96 96 <script>
97 97 import CardList from '@/components/card/index.vue'
98 98 import FilterModal from '@/components/filter/index.vue'
99   -import { queryContractApi, statusStyle,statusMap } from '@/api/contract.js'
100   -import { officeQueryApi } from '@/api/devManage.js'
  99 +import { queryContractApi, statusStyle } from '@/api/contract.js'
101 100
102 101 export default {
103 102 components: { CardList, FilterModal },
... ... @@ -117,8 +116,7 @@ export default {
117 116 filterVisible: false,
118 117 filterForm: { deptId: '', deptName: '', dateRange: [] },
119 118 deptSelectVisible: false,
120   - statusStyle,
121   - statusMap,
  119 + statusStyle
122 120 }
123 121 },
124 122 computed: {
... ... @@ -332,26 +330,26 @@ export default {
332 330 font-size: 30rpx;
333 331 font-weight: 600;
334 332 position: absolute;
335   - top: -36rpx;
  333 + top: -32rpx;
336 334 right: -12rpx;
337 335 height: 48rpx;
338   - line-height: 48rpx;
  336 + line-height: 50rpx;
339 337 color: #fff;
340 338 font-size: 24rpx;
341 339 padding: 0 14rpx;
342 340 border-radius: 6rpx;
343   - &.status_1 {
  341 + &_审批中 {
344 342 background: $theme-primary;
345 343 }
346   - &.status_2 {
  344 + &_生产中 {
347 345 background: #2BA471;
348 346 }
349   - &.status_3 {
350   - background: #D54941;
  347 + &_已发货 {
  348 + background: #E37318;
351 349 }
352   - &.status_4 {
353   - background: #E7E7E7;
354   - color: rgba(0,0,0,0.9);
  350 + &_已签收 {
  351 + background: #9E9E9E;
  352 + color: #ffffff;
355 353 }
356 354 }
357 355 }
... ...
... ... @@ -109,7 +109,7 @@
109 109 </uni-list-item>
110 110 <uni-list-item title="数量">
111 111 <template v-slot:footer>
112   - <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 9)" />
  112 + <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
113 113 </template>
114 114 </uni-list-item>
115 115 <uni-list-item title="单价">
... ...
... ... @@ -49,7 +49,7 @@
49 49 <view class="card" @click="goDetail(item)">
50 50 <view class="card-header">
51 51 <text class="title omit2">{{ item.buyerName }}</text>
52   - <text v-if="item.status === 'STANDARD'" :class="['status']" :style="{ background: statusMap[item.shippingStatusName] }">{{ item.shippingStatusName }}</text>
  52 + <text v-if="item.status === 'STANDARD'" :class="['status', 'status_' + item.shippingStatusName]">{{ item.shippingStatusName }}</text>
53 53 </view>
54 54 <view class="info-row">
55 55 <text>编号</text><text>{{ item.code }}</text>
... ... @@ -94,8 +94,7 @@
94 94 <script>
95 95 import CardList from '@/components/card/index.vue'
96 96 import FilterModal from '@/components/filter/index.vue'
97   -import { queryContractApi, statusStyle,statusMap } from '@/api/contract.js'
98   -import { officeQueryApi } from '@/api/devManage.js'
  97 +import { queryContractApi, statusStyle } from '@/api/contract.js'
99 98
100 99 export default {
101 100 components: { CardList, FilterModal },
... ... @@ -116,7 +115,6 @@ export default {
116 115 filterForm: { deptId: '', deptName: '', dateRange: [] },
117 116 deptSelectVisible: false,
118 117 statusStyle,
119   - statusMap,
120 118 }
121 119 },
122 120 computed: {
... ... @@ -329,26 +327,26 @@ export default {
329 327 font-size: 30rpx;
330 328 font-weight: 600;
331 329 position: absolute;
332   - top: -36rpx;
  330 + top: -32rpx;
333 331 right: -12rpx;
334 332 height: 48rpx;
335   - line-height: 48rpx;
  333 + line-height: 50rpx;
336 334 color: #fff;
337 335 font-size: 24rpx;
338 336 padding: 0 14rpx;
339 337 border-radius: 6rpx;
340   - &.status_1 {
  338 + &_审批中 {
341 339 background: $theme-primary;
342 340 }
343   - &.status_2 {
  341 + &_生产中 {
344 342 background: #2BA471;
345 343 }
346   - &.status_3 {
347   - background: #D54941;
  344 + &_已发货 {
  345 + background: #E37318;
348 346 }
349   - &.status_4 {
350   - background: #E7E7E7;
351   - color: rgba(0,0,0,0.9);
  347 + &_已签收 {
  348 + background: #9E9E9E;
  349 + color: #ffffff;
352 350 }
353 351 }
354 352 }
... ...
... ... @@ -136,7 +136,7 @@
136 136 </uni-list-item>
137 137 <uni-list-item title="定作物数量">
138 138 <template v-slot:footer>
139   - <uni-easyinput v-model="item.productQuantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'productQuantity')" @blur="onNonNegativeBlur(idx, 'productQuantity', 9)" />
  139 + <uni-easyinput v-model="item.productQuantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'productQuantity')" @blur="onNonNegativeBlur(idx, 'productQuantity', 2)" />
140 140 </template>
141 141 </uni-list-item>
142 142 <uni-list-item title="加工费单价">
... ...
... ... @@ -49,7 +49,7 @@
49 49 <view class="card" @click="goDetail(item)">
50 50 <view class="card-header">
51 51 <text class="title omit2">{{ item.buyerName }}</text>
52   - <text v-if="item.status === 'STANDARD'" :class="['status']" :style="{ background: statusMap[item.shippingStatusName] }">{{ item.shippingStatusName }}</text>
  52 + <text v-if="item.status === 'STANDARD'" :class="['status', 'status_' + item.shippingStatusName]" >{{ item.shippingStatusName }}</text>
53 53 </view>
54 54 <view class="info-row">
55 55 <text>编号</text><text>{{ item.code }}</text>
... ... @@ -94,8 +94,7 @@
94 94 <script>
95 95 import CardList from '@/components/card/index.vue'
96 96 import FilterModal from '@/components/filter/index.vue'
97   -import { queryContractApi, statusStyle, statusMap } from '@/api/contract.js'
98   -import { officeQueryApi } from '@/api/devManage.js'
  97 +import { queryContractApi, statusStyle } from '@/api/contract.js'
99 98
100 99 export default {
101 100 components: { CardList, FilterModal },
... ... @@ -112,8 +111,7 @@ export default {
112 111 filterVisible: false,
113 112 filterForm: { deptId: '', deptName: '', dateRange: [] },
114 113 deptSelectVisible: false,
115   - statusStyle,
116   - statusMap
  114 + statusStyle
117 115 }
118 116 },
119 117 computed: {
... ... @@ -326,26 +324,26 @@ export default {
326 324 font-size: 30rpx;
327 325 font-weight: 600;
328 326 position: absolute;
329   - top: -36rpx;
  327 + top: -32rpx;
330 328 right: -12rpx;
331 329 height: 48rpx;
332   - line-height: 48rpx;
  330 + line-height: 50rpx;
333 331 color: #fff;
334 332 font-size: 24rpx;
335 333 padding: 0 14rpx;
336 334 border-radius: 6rpx;
337   - &.status_1 {
  335 + &_审批中 {
338 336 background: $theme-primary;
339 337 }
340   - &.status_2 {
  338 + &_生产中 {
341 339 background: #2BA471;
342 340 }
343   - &.status_3 {
344   - background: #D54941;
  341 + &_已发货 {
  342 + background: #E37318;
345 343 }
346   - &.status_4 {
347   - background: #E7E7E7;
348   - color: rgba(0,0,0,0.9);
  344 + &_已签收 {
  345 + background: #9E9E9E;
  346 + color: #ffffff;
349 347 }
350 348 }
351 349 }
... ...
... ... @@ -109,7 +109,7 @@
109 109 </uni-list-item>
110 110 <uni-list-item title="数量kg">
111 111 <template v-slot:footer>
112   - <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 9)" />
  112 + <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
113 113 </template>
114 114 </uni-list-item>
115 115 <uni-list-item title="销售价格">
... ...
... ... @@ -49,7 +49,7 @@
49 49 <view class="card" @click="goDetail(item)">
50 50 <view class="card-header">
51 51 <text class="title omit2">{{ item.buyerName }}</text>
52   - <text v-if="item.status === 'STANDARD'" :class="['status']" :style="{ background: statusMap[item.shippingStatusName] }">{{ item.shippingStatusName }}</text>
  52 + <text v-if="item.status === 'STANDARD'" :class="['status', 'status_' + item.shippingStatusName]">{{ item.shippingStatusName }}</text>
53 53 </view>
54 54 <view class="info-row">
55 55 <text>编号</text><text>{{ item.code }}</text>
... ... @@ -96,8 +96,7 @@
96 96 <script>
97 97 import CardList from '@/components/card/index.vue'
98 98 import FilterModal from '@/components/filter/index.vue'
99   -import { queryContractApi, statusStyle,statusMap } from '@/api/contract.js'
100   -import { officeQueryApi } from '@/api/devManage.js'
  99 +import { queryContractApi, statusStyle } from '@/api/contract.js'
101 100
102 101 export default {
103 102 components: { CardList, FilterModal },
... ... @@ -117,8 +116,7 @@ export default {
117 116 filterVisible: false,
118 117 filterForm: { deptId: '', deptName: '', dateRange: [] },
119 118 deptSelectVisible: false,
120   - statusStyle,
121   - statusMap,
  119 + statusStyle
122 120 }
123 121 },
124 122 computed: {
... ... @@ -332,26 +330,26 @@ export default {
332 330 font-size: 30rpx;
333 331 font-weight: 600;
334 332 position: absolute;
335   - top: -36rpx;
  333 + top: -32rpx;
336 334 right: -12rpx;
337 335 height: 48rpx;
338   - line-height: 48rpx;
  336 + line-height: 50rpx;
339 337 color: #fff;
340 338 font-size: 24rpx;
341 339 padding: 0 14rpx;
342 340 border-radius: 6rpx;
343   - &.status_1 {
  341 + &_审批中 {
344 342 background: $theme-primary;
345 343 }
346   - &.status_2 {
  344 + &_生产中 {
347 345 background: #2BA471;
348 346 }
349   - &.status_3 {
350   - background: #D54941;
  347 + &_已发货 {
  348 + background: #E37318;
351 349 }
352   - &.status_4 {
353   - background: #E7E7E7;
354   - color: rgba(0,0,0,0.9);
  350 + &_已签收 {
  351 + background: #9E9E9E;
  352 + color: #ffffff;
355 353 }
356 354 }
357 355 }
... ...
... ... @@ -109,7 +109,7 @@
109 109 </uni-list-item>
110 110 <uni-list-item title="数量">
111 111 <template v-slot:footer>
112   - <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 9)" />
  112 + <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
113 113 </template>
114 114 </uni-list-item>
115 115 <uni-list-item title="单价">
... ...
... ... @@ -49,7 +49,7 @@
49 49 <view class="card" @click="goDetail(item)">
50 50 <view class="card-header">
51 51 <text class="title omit2">{{ item.buyerName }}</text>
52   - <text v-if="item.status === 'STANDARD'" :class="['status']" :style="{ background: statusMap[item.shippingStatusName] }">{{ item.shippingStatusName }}</text>
  52 + <text v-if="item.status === 'STANDARD'" :class="['status', 'status_' + item.shippingStatusName]">{{ item.shippingStatusName }}</text>
53 53 </view>
54 54 <view class="info-row">
55 55 <text>编号</text><text>{{ item.code }}</text>
... ... @@ -96,8 +96,7 @@
96 96 <script>
97 97 import CardList from '@/components/card/index.vue'
98 98 import FilterModal from '@/components/filter/index.vue'
99   -import { queryContractApi, statusStyle,statusMap } from '@/api/contract.js'
100   -import { officeQueryApi } from '@/api/devManage.js'
  99 +import { queryContractApi, statusStyle } from '@/api/contract.js'
101 100
102 101 export default {
103 102 components: { CardList, FilterModal },
... ... @@ -115,8 +114,7 @@ export default {
115 114 filterVisible: false,
116 115 filterForm: { deptId: '', deptName: '', dateRange: [] },
117 116 deptSelectVisible: false,
118   - statusStyle,
119   - statusMap,
  117 + statusStyle
120 118 }
121 119 },
122 120 computed: {
... ... @@ -332,26 +330,26 @@ export default {
332 330 font-size: 30rpx;
333 331 font-weight: 600;
334 332 position: absolute;
335   - top: -36rpx;
  333 + top: -32rpx;
336 334 right: -12rpx;
337 335 height: 48rpx;
338   - line-height: 48rpx;
  336 + line-height: 50rpx;
339 337 color: #fff;
340 338 font-size: 24rpx;
341 339 padding: 0 14rpx;
342 340 border-radius: 6rpx;
343   - &.status_1 {
  341 + &_审批中 {
344 342 background: $theme-primary;
345 343 }
346   - &.status_2 {
  344 + &_生产中 {
347 345 background: #2BA471;
348 346 }
349   - &.status_3 {
350   - background: #D54941;
  347 + &_已发货 {
  348 + background: #E37318;
351 349 }
352   - &.status_4 {
353   - background: #E7E7E7;
354   - color: rgba(0,0,0,0.9);
  350 + &_已签收 {
  351 + background: #9E9E9E;
  352 + color: #ffffff;
355 353 }
356 354 }
357 355 }
... ...
... ... @@ -109,7 +109,7 @@
109 109 </uni-list-item>
110 110 <uni-list-item title="数量">
111 111 <template v-slot:footer>
112   - <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 9)" />
  112 + <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
113 113 </template>
114 114 </uni-list-item>
115 115 <uni-list-item title="单价">
... ...

28.8 KB | W: | H:

28.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin