Merge branch 'cjerp-1.0_20251220' into publish_cjerp

gesilong
2 parents 1d9333b6 8d9717fb
Showing 11 changed files with 194 additions and 73 deletions
pages/contract_foreign_std/detail.vue
pages/contract_foreign_stock/detail.vue
pages/contract_foreign_unplan/detail.vue
pages/contract_process/detail.vue
pages/contract_retail/detail.vue
pages/contract_stock/detail.vue
pages/contract_unplan/detail.vue
static/images/contract/status_1.png
static/images/contract/status_2.png
static/images/contract/status_3.png
static/images/contract/status_4.png
--- a/pages/contract_foreign_std/detail.vue
View file @6c8c908
+++ b/pages/contract_foreign_std/detail.vue
View file @6c8c908
@@ -5,7 +5,7 @@
                 <view class="section">
                     <text class="row customer">{{ detail.code }}</text>
                     <view class="row" v-if="status === 'STANDARD'"><text class="label">正式合同规范性审核</text><text class="value"><span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span></text></view>
-                    <view class="row" v-if="detail.status === 'STANDARD'"><text class="label">合同状态</text><text class="value"><span class="info-status" :style="detail.shippingStatusName ? getShippingStatusName(detail.shippingStatusName) : { color: '#000'}" >{{ detail.shippingStatusName || '-' }}</span></text></view>
+                    <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />                    
                     <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
                     }}</text></view>
                     <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
@@ -214,7 +214,6 @@ export default {
             {
                 text: '审核详情',
                 visible: true,
-                variant: 'primary',
                 event: 'auditDetail'
             },
             ],
@@ -241,13 +240,6 @@ export default {
         this.loadDetail()
     },
     methods: {
-        getShippingStatusName(name) {
-            const found = this.statusMap[name] || ''
-            return {
-                backgroundColor: found || '#000',
-                color: found ? '#fff' : '#000'
-            }
-        },
         getStatusCss(name) {
         const list = Array.isArray(this.statusStyle) ? this.statusStyle : []
         const found = list.find(it => it && it.text === name) || {}
@@ -436,6 +428,32 @@ export default {
     padding: 32rpx;
     background: #fff;
     margin-bottom: 20rpx;
+    .status {
+    position: absolute;
+    top: 16rpx;
+    right: 52rpx;
+    width: 180rpx;
+    height: 146rpx;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    background-position: center;
+
+    &_审批中 {
+      background-image: url('~@/static/images/contract/status_1.png');
+    }
+
+    &_生产中 {
+      background-image: url('~@/static/images/contract/status_2.png');
+    }
+
+    &_已发货 {
+      background-image: url('~@/static/images/contract/status_3.png');
+    }
+
+    &_已签收 {
+      background-image: url('~@/static/images/contract/status_4.png');
+    }
+  }
 }
 .section1 {
--- a/pages/contract_foreign_stock/detail.vue
View file @6c8c908
+++ b/pages/contract_foreign_stock/detail.vue
View file @6c8c908
@@ -10,7 +10,8 @@
                             <span v-if="detail.status === 'STANDARD'" class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>
                             <span v-if="detail.status === 'FORMAL'" class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
                         </text>
-                    </view>                    <view class="row" v-if="detail.status === 'STANDARD'"><text class="label">合同状态</text><text class="value"><span class="info-status" :style="detail.shippingStatusName ? getShippingStatusName(detail.shippingStatusName) : { color: '#000'}" >{{ detail.shippingStatusName || '-' }}</span></text></view>
+                    </view>                    
+                    <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />                                        
                     <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
                     }}</text></view>
                     <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
@@ -251,19 +252,16 @@ export default {
             {
                 text: '正式合同审核详情',
                 visible: true,
-                variant: 'primary',
                 event: 'auditDetail1'
             },
             {
                 text: '正式合同审核详情',
                 visible: true,
-                variant: 'primary',
                 event: 'auditDetail2'
             },
             {
                 text: '标准合同审核详情',
                 visible: true,
-                variant: 'primary',
                 event: 'auditDetail3'
             },
             {
@@ -306,13 +304,6 @@ export default {
         this.loadDetail()
     },
     methods: {
-        getShippingStatusName(name) {
-            const found = this.statusMap[name] || ''
-            return {
-                backgroundColor: found || '#000',
-                color: found ? '#fff' : '#000'
-            }
-        },
         getStatusCss(name) {
             const list = Array.isArray(this.statusStyle) ? this.statusStyle : []
             const found = list.find(it => it && it.text === name) || {}
@@ -523,6 +514,32 @@ export default {
     padding: 32rpx;
     background: #fff;
     margin-bottom: 20rpx;
+    .status {
+    position: absolute;
+    top: 16rpx;
+    right: 52rpx;
+    width: 180rpx;
+    height: 146rpx;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    background-position: center;
+
+    &_审批中 {
+      background-image: url('~@/static/images/contract/status_1.png');
+    }
+
+    &_生产中 {
+      background-image: url('~@/static/images/contract/status_2.png');
+    }
+
+    &_已发货 {
+      background-image: url('~@/static/images/contract/status_3.png');
+    }
+
+    &_已签收 {
+      background-image: url('~@/static/images/contract/status_4.png');
+    }
+  }
 }
 .section1 {
--- a/pages/contract_foreign_unplan/detail.vue
View file @6c8c908
+++ b/pages/contract_foreign_unplan/detail.vue
View file @6c8c908
@@ -12,7 +12,8 @@
                             <span v-if="detail.status === 'FORMAL'" class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
                         </text>
-                    </view>                    <view class="row" v-if="detail.status === 'STANDARD'"><text class="label">合同状态</text><text class="value"><span class="info-status" :style="detail.shippingStatusName ? getShippingStatusName(detail.shippingStatusName) : { color: '#000'}" >{{ detail.shippingStatusName || '-' }}</span></text></view>                    
+                    </view>                    
+                    <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />                    
                     <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
                     }}</text></view>
                     <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
@@ -259,19 +260,16 @@ export default {
             {
                 text: '正式合同审核详情',
                 visible: true,
-                variant: 'primary',
                 event: 'auditDetail1'
             },
             {
                 text: '正式合同审核详情',
                 visible: true,
-                variant: 'primary',
                 event: 'auditDetail2'
             },
             {
                 text: '标准合同审核详情',
                 visible: true,
-                variant: 'primary',
                 event: 'auditDetail3'
             },
             {
@@ -315,13 +313,6 @@ export default {
         this.loadDetail()
     },
     methods: {
-        getShippingStatusName(name) {
-            const found = this.statusMap[name] || ''
-            return {
-                backgroundColor: found || '#000',
-                color: found ? '#fff' : '#000'
-            }
-        },
         getStatusCss(name) {
             const list = Array.isArray(this.statusStyle) ? this.statusStyle : []
             const found = list.find(it => it && it.text === name) || {}
@@ -537,6 +528,32 @@ export default {
     padding: 32rpx;
     background: #fff;
     margin-bottom: 20rpx;
+    .status {
+    position: absolute;
+    top: 16rpx;
+    right: 52rpx;
+    width: 180rpx;
+    height: 146rpx;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    background-position: center;
+
+    &_审批中 {
+      background-image: url('~@/static/images/contract/status_1.png');
+    }
+
+    &_生产中 {
+      background-image: url('~@/static/images/contract/status_2.png');
+    }
+
+    &_已发货 {
+      background-image: url('~@/static/images/contract/status_3.png');
+    }
+
+    &_已签收 {
+      background-image: url('~@/static/images/contract/status_4.png');
+    }
+  }
 }
 .section1 {
--- a/pages/contract_process/detail.vue
View file @6c8c908
+++ b/pages/contract_process/detail.vue
View file @6c8c908
@@ -5,7 +5,7 @@ statusStyl<template>
                 <view class="section">
                     <text class="row customer">{{ detail.code }}</text>
                     <view class="row" v-if="status === 'STANDARD'"><text class="label">正式合同规范性审核</text><text class="value"><span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span></text></view>
-                    <view class="row" v-if="detail.status === 'STANDARD'"><text class="label">合同状态</text><text class="value"><span class="info-status" :style="detail.shippingStatusName ? getShippingStatusName(detail.shippingStatusName) : { color: '#000'}" >{{ detail.shippingStatusName || '-' }}</span></text></view>                    
+                    <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />                    
                     <view class="row"><text class="label">承揽方</text><text class="value">{{ detail.supplierName || '-'
                             }}</text></view>
                     <view class="row"><text class="label">定作方</text><text class="value">{{ detail.buyerName || '-'
@@ -205,7 +205,6 @@ export default {
           {
             text: '审核详情',
             visible: true,
-            variant: 'primary',
             event: 'auditDetail'
           },
         ],
@@ -231,13 +230,6 @@ export default {
         this.loadDetail()
     },
     methods: {
-        getShippingStatusName(name) {
-            const found = this.statusMap[name] || ''
-            return {
-                backgroundColor: found || '#000',
-                color: found ? '#fff' : '#000'
-            }
-        },
         getStatusCss(name) {
         const list = Array.isArray(this.statusStyle) ? this.statusStyle : []
         const found = list.find(it => it && it.text === name) || {}
@@ -420,6 +412,32 @@ export default {
     padding: 32rpx;
     background: #fff;
     margin-bottom: 20rpx;
+    .status {
+    position: absolute;
+    top: 16rpx;
+    right: 52rpx;
+    width: 180rpx;
+    height: 146rpx;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    background-position: center;
+
+    &_审批中 {
+      background-image: url('~@/static/images/contract/status_1.png');
+    }
+
+    &_生产中 {
+      background-image: url('~@/static/images/contract/status_2.png');
+    }
+
+    &_已发货 {
+      background-image: url('~@/static/images/contract/status_3.png');
+    }
+
+    &_已签收 {
+      background-image: url('~@/static/images/contract/status_4.png');
+    }
+  }
 }
 .section1 {
     background: #fff;
--- a/pages/contract_retail/detail.vue
View file @6c8c908
+++ b/pages/contract_retail/detail.vue
View file @6c8c908
@@ -5,7 +5,7 @@
                 <view class="section">
                     <text class="row customer">{{ detail.code }}</text>
                     <view class="row" v-if="detail.status === 'STANDARD'"><text class="label">正式合同规范性审核</text><text class="value"><span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span></text></view>
-                    <view class="row" v-if="detail.status === 'STANDARD'"><text class="label">合同状态</text><text class="value"><span class="info-status" :style="detail.shippingStatusName ? getShippingStatusName(detail.shippingStatusName) : { color: '#000'}" >{{ detail.shippingStatusName || '-' }}</span></text></view>
+                    <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />
                     <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName ||
                             '-'}}</text></view>
                     <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName ||
@@ -60,7 +60,7 @@
                     }}</text></view>
                 </view>
-                <view class="section" v-if="status === 'STANDARD'">
+                <view class="section" v-if="detail.status === 'STANDARD'">
                     <view class="row"><text class="label">规范性合同</text><text class="value" style="color: #3D48A3;">{{
                         detail.standardFileName || '-' }}</text></view>
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{
@@ -205,7 +205,6 @@ export default {
             {
                 text: '审核详情',
                 visible: true,
-                variant: 'primary',
                 event: 'auditDetail'
             },
             ],
@@ -259,13 +258,6 @@ export default {
             const name = getDicName('AUDIT_STATUS', code, this.dicOptions.AUDIT_STATUS)
             this.detail = { ...this.detail, standardApprovedName: name }
         },
-        getShippingStatusName(name) {
-            const found = this.statusMap[name] || ''
-            return {
-                backgroundColor: found || '#000',
-                color: found ? '#fff' : '#000'
-            }
-        },
         onUploadSubmit() {
             if (!this.fileInfo.id) {
                 uni.showToast({
@@ -428,8 +420,35 @@ export default {
     padding: 32rpx;
     background: #fff;
     margin-bottom: 20rpx;
+    .status {
+    position: absolute;
+    top: 16rpx;
+    right: 52rpx;
+    width: 180rpx;
+    height: 146rpx;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    background-position: center;
+
+    &_审批中 {
+      background-image: url('~@/static/images/contract/status_1.png');
+    }
+
+    &_生产中 {
+      background-image: url('~@/static/images/contract/status_2.png');
+    }
+
+    &_已发货 {
+      background-image: url('~@/static/images/contract/status_3.png');
+    }
+
+    &_已签收 {
+      background-image: url('~@/static/images/contract/status_4.png');
+    }
+  }
 }
+
 .section1 {
     background: #fff;
     margin-bottom: 20rpx;
--- a/pages/contract_stock/detail.vue
View file @6c8c908
+++ b/pages/contract_stock/detail.vue
View file @6c8c908
@@ -12,7 +12,8 @@
                             <span v-if="detail.status === 'FORMAL'" class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
                         </text>
-                    </view>                    <view class="row" v-if="detail.status === 'STANDARD'"><text class="label">合同状态</text><text class="value"><span class="info-status" :style="detail.shippingStatusName ? getShippingStatusName(detail.shippingStatusName) : { color: '#000'}" >{{ detail.shippingStatusName || '-' }}</span></text></view>
+                    </view>                    
+                    <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />                    
                     <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
                             }}</text></view>
                     <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
@@ -245,19 +246,16 @@ export default {
           {
             text: '正式合同审核详情',
             visible: true,
-            variant: 'primary',
             event: 'auditDetail1'
           },
           {
             text: '正式合同审核详情',
             visible: true,
-            variant: 'primary',
             event: 'auditDetail2'
           },
           {
             text: '标准合同审核详情',
             visible: true,
-            variant: 'primary',
             event: 'auditDetail3'
           },
         ],
@@ -295,13 +293,6 @@ export default {
         this.loadDetail()
     },
     methods: {
-        getShippingStatusName(name) {
-            const found = this.statusMap[name] || ''
-            return {
-                backgroundColor: found || '#000',
-                color: found ? '#fff' : '#000'
-            }
-        },
         onDelete() {
             uni.showModal({
                 title: '确认删除',
@@ -501,6 +492,32 @@ export default {
     padding: 32rpx;
     background: #fff;
     margin-bottom: 20rpx;
+    .status {
+    position: absolute;
+    top: 16rpx;
+    right: 52rpx;
+    width: 180rpx;
+    height: 146rpx;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    background-position: center;
+
+    &_审批中 {
+      background-image: url('~@/static/images/contract/status_1.png');
+    }
+
+    &_生产中 {
+      background-image: url('~@/static/images/contract/status_2.png');
+    }
+
+    &_已发货 {
+      background-image: url('~@/static/images/contract/status_3.png');
+    }
+
+    &_已签收 {
+      background-image: url('~@/static/images/contract/status_4.png');
+    }
+  }
 }
 .section1 {
     background: #fff;
--- a/pages/contract_unplan/detail.vue
View file @6c8c908
+++ b/pages/contract_unplan/detail.vue
View file @6c8c908
@@ -13,7 +13,7 @@
                         </text>
                     </view>
-                    <view class="row" v-if="detail.status === 'STANDARD'"><text class="label">合同状态</text><text class="value"><span class="info-status" :style="detail.shippingStatusName ? getShippingStatusName(detail.shippingStatusName) :{ color: '#000'}" >{{ detail.shippingStatusName || '-' }}</span></text></view>                    
+                    <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />                    
                     <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
                     }}</text></view>
                     <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
@@ -253,19 +253,16 @@ export default {
             {
                 text: '正式合同审核详情',
                 visible: true,
-                variant: 'primary',
                 event: 'auditDetail1'
             },
             {
                 text: '正式合同审核详情',
                 visible: true,
-                variant: 'primary',
                 event: 'auditDetail2'
             },
             {
                 text: '标准合同审核详情',
                 visible: true,
-                variant: 'primary',
                 event: 'auditDetail3'
             },
             ],
@@ -302,14 +299,6 @@ export default {
         this.loadDetail()
     },
     methods: {
-        getShippingStatusName(name) {
-            const found = this.statusMap[name] || ''
-            console.log(found,'found')
-            return {
-                backgroundColor: found || '#000',
-                color: found ? '#fff' : '#000'
-            }
-        },
         getStatusCss(name) {
             const list = Array.isArray(this.statusStyle) ? this.statusStyle : []
             const found = list.find(it => it && it.text === name) || {}
@@ -522,6 +511,32 @@ export default {
     padding: 32rpx;
     background: #fff;
     margin-bottom: 20rpx;
+    .status {
+    position: absolute;
+    top: 16rpx;
+    right: 52rpx;
+    width: 180rpx;
+    height: 146rpx;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    background-position: center;
+
+    &_审批中 {
+      background-image: url('~@/static/images/contract/status_1.png');
+    }
+
+    &_生产中 {
+      background-image: url('~@/static/images/contract/status_2.png');
+    }
+
+    &_已发货 {
+      background-image: url('~@/static/images/contract/status_3.png');
+    }
+
+    &_已签收 {
+      background-image: url('~@/static/images/contract/status_4.png');
+    }
+  }
 }
 .section1 {
--- a/static/images/contract/status_1.png 0 → 100644
View file @6c8c908
+++ b/static/images/contract/status_1.png 0 → 100644
View file @6c8c908
--- a/static/images/contract/status_2.png 0 → 100644
View file @6c8c908
+++ b/static/images/contract/status_2.png 0 → 100644
View file @6c8c908
--- a/static/images/contract/status_3.png 0 → 100644
View file @6c8c908
+++ b/static/images/contract/status_3.png 0 → 100644
View file @6c8c908
--- a/static/images/contract/status_4.png 0 → 100644
View file @6c8c908
+++ b/static/images/contract/status_4.png 0 → 100644
View file @6c8c908