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

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

@@ -11,6 +11,9 @@ export const ItemRules = reactive({
     { required: true, message: '请选择备件单位', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  classification: [
+    { required: true, message: '请选择备件分类', trigger: 'blur' },
+  ],
 })
 
 export const Item = useCrudSchemas(reactive<CrudSchema[]>([

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

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

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

@@ -78,6 +78,7 @@ export const ItemAccounts = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  
   {
     label: '规格',
     field: 'itemDO.specifications',
@@ -107,6 +108,30 @@ export const ItemAccounts = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '是否存储',
+    field: 'itemDO.isRadeIn',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 110
+    },
+    tableForm: {
+      type: 'Select',
+      inactiveValue: 'FALSE',
+      disabled: true
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
   {
     label: '科目',
     field: 'itemDO.subject',
@@ -164,33 +189,31 @@ export const ItemAccounts = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'itemDO.financer',
     sort: 'custom',
   },
- {
-    label: '是否以旧换新',
-    field: 'itemDO.isRadeIn',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isSearch: false,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'Select',
-      inactiveValue: 'FALSE',
-      disabled: true
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    }
-  },
-  
-  
+ // {
+ //    label: '是否以旧换新',
+ //    field: 'itemDO.isRadeIn',
+ //    dictType: DICT_TYPE.TRUE_FALSE,
+ //    dictClass: 'string',
+ //    isSearch: false,
+ //    isTable: true,
+ //    sort: 'custom',
+ //    table: {
+ //      width: 150
+ //    },
+ //    tableForm: {
+ //      type: 'Select',
+ //      inactiveValue: 'FALSE',
+ //      disabled: true
+ //    },
+ //    form: {
+ //      component: 'Switch',
+ //      value: 'TRUE',
+ //      componentProps: {
+ //        inactiveValue: 'FALSE',
+ //        activeValue: 'TRUE'
+ //      }
+ //    }
+ //  },
   {
     label: '是否可用',
     field: 'available',

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

@@ -115,7 +115,6 @@
       setV[formField] = val[0][searchField]
       if (formField == 'itemNumber') {
         setV['itemNumber'] = val[0]['itemNumber']
-        
         setV['isInAccount'] = val[0]['isInAccount']
         setV['currentQty'] = val[0]['qty']
         setV['available'] = val[0]['available']

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

@@ -23,21 +23,21 @@ export const ItemApplyMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '申领人',
-    field: 'applyName',
+    field: 'applyId',
     sort: 'custom',
     isForm: false,
     isSearch: false,
   },
   {
     label: '审批人',
-    field: 'approveName',
+    field: 'approveId',
     sort: 'custom',
     isForm: false,
     isSearch: false,
   },
   {
     label: '出库人',
-    field: 'outName',
+    field: 'outId',
     sort: 'custom',
     isForm: false,
     isSearch: false,
@@ -260,11 +260,9 @@ export const ItemApplyDetail = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 2
     }
   },
-
-
   {
-    label: '是否可用',
-    field: 'available',
+    label: '是否账内库',
+    field: 'isInAccount',
     sort: 'custom',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
@@ -276,13 +274,16 @@ export const ItemApplyDetail = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm: {
       type: 'Select',
       disabled: true
-    }
+    },
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    },
   },
-
-
   {
-    label: '是否以旧换新',
-    field: 'isRadeIn',
+    label: '是否可用',
+    field: 'available',
     sort: 'custom',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
@@ -294,12 +295,7 @@ export const ItemApplyDetail = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm: {
       type: 'Select',
       disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true,
-      }
-    },
+    }
   },
   {
     label: '备注',

src/views/home/index.vue

@@ -115,17 +115,17 @@
             <ul class="table ul-body">
               <li class="one">设备停机率</li>
               <li class="two orange">0.05%</li>
-              <li class="three green">0</li>
+              <li class="three green">0.06%</li>
             </ul>
             <ul class="table ul-body">
               <li class="one">平均故障回复时间</li>
               <li class="two orange">20</li>
-              <li class="three green">0</li>
+              <li class="three red">10</li>
             </ul>
             <ul class="table ul-body">
               <li class="one">平均故障间隔时间</li>
-              <li class="two orange">20</li>
-              <li class="three green">0</li>
+              <li class="two orange">120</li>
+              <li class="three red">16</li>
             </ul>
           </div>
         </div>
@@ -141,18 +141,18 @@
             </ul>
             <ul class="table ul-body">
               <li class="one">设备停机率</li>
-              <li class="two orange">0.05%</li>
-              <li class="three green">0</li>
+              <li class="two orange">89%</li>
+              <li class="three red">76%</li>
             </ul>
             <ul class="table ul-body">
               <li class="one">平均故障回复时间</li>
-              <li class="two orange">20</li>
-              <li class="three green">0</li>
+              <li class="two orange">88</li>
+              <li class="three red">12</li>
             </ul>
             <ul class="table ul-body">
               <li class="one">平均故障间隔时间</li>
-              <li class="two orange">20</li>
-              <li class="three green">0</li>
+              <li class="two orange">62</li>
+              <li class="three green">90</li>
             </ul>
           </div>
         </div>
@@ -168,18 +168,18 @@
             </ul>
             <ul class="table ul-body">
               <li class="one">设备停机率</li>
-              <li class="two orange">0.05%</li>
-              <li class="three green">0</li>
+              <li class="two orange">19%</li>
+              <li class="three red">16%</li>
             </ul>
             <ul class="table ul-body">
               <li class="one">平均故障回复时间</li>
-              <li class="two orange">20</li>
-              <li class="three green">0</li>
+              <li class="two orange">200</li>
+              <li class="three green">160</li>
             </ul>
             <ul class="table ul-body">
               <li class="one">平均故障间隔时间</li>
-              <li class="two orange">20</li>
-              <li class="three green">0</li>
+              <li class="two orange">140</li>
+              <li class="three green">155</li>
             </ul>
           </div>
         </div>
@@ -426,5 +426,10 @@ onMounted(async () => {
     font-size: 18px;
     font-weight: bold;
   }
+  .red{
+    color: #ff0000;
+    font-size: 18px;
+    font-weight: bold;
+  }
 }
 </style>