commit: 优化错误

gesilong
1 parent c750eae8
Showing 27 changed files with 98 additions and 79 deletions
pages/contract_foreign_std/add.vue
pages/contract_foreign_std/detail.vue
pages/contract_foreign_std/modify.vue
pages/contract_foreign_stock/add.vue
pages/contract_foreign_stock/detail.vue
pages/contract_foreign_stock/lock.vue
pages/contract_foreign_stock/modify.vue
pages/contract_foreign_unplan/add.vue
pages/contract_foreign_unplan/detail.vue
pages/contract_foreign_unplan/lock.vue
pages/contract_foreign_unplan/modify.vue
pages/contract_framework/add.vue
pages/contract_process/add.vue
pages/contract_process/detail.vue
pages/contract_process/modify.vue
pages/contract_retail/add.vue
pages/contract_retail/detail.vue
pages/contract_retail/modify.vue
pages/contract_stock/add.vue
pages/contract_stock/detail.vue
--- a/pages/contract_foreign_std/add.vue
View file @e417d13
+++ b/pages/contract_foreign_std/add.vue
View file @e417d13
@@ -517,7 +517,7 @@ export default {
         openRelate(fieldKey) {
             let config = {}
             if (fieldKey === 'buyer') {
-                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             } else if (fieldKey === 'stockUpCompanyId') {
                 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
@@ -588,7 +588,7 @@ export default {
                 uni.showToast({ title: '新增成功', icon: 'none' })
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_std/index' }) }, 400)
             } catch (e) {
-                uni.showToast({ title: '提交失败', icon: 'none' })
+                uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
             }
         },
         validateRequired() {
--- a/pages/contract_foreign_std/detail.vue
View file @e417d13
+++ b/pages/contract_foreign_std/detail.vue
View file @e417d13
@@ -472,7 +472,7 @@ export default {
 }
 .label {
-    width: 280rpx;
+    width: 310rpx;
     color: rgba(0, 0, 0, 0.6);
     font-size: 28rpx;
 }
@@ -541,7 +541,7 @@ export default {
 }
 .label1 {
-    width: 280rpx;
+    width: 310rpx;
     color: rgba(0, 0, 0, 0.6);
     font-size: 32rpx;
 }
--- a/pages/contract_foreign_std/modify.vue
View file @e417d13
+++ b/pages/contract_foreign_std/modify.vue
View file @e417d13
@@ -457,7 +457,7 @@ export default {
         openRelate(fieldKey) {
             let config = {}
             if (fieldKey === 'buyer') {
-                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             } else if (fieldKey === 'stockUpCompanyId') {
                 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
@@ -562,7 +562,7 @@ export default {
                     uni.showToast({ title: '保存成功', icon: 'none' })
                     setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_std/index' }) }, 400)
                 } catch (e) {
-                    uni.showToast({ title: '提交失败', icon: 'none' })
+                    uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
                 }
         }
     }
--- a/pages/contract_foreign_stock/add.vue
View file @e417d13
+++ b/pages/contract_foreign_stock/add.vue
View file @e417d13
@@ -521,7 +521,7 @@ export default {
         openRelate(fieldKey) {
             let config = {}
             if (fieldKey === 'buyer') {
-                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             } else if (fieldKey === 'stockUpCompanyId') {
                 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
@@ -592,7 +592,7 @@ export default {
                 uni.showToast({ title: '新增成功', icon: 'none' })
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_stock/index' }) }, 400)
             } catch (e) {
-                uni.showToast({ title: '提交失败', icon: 'none' })
+                uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
             }
         },
         validateRequired() {
--- a/pages/contract_foreign_stock/detail.vue
View file @e417d13
+++ b/pages/contract_foreign_stock/detail.vue
View file @e417d13
@@ -4,13 +4,19 @@
             <view class="detail-page">
                 <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' || detail.status === 'FORMAL'">
-                        <text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text>
+                        <text class="label">正式合同规范性审核状态</text>
                         <text class="value">
-                            <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>
+                            <span class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</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>
@@ -558,7 +564,7 @@ export default {
 }
 .label {
-    width: 280rpx;
+    width: 310rpx;
     color: rgba(0, 0, 0, 0.6);
     font-size: 28rpx;
 }
@@ -627,7 +633,7 @@ export default {
 }
 .label1 {
-    width: 280rpx;
+    width: 310rpx;
     color: rgba(0, 0, 0, 0.6);
     font-size: 32rpx;
 }
--- a/pages/contract_foreign_stock/lock.vue
View file @e417d13
+++ b/pages/contract_foreign_stock/lock.vue
View file @e417d13
@@ -363,8 +363,8 @@ export default {
                             setTimeout(() => {
                                 uni.navigateTo({ url: '/pages/contract_foreign_stock/index' })
                             }, 500)
-                        }).catch(() => {
-                            uni.showToast({ title: '提交失败', icon: 'none' })
+                        }).catch((err) => {
+                            uni.showToast({ title: err.msg ||'提交失败', icon: 'none' })
                         })
                     }
                 }
--- a/pages/contract_foreign_stock/modify.vue
View file @e417d13
+++ b/pages/contract_foreign_stock/modify.vue
View file @e417d13
@@ -462,7 +462,7 @@ export default {
         openRelate(fieldKey) {
             let config = {}
             if (fieldKey === 'buyer') {
-                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             } else if (fieldKey === 'stockUpCompanyId') {
                 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
@@ -565,7 +565,7 @@ export default {
                 uni.showToast({ title: '保存成功', icon: 'none' })
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_stock/index' }) }, 400)
             } catch (e) {
-                uni.showToast({ title: '提交失败', icon: 'none' })
+                uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
             }
         }
     }
--- a/pages/contract_foreign_unplan/add.vue
View file @e417d13
+++ b/pages/contract_foreign_unplan/add.vue
View file @e417d13
@@ -518,7 +518,7 @@ export default {
         openRelate(fieldKey) {
             let config = {}
             if (fieldKey === 'buyer') {
-                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             } else if (fieldKey === 'stockUpCompanyId') {
                 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
@@ -590,7 +590,7 @@ export default {
                 uni.showToast({ title: '新增成功', icon: 'none' })
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_unplan/index' }) }, 400)
             } catch (e) {
-                uni.showToast({ title: '提交失败', icon: 'none' })
+                uni.showToast({ title: e.msg ||'新增失败', icon: 'none' })
             }
         },
         validateRequired() {
--- a/pages/contract_foreign_unplan/detail.vue
View file @e417d13
+++ b/pages/contract_foreign_unplan/detail.vue
View file @e417d13
@@ -4,15 +4,19 @@
             <view class="detail-page">
                 <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' || detail.status === 'FORMAL'">
-                        <text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text>
+                        <text class="label">正式合同规范性审核状态</text>
                         <text class="value">
-
-                            <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>
-                            
+                            <span class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</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>
@@ -572,7 +576,7 @@ export default {
 }
 .label {
-    width: 280rpx;
+    width: 310rpx;
     color: rgba(0, 0, 0, 0.6);
     font-size: 28rpx;
 }
@@ -641,7 +645,7 @@ export default {
 }
 .label1 {
-    width: 280rpx;
+    width: 310rpx;
     color: rgba(0, 0, 0, 0.6);
     font-size: 32rpx;
 }
--- a/pages/contract_foreign_unplan/lock.vue
View file @e417d13
+++ b/pages/contract_foreign_unplan/lock.vue
View file @e417d13
@@ -363,8 +363,8 @@ export default {
                             setTimeout(() => {
                                 uni.navigateTo({ url: '/pages/contract_foreign_unplan/index' })
                             }, 500)
-                        }).catch(() => {
-                            uni.showToast({ title: '提交失败', icon: 'none' })
+                        }).catch((err) => {
+                            uni.showToast({ title: err.msg ||'提交失败', icon: 'none' })
                         })
                     }
                 }
--- a/pages/contract_foreign_unplan/modify.vue
View file @e417d13
+++ b/pages/contract_foreign_unplan/modify.vue
View file @e417d13
@@ -461,7 +461,7 @@ export default {
         openRelate(fieldKey) {
             let config = {}
             if (fieldKey === 'buyer') {
-                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             } else if (fieldKey === 'stockUpCompanyId') {
                 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
@@ -564,7 +564,7 @@ export default {
                 uni.showToast({ title: '保存成功', icon: 'none' })
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_unplan/index' }) }, 400)
             } catch (e) {
-                uni.showToast({ title: '提交失败', icon: 'none' })
+                uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
             }
         }
     }
--- a/pages/contract_framework/add.vue
View file @e417d13
+++ b/pages/contract_framework/add.vue
View file @e417d13
@@ -200,8 +200,8 @@ export default {
           uni.showToast({ title: '已提交', icon: 'none' })
           setTimeout(() => { uni.redirectTo({ url: '/pages/contract_framework/index' }) }, 800)
         })
-        .catch(() => {
-          uni.showToast({ title: '提交失败', icon: 'none' })
+        .catch((err) => {
+          uni.showToast({ title: err.msg ||'提交失败', icon: 'none' })
         })
     },
     validateRequired() {
--- a/pages/contract_process/add.vue
View file @e417d13
+++ b/pages/contract_process/add.vue
View file @e417d13
@@ -522,7 +522,7 @@ export default {
         openRelate(fieldKey) {
             let config = {}
             if (fieldKey === 'buyer') {
-                config = { title: '定作方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+                config = { title: '定作方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             } else if (fieldKey === 'stockUpCompanyId') {
                 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
@@ -598,7 +598,7 @@ export default {
                 uni.showToast({ title: '新增成功', icon: 'none' })
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_process/index' }) }, 400)
             } catch (e) {
-                uni.showToast({ title: '提交失败', icon: 'none' })
+                uni.showToast({ title: e.msg ||'新增失败', icon: 'none' })
             }
         },
         validateRequired() {
--- a/pages/contract_process/detail.vue
View file @e417d13
+++ b/pages/contract_process/detail.vue
View file @e417d13
@@ -455,7 +455,7 @@ export default {
 }
 .label {
-    width: 280rpx;
+    width: 310rpx;
     color: rgba(0, 0, 0, 0.6);
     font-size: 28rpx;
 }
@@ -511,7 +511,7 @@ export default {
 }
 .label1 {
-    width: 280rpx;
+    width: 310rpx;
     color: rgba(0, 0, 0, 0.6);
     font-size: 32rpx;
 }
--- a/pages/contract_process/modify.vue
View file @e417d13
+++ b/pages/contract_process/modify.vue
View file @e417d13
@@ -441,7 +441,7 @@ export default {
         openRelate(fieldKey) {
             let config = {}
             if (fieldKey === 'buyer') {
-                config = { title: '定作方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+                config = { title: '定作方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             this.sheet.visible = false
@@ -536,7 +536,7 @@ export default {
                 uni.showToast({ title: '保存成功', icon: 'none' })
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_process/index' }) }, 400)
             } catch (e) {
-                uni.showToast({ title: '提交失败', icon: 'none' })
+                uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
             }
         }
     }
--- a/pages/contract_retail/add.vue
View file @e417d13
+++ b/pages/contract_retail/add.vue
View file @e417d13
@@ -515,7 +515,7 @@ export default {
         openRelate(fieldKey) {
             let config = {}
             if (fieldKey === 'buyer') {
-                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             } else if (fieldKey === 'stockUpCompanyId') {
                 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
@@ -552,7 +552,7 @@ export default {
         async onSubmit() {
             if (!this.validateRequired()) return
             const confirmRes = await new Promise(resolve => {
-                uni.showModal({ title: '提示', content: '确定新增经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
+                uni.showModal({ title: '提示', content: '确定新增经销标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
             })
             if (!(confirmRes && confirmRes.confirm)) return
             const clean = (obj) => {
@@ -586,7 +586,7 @@ export default {
                 uni.showToast({ title: '新增成功', icon: 'none' })
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_retail/index' }) }, 400)
             } catch (e) {
-                uni.showToast({ title: '提交失败', icon: 'none' })
+                uni.showToast({ title: e.msg ||'新增失败', icon: 'none' })
             }
         },
         validateRequired() {
@@ -632,6 +632,13 @@ export default {
 }
 </script>
+<style>
+/* 强制提升日历层级，解决被 footer 遮挡问题 */
+.uni-calendar--mask,
+.uni-calendar--fixed {
+    z-index: 9999 !important;
+}
+</style>
 <style lang="scss" scoped>
 .total {
     .total-text {
@@ -746,11 +753,6 @@ export default {
     color: rgba(0, 0, 0, 0.9);
 }
-.scroll {
-    flex: 1;
-    padding: 12rpx 0 160rpx;
-}
-
 .quality {
     background-color: #fff;
     display: flex;
--- a/pages/contract_retail/detail.vue
View file @e417d13
+++ b/pages/contract_retail/detail.vue
View file @e417d13
@@ -471,7 +471,7 @@ export default {
 }
 .label {
-    width: 280rpx;
+    width: 310rpx;
     color: rgba(0, 0, 0, 0.6);
     font-size: 28rpx;
 }
@@ -485,7 +485,7 @@ export default {
 }
 .label1 {
-    width: 280rpx;
+    width: 310rpx;
     color: rgba(0, 0, 0, 0.6);
     font-size: 32rpx;
 }
--- a/pages/contract_retail/modify.vue
View file @e417d13
+++ b/pages/contract_retail/modify.vue
View file @e417d13
@@ -454,7 +454,7 @@ export default {
         openRelate(fieldKey) {
             let config = {}
             if (fieldKey === 'buyer') {
-                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             } else if (fieldKey === 'stockUpCompanyId') {
                 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
@@ -558,7 +558,7 @@ export default {
                 uni.showToast({ title: '保存成功', icon: 'none' })
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_retail/index' }) }, 400)
             } catch (e) {
-                uni.showToast({ title: '提交失败', icon: 'none' })
+                uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
             }
         }
     }
--- a/pages/contract_stock/add.vue
View file @e417d13
+++ b/pages/contract_stock/add.vue
View file @e417d13
@@ -512,7 +512,7 @@ export default {
         openRelate(fieldKey) {
             let config = {}
             if (fieldKey === 'buyer') {
-                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             } else if (fieldKey === 'stockUpCompanyId') {
                 config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
@@ -583,7 +583,7 @@ export default {
                 uni.showToast({ title: '新增成功', icon: 'none' })
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_stock/index' }) }, 400)
             } catch (e) {
-                uni.showToast({ title: '提交失败', icon: 'none' })
+                uni.showToast({ title: e.msg ||'新增失败', icon: 'none' })
             }
         },
         validateRequired() {
--- a/pages/contract_stock/detail.vue
View file @e417d13
+++ b/pages/contract_stock/detail.vue
View file @e417d13
@@ -4,15 +4,18 @@
             <view class="detail-page">
                 <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' || detail.status === 'FORMAL'">
-                        <text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text>
+                        <text class="label">正式合同规范性审核状态</text>
                         <text class="value">
-
-                            <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>
-                            
+                            <span class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</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>
@@ -535,7 +538,7 @@ export default {
 }
 .label {
-    width: 280rpx;
+    width: 310rpx;
     color: rgba(0, 0, 0, 0.6);
     font-size: 28rpx;
 }
@@ -591,7 +594,7 @@ export default {
 }
 .label1 {
-    width: 280rpx;
+    width: 310rpx;
     color: rgba(0, 0, 0, 0.6);
     font-size: 32rpx;
 }
--- a/pages/contract_stock/lock.vue
View file @e417d13
+++ b/pages/contract_stock/lock.vue
View file @e417d13
@@ -363,8 +363,8 @@ export default {
                             setTimeout(() => {
                                 uni.navigateTo({ url: '/pages/contract_stock/index' })
                             }, 500)
-                        }).catch(() => {
-                            uni.showToast({ title: '提交失败', icon: 'none' })
+                        }).catch((err) => {
+                            uni.showToast({ title: err.msg ||'提交失败', icon: 'none' })
                         })
                     }
                 }
--- a/pages/contract_stock/modify.vue
View file @e417d13
+++ b/pages/contract_stock/modify.vue
View file @e417d13
@@ -456,7 +456,7 @@ export default {
         openRelate(fieldKey) {
             let config = {}
             if (fieldKey === 'buyer') {
-                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             this.sheet.visible = false
@@ -550,7 +550,7 @@ export default {
                 uni.showToast({ title: '保存成功', icon: 'none' })
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_stock/index' }) }, 400)
             } catch (e) {
-                uni.showToast({ title: '提交失败', icon: 'none' })
+                uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
             }
         }
     }
--- a/pages/contract_unplan/add.vue
View file @e417d13
+++ b/pages/contract_unplan/add.vue
View file @e417d13
@@ -517,7 +517,7 @@ export default {
         openRelate(fieldKey) {
             let config = {}
             if (fieldKey === 'buyer') {
-                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             this.sheet.visible = false
@@ -576,7 +576,7 @@ export default {
                 uni.showToast({ title: '新增成功', icon: 'none' })
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_unplan/index' }) }, 400)
             } catch (e) {
-                uni.showToast({ title: '提交失败', icon: 'none' })
+                uni.showToast({ title: e.msg ||'新增失败', icon: 'none' })
             }
         },
         validateRequired() {
--- a/pages/contract_unplan/detail.vue
View file @e417d13
+++ b/pages/contract_unplan/detail.vue
View file @e417d13
@@ -4,13 +4,16 @@
             <view class="detail-page">
                 <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' || detail.status === 'FORMAL'">
-                        <text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text>
+                        <text class="label">正式合同规范性审核状态</text>
                         <text class="value">
-
-                            <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>
-                            
+                            <span class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
                         </text>
                     </view>
                     <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />                    
@@ -555,7 +558,7 @@ export default {
 }
 .label {
-    width: 280rpx;
+    width: 310rpx;
     color: rgba(0, 0, 0, 0.6);
     font-size: 28rpx;
 }
@@ -624,7 +627,7 @@ export default {
 }
 .label1 {
-    width: 280rpx;
+    width: 310rpx;
     color: rgba(0, 0, 0, 0.6);
     font-size: 32rpx;
 }
--- a/pages/contract_unplan/lock.vue
View file @e417d13
+++ b/pages/contract_unplan/lock.vue
View file @e417d13
@@ -363,8 +363,8 @@ export default {
                             setTimeout(() => {
                                 uni.navigateTo({ url: '/pages/contract_unplan/index' })
                             }, 500)
-                        }).catch(() => {
-                            uni.showToast({ title: '提交失败', icon: 'none' })
+                        }).catch((err) => {
+                            uni.showToast({ title: err.msg ||'提交失败', icon: 'none' })
                         })
                     }
                 }
--- a/pages/contract_unplan/modify.vue
View file @e417d13
+++ b/pages/contract_unplan/modify.vue
View file @e417d13
@@ -453,7 +453,7 @@ export default {
         openRelate(fieldKey) {
             let config = {}
             if (fieldKey === 'buyer') {
-                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+                config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '名称', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             this.sheet.visible = false
@@ -550,7 +550,7 @@ export default {
                 uni.showToast({ title: '保存成功', icon: 'none' })
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_unplan/index' }) }, 400)
             } catch (e) {
-                uni.showToast({ title: '提交失败', icon: 'none' })
+                uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
             }
         }
     }
--- a/pages/dev_manage/detail.vue
View file @e417d13
+++ b/pages/dev_manage/detail.vue
View file @e417d13
@@ -146,6 +146,7 @@ export default {
 		displayButtons() {
 			const s = Number(this.form && this.form.status || 0)
 			const t = this.todoType || '';
+			console.log('s', s, 't', t)
 			return [
 				{ ...this.buttons[0], visible: (s === 3 && t === '' && this.$auth.hasPermi('customer-dev-manage:customer-dev-plan:modify')) },
 				{ ...this.buttons[1], visible: this.$auth.hasPermi('customer-dev-manage:customer-dev-plan:reviewDetail') },