朱园亮 / erp-mobile · Commits

Commit db866aa4c030878fd5c3b09d36c6e963f5128493

Authored by gesilong
1 parent 2d7f90b5

commit：移动端Bug修复；合同状态样式统一更换

Inline Side-by-side
Showing 15 changed files with 94 additions and 95 deletions
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <view class="card" @click="goDetail(item)"> 49 <view class="card" @click="goDetail(item)">
50 <view class="card-header"> 50 <view class="card-header">
51 <text class="title omit2">{{ item.buyerName }}</text> 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 </view> 53 </view>
54 <view class="info-row"> 54 <view class="info-row">
55 <text>编号</text><text>{{ item.code }}</text> 55 <text>编号</text><text>{{ item.code }}</text>
@@ -94,8 +94,7 @@ @@ -94,8 +94,7 @@
94 <script> 94 <script>
95 import CardList from '@/components/card/index.vue' 95 import CardList from '@/components/card/index.vue'
96 import FilterModal from '@/components/filter/index.vue' 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 export default { 99 export default {
101 components: { CardList, FilterModal }, 100 components: { CardList, FilterModal },
@@ -118,7 +117,6 @@ export default { @@ -118,7 +117,6 @@ export default {
118 filterForm: { deptId: '', deptName: '', dateRange: [] }, 117 filterForm: { deptId: '', deptName: '', dateRange: [] },
119 deptSelectVisible: false, 118 deptSelectVisible: false,
120 statusStyle, 119 statusStyle,
121 - statusMap,  
122 } 120 }
123 }, 121 },
124 computed: { 122 computed: {
@@ -329,14 +327,27 @@ export default { @@ -329,14 +327,27 @@ export default {
329 font-size: 30rpx; 327 font-size: 30rpx;
330 font-weight: 600; 328 font-weight: 600;
331 position: absolute; 329 position: absolute;
332 - top: -36rpx; 330 + top: -32rpx;
333 right: -12rpx; 331 right: -12rpx;
334 height: 48rpx; 332 height: 48rpx;
335 - line-height: 48rpx; 333 + line-height: 50rpx;
336 color: #fff; 334 color: #fff;
337 font-size: 24rpx; 335 font-size: 24rpx;
338 padding: 0 14rpx; 336 padding: 0 14rpx;
339 border-radius: 6rpx; 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 .info-row { 353 .info-row {
@@ -109,7 +109,7 @@ @@ -109,7 +109,7 @@
109 </uni-list-item> 109 </uni-list-item>
110 <uni-list-item title="数量"> 110 <uni-list-item title="数量">
111 <template v-slot:footer> 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 </template> 113 </template>
114 </uni-list-item> 114 </uni-list-item>
115 <uni-list-item title="单价"> 115 <uni-list-item title="单价">
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <view class="card" @click="goDetail(item)"> 49 <view class="card" @click="goDetail(item)">
50 <view class="card-header"> 50 <view class="card-header">
51 <text class="title omit2">{{ item.buyerName }}</text> 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 </view> 53 </view>
54 <view class="info-row"> 54 <view class="info-row">
55 <text>编号</text><text>{{ item.code }}</text> 55 <text>编号</text><text>{{ item.code }}</text>
@@ -96,8 +96,7 @@ @@ -96,8 +96,7 @@
96 <script> 96 <script>
97 import CardList from '@/components/card/index.vue' 97 import CardList from '@/components/card/index.vue'
98 import FilterModal from '@/components/filter/index.vue' 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 export default { 101 export default {
103 components: { CardList, FilterModal }, 102 components: { CardList, FilterModal },
@@ -118,7 +117,6 @@ export default { @@ -118,7 +117,6 @@ export default {
118 filterForm: { deptId: '', deptName: '', dateRange: [] }, 117 filterForm: { deptId: '', deptName: '', dateRange: [] },
119 deptSelectVisible: false, 118 deptSelectVisible: false,
120 statusStyle, 119 statusStyle,
121 - statusMap,  
122 } 120 }
123 }, 121 },
124 computed: { 122 computed: {
@@ -330,26 +328,26 @@ export default { @@ -330,26 +328,26 @@ export default {
330 font-size: 30rpx; 328 font-size: 30rpx;
331 font-weight: 600; 329 font-weight: 600;
332 position: absolute; 330 position: absolute;
333 - top: -36rpx; 331 + top: -32rpx;
334 right: -12rpx; 332 right: -12rpx;
335 height: 48rpx; 333 height: 48rpx;
336 - line-height: 48rpx; 334 + line-height: 50rpx;
337 color: #fff; 335 color: #fff;
338 font-size: 24rpx; 336 font-size: 24rpx;
339 padding: 0 14rpx; 337 padding: 0 14rpx;
340 border-radius: 6rpx; 338 border-radius: 6rpx;
341 - &.status_1 { 339 + &_审批中 {
342 background: $theme-primary; 340 background: $theme-primary;
343 } 341 }
344 - &.status_2 { 342 + &_生产中 {
345 background: #2BA471; 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,7 +111,7 @@
111 </uni-list-item> 111 </uni-list-item>
112 <uni-list-item title="数量"> 112 <uni-list-item title="数量">
113 <template v-slot:footer> 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 </template> 115 </template>
116 </uni-list-item> 116 </uni-list-item>
117 <uni-list-item title="单价"> 117 <uni-list-item title="单价">
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <view class="card" @click="goDetail(item)"> 49 <view class="card" @click="goDetail(item)">
50 <view class="card-header"> 50 <view class="card-header">
51 <text class="title omit2">{{ item.buyerName }}</text> 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 </view> 53 </view>
54 <view class="info-row"> 54 <view class="info-row">
55 <text>编号</text><text>{{ item.code }}</text> 55 <text>编号</text><text>{{ item.code }}</text>
@@ -96,8 +96,7 @@ @@ -96,8 +96,7 @@
96 <script> 96 <script>
97 import CardList from '@/components/card/index.vue' 97 import CardList from '@/components/card/index.vue'
98 import FilterModal from '@/components/filter/index.vue' 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 export default { 101 export default {
103 components: { CardList, FilterModal }, 102 components: { CardList, FilterModal },
@@ -117,8 +116,7 @@ export default { @@ -117,8 +116,7 @@ export default {
117 filterVisible: false, 116 filterVisible: false,
118 filterForm: { deptId: '', deptName: '', dateRange: [] }, 117 filterForm: { deptId: '', deptName: '', dateRange: [] },
119 deptSelectVisible: false, 118 deptSelectVisible: false,
120 - statusStyle,  
121 - statusMap, 119 + statusStyle
122 } 120 }
123 }, 121 },
124 computed: { 122 computed: {
@@ -332,26 +330,26 @@ export default { @@ -332,26 +330,26 @@ export default {
332 font-size: 30rpx; 330 font-size: 30rpx;
333 font-weight: 600; 331 font-weight: 600;
334 position: absolute; 332 position: absolute;
335 - top: -36rpx; 333 + top: -32rpx;
336 right: -12rpx; 334 right: -12rpx;
337 height: 48rpx; 335 height: 48rpx;
338 - line-height: 48rpx; 336 + line-height: 50rpx;
339 color: #fff; 337 color: #fff;
340 font-size: 24rpx; 338 font-size: 24rpx;
341 padding: 0 14rpx; 339 padding: 0 14rpx;
342 border-radius: 6rpx; 340 border-radius: 6rpx;
343 - &.status_1 { 341 + &_审批中 {
344 background: $theme-primary; 342 background: $theme-primary;
345 } 343 }
346 - &.status_2 { 344 + &_生产中 {
347 background: #2BA471; 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,7 +109,7 @@
109 </uni-list-item> 109 </uni-list-item>
110 <uni-list-item title="数量"> 110 <uni-list-item title="数量">
111 <template v-slot:footer> 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 </template> 113 </template>
114 </uni-list-item> 114 </uni-list-item>
115 <uni-list-item title="单价"> 115 <uni-list-item title="单价">
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <view class="card" @click="goDetail(item)"> 49 <view class="card" @click="goDetail(item)">
50 <view class="card-header"> 50 <view class="card-header">
51 <text class="title omit2">{{ item.buyerName }}</text> 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 </view> 53 </view>
54 <view class="info-row"> 54 <view class="info-row">
55 <text>编号</text><text>{{ item.code }}</text> 55 <text>编号</text><text>{{ item.code }}</text>
@@ -94,8 +94,7 @@ @@ -94,8 +94,7 @@
94 <script> 94 <script>
95 import CardList from '@/components/card/index.vue' 95 import CardList from '@/components/card/index.vue'
96 import FilterModal from '@/components/filter/index.vue' 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 export default { 99 export default {
101 components: { CardList, FilterModal }, 100 components: { CardList, FilterModal },
@@ -116,7 +115,6 @@ export default { @@ -116,7 +115,6 @@ export default {
116 filterForm: { deptId: '', deptName: '', dateRange: [] }, 115 filterForm: { deptId: '', deptName: '', dateRange: [] },
117 deptSelectVisible: false, 116 deptSelectVisible: false,
118 statusStyle, 117 statusStyle,
119 - statusMap,  
120 } 118 }
121 }, 119 },
122 computed: { 120 computed: {
@@ -329,26 +327,26 @@ export default { @@ -329,26 +327,26 @@ export default {
329 font-size: 30rpx; 327 font-size: 30rpx;
330 font-weight: 600; 328 font-weight: 600;
331 position: absolute; 329 position: absolute;
332 - top: -36rpx; 330 + top: -32rpx;
333 right: -12rpx; 331 right: -12rpx;
334 height: 48rpx; 332 height: 48rpx;
335 - line-height: 48rpx; 333 + line-height: 50rpx;
336 color: #fff; 334 color: #fff;
337 font-size: 24rpx; 335 font-size: 24rpx;
338 padding: 0 14rpx; 336 padding: 0 14rpx;
339 border-radius: 6rpx; 337 border-radius: 6rpx;
340 - &.status_1 { 338 + &_审批中 {
341 background: $theme-primary; 339 background: $theme-primary;
342 } 340 }
343 - &.status_2 { 341 + &_生产中 {
344 background: #2BA471; 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,7 +136,7 @@
136 </uni-list-item> 136 </uni-list-item>
137 <uni-list-item title="定作物数量"> 137 <uni-list-item title="定作物数量">
138 <template v-slot:footer> 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 </template> 140 </template>
141 </uni-list-item> 141 </uni-list-item>
142 <uni-list-item title="加工费单价"> 142 <uni-list-item title="加工费单价">
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <view class="card" @click="goDetail(item)"> 49 <view class="card" @click="goDetail(item)">
50 <view class="card-header"> 50 <view class="card-header">
51 <text class="title omit2">{{ item.buyerName }}</text> 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 </view> 53 </view>
54 <view class="info-row"> 54 <view class="info-row">
55 <text>编号</text><text>{{ item.code }}</text> 55 <text>编号</text><text>{{ item.code }}</text>
@@ -94,8 +94,7 @@ @@ -94,8 +94,7 @@
94 <script> 94 <script>
95 import CardList from '@/components/card/index.vue' 95 import CardList from '@/components/card/index.vue'
96 import FilterModal from '@/components/filter/index.vue' 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 export default { 99 export default {
101 components: { CardList, FilterModal }, 100 components: { CardList, FilterModal },
@@ -112,8 +111,7 @@ export default { @@ -112,8 +111,7 @@ export default {
112 filterVisible: false, 111 filterVisible: false,
113 filterForm: { deptId: '', deptName: '', dateRange: [] }, 112 filterForm: { deptId: '', deptName: '', dateRange: [] },
114 deptSelectVisible: false, 113 deptSelectVisible: false,
115 - statusStyle,  
116 - statusMap 114 + statusStyle
117 } 115 }
118 }, 116 },
119 computed: { 117 computed: {
@@ -326,26 +324,26 @@ export default { @@ -326,26 +324,26 @@ export default {
326 font-size: 30rpx; 324 font-size: 30rpx;
327 font-weight: 600; 325 font-weight: 600;
328 position: absolute; 326 position: absolute;
329 - top: -36rpx; 327 + top: -32rpx;
330 right: -12rpx; 328 right: -12rpx;
331 height: 48rpx; 329 height: 48rpx;
332 - line-height: 48rpx; 330 + line-height: 50rpx;
333 color: #fff; 331 color: #fff;
334 font-size: 24rpx; 332 font-size: 24rpx;
335 padding: 0 14rpx; 333 padding: 0 14rpx;
336 border-radius: 6rpx; 334 border-radius: 6rpx;
337 - &.status_1 { 335 + &_审批中 {
338 background: $theme-primary; 336 background: $theme-primary;
339 } 337 }
340 - &.status_2 { 338 + &_生产中 {
341 background: #2BA471; 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,7 +109,7 @@
109 </uni-list-item> 109 </uni-list-item>
110 <uni-list-item title="数量kg"> 110 <uni-list-item title="数量kg">
111 <template v-slot:footer> 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 </template> 113 </template>
114 </uni-list-item> 114 </uni-list-item>
115 <uni-list-item title="销售价格"> 115 <uni-list-item title="销售价格">
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <view class="card" @click="goDetail(item)"> 49 <view class="card" @click="goDetail(item)">
50 <view class="card-header"> 50 <view class="card-header">
51 <text class="title omit2">{{ item.buyerName }}</text> 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 </view> 53 </view>
54 <view class="info-row"> 54 <view class="info-row">
55 <text>编号</text><text>{{ item.code }}</text> 55 <text>编号</text><text>{{ item.code }}</text>
@@ -96,8 +96,7 @@ @@ -96,8 +96,7 @@
96 <script> 96 <script>
97 import CardList from '@/components/card/index.vue' 97 import CardList from '@/components/card/index.vue'
98 import FilterModal from '@/components/filter/index.vue' 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 export default { 101 export default {
103 components: { CardList, FilterModal }, 102 components: { CardList, FilterModal },
@@ -117,8 +116,7 @@ export default { @@ -117,8 +116,7 @@ export default {
117 filterVisible: false, 116 filterVisible: false,
118 filterForm: { deptId: '', deptName: '', dateRange: [] }, 117 filterForm: { deptId: '', deptName: '', dateRange: [] },
119 deptSelectVisible: false, 118 deptSelectVisible: false,
120 - statusStyle,  
121 - statusMap, 119 + statusStyle
122 } 120 }
123 }, 121 },
124 computed: { 122 computed: {
@@ -332,26 +330,26 @@ export default { @@ -332,26 +330,26 @@ export default {
332 font-size: 30rpx; 330 font-size: 30rpx;
333 font-weight: 600; 331 font-weight: 600;
334 position: absolute; 332 position: absolute;
335 - top: -36rpx; 333 + top: -32rpx;
336 right: -12rpx; 334 right: -12rpx;
337 height: 48rpx; 335 height: 48rpx;
338 - line-height: 48rpx; 336 + line-height: 50rpx;
339 color: #fff; 337 color: #fff;
340 font-size: 24rpx; 338 font-size: 24rpx;
341 padding: 0 14rpx; 339 padding: 0 14rpx;
342 border-radius: 6rpx; 340 border-radius: 6rpx;
343 - &.status_1 { 341 + &_审批中 {
344 background: $theme-primary; 342 background: $theme-primary;
345 } 343 }
346 - &.status_2 { 344 + &_生产中 {
347 background: #2BA471; 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,7 +109,7 @@
109 </uni-list-item> 109 </uni-list-item>
110 <uni-list-item title="数量"> 110 <uni-list-item title="数量">
111 <template v-slot:footer> 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 </template> 113 </template>
114 </uni-list-item> 114 </uni-list-item>
115 <uni-list-item title="单价"> 115 <uni-list-item title="单价">
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <view class="card" @click="goDetail(item)"> 49 <view class="card" @click="goDetail(item)">
50 <view class="card-header"> 50 <view class="card-header">
51 <text class="title omit2">{{ item.buyerName }}</text> 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 </view> 53 </view>
54 <view class="info-row"> 54 <view class="info-row">
55 <text>编号</text><text>{{ item.code }}</text> 55 <text>编号</text><text>{{ item.code }}</text>
@@ -96,8 +96,7 @@ @@ -96,8 +96,7 @@
96 <script> 96 <script>
97 import CardList from '@/components/card/index.vue' 97 import CardList from '@/components/card/index.vue'
98 import FilterModal from '@/components/filter/index.vue' 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 export default { 101 export default {
103 components: { CardList, FilterModal }, 102 components: { CardList, FilterModal },
@@ -115,8 +114,7 @@ export default { @@ -115,8 +114,7 @@ export default {
115 filterVisible: false, 114 filterVisible: false,
116 filterForm: { deptId: '', deptName: '', dateRange: [] }, 115 filterForm: { deptId: '', deptName: '', dateRange: [] },
117 deptSelectVisible: false, 116 deptSelectVisible: false,
118 - statusStyle,  
119 - statusMap, 117 + statusStyle
120 } 118 }
121 }, 119 },
122 computed: { 120 computed: {
@@ -332,26 +330,26 @@ export default { @@ -332,26 +330,26 @@ export default {
332 font-size: 30rpx; 330 font-size: 30rpx;
333 font-weight: 600; 331 font-weight: 600;
334 position: absolute; 332 position: absolute;
335 - top: -36rpx; 333 + top: -32rpx;
336 right: -12rpx; 334 right: -12rpx;
337 height: 48rpx; 335 height: 48rpx;
338 - line-height: 48rpx; 336 + line-height: 50rpx;
339 color: #fff; 337 color: #fff;
340 font-size: 24rpx; 338 font-size: 24rpx;
341 padding: 0 14rpx; 339 padding: 0 14rpx;
342 border-radius: 6rpx; 340 border-radius: 6rpx;
343 - &.status_1 { 341 + &_审批中 {
344 background: $theme-primary; 342 background: $theme-primary;
345 } 343 }
346 - &.status_2 { 344 + &_生产中 {
347 background: #2BA471; 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,7 +109,7 @@
109 </uni-list-item> 109 </uni-list-item>
110 <uni-list-item title="数量"> 110 <uni-list-item title="数量">
111 <template v-slot:footer> 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 </template> 113 </template>
114 </uni-list-item> 114 </uni-list-item>
115 <uni-list-item title="单价"> 115 <uni-list-item title="单价">

28.8 KB | W: | H:

28.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin