朱园亮 / erp-mobile · Commits

Commit e417d1315295756f6b701c4cf206b871451b3bcf

Authored by gesilong
1 parent c750eae8

commit: 优化错误

Inline Side-by-side
Showing 27 changed files with 98 additions and 79 deletions
... ... @@ -517,7 +517,7 @@ export default {
517 517 openRelate(fieldKey) {
518 518 let config = {}
519 519 if (fieldKey === 'buyer') {
520   - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  520 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
521 521 } else if (fieldKey === 'stockUpCompanyId') {
522 522 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
523 523 }
... ... @@ -588,7 +588,7 @@ export default {
588 588 uni.showToast({ title: '新增成功', icon: 'none' })
589 589 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_std/index' }) }, 400)
590 590 } catch (e) {
591   - uni.showToast({ title: '提交失败', icon: 'none' })
  591 + uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
592 592 }
593 593 },
594 594 validateRequired() {
... ...
... ... @@ -472,7 +472,7 @@ export default {
472 472 }
473 473
474 474 .label {
475   - width: 280rpx;
  475 + width: 310rpx;
476 476 color: rgba(0, 0, 0, 0.6);
477 477 font-size: 28rpx;
478 478 }
... ... @@ -541,7 +541,7 @@ export default {
541 541 }
542 542
543 543 .label1 {
544   - width: 280rpx;
  544 + width: 310rpx;
545 545 color: rgba(0, 0, 0, 0.6);
546 546 font-size: 32rpx;
547 547 }
... ...
... ... @@ -457,7 +457,7 @@ export default {
457 457 openRelate(fieldKey) {
458 458 let config = {}
459 459 if (fieldKey === 'buyer') {
460   - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  460 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
461 461 } else if (fieldKey === 'stockUpCompanyId') {
462 462 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
463 463 }
... ... @@ -562,7 +562,7 @@ export default {
562 562 uni.showToast({ title: '保存成功', icon: 'none' })
563 563 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_std/index' }) }, 400)
564 564 } catch (e) {
565   - uni.showToast({ title: '提交失败', icon: 'none' })
  565 + uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
566 566 }
567 567 }
568 568 }
... ...
... ... @@ -521,7 +521,7 @@ export default {
521 521 openRelate(fieldKey) {
522 522 let config = {}
523 523 if (fieldKey === 'buyer') {
524   - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  524 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
525 525 } else if (fieldKey === 'stockUpCompanyId') {
526 526 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
527 527 }
... ... @@ -592,7 +592,7 @@ export default {
592 592 uni.showToast({ title: '新增成功', icon: 'none' })
593 593 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_stock/index' }) }, 400)
594 594 } catch (e) {
595   - uni.showToast({ title: '提交失败', icon: 'none' })
  595 + uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
596 596 }
597 597 },
598 598 validateRequired() {
... ...
... ... @@ -4,13 +4,19 @@
4 4 <view class="detail-page">
5 5 <view class="section">
6 6 <text class="row customer">{{ detail.code }}</text>
  7 + <view class="row" v-if="detail.status === 'STANDARD'">
  8 + <text class="label">标准合同规范性审核状态</text>
  9 + <text class="value">
  10 + <span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>
  11 + </text>
  12 + </view>
7 13 <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'">
8   - <text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text>
  14 + <text class="label">正式合同规范性审核状态</text>
9 15 <text class="value">
10   - <span v-if="detail.status === 'STANDARD'" class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>
11   - <span v-if="detail.status === 'FORMAL'" class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
  16 + <span class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
12 17 </text>
13   - </view>
  18 + </view>
  19 +
14 20 <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />
15 21 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
16 22 }}</text></view>
... ... @@ -558,7 +564,7 @@ export default {
558 564 }
559 565
560 566 .label {
561   - width: 280rpx;
  567 + width: 310rpx;
562 568 color: rgba(0, 0, 0, 0.6);
563 569 font-size: 28rpx;
564 570 }
... ... @@ -627,7 +633,7 @@ export default {
627 633 }
628 634
629 635 .label1 {
630   - width: 280rpx;
  636 + width: 310rpx;
631 637 color: rgba(0, 0, 0, 0.6);
632 638 font-size: 32rpx;
633 639 }
... ...
... ... @@ -363,8 +363,8 @@ export default {
363 363 setTimeout(() => {
364 364 uni.navigateTo({ url: '/pages/contract_foreign_stock/index' })
365 365 }, 500)
366   - }).catch(() => {
367   - uni.showToast({ title: '提交失败', icon: 'none' })
  366 + }).catch((err) => {
  367 + uni.showToast({ title: err.msg ||'提交失败', icon: 'none' })
368 368 })
369 369 }
370 370 }
... ...
... ... @@ -462,7 +462,7 @@ export default {
462 462 openRelate(fieldKey) {
463 463 let config = {}
464 464 if (fieldKey === 'buyer') {
465   - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  465 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
466 466 } else if (fieldKey === 'stockUpCompanyId') {
467 467 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
468 468 }
... ... @@ -565,7 +565,7 @@ export default {
565 565 uni.showToast({ title: '保存成功', icon: 'none' })
566 566 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_stock/index' }) }, 400)
567 567 } catch (e) {
568   - uni.showToast({ title: '提交失败', icon: 'none' })
  568 + uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
569 569 }
570 570 }
571 571 }
... ...
... ... @@ -518,7 +518,7 @@ export default {
518 518 openRelate(fieldKey) {
519 519 let config = {}
520 520 if (fieldKey === 'buyer') {
521   - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  521 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
522 522 } else if (fieldKey === 'stockUpCompanyId') {
523 523 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
524 524 }
... ... @@ -590,7 +590,7 @@ export default {
590 590 uni.showToast({ title: '新增成功', icon: 'none' })
591 591 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_unplan/index' }) }, 400)
592 592 } catch (e) {
593   - uni.showToast({ title: '提交失败', icon: 'none' })
  593 + uni.showToast({ title: e.msg ||'新增失败', icon: 'none' })
594 594 }
595 595 },
596 596 validateRequired() {
... ...
... ... @@ -4,15 +4,19 @@
4 4 <view class="detail-page">
5 5 <view class="section">
6 6 <text class="row customer">{{ detail.code }}</text>
  7 + <view class="row" v-if="detail.status === 'STANDARD'">
  8 + <text class="label">标准合同规范性审核状态</text>
  9 + <text class="value">
  10 + <span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>
  11 + </text>
  12 + </view>
7 13 <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'">
8   - <text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text>
  14 + <text class="label">正式合同规范性审核状态</text>
9 15 <text class="value">
10   -
11   - <span v-if="detail.status === 'STANDARD'" class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>
12   - <span v-if="detail.status === 'FORMAL'" class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
13   -
  16 + <span class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
14 17 </text>
15   - </view>
  18 + </view>
  19 +
16 20 <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />
17 21 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
18 22 }}</text></view>
... ... @@ -572,7 +576,7 @@ export default {
572 576 }
573 577
574 578 .label {
575   - width: 280rpx;
  579 + width: 310rpx;
576 580 color: rgba(0, 0, 0, 0.6);
577 581 font-size: 28rpx;
578 582 }
... ... @@ -641,7 +645,7 @@ export default {
641 645 }
642 646
643 647 .label1 {
644   - width: 280rpx;
  648 + width: 310rpx;
645 649 color: rgba(0, 0, 0, 0.6);
646 650 font-size: 32rpx;
647 651 }
... ...
... ... @@ -363,8 +363,8 @@ export default {
363 363 setTimeout(() => {
364 364 uni.navigateTo({ url: '/pages/contract_foreign_unplan/index' })
365 365 }, 500)
366   - }).catch(() => {
367   - uni.showToast({ title: '提交失败', icon: 'none' })
  366 + }).catch((err) => {
  367 + uni.showToast({ title: err.msg ||'提交失败', icon: 'none' })
368 368 })
369 369 }
370 370 }
... ...
... ... @@ -461,7 +461,7 @@ export default {
461 461 openRelate(fieldKey) {
462 462 let config = {}
463 463 if (fieldKey === 'buyer') {
464   - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  464 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
465 465 } else if (fieldKey === 'stockUpCompanyId') {
466 466 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
467 467 }
... ... @@ -564,7 +564,7 @@ export default {
564 564 uni.showToast({ title: '保存成功', icon: 'none' })
565 565 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_unplan/index' }) }, 400)
566 566 } catch (e) {
567   - uni.showToast({ title: '提交失败', icon: 'none' })
  567 + uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
568 568 }
569 569 }
570 570 }
... ...
... ... @@ -200,8 +200,8 @@ export default {
200 200 uni.showToast({ title: '已提交', icon: 'none' })
201 201 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_framework/index' }) }, 800)
202 202 })
203   - .catch(() => {
204   - uni.showToast({ title: '提交失败', icon: 'none' })
  203 + .catch((err) => {
  204 + uni.showToast({ title: err.msg ||'提交失败', icon: 'none' })
205 205 })
206 206 },
207 207 validateRequired() {
... ...
... ... @@ -522,7 +522,7 @@ export default {
522 522 openRelate(fieldKey) {
523 523 let config = {}
524 524 if (fieldKey === 'buyer') {
525   - config = { title: '定作方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  525 + config = { title: '定作方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
526 526 } else if (fieldKey === 'stockUpCompanyId') {
527 527 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
528 528 }
... ... @@ -598,7 +598,7 @@ export default {
598 598 uni.showToast({ title: '新增成功', icon: 'none' })
599 599 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_process/index' }) }, 400)
600 600 } catch (e) {
601   - uni.showToast({ title: '提交失败', icon: 'none' })
  601 + uni.showToast({ title: e.msg ||'新增失败', icon: 'none' })
602 602 }
603 603 },
604 604 validateRequired() {
... ...
... ... @@ -455,7 +455,7 @@ export default {
455 455 }
456 456
457 457 .label {
458   - width: 280rpx;
  458 + width: 310rpx;
459 459 color: rgba(0, 0, 0, 0.6);
460 460 font-size: 28rpx;
461 461 }
... ... @@ -511,7 +511,7 @@ export default {
511 511 }
512 512
513 513 .label1 {
514   - width: 280rpx;
  514 + width: 310rpx;
515 515 color: rgba(0, 0, 0, 0.6);
516 516 font-size: 32rpx;
517 517 }
... ...
... ... @@ -441,7 +441,7 @@ export default {
441 441 openRelate(fieldKey) {
442 442 let config = {}
443 443 if (fieldKey === 'buyer') {
444   - config = { title: '定作方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  444 + config = { title: '定作方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
445 445 }
446 446 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
447 447 this.sheet.visible = false
... ... @@ -536,7 +536,7 @@ export default {
536 536 uni.showToast({ title: '保存成功', icon: 'none' })
537 537 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_process/index' }) }, 400)
538 538 } catch (e) {
539   - uni.showToast({ title: '提交失败', icon: 'none' })
  539 + uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
540 540 }
541 541 }
542 542 }
... ...
... ... @@ -515,7 +515,7 @@ export default {
515 515 openRelate(fieldKey) {
516 516 let config = {}
517 517 if (fieldKey === 'buyer') {
518   - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  518 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
519 519 } else if (fieldKey === 'stockUpCompanyId') {
520 520 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
521 521 }
... ... @@ -552,7 +552,7 @@ export default {
552 552 async onSubmit() {
553 553 if (!this.validateRequired()) return
554 554 const confirmRes = await new Promise(resolve => {
555   - uni.showModal({ title: '提示', content: '确定新增经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
  555 + uni.showModal({ title: '提示', content: '确定新增经销标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
556 556 })
557 557 if (!(confirmRes && confirmRes.confirm)) return
558 558 const clean = (obj) => {
... ... @@ -586,7 +586,7 @@ export default {
586 586 uni.showToast({ title: '新增成功', icon: 'none' })
587 587 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_retail/index' }) }, 400)
588 588 } catch (e) {
589   - uni.showToast({ title: '提交失败', icon: 'none' })
  589 + uni.showToast({ title: e.msg ||'新增失败', icon: 'none' })
590 590 }
591 591 },
592 592 validateRequired() {
... ... @@ -632,6 +632,13 @@ export default {
632 632 }
633 633
634 634 </script>
  635 +<style>
  636 +/* 强制提升日历层级，解决被 footer 遮挡问题 */
  637 +.uni-calendar--mask,
  638 +.uni-calendar--fixed {
  639 + z-index: 9999 !important;
  640 +}
  641 +</style>
635 642 <style lang="scss" scoped>
636 643 .total {
637 644 .total-text {
... ... @@ -746,11 +753,6 @@ export default {
746 753 color: rgba(0, 0, 0, 0.9);
747 754 }
748 755
749   -.scroll {
750   - flex: 1;
751   - padding: 12rpx 0 160rpx;
752   -}
753   -
754 756 .quality {
755 757 background-color: #fff;
756 758 display: flex;
... ...
... ... @@ -471,7 +471,7 @@ export default {
471 471 }
472 472
473 473 .label {
474   - width: 280rpx;
  474 + width: 310rpx;
475 475 color: rgba(0, 0, 0, 0.6);
476 476 font-size: 28rpx;
477 477 }
... ... @@ -485,7 +485,7 @@ export default {
485 485 }
486 486
487 487 .label1 {
488   - width: 280rpx;
  488 + width: 310rpx;
489 489 color: rgba(0, 0, 0, 0.6);
490 490 font-size: 32rpx;
491 491 }
... ...
... ... @@ -454,7 +454,7 @@ export default {
454 454 openRelate(fieldKey) {
455 455 let config = {}
456 456 if (fieldKey === 'buyer') {
457   - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  457 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
458 458 } else if (fieldKey === 'stockUpCompanyId') {
459 459 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
460 460 }
... ... @@ -558,7 +558,7 @@ export default {
558 558 uni.showToast({ title: '保存成功', icon: 'none' })
559 559 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_retail/index' }) }, 400)
560 560 } catch (e) {
561   - uni.showToast({ title: '提交失败', icon: 'none' })
  561 + uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
562 562 }
563 563 }
564 564 }
... ...
... ... @@ -512,7 +512,7 @@ export default {
512 512 openRelate(fieldKey) {
513 513 let config = {}
514 514 if (fieldKey === 'buyer') {
515   - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  515 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
516 516 } else if (fieldKey === 'stockUpCompanyId') {
517 517 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
518 518 }
... ... @@ -583,7 +583,7 @@ export default {
583 583 uni.showToast({ title: '新增成功', icon: 'none' })
584 584 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_stock/index' }) }, 400)
585 585 } catch (e) {
586   - uni.showToast({ title: '提交失败', icon: 'none' })
  586 + uni.showToast({ title: e.msg ||'新增失败', icon: 'none' })
587 587 }
588 588 },
589 589 validateRequired() {
... ...
... ... @@ -4,15 +4,18 @@
4 4 <view class="detail-page">
5 5 <view class="section">
6 6 <text class="row customer">{{ detail.code }}</text>
  7 + <view class="row" v-if="detail.status === 'STANDARD'">
  8 + <text class="label">标准合同规范性审核状态</text>
  9 + <text class="value">
  10 + <span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>
  11 + </text>
  12 + </view>
7 13 <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'">
8   - <text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text>
  14 + <text class="label">正式合同规范性审核状态</text>
9 15 <text class="value">
10   -
11   - <span v-if="detail.status === 'STANDARD'" class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>
12   - <span v-if="detail.status === 'FORMAL'" class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
13   -
  16 + <span class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
14 17 </text>
15   - </view>
  18 + </view>
16 19 <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />
17 20 <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
18 21 }}</text></view>
... ... @@ -535,7 +538,7 @@ export default {
535 538 }
536 539
537 540 .label {
538   - width: 280rpx;
  541 + width: 310rpx;
539 542 color: rgba(0, 0, 0, 0.6);
540 543 font-size: 28rpx;
541 544 }
... ... @@ -591,7 +594,7 @@ export default {
591 594 }
592 595
593 596 .label1 {
594   - width: 280rpx;
  597 + width: 310rpx;
595 598 color: rgba(0, 0, 0, 0.6);
596 599 font-size: 32rpx;
597 600 }
... ...
... ... @@ -363,8 +363,8 @@ export default {
363 363 setTimeout(() => {
364 364 uni.navigateTo({ url: '/pages/contract_stock/index' })
365 365 }, 500)
366   - }).catch(() => {
367   - uni.showToast({ title: '提交失败', icon: 'none' })
  366 + }).catch((err) => {
  367 + uni.showToast({ title: err.msg ||'提交失败', icon: 'none' })
368 368 })
369 369 }
370 370 }
... ...
... ... @@ -456,7 +456,7 @@ export default {
456 456 openRelate(fieldKey) {
457 457 let config = {}
458 458 if (fieldKey === 'buyer') {
459   - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  459 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
460 460 }
461 461 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
462 462 this.sheet.visible = false
... ... @@ -550,7 +550,7 @@ export default {
550 550 uni.showToast({ title: '保存成功', icon: 'none' })
551 551 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_stock/index' }) }, 400)
552 552 } catch (e) {
553   - uni.showToast({ title: '提交失败', icon: 'none' })
  553 + uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
554 554 }
555 555 }
556 556 }
... ...
... ... @@ -517,7 +517,7 @@ export default {
517 517 openRelate(fieldKey) {
518 518 let config = {}
519 519 if (fieldKey === 'buyer') {
520   - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  520 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
521 521 }
522 522 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
523 523 this.sheet.visible = false
... ... @@ -576,7 +576,7 @@ export default {
576 576 uni.showToast({ title: '新增成功', icon: 'none' })
577 577 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_unplan/index' }) }, 400)
578 578 } catch (e) {
579   - uni.showToast({ title: '提交失败', icon: 'none' })
  579 + uni.showToast({ title: e.msg ||'新增失败', icon: 'none' })
580 580 }
581 581 },
582 582 validateRequired() {
... ...
... ... @@ -4,13 +4,16 @@
4 4 <view class="detail-page">
5 5 <view class="section">
6 6 <text class="row customer">{{ detail.code }}</text>
  7 + <view class="row" v-if="detail.status === 'STANDARD'">
  8 + <text class="label">标准合同规范性审核状态</text>
  9 + <text class="value">
  10 + <span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>
  11 + </text>
  12 + </view>
7 13 <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'">
8   - <text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text>
  14 + <text class="label">正式合同规范性审核状态</text>
9 15 <text class="value">
10   -
11   - <span v-if="detail.status === 'STANDARD'" class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>
12   - <span v-if="detail.status === 'FORMAL'" class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
13   -
  16 + <span class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
14 17 </text>
15 18 </view>
16 19 <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />
... ... @@ -555,7 +558,7 @@ export default {
555 558 }
556 559
557 560 .label {
558   - width: 280rpx;
  561 + width: 310rpx;
559 562 color: rgba(0, 0, 0, 0.6);
560 563 font-size: 28rpx;
561 564 }
... ... @@ -624,7 +627,7 @@ export default {
624 627 }
625 628
626 629 .label1 {
627   - width: 280rpx;
  630 + width: 310rpx;
628 631 color: rgba(0, 0, 0, 0.6);
629 632 font-size: 32rpx;
630 633 }
... ...
... ... @@ -363,8 +363,8 @@ export default {
363 363 setTimeout(() => {
364 364 uni.navigateTo({ url: '/pages/contract_unplan/index' })
365 365 }, 500)
366   - }).catch(() => {
367   - uni.showToast({ title: '提交失败', icon: 'none' })
  366 + }).catch((err) => {
  367 + uni.showToast({ title: err.msg ||'提交失败', icon: 'none' })
368 368 })
369 369 }
370 370 }
... ...
... ... @@ -453,7 +453,7 @@ export default {
453 453 openRelate(fieldKey) {
454 454 let config = {}
455 455 if (fieldKey === 'buyer') {
456   - config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  456 + config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
457 457 }
458 458 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
459 459 this.sheet.visible = false
... ... @@ -550,7 +550,7 @@ export default {
550 550 uni.showToast({ title: '保存成功', icon: 'none' })
551 551 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_unplan/index' }) }, 400)
552 552 } catch (e) {
553   - uni.showToast({ title: '提交失败', icon: 'none' })
  553 + uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
554 554 }
555 555 }
556 556 }
... ...
... ... @@ -146,6 +146,7 @@ export default {
146 146 displayButtons() {
147 147 const s = Number(this.form && this.form.status || 0)
148 148 const t = this.todoType || '';
  149 + console.log('s', s, 't', t)
149 150 return [
150 151 { ...this.buttons[0], visible: (s === 3 && t === '' && this.$auth.hasPermi('customer-dev-manage:customer-dev-plan:modify')) },
151 152 { ...this.buttons[1], visible: this.$auth.hasPermi('customer-dev-manage:customer-dev-plan:reviewDetail') },
... ...