feat: 审批页增加表单必填校验方法-通用&&补货单-审批（特殊角色&正常角色）

史婷婷
1 parent 94604b5d
Showing 3 changed files with 74 additions and 11 deletions
pages/flow/audit.vue
pages/replenishment_order/approve.vue
pages/replenishment_order/product.vue
--- a/pages/flow/audit.vue
View file @4a06e5a
+++ b/pages/flow/audit.vue
View file @4a06e5a
@@ -251,6 +251,11 @@ export default {
 				...vals,
 			}
 		},
+		// 校验表单 默认通过
+		basicRefCheck() {
+			const ref = this.$refs.basicRef
+			return ref && typeof ref.checkForm === 'function' ? ref.checkForm() : true
+		},
 		//  驳回
 		onReject() {
 			this.approveType = 'REFUSE'
@@ -260,6 +265,11 @@ export default {
 		//  通过
 		//  在这里增加业务判断  比如 资信管理，判断有没有填写客户信息、公司评审（这些是不同角色进行操作的）
 		onPass() {
+			// 校验表单
+			if (!this.basicRefCheck()) {
+				return
+			}
+			console.log('onPass');
 			console.log('审核__roles&&bizFlag', this.roleCodes, this.auditCtx.bizFlag);
 			// 客户资信的审核
 			if (this.auditCtx.bizFlag === 'CUSTOMER_CREDIT_EDIT') {
--- a/pages/replenishment_order/approve.vue
View file @4a06e5a
+++ b/pages/replenishment_order/approve.vue
View file @4a06e5a
@@ -14,12 +14,13 @@
                     <view class="row"><text class="label">购货单位</text><text class="value">{{ form.customerName }}</text>
                     </view>
                     <view class="row"><text class="label">原计划发货日期</text><text class="value">{{ form.originPlanShipDate
-                    }}</text></view>
+                            }}</text></view>
                 </view>
                 <!-- 产品 -->
                 <view class="section2">
-                    <Product mode="approve" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange"/>
+                    <Product mode="approve" :list="initPurchaseOrderLineList"
+                        :canEditSupplementary="canEditSupplementary" @change="purchaseOrderLineListChange" />
                 </view>
                 <view class="section3">
                     <view class="view-total">
@@ -35,7 +36,7 @@
                         <view class="row">
                             <view class="row2">
                                 <text class="label">需求补货</text><text class="value">{{ form.totalSupplementaryQuantity
-                                    }}</text>
+                                }}</text>
                             </view>
                         </view>
                     </view>
@@ -58,6 +59,8 @@ export default {
         return {
             form: {},
             initPurchaseOrderLineList: [],
+            roleCodes: [],
+            canEditSupplementary: false
         }
     },
     computed: {
@@ -67,13 +70,25 @@ export default {
             immediate: true,
             handler(val) {
                 const v = (val !== undefined && val !== null) ? String(val) : ''
-                if (v) this.loadDetail(v)
+                if (v) {
+                    this.loadDetail(v);
+                    this.getRoleInfo();
+                }
             }
         }
     },
     onLoad(query) {
+
     },
     methods: {
+        getRoleInfo() {
+            this.roleCodes = this.$store.getters.roleCodes || [];
+            console.log('roleCodes', this.roleCodes)
+            // 一分厂经营办计划员/二分厂经营办计划员/三分厂经营办计划员/四分厂经营办计划员
+            const allowed = ['yfcjybjhy', 'efcjybjhy', 'sfcjybjhy', 'ztfcjybjhy'];
+            this.canEditSupplementary = allowed.some((code) => this.roleCodes.includes(code));
+            console.log('canEditSupplementary', this.canEditSupplementary)
+        },
         async loadDetail(id) {
             try {
                 const res = await getDetailApi(id)
@@ -119,6 +134,38 @@ export default {
             this.form.purchaseOrderLineList = list
             this.calculateSummary(list)
         },
+        getFormValues() {
+            const m = this.form || {}
+            return JSON.parse(JSON.stringify(m))
+        },
+        // 审批-通过：校验表单
+        checkForm() {
+            if (this.canEditSupplementary) {
+                const list = Array.isArray(this.form.purchaseOrderLineList) ? this.form.purchaseOrderLineList : [];
+                console.log('checkForm__list', list)
+                if (list.length === 0) {
+                    uni.showToast({ title: '请先添加产品', icon: 'none' })
+                    return false
+                }
+                const fields = [
+                    { key: 'supplementaryQuantity', label: '需求补货数量' },
+                ]
+                for (let i = 0; i < list.length; i++) {
+                    const it = list[i] || {}
+                    for (const f of fields) {
+                        const v = it && it[f.key]
+                        if (v === undefined || v === null || String(v).trim() === '') {
+                            uni.showToast({ title: `产品第${i + 1}条：${f.label}不能为空！`, icon: 'none' })
+                            return false
+                        }
+                    }
+                }
+                return true
+            } else {
+                return true
+            }
+
+        }
     }
 }
 </script>
@@ -201,11 +248,13 @@ export default {
         font-weight: 600;
     }
 }
+
 .section3 {
     padding: 0 32rpx;
     background-color: #fff;
     margin-top: 20rpx;
 }
+
 .view-total {
     padding: 20rpx 0;
--- a/pages/replenishment_order/product.vue
View file @4a06e5a
+++ b/pages/replenishment_order/product.vue
View file @4a06e5a
@@ -347,14 +347,12 @@
                             </template>
                         </uni-list-item>
                         <uni-list-item title="需求补货数量(kg)">
-                            <!-- <template v-slot:footer>
-                                <text class="value">{{ item.supplementaryQuantity }}</text>
-                            </template> -->
                             <template v-slot:footer>
-                                <uni-easyinput type="digit" v-model="item.supplementaryQuantity"
+                                <uni-easyinput v-if="canEditSupplementary" type="digit" v-model="item.supplementaryQuantity"
                                     placeholder="请输入需求补货数量kg" :inputBorder="false"
                                     @input="onNonNegativeNumberInput($event, item, idx, 'supplementaryQuantity')"
                                     @blur="onNonNegativeNumberBlur(item, idx, 'supplementaryQuantity')" />
+                                <text v-else class="value">{{ item.supplementaryQuantity }}</text>   
                             </template>
                         </uni-list-item>
                         <uni-list-item class="amount-item" title="单价(元/kg)">
@@ -475,12 +473,14 @@ export default {
         totalQuantity: { type: Number, default: 0 },
         totalShippedQuantity: { type: Number, default: 0 },
         totalSupplementaryQuantity: { type: Number, default: 0 },
-        orderDate: { type: String, default: '' }
+        orderDate: { type: String, default: '' },
+        canEditSupplementary: { type: Boolean, default: false }
     },
     data() {
         return {
             items: [],
             collapsedView: false,
+            roleCodes: [],
         }
     },
     computed: {
@@ -498,7 +498,11 @@ export default {
             const mm = String(dt.getMonth() + 1).padStart(2, '0')
             const dd = String(dt.getDate()).padStart(2, '0')
             return `${yy}/${mm}/${dd}`
-        }
+        },
+        // roleCodes() {
+		// 	const g = this.$store && this.$store.getters
+		// 	return (g && g.roleCodes) || [];
+		// },
     },
     watch: {
         items: {
@@ -518,7 +522,7 @@ export default {
     },
     created() {
         const init = Array.isArray(this.list) && this.list.length > 0 ? this.list.map(v => ({ ...this.defaultItem(), ...v, collapsed: false })) : [{ ...this.defaultItem(), collapsed: false }]
-        this.items = init
+        this.items = init;
     },
     methods: {
         defaultItem() {