eam
/
eam-ui
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

master
ljlong_2630 8 months ago
parent
5232de2cb3 096552d3dd
commit
6ea1842202
6 changed files with 97 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/views/eam/basic/item/item.data.ts
  2. 18
      src/views/eam/device/deviceInternalAudit/deviceInternalAudit.data.ts
  3. 77
      src/views/eam/item/itemAccounts/itemAccounts.data.ts
  4. 1
      src/views/eam/item/itemApplyMain/index.vue
  5. 28
      src/views/eam/item/itemApplyMain/itemApplyMain.data.ts
  6. 37
      src/views/home/index.vue

3
src/views/eam/basic/item/item.data.ts
View File

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

18
src/views/eam/device/deviceInternalAudit/deviceInternalAudit.data.ts
View File

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

77
src/views/eam/item/itemAccounts/itemAccounts.data.ts
View File

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

1
src/views/eam/item/itemApplyMain/index.vue
View File

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

28
src/views/eam/item/itemApplyMain/itemApplyMain.data.ts
View File

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

37
src/views/home/index.vue
View File

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

Write Preview
Loading…
Cancel
Save