Merge branch 'master' of http://dev.ccwin-in.com:3000/eam/eam-ui

src/views/eam/device/deviceInternalAudit/deviceInternalAudit.data.ts

@@ -5,33 +5,43 @@ import { dateFormatter } from '@/utils/formatTime'
 export const DeviceInternalAuditRules = reactive({
   personer: [
     { required: true, message: '请输入人员', trigger: 'blur' },
+    
   ],
   fitOut: [
     { required: true, message: '请输入装配', trigger: 'blur' },
+    { max: 200, message: '不得超过200', trigger: 'blur' }
   ],
   coating: [
     { required: true, message: '请输入涂装', trigger: 'blur' },
+    { max: 200, message: '不得超过200', trigger: 'blur' }
   ],
   injectionMolding: [
     { required: true, message: '请输入注塑', trigger: 'blur' },
+    { max: 200, message: '不得超过200', trigger: 'blur' }
   ],
   business: [
     { required: true, message: '请输入商务', trigger: 'blur' },
+    { max: 200, message: '不得超过200', trigger: 'blur' }
   ],
   laboratory: [
     { required: true, message: '请输入实验室', trigger: 'blur' },
+    { max: 200, message: '不得超过200', trigger: 'blur' }
   ],
   it: [
     { required: true, message: '请输入IT', trigger: 'blur' },
+    { max: 200, message: '不得超过200', trigger: 'blur' }
   ],
   qualityDepartment: [
     { required: true, message: '请输入质量保障部', trigger: 'blur' },
+    { max: 200, message: '不得超过200', trigger: 'blur' }
   ],
   materialFlow: [
     { required: true, message: '请输入物流', trigger: 'blur' },
+    { max: 200, message: '不得超过200', trigger: 'blur' }
   ],
   moldPre: [
     { required: true, message: '请输入模具前期', trigger: 'blur' },
+    { max: 200, message: '不得超过200', trigger: 'blur' }
   ],
 })
 

src/views/eam/item/countadjustPlan/countadjustPlan.data.ts

@@ -4,6 +4,10 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 export const CountadjustPlanRules = reactive({
   number: [required],
   name: [required],
+  classification: [
+    { required: true, message: '请选择盘点类型', trigger: 'blur' }
+  ],
+  
 })
 
 export const CountadjustPlan = useCrudSchemas(reactive<CrudSchema[]>([

src/views/eam/item/itemApplyMain/index.vue

@@ -39,9 +39,7 @@
     :apiCreate="ItemApplyDetailApi.createItemApplyDetail" :apiUpdate="ItemApplyDetailApi.updateItemApplyDetail"
     :apiPage="ItemApplyDetailApi.getItemApplyDetailPage" :apiDelete="ItemApplyDetailApi.deleteItemApplyDetail"
     @searchTableSuccessDetail="searchTableSuccessDetail" @detailSubmitForm='detailSubmitForm'
-    :isShowAddBtn="isShowAddBtn" 
+    :isShowAddBtn="isShowAddBtn" :detailButtonIsShow="detailButtonIsShow" />
-    :detailButtonIsShow="detailButtonIsShow" 
-     />
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/purchase-main/import" :importTemplateData="importTemplateData"
@@ -84,7 +82,8 @@
           let flag = false;
           if (subList.length > 0) {
             subList.forEach((item) => {
-              if (item.itemNumber == val[0]['itemNumber']) {
+              if (item.itemNumber == val[0]['itemNumber'] &&item.isInAccount == val[0]['isInAccount']
+              ) {
                 flag = true;
               }
             })
@@ -95,7 +94,7 @@
           }
           row[formField] = val[0][searchField]
           row['itemNumber'] = val[0]['itemNumber']
-          row['isRadeIn'] = val[0]['isInAccount']
+          row['isInAccount'] = val[0]['isInAccount']
           row['currentQty'] = val[0]['qty']
           row['available'] = val[0]['available']
         }
@@ -116,7 +115,8 @@
       setV[formField] = val[0][searchField]
       if (formField == 'itemNumber') {
         setV['itemNumber'] = val[0]['itemNumber']
-        setV['isRadeIn'] = val[0]['isInAccount']
+        
+        setV['isInAccount'] = val[0]['isInAccount']
         setV['currentQty'] = val[0]['qty']
         setV['available'] = val[0]['available']
       } else if (formField == 'deviceNumber') {
@@ -228,12 +228,12 @@
   /** 详情操作 */
   const detailRef = ref()
   const openDetail = (row : any, titleName : any, titleValue : any) => {
-    if(row.status!='0'){
+    if (row.status != '0') {
-      isShowAddBtn.value=false
+      isShowAddBtn.value = false
-      detailButtonIsShow.value=true
+      detailButtonIsShow.value = true
-    }else{
+    } else {
-      isShowAddBtn.value=true
+      isShowAddBtn.value = true
-      detailButtonIsShow.value=false
+      detailButtonIsShow.value = false
     }
     detailRef.value.openDetail(row, titleName, titleValue, 'basicItemApplyMain')
   }
@@ -348,7 +348,7 @@
         formRef.dialogVisible = false
         await detailRef.value.getList()
       }
-    }catch {
+    } catch {
     } finally {
       formRef.formLoading = false
     }