Merge remote-tracking branch 'origin/cjerp-1.0_20260116' into cjerp-1.0_20260122-sydd

史婷婷
2 parents 6b31c90b 5835cf65
Showing 11 changed files with 56 additions and 27 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
pages/credit_manage/detail.vue
pages/delay_invoice/detail.vue
pages/draft_order/detail.vue
pages/flow/audit.vue
--- a/pages/contract_foreign_std/detail.vue
View file @9e15aba
+++ b/pages/contract_foreign_std/detail.vue
View file @9e15aba
@@ -232,8 +232,8 @@ export default {
                 { ...this.buttons[1], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:delete')) },
                 { ...this.buttons[2], visible: (s !== 'DELETED' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:upload')) },
                 { ...this.buttons[3], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:upload-seal')) },
+                { ...this.buttons[5], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:review')) },
                 { ...this.buttons[4], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:approve')) },
-                { ...this.buttons[5], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:review')) }
             ]
         }
     },
--- a/pages/contract_foreign_stock/detail.vue
View file @9e15aba
+++ b/pages/contract_foreign_stock/detail.vue
View file @9e15aba
@@ -297,13 +297,13 @@ export default {
                 { ...this.buttons[3], visible: ((s === 'DRAFT' || s === 'FORMAL') && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:upload')) }, 
                 { ...this.buttons[4], visible: (s === 'STANDARD' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:upload')) }, 
                 { ...this.buttons[5], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:standard-upload')) },
-                { ...this.buttons[6], visible: (s === 'FORMAL' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:approve')) },
-                { ...this.buttons[7], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:approve')) },
-                { ...this.buttons[8], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:standard-approve')) }, 
                 { ...this.buttons[9], visible: (s === 'FORMAL' && t && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:review')) }, 
                 { ...this.buttons[10], visible: (s === 'STANDARD' && t && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:review')) },
                 { ...this.buttons[11], visible: (s === 'STANDARD' && a && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:standard-review')) },
                 { ...this.buttons[12], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:upload-seal')) }, 
+                { ...this.buttons[6], visible: (s === 'FORMAL' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:approve')) },
+                { ...this.buttons[7], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:approve')) },
+                { ...this.buttons[8], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:standard-approve')) }, 
             ]
         }
     },
--- a/pages/contract_foreign_unplan/detail.vue
View file @9e15aba
+++ b/pages/contract_foreign_unplan/detail.vue
View file @9e15aba
@@ -304,13 +304,13 @@ export default {
                 { ...this.buttons[4], visible: ((s === 'DRAFT' || s === 'FORMAL') && a !== 'AUDIT' && a !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:upload')) }, //上传正式合同附件
                 { ...this.buttons[5], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:upload')) }, //上传正式合同附件
                 { ...this.buttons[6], visible: (s === 'STANDARD' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:standard-upload')) },         //上传标准合同附件
-                { ...this.buttons[7], visible: (s === 'FORMAL' && e && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:approve')) }, //审核正式合同
-                { ...this.buttons[8], visible: (s === 'STANDARD' && e && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:approve')) }, //审核正式合同
-                { ...this.buttons[9], visible: (s === 'STANDARD' && f && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:standard-approve')) },         //审核标准合同
                 { ...this.buttons[10], visible: (s === 'FORMAL' && a && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:review')) }, //正式合同审核详情
                 { ...this.buttons[11], visible: (s === 'STANDARD' && a && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:review')) }, //正式合同审核详情
                 { ...this.buttons[12], visible: (s === 'STANDARD' && t && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:standard-review')) },         //标准合同审核详情
                 { ...this.buttons[13], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:upload-seal')) }, //上传双方盖章合同附件
+                { ...this.buttons[7], visible: (s === 'FORMAL' && e && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:approve')) }, //审核正式合同
+                { ...this.buttons[8], visible: (s === 'STANDARD' && e && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:approve')) }, //审核正式合同
+                { ...this.buttons[9], visible: (s === 'STANDARD' && f && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:standard-approve')) },         //审核标准合同
             ]
         }
     },
--- a/pages/contract_process/detail.vue
View file @9e15aba
+++ b/pages/contract_process/detail.vue
View file @9e15aba
@@ -222,8 +222,8 @@ export default {
           { ...this.buttons[0], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:processed-standard-contract:modify')) },
           { ...this.buttons[1], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:processed-standard-contract:delete'))  },
           { ...this.buttons[2], visible: (s !== 'DELETED' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:processed-standard-contract:upload')) },
+          { ...this.buttons[4], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:processed-standard-contract:review')) },
           { ...this.buttons[3], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:processed-standard-contract:approve')) },
-          { ...this.buttons[4], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:processed-standard-contract:review')) }
         ]
       }
     },
--- a/pages/contract_retail/detail.vue
View file @9e15aba
+++ b/pages/contract_retail/detail.vue
View file @9e15aba
@@ -224,8 +224,8 @@ export default {
                 { ...this.buttons[0], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:modify')) },
                 { ...this.buttons[1], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:delete')) },
                 { ...this.buttons[2], visible: (s !== 'DELETED' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:upload')) },
+                { ...this.buttons[4], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:review')) },
                 { ...this.buttons[3], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:approve')) },
-                { ...this.buttons[4], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:review')) }
             ]
         }
     },
--- a/pages/contract_stock/detail.vue
View file @9e15aba
+++ b/pages/contract_stock/detail.vue
View file @9e15aba
@@ -286,12 +286,12 @@ export default {
           { ...this.buttons[3], visible: ((s === 'DRAFT' || s === 'FORMAL') && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:upload')) },
           { ...this.buttons[4], visible: (s === 'STANDARD' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:upload')) },
           { ...this.buttons[5], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:standard-upload')) },
-          { ...this.buttons[6], visible: (s === 'FORMAL' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:approve')) },
-          { ...this.buttons[7], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:approve')) },
-          { ...this.buttons[8], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:standard-approve')) },
           { ...this.buttons[9], visible: (s === 'FORMAL' && t && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:review')) },
           { ...this.buttons[10], visible: (s === 'STANDARD' && t && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:review')) },
           { ...this.buttons[11], visible: (s === 'STANDARD' && a && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:standard-review')) },
+          { ...this.buttons[6], visible: (s === 'FORMAL' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:approve')) },
+          { ...this.buttons[7], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:approve')) },
+          { ...this.buttons[8], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:standard-approve')) },
         ]
       }
     },
--- a/pages/contract_unplan/detail.vue
View file @9e15aba
+++ b/pages/contract_unplan/detail.vue
View file @9e15aba
@@ -290,12 +290,12 @@ export default {
                 { ...this.buttons[4], visible: ((s === 'DRAFT' || s === 'FORMAL') && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:upload')) },
                 { ...this.buttons[5], visible: (s === 'STANDARD' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:upload')) },
                 { ...this.buttons[6], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:standard-upload')) },
-                { ...this.buttons[7], visible: (s === 'FORMAL' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:approve')) },
-                { ...this.buttons[8], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:approve')) },
-                { ...this.buttons[9], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:standard-approve')) },
                 { ...this.buttons[10], visible: (s === 'FORMAL' && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:review')) },
                 { ...this.buttons[11], visible: (s === 'STANDARD' && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:review')) },
                 { ...this.buttons[12], visible: (s === 'STANDARD' && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:standard-review')) },
+                { ...this.buttons[7], visible: (s === 'FORMAL' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:approve')) },
+                { ...this.buttons[8], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:approve')) },
+                { ...this.buttons[9], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:standard-approve')) },
             ]
         }
     },
--- a/pages/credit_manage/detail.vue
View file @9e15aba
+++ b/pages/credit_manage/detail.vue
View file @9e15aba
@@ -208,13 +208,14 @@ export default {
         isPass: s === 'PASS',
         isAudit: s === 'AUDIT',
         canExamine: e,
+        isAuditDetail: this.form.showExamineDetail || false,
       }
     },
     displayButtons() {
       const f = this.statusFlags
       return [
         { ...this.buttons[0], visible: f.isRefuse && this.$auth.hasPermi('customer-credit-manage:customer-credit-plan:modify') },
-        { ...this.buttons[1], visible: this.$auth.hasPermi('customer-credit-manage:customer-credit-plan:review') },
+        { ...this.buttons[1], visible: f.isAuditDetail && this.$auth.hasPermi('customer-credit-manage:customer-credit-plan:review') },
         { ...this.buttons[2], visible: f.isAudit && f.canExamine && this.$auth.hasPermi('customer-credit-manage:customer-credit-plan:approve') },
         { ...this.buttons[3], visible: f.isPass && this.$auth.hasPermi('customer-credit-manage:customer-credit-plan:change') },
         { ...this.buttons[4], visible: f.isRefuse && this.$auth.hasPermi('customer-credit-manage:customer-credit-plan:close') },
--- a/pages/delay_invoice/detail.vue
View file @9e15aba
+++ b/pages/delay_invoice/detail.vue
View file @9e15aba
@@ -45,6 +45,7 @@ export default {
       return {
         isRefuse: e === 'REFUSE' || false,
         isAudit: e === 'AUDIT' || false,
+        isAuditDetail: m.showExamineDetail || false,
         canEdit: e === 'REFUSE' && m.delayedCreateBy || false,
         canAudit: e === 'AUDIT' && m.showExamine || false,
         canCancel: e === 'REFUSE' && m.delayedCreateBy || false,
@@ -54,7 +55,7 @@ export default {
       const f = this.statusFlags
       return [
         { ...this.buttons[0], visible: f.canEdit && this.$auth.hasPermi('shipping-plan-manage:delay-invoice:modify') },
-        { ...this.buttons[1], visible: this.$auth.hasPermi('shipping-plan-manage:delay-invoice:review') },
+        { ...this.buttons[1], visible: f.isAuditDetail && this.$auth.hasPermi('shipping-plan-manage:delay-invoice:review') },
         { ...this.buttons[2], visible: f.canAudit && this.$auth.hasPermi('shipping-plan-manage:delay-invoice:approve') },
         { ...this.buttons[3], visible: f.canCancel && this.$auth.hasPermi('shipping-plan-manage:delay-invoice:cancel') },
       ]
--- a/pages/draft_order/detail.vue
View file @9e15aba
+++ b/pages/draft_order/detail.vue
View file @9e15aba
@@ -13,10 +13,13 @@
           <view class="row"><text class="label">卸货地点</text><text class="value">{{ form.destination }}</text></view>
           <view class="row"><text class="label">接货人/联络人</text><text class="value">{{ form.consignee }}</text></view>
           <view class="row"><text class="label">联系电话</text><text class="value">{{ form.phone }}</text></view>
-          <view class="row"><text class="label">回货计划安排</text><text class="value">{{ form.returnPlanArrangement }}</text></view>
+          <view class="row"><text class="label">回货计划安排</text><text class="value">{{ form.returnPlanArrangement }}</text>
+          </view>
           <view class="row"><text class="label">特殊需求、其他等</text><text class="value">{{ form.other }}</text></view>
-          <view class="row"><text class="label">装货特别要求/需求</text><text class="value">{{ form.specialLoadingRequirement }}</text></view>
-          <view class="row"><text class="label">是否冻结</text><text class="value">{{ form.freeze ? '是' : '否' }}</text></view>
+          <view class="row"><text class="label">装货特别要求/需求</text><text class="value">{{ form.specialLoadingRequirement
+              }}</text></view>
+          <view class="row"><text class="label">是否冻结</text><text class="value">{{ form.freeze ? '是' : '否' }}</text>
+          </view>
         </view>
       </view>
     </scroll-view>
@@ -27,6 +30,7 @@
 <script>
 import { getDetailApi, cancelApi } from '@/api/draft_order.js'
 import DetailButtons from '@/components/detail-buttons/index.vue'
+import { checkApi } from '@/api/order_list.js'
 export default {
   name: 'DraftOrderDetail',
@@ -88,8 +92,18 @@ export default {
       if (typeof fn === 'function') fn()
     },
     onEdit() {
-      const id = this.form.id || this.form.code
-      if (id) uni.navigateTo({ url: `/pages/draft_order/modify?id=${id}` })
+      const id = this.form.id || this.form.code;
+      const query = id ? ('?id=' + encodeURIComponent(id)) : '';
+      //  purchaseOrderId 订单id
+      checkApi({ id: this.form.purchaseOrderId }).then(res => {
+        if (res.code === 200) {
+          uni.navigateTo({ url: '/pages/draft_order/modify' + query })
+        } else {
+          uni.showToast({ title: res.msg || '失败', icon: 'none' })
+        }
+      }).catch((e) => {
+        uni.showToast({ title: e.msg, icon: 'none' })
+      })
     },
     onAuditDetail() {
       uni.setStorageSync('sourceBusinessId', this.form.id)
@@ -154,7 +168,7 @@ export default {
     background-size: 100% 100%;
     background-position: center;
-   &_AUDIT {
+    &_AUDIT {
       background-image: url('~@/static/images/dev_manage/status_1.png');
     }
--- a/pages/flow/audit.vue
View file @9e15aba
+++ b/pages/flow/audit.vue
View file @9e15aba
@@ -92,8 +92,8 @@
 							</template>
 							<template v-slot:footer>
 								<view class="amount-row">
-									<uni-easyinput type="digit" v-model="companyReview.companyCreditLimit"
-										placeholder="请输入授信额度" :inputBorder="false" />
+									<uni-easyinput type="number" v-model="companyReview.companyCreditLimit"
+										placeholder="请输入授信额度" :inputBorder="false" @input="onCreditLimitInput" />
 								</view>
 							</template>
 						</uni-list-item>
@@ -246,6 +246,19 @@ export default {
 		} catch (e) { }
 	},
 	methods: {
+		onCreditLimitInput(val) {
+			let value = String(val)
+			// 只允许数字和小数点
+			value = value.replace(/[^\d.]/g, '')
+			// 保证只有一个小数点
+			const parts = value.split('.')
+			if (parts.length > 2) {
+				value = parts[0] + '.' + parts.slice(1).join('')
+			}
+			this.$nextTick(() => {
+				this.companyReview.companyCreditLimit = value
+			})
+		},
 		async loadCategoryOptions() {
 			try {
 				const res = await getDicByCodeApi('CUSTOMER_CATEGORY')
@@ -325,7 +338,7 @@ export default {
 		// 是否填写-公司评审信息
 		hsCompanyReview() {
 			// 结算期限 授信额度
-			if (this.companyReview.companySettlementPeriod || this.companyReview.companyCreditLimit) {
+			if (this.companyReview.companySettlementPeriod || !['', null, undefined].includes(this.companyReview.companyCreditLimit)) {
 				return true
 			}
 			return false
@@ -378,7 +391,7 @@ export default {
 				uni.showToast({ title: '请输入结算期限', icon: 'none' })
 				return
 			}
-			if (!this.companyReview.companyCreditLimit) {
+			if (['', null, undefined].includes(this.companyReview.companyCreditLimit)) {
 				uni.showToast({ title: '请输入授信额度', icon: 'none' })
 				return
 			}