Showing
22 changed files
with
109 additions
and
81 deletions
| 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 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" /> | ||
| 27 | + </list> | ||
| 5 | <option name="SHOW_DIALOG" value="false" /> | 28 | <option name="SHOW_DIALOG" value="false" /> |
| 6 | <option name="HIGHLIGHT_CONFLICTS" value="true" /> | 29 | <option name="HIGHLIGHT_CONFLICTS" value="true" /> |
| 7 | <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> | 30 | <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> |
| @@ -48,6 +71,11 @@ | @@ -48,6 +71,11 @@ | ||
| 48 | <ui_properties converted="true" /> | 71 | <ui_properties converted="true" /> |
| 49 | </component> | 72 | </component> |
| 50 | <component name="Git.Settings"> | 73 | <component name="Git.Settings"> |
| 74 | + <option name="RECENT_BRANCH_BY_REPOSITORY"> | ||
| 75 | + <map> | ||
| 76 | + <entry key="$PROJECT_DIR$" value="publish_cjerp" /> | ||
| 77 | + </map> | ||
| 78 | + </option> | ||
| 51 | <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> | 79 | <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> |
| 52 | </component> | 80 | </component> |
| 53 | <component name="ProjectColorInfo">{ | 81 | <component name="ProjectColorInfo">{ |
| @@ -233,13 +233,13 @@ export default { | @@ -233,13 +233,13 @@ export default { | ||
| 233 | .cancel { color: rgba(0,0,0,0.6); font-size: 28rpx; } | 233 | .cancel { color: rgba(0,0,0,0.6); font-size: 28rpx; } |
| 234 | .ok { color: $theme-primary; font-size: 28rpx; } | 234 | .ok { color: $theme-primary; font-size: 28rpx; } |
| 235 | .sheet-search { padding: 16rpx 24rpx; } | 235 | .sheet-search { padding: 16rpx 24rpx; } |
| 236 | -.sheet-body { | ||
| 237 | - flex: 1 1 auto; overflow-y: auto; padding: 24rpx; | 236 | +.sheet-body { |
| 237 | + flex: 1 1 auto; overflow-y: auto; padding: 24rpx; | ||
| 238 | background: #f3f3f3; | 238 | background: #f3f3f3; |
| 239 | } | 239 | } |
| 240 | .card { background: #fff; } | 240 | .card { background: #fff; } |
| 241 | -.card.selected { | ||
| 242 | - background-color: #fff; | 241 | +.card.selected { |
| 242 | + background-color: #fff; | ||
| 243 | position: relative; | 243 | position: relative; |
| 244 | &::after { | 244 | &::after { |
| 245 | content: ''; | 245 | content: ''; |
| @@ -247,7 +247,7 @@ export default { | @@ -247,7 +247,7 @@ export default { | ||
| 247 | top: -32rpx; | 247 | top: -32rpx; |
| 248 | left: -32rpx; | 248 | left: -32rpx; |
| 249 | bottom: -32rpx; | 249 | bottom: -32rpx; |
| 250 | - right: -32rpx; | 250 | + right: -12rpx; |
| 251 | border: 1px solid $theme-primary-alpha-50; | 251 | border: 1px solid $theme-primary-alpha-50; |
| 252 | } | 252 | } |
| 253 | } | 253 | } |
| @@ -363,7 +363,7 @@ export default { | @@ -363,7 +363,7 @@ export default { | ||
| 363 | .status-box { | 363 | .status-box { |
| 364 | position: absolute; | 364 | position: absolute; |
| 365 | top: -32rpx; | 365 | top: -32rpx; |
| 366 | - right: -32rpx; | 366 | + right: -12rpx; |
| 367 | 367 | ||
| 368 | .status { | 368 | .status { |
| 369 | display: block; | 369 | display: block; |
| @@ -522,4 +522,4 @@ export default { | @@ -522,4 +522,4 @@ export default { | ||
| 522 | } | 522 | } |
| 523 | 523 | ||
| 524 | } | 524 | } |
| 525 | -</style> | ||
| 525 | +</style> |
| @@ -246,7 +246,7 @@ export default { | @@ -246,7 +246,7 @@ export default { | ||
| 246 | font-weight: 600; | 246 | font-weight: 600; |
| 247 | position: absolute; | 247 | position: absolute; |
| 248 | top: -32rpx; | 248 | top: -32rpx; |
| 249 | - right: -32rpx; | 249 | + right: -12rpx; |
| 250 | height: 48rpx; | 250 | height: 48rpx; |
| 251 | line-height: 48rpx; | 251 | line-height: 48rpx; |
| 252 | color: #fff; | 252 | color: #fff; |
| @@ -317,7 +317,7 @@ export default { | @@ -317,7 +317,7 @@ export default { | ||
| 317 | font-weight: 600; | 317 | font-weight: 600; |
| 318 | position: absolute; | 318 | position: absolute; |
| 319 | top: -36rpx; | 319 | top: -36rpx; |
| 320 | - right: -32rpx; | 320 | + right: -12rpx; |
| 321 | height: 48rpx; | 321 | height: 48rpx; |
| 322 | line-height: 48rpx; | 322 | line-height: 48rpx; |
| 323 | color: #fff; | 323 | color: #fff; |
| @@ -353,19 +353,19 @@ export default { | @@ -353,19 +353,19 @@ export default { | ||
| 353 | } | 353 | } |
| 354 | } | 354 | } |
| 355 | 355 | ||
| 356 | -.filter-form { | 356 | +.filter-form { |
| 357 | .form-item { margin-bottom: 24rpx; } | 357 | .form-item { margin-bottom: 24rpx; } |
| 358 | - .label { | ||
| 359 | - margin-bottom: 20rpx; | 358 | + .label { |
| 359 | + margin-bottom: 20rpx; | ||
| 360 | color: rgba(0,0,0,0.9); | 360 | color: rgba(0,0,0,0.9); |
| 361 | height: 44rpx; | 361 | height: 44rpx; |
| 362 | line-height: 44rpx; | 362 | line-height: 44rpx; |
| 363 | font-size: 30rpx; | 363 | font-size: 30rpx; |
| 364 | } | 364 | } |
| 365 | - .fake-select { | ||
| 366 | - height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx; | 365 | + .fake-select { |
| 366 | + height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx; | ||
| 367 | .placeholder { color: #999; } | 367 | .placeholder { color: #999; } |
| 368 | .value { color: #333; } | 368 | .value { color: #333; } |
| 369 | } | 369 | } |
| 370 | } | 370 | } |
| 371 | -</style> | ||
| 371 | +</style> |
| @@ -319,7 +319,7 @@ export default { | @@ -319,7 +319,7 @@ export default { | ||
| 319 | font-weight: 600; | 319 | font-weight: 600; |
| 320 | position: absolute; | 320 | position: absolute; |
| 321 | top: -36rpx; | 321 | top: -36rpx; |
| 322 | - right: -32rpx; | 322 | + right: -12rpx; |
| 323 | height: 48rpx; | 323 | height: 48rpx; |
| 324 | line-height: 48rpx; | 324 | line-height: 48rpx; |
| 325 | color: #fff; | 325 | color: #fff; |
| @@ -368,19 +368,19 @@ export default { | @@ -368,19 +368,19 @@ export default { | ||
| 368 | } | 368 | } |
| 369 | } | 369 | } |
| 370 | 370 | ||
| 371 | -.filter-form { | 371 | +.filter-form { |
| 372 | .form-item { margin-bottom: 24rpx; } | 372 | .form-item { margin-bottom: 24rpx; } |
| 373 | - .label { | ||
| 374 | - margin-bottom: 20rpx; | 373 | + .label { |
| 374 | + margin-bottom: 20rpx; | ||
| 375 | color: rgba(0,0,0,0.9); | 375 | color: rgba(0,0,0,0.9); |
| 376 | height: 44rpx; | 376 | height: 44rpx; |
| 377 | line-height: 44rpx; | 377 | line-height: 44rpx; |
| 378 | font-size: 30rpx; | 378 | font-size: 30rpx; |
| 379 | } | 379 | } |
| 380 | - .fake-select { | ||
| 381 | - height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx; | 380 | + .fake-select { |
| 381 | + height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx; | ||
| 382 | .placeholder { color: #999; } | 382 | .placeholder { color: #999; } |
| 383 | .value { color: #333; } | 383 | .value { color: #333; } |
| 384 | } | 384 | } |
| 385 | } | 385 | } |
| 386 | -</style> | ||
| 386 | +</style> |
| @@ -63,7 +63,7 @@ | @@ -63,7 +63,7 @@ | ||
| 63 | <view class="info-row" v-if="item.status === 'STANDARD' || item.status === 'FORMAL'"> | 63 | <view class="info-row" v-if="item.status === 'STANDARD' || item.status === 'FORMAL'"> |
| 64 | <text>{{ item.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text> | 64 | <text>{{ item.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text> |
| 65 | <span v-if="item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName" class="info-status" :style="getStatusCss(item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName)">{{ item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName }}</span> | 65 | <span v-if="item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName" class="info-status" :style="getStatusCss(item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName)">{{ item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName }}</span> |
| 66 | - <span v-else>-</span> | 66 | + <span v-else>-</span> |
| 67 | </view> | 67 | </view> |
| 68 | <view class="info-row"> | 68 | <view class="info-row"> |
| 69 | <text>订货日期</text><text>{{ item.orderDate }}</text> | 69 | <text>订货日期</text><text>{{ item.orderDate }}</text> |
| @@ -321,7 +321,7 @@ export default { | @@ -321,7 +321,7 @@ export default { | ||
| 321 | font-weight: 600; | 321 | font-weight: 600; |
| 322 | position: absolute; | 322 | position: absolute; |
| 323 | top: -36rpx; | 323 | top: -36rpx; |
| 324 | - right: -32rpx; | 324 | + right: -12rpx; |
| 325 | height: 48rpx; | 325 | height: 48rpx; |
| 326 | line-height: 48rpx; | 326 | line-height: 48rpx; |
| 327 | color: #fff; | 327 | color: #fff; |
| @@ -370,19 +370,19 @@ export default { | @@ -370,19 +370,19 @@ export default { | ||
| 370 | } | 370 | } |
| 371 | } | 371 | } |
| 372 | 372 | ||
| 373 | -.filter-form { | 373 | +.filter-form { |
| 374 | .form-item { margin-bottom: 24rpx; } | 374 | .form-item { margin-bottom: 24rpx; } |
| 375 | - .label { | ||
| 376 | - margin-bottom: 20rpx; | 375 | + .label { |
| 376 | + margin-bottom: 20rpx; | ||
| 377 | color: rgba(0,0,0,0.9); | 377 | color: rgba(0,0,0,0.9); |
| 378 | height: 44rpx; | 378 | height: 44rpx; |
| 379 | line-height: 44rpx; | 379 | line-height: 44rpx; |
| 380 | font-size: 30rpx; | 380 | font-size: 30rpx; |
| 381 | } | 381 | } |
| 382 | - .fake-select { | ||
| 383 | - height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx; | 382 | + .fake-select { |
| 383 | + height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx; | ||
| 384 | .placeholder { color: #999; } | 384 | .placeholder { color: #999; } |
| 385 | .value { color: #333; } | 385 | .value { color: #333; } |
| 386 | } | 386 | } |
| 387 | } | 387 | } |
| 388 | -</style> | ||
| 388 | +</style> |
| @@ -277,7 +277,7 @@ export default { | @@ -277,7 +277,7 @@ export default { | ||
| 277 | font-weight: 600; | 277 | font-weight: 600; |
| 278 | position: absolute; | 278 | position: absolute; |
| 279 | top: -36rpx; | 279 | top: -36rpx; |
| 280 | - right: -32rpx; | 280 | + right: -12rpx; |
| 281 | height: 48rpx; | 281 | height: 48rpx; |
| 282 | line-height: 48rpx; | 282 | line-height: 48rpx; |
| 283 | color: #fff; | 283 | color: #fff; |
| @@ -397,4 +397,4 @@ export default { | @@ -397,4 +397,4 @@ export default { | ||
| 397 | } | 397 | } |
| 398 | 398 | ||
| 399 | } | 399 | } |
| 400 | -</style> | ||
| 400 | +</style> |
| @@ -319,7 +319,7 @@ export default { | @@ -319,7 +319,7 @@ export default { | ||
| 319 | font-weight: 600; | 319 | font-weight: 600; |
| 320 | position: absolute; | 320 | position: absolute; |
| 321 | top: -36rpx; | 321 | top: -36rpx; |
| 322 | - right: -32rpx; | 322 | + right: -12rpx; |
| 323 | height: 48rpx; | 323 | height: 48rpx; |
| 324 | line-height: 48rpx; | 324 | line-height: 48rpx; |
| 325 | color: #fff; | 325 | color: #fff; |
| @@ -368,19 +368,19 @@ export default { | @@ -368,19 +368,19 @@ export default { | ||
| 368 | } | 368 | } |
| 369 | } | 369 | } |
| 370 | 370 | ||
| 371 | -.filter-form { | 371 | +.filter-form { |
| 372 | .form-item { margin-bottom: 24rpx; } | 372 | .form-item { margin-bottom: 24rpx; } |
| 373 | - .label { | ||
| 374 | - margin-bottom: 20rpx; | 373 | + .label { |
| 374 | + margin-bottom: 20rpx; | ||
| 375 | color: rgba(0,0,0,0.9); | 375 | color: rgba(0,0,0,0.9); |
| 376 | height: 44rpx; | 376 | height: 44rpx; |
| 377 | line-height: 44rpx; | 377 | line-height: 44rpx; |
| 378 | font-size: 30rpx; | 378 | font-size: 30rpx; |
| 379 | } | 379 | } |
| 380 | - .fake-select { | ||
| 381 | - height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx; | 380 | + .fake-select { |
| 381 | + height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx; | ||
| 382 | .placeholder { color: #999; } | 382 | .placeholder { color: #999; } |
| 383 | .value { color: #333; } | 383 | .value { color: #333; } |
| 384 | } | 384 | } |
| 385 | } | 385 | } |
| 386 | -</style> | ||
| 386 | +</style> |
| @@ -319,7 +319,7 @@ export default { | @@ -319,7 +319,7 @@ export default { | ||
| 319 | font-weight: 600; | 319 | font-weight: 600; |
| 320 | position: absolute; | 320 | position: absolute; |
| 321 | top: -36rpx; | 321 | top: -36rpx; |
| 322 | - right: -32rpx; | 322 | + right: -12rpx; |
| 323 | height: 48rpx; | 323 | height: 48rpx; |
| 324 | line-height: 48rpx; | 324 | line-height: 48rpx; |
| 325 | color: #fff; | 325 | color: #fff; |
| @@ -368,19 +368,19 @@ export default { | @@ -368,19 +368,19 @@ export default { | ||
| 368 | } | 368 | } |
| 369 | } | 369 | } |
| 370 | 370 | ||
| 371 | -.filter-form { | 371 | +.filter-form { |
| 372 | .form-item { margin-bottom: 24rpx; } | 372 | .form-item { margin-bottom: 24rpx; } |
| 373 | - .label { | ||
| 374 | - margin-bottom: 20rpx; | 373 | + .label { |
| 374 | + margin-bottom: 20rpx; | ||
| 375 | color: rgba(0,0,0,0.9); | 375 | color: rgba(0,0,0,0.9); |
| 376 | height: 44rpx; | 376 | height: 44rpx; |
| 377 | line-height: 44rpx; | 377 | line-height: 44rpx; |
| 378 | font-size: 30rpx; | 378 | font-size: 30rpx; |
| 379 | } | 379 | } |
| 380 | - .fake-select { | ||
| 381 | - height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx; | 380 | + .fake-select { |
| 381 | + height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx; | ||
| 382 | .placeholder { color: #999; } | 382 | .placeholder { color: #999; } |
| 383 | .value { color: #333; } | 383 | .value { color: #333; } |
| 384 | } | 384 | } |
| 385 | } | 385 | } |
| 386 | -</style> | ||
| 386 | +</style> |
| @@ -321,7 +321,7 @@ export default { | @@ -321,7 +321,7 @@ export default { | ||
| 321 | font-weight: 600; | 321 | font-weight: 600; |
| 322 | position: absolute; | 322 | position: absolute; |
| 323 | top: -36rpx; | 323 | top: -36rpx; |
| 324 | - right: -32rpx; | 324 | + right: -12rpx; |
| 325 | height: 48rpx; | 325 | height: 48rpx; |
| 326 | line-height: 48rpx; | 326 | line-height: 48rpx; |
| 327 | color: #fff; | 327 | color: #fff; |
| @@ -370,19 +370,19 @@ export default { | @@ -370,19 +370,19 @@ export default { | ||
| 370 | } | 370 | } |
| 371 | } | 371 | } |
| 372 | 372 | ||
| 373 | -.filter-form { | 373 | +.filter-form { |
| 374 | .form-item { margin-bottom: 24rpx; } | 374 | .form-item { margin-bottom: 24rpx; } |
| 375 | - .label { | ||
| 376 | - margin-bottom: 20rpx; | 375 | + .label { |
| 376 | + margin-bottom: 20rpx; | ||
| 377 | color: rgba(0,0,0,0.9); | 377 | color: rgba(0,0,0,0.9); |
| 378 | height: 44rpx; | 378 | height: 44rpx; |
| 379 | line-height: 44rpx; | 379 | line-height: 44rpx; |
| 380 | font-size: 30rpx; | 380 | font-size: 30rpx; |
| 381 | } | 381 | } |
| 382 | - .fake-select { | ||
| 383 | - height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx; | 382 | + .fake-select { |
| 383 | + height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx; | ||
| 384 | .placeholder { color: #999; } | 384 | .placeholder { color: #999; } |
| 385 | .value { color: #333; } | 385 | .value { color: #333; } |
| 386 | } | 386 | } |
| 387 | } | 387 | } |
| 388 | -</style> | ||
| 388 | +</style> |
| @@ -299,7 +299,7 @@ export default { | @@ -299,7 +299,7 @@ export default { | ||
| 299 | font-weight: 600; | 299 | font-weight: 600; |
| 300 | position: absolute; | 300 | position: absolute; |
| 301 | top: -36rpx; | 301 | top: -36rpx; |
| 302 | - right: -32rpx; | 302 | + right: -12rpx; |
| 303 | height: 48rpx; | 303 | height: 48rpx; |
| 304 | line-height: 48rpx; | 304 | line-height: 48rpx; |
| 305 | color: #fff; | 305 | color: #fff; |
| @@ -418,4 +418,4 @@ export default { | @@ -418,4 +418,4 @@ export default { | ||
| 418 | } | 418 | } |
| 419 | 419 | ||
| 420 | } | 420 | } |
| 421 | -</style> | ||
| 421 | +</style> |
| @@ -63,7 +63,7 @@ | @@ -63,7 +63,7 @@ | ||
| 63 | <view class="info-row" v-if="item.status === 'STANDARD' || item.status === 'FORMAL'"> | 63 | <view class="info-row" v-if="item.status === 'STANDARD' || item.status === 'FORMAL'"> |
| 64 | <text>{{ item.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text> | 64 | <text>{{ item.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text> |
| 65 | <span v-if="item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName" class="info-status" :style="getStatusCss(item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName)">{{ item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName }}</span> | 65 | <span v-if="item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName" class="info-status" :style="getStatusCss(item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName)">{{ item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName }}</span> |
| 66 | - <span v-else>-</span> | 66 | + <span v-else>-</span> |
| 67 | </view> | 67 | </view> |
| 68 | <view class="info-row"> | 68 | <view class="info-row"> |
| 69 | <text>订货日期</text><text>{{ item.orderDate }}</text> | 69 | <text>订货日期</text><text>{{ item.orderDate }}</text> |
| @@ -323,7 +323,7 @@ export default { | @@ -323,7 +323,7 @@ export default { | ||
| 323 | font-weight: 600; | 323 | font-weight: 600; |
| 324 | position: absolute; | 324 | position: absolute; |
| 325 | top: -36rpx; | 325 | top: -36rpx; |
| 326 | - right: -32rpx; | 326 | + right: -12rpx; |
| 327 | height: 48rpx; | 327 | height: 48rpx; |
| 328 | line-height: 48rpx; | 328 | line-height: 48rpx; |
| 329 | color: #fff; | 329 | color: #fff; |
| @@ -372,19 +372,19 @@ export default { | @@ -372,19 +372,19 @@ export default { | ||
| 372 | } | 372 | } |
| 373 | } | 373 | } |
| 374 | 374 | ||
| 375 | -.filter-form { | 375 | +.filter-form { |
| 376 | .form-item { margin-bottom: 24rpx; } | 376 | .form-item { margin-bottom: 24rpx; } |
| 377 | - .label { | ||
| 378 | - margin-bottom: 20rpx; | 377 | + .label { |
| 378 | + margin-bottom: 20rpx; | ||
| 379 | color: rgba(0,0,0,0.9); | 379 | color: rgba(0,0,0,0.9); |
| 380 | height: 44rpx; | 380 | height: 44rpx; |
| 381 | line-height: 44rpx; | 381 | line-height: 44rpx; |
| 382 | font-size: 30rpx; | 382 | font-size: 30rpx; |
| 383 | } | 383 | } |
| 384 | - .fake-select { | ||
| 385 | - height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx; | 384 | + .fake-select { |
| 385 | + height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx; | ||
| 386 | .placeholder { color: #999; } | 386 | .placeholder { color: #999; } |
| 387 | .value { color: #333; } | 387 | .value { color: #333; } |
| 388 | } | 388 | } |
| 389 | } | 389 | } |
| 390 | -</style> | ||
| 390 | +</style> |
| @@ -395,7 +395,7 @@ | @@ -395,7 +395,7 @@ | ||
| 395 | .status-box { | 395 | .status-box { |
| 396 | position: absolute; | 396 | position: absolute; |
| 397 | top: -32rpx; | 397 | top: -32rpx; |
| 398 | - right: -32rpx; | 398 | + right: -12rpx; |
| 399 | 399 | ||
| 400 | .status { | 400 | .status { |
| 401 | display: block; | 401 | display: block; |
| @@ -563,4 +563,4 @@ | @@ -563,4 +563,4 @@ | ||
| 563 | 563 | ||
| 564 | } | 564 | } |
| 565 | 565 | ||
| 566 | -</style> | ||
| 566 | +</style> |
| @@ -175,7 +175,7 @@ | @@ -175,7 +175,7 @@ | ||
| 175 | if ((payload.available === '' || payload.available == null) && this.filterForm.available !== '') { | 175 | if ((payload.available === '' || payload.available == null) && this.filterForm.available !== '') { |
| 176 | q.available = this.filterForm.available | 176 | q.available = this.filterForm.available |
| 177 | } | 177 | } |
| 178 | - | 178 | + |
| 179 | this.query = q | 179 | this.query = q |
| 180 | }, | 180 | }, |
| 181 | onStatusChange(e) { | 181 | onStatusChange(e) { |
| @@ -317,7 +317,7 @@ | @@ -317,7 +317,7 @@ | ||
| 317 | .status-box { | 317 | .status-box { |
| 318 | position: absolute; | 318 | position: absolute; |
| 319 | top: -32rpx; | 319 | top: -32rpx; |
| 320 | - right: -32rpx; | 320 | + right: -12rpx; |
| 321 | 321 | ||
| 322 | .status { | 322 | .status { |
| 323 | display: block; | 323 | display: block; |
| @@ -485,4 +485,4 @@ | @@ -485,4 +485,4 @@ | ||
| 485 | 485 | ||
| 486 | } | 486 | } |
| 487 | 487 | ||
| 488 | -</style> | ||
| 488 | +</style> |
| @@ -333,7 +333,7 @@ export default { | @@ -333,7 +333,7 @@ export default { | ||
| 333 | font-weight: 600; | 333 | font-weight: 600; |
| 334 | position: absolute; | 334 | position: absolute; |
| 335 | top: -32rpx; | 335 | top: -32rpx; |
| 336 | - right: -32rpx; | 336 | + right: -12rpx; |
| 337 | height: 48rpx; | 337 | height: 48rpx; |
| 338 | line-height: 48rpx; | 338 | line-height: 48rpx; |
| 339 | color: #fff; | 339 | color: #fff; |
| @@ -477,4 +477,4 @@ export default { | @@ -477,4 +477,4 @@ export default { | ||
| 477 | } | 477 | } |
| 478 | 478 | ||
| 479 | } | 479 | } |
| 480 | -</style> | ||
| 480 | +</style> |
| @@ -456,7 +456,7 @@ | @@ -456,7 +456,7 @@ | ||
| 456 | const query = '?id=' + encodeURIComponent(id) + '&todoType=' + encodeURIComponent(this.todoType || '') | 456 | const query = '?id=' + encodeURIComponent(id) + '&todoType=' + encodeURIComponent(this.todoType || '') |
| 457 | uni.navigateTo({ url: '/pages/dev_manage/detail' + query }) | 457 | uni.navigateTo({ url: '/pages/dev_manage/detail' + query }) |
| 458 | }, | 458 | }, |
| 459 | - | 459 | + |
| 460 | } | 460 | } |
| 461 | } | 461 | } |
| 462 | </script> | 462 | </script> |
| @@ -623,7 +623,7 @@ | @@ -623,7 +623,7 @@ | ||
| 623 | font-weight: 600; | 623 | font-weight: 600; |
| 624 | position: absolute; | 624 | position: absolute; |
| 625 | top: -32rpx; | 625 | top: -32rpx; |
| 626 | - right: -32rpx; | 626 | + right: -12rpx; |
| 627 | height: 48rpx; | 627 | height: 48rpx; |
| 628 | line-height: 48rpx; | 628 | line-height: 48rpx; |
| 629 | color: #fff; | 629 | color: #fff; |
| @@ -365,7 +365,7 @@ export default { | @@ -365,7 +365,7 @@ export default { | ||
| 365 | font-weight: 600; | 365 | font-weight: 600; |
| 366 | position: absolute; | 366 | position: absolute; |
| 367 | top: -32rpx; | 367 | top: -32rpx; |
| 368 | - right: -32rpx; | 368 | + right: -12rpx; |
| 369 | height: 48rpx; | 369 | height: 48rpx; |
| 370 | line-height: 48rpx; | 370 | line-height: 48rpx; |
| 371 | color: #fff; | 371 | color: #fff; |
| @@ -511,4 +511,4 @@ export default { | @@ -511,4 +511,4 @@ export default { | ||
| 511 | } | 511 | } |
| 512 | 512 | ||
| 513 | } | 513 | } |
| 514 | -</style> | ||
| 514 | +</style> |
| @@ -400,7 +400,7 @@ export default { | @@ -400,7 +400,7 @@ export default { | ||
| 400 | .status-box { | 400 | .status-box { |
| 401 | position: absolute; | 401 | position: absolute; |
| 402 | top: -32rpx; | 402 | top: -32rpx; |
| 403 | - right: -32rpx; | 403 | + right: -12rpx; |
| 404 | 404 | ||
| 405 | .status { | 405 | .status { |
| 406 | display: block; | 406 | display: block; |
| @@ -559,4 +559,4 @@ export default { | @@ -559,4 +559,4 @@ export default { | ||
| 559 | } | 559 | } |
| 560 | 560 | ||
| 561 | } | 561 | } |
| 562 | -</style> | ||
| 562 | +</style> |
| @@ -349,7 +349,7 @@ export default { | @@ -349,7 +349,7 @@ export default { | ||
| 349 | font-weight: 600; | 349 | font-weight: 600; |
| 350 | position: absolute; | 350 | position: absolute; |
| 351 | top: -32rpx; | 351 | top: -32rpx; |
| 352 | - right: -32rpx; | 352 | + right: -12rpx; |
| 353 | height: 48rpx; | 353 | height: 48rpx; |
| 354 | line-height: 48rpx; | 354 | line-height: 48rpx; |
| 355 | color: #fff; | 355 | color: #fff; |
| @@ -366,7 +366,7 @@ export default { | @@ -366,7 +366,7 @@ export default { | ||
| 366 | font-weight: 600; | 366 | font-weight: 600; |
| 367 | position: absolute; | 367 | position: absolute; |
| 368 | top: -32rpx; | 368 | top: -32rpx; |
| 369 | - right: -32rpx; | 369 | + right: -12rpx; |
| 370 | height: 48rpx; | 370 | height: 48rpx; |
| 371 | line-height: 48rpx; | 371 | line-height: 48rpx; |
| 372 | color: #fff; | 372 | color: #fff; |
| @@ -510,4 +510,4 @@ export default { | @@ -510,4 +510,4 @@ export default { | ||
| 510 | } | 510 | } |
| 511 | 511 | ||
| 512 | } | 512 | } |
| 513 | -</style> | ||
| 513 | +</style> |
| @@ -247,7 +247,7 @@ export default { | @@ -247,7 +247,7 @@ export default { | ||
| 247 | font-weight: 600; | 247 | font-weight: 600; |
| 248 | position: absolute; | 248 | position: absolute; |
| 249 | top: -32rpx; | 249 | top: -32rpx; |
| 250 | - right: -32rpx; | 250 | + right: -12rpx; |
| 251 | height: 48rpx; | 251 | height: 48rpx; |
| 252 | line-height: 48rpx; | 252 | line-height: 48rpx; |
| 253 | color: #fff; | 253 | color: #fff; |