root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zds
2022-10-14 12:17:51 +08:00
parent 91a9c53d5a
commit 89f4859034
7 changed files with 168 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mes/qd/src/views/wms/basedata/em/equipmentfile/AddDialog.vue
View File

@@ -126,6 +126,21 @@
/>
</el-select>
</el-form-item>
<el-form-item label="设备等级" prop="device_level">
<el-select
v-model="form.device_level"
placeholder="设备等级"
style="width: 210px"
class="filter-item"
>
<el-option
v-for="item in dict.device_level"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="内部自编号" prop="extend_code">
<label slot="label">内部自编号:</label>
<el-input v-model="form.extend_code" clearable style="width: 210px" />
@@ -283,6 +298,7 @@ const defaultForm = {
setting_place: '',
device_bom_id: '',
theory_beat: '',
device_level: '',
oraginal_value: '',
net_amount: '',
remark: ''
@@ -297,7 +313,7 @@ export default {
default: false
}
},
dicts: ['device_type', 'workorder_type', 'is_produceuse', 'device_status'],
dicts: ['device_type', 'workorder_type', 'is_produceuse', 'device_status', 'device_level'],
data() {
return {
dialogVisible: false,

18
mes/qd/src/views/wms/basedata/em/equipmentfile/ViewDialog.vue
View File

@@ -111,6 +111,22 @@
/>
</el-select>
</el-form-item>
<el-form-item label="设备等级" prop="device_level">
<el-select
v-model="form.device_level"
placeholder="设备等级"
style="width: 210px"
disabled
class="filter-item"
>
<el-option
v-for="item in dict.device_level"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="内部自编号" prop="extend_code">
<label slot="label">内部自编号:</label>
<el-input v-model="form.extend_code" disabled style="width: 210px" />
@@ -233,7 +249,7 @@ export default {
type: Object
}
},
dicts: ['device_type', 'workorder_type', 'is_produceuse', 'device_status'],
dicts: ['device_type', 'workorder_type', 'is_produceuse', 'device_status', 'device_level'],
data() {
return {
dialogVisible: false,

125
mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue
View File

@@ -66,18 +66,6 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="启用日期">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
@input="onInput()"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
</el-form-item>
<el-form-item label="所属工序">
<el-select
v-model="query.workprocedure_id"
@@ -129,6 +117,35 @@
/>
</el-select>
</el-form-item>
<el-form-item label="设备等级">
<el-select
v-model="query.device_level"
clearable
style="width: 200px"
placeholder="设备等级"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.device_level"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="启用日期">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@input="onInput()"
@change="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
</div>
@@ -143,7 +160,7 @@
:disabled="sub_flag"
@click="submit('10')"
>
启用
启用
</el-button>
<el-button
slot="right"
@@ -165,7 +182,7 @@
size="mini"
@click="openWork"
>
档案维护
档案维护
</el-button>
<el-button
slot="right"
@@ -195,6 +212,7 @@
size="mini"
:data="crud.data"
style="width: 100%;"
:cell-style="cellstyle"
:highlight-current-row="true"
@selection-change="mySelectionChange"
>
@@ -219,30 +237,31 @@
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.device_code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="device_name" min-width="150" label="设备名称"/>
<el-table-column prop="extend_code" min-width="100" label="内部自编号"/>
<el-table-column prop="device_model" min-width="130" label="设备型号"/>
<el-table-column prop="device_spec" min-width="130" label="设备规格"/>
<el-table-column prop="device_name" min-width="150" label="设备名称" />
<el-table-column prop="extend_code" min-width="100" label="内部自编号" />
<el-table-column prop="device_model" min-width="130" label="设备型号" />
<el-table-column prop="device_spec" min-width="130" label="设备规格" />
<el-table-column prop="device_level" min-width="70" label="设备等级" :formatter="device_levelFormat" />
<el-table-column prop="material_type_name" min-width="150" label="设备类别" />
<el-table-column :formatter="is_produceuseFormat" min-width="70" prop="is_produceuse" label="生产用途" />
<el-table-column :formatter="stateFormat" min-width="70" prop="status" label="设备状态" />
<el-table-column prop="beginuse_date" min-width="90" label="启用日期"/>
<el-table-column prop="use_deptname" min-width="130" label="使用部门"/>
<el-table-column prop="use_groupname" min-width="130" label="使用班组"/>
<el-table-column prop="supplier_name" min-width="180" label="供应商" show-overflow-tooltip/>
<el-table-column prop="manufacturer" min-width="180" label="制造商" show-overflow-tooltip/>
<el-table-column prop="country_manufactur" min-width="90" label="制造国别"/>
<el-table-column prop="leavefactory_date" min-width="80" label="出厂日期" show-overflow-tooltip/>
<el-table-column prop="leavefactory_number" min-width="130" label="出厂编号" show-overflow-tooltip/>
<el-table-column prop="drawing_number" min-width="130" label="图号" show-overflow-tooltip/>
<el-table-column prop="device_type" min-width="70" label="设备属性" :formatter="device_typeFormat" show-overflow-tooltip/>
<el-table-column prop="workprocedure_id" min-width="70" label="工序" :formatter="seriesFormat2" show-overflow-tooltip/>
<el-table-column prop="assets_code" min-width="100" label="资产编码" show-overflow-tooltip/>
<el-table-column prop="assets_name" min-width="150" label="资产名称" show-overflow-tooltip/>
<el-table-column prop="create_name" min-width="90" label="生成人" show-overflow-tooltip/>
<el-table-column prop="create_time" min-width="140" label="生成时间" show-overflow-tooltip/>
<el-table-column prop="update_optname" min-width="90" label="修改人" show-overflow-tooltip/>
<el-table-column prop="update_time" min-width="140" label="修改时间" show-overflow-tooltip/>
<el-table-column :formatter="is_produceuseFormat" min-width="70" prop="is_produceuse" label="生产用途" />
<el-table-column :formatter="stateFormat" min-width="70" prop="status" label="设备状态" />
<el-table-column prop="beginuse_date" min-width="90" label="启用日期" />
<el-table-column prop="use_deptname" min-width="130" label="使用部门" />
<el-table-column prop="use_groupname" min-width="130" label="使用班组" />
<el-table-column prop="supplier_name" min-width="180" label="供应商" show-overflow-tooltip />
<el-table-column prop="manufacturer" min-width="180" label="制造商" show-overflow-tooltip />
<el-table-column prop="country_manufactur" min-width="90" label="制造国别" />
<el-table-column prop="leavefactory_date" min-width="80" label="出厂日期" show-overflow-tooltip />
<el-table-column prop="leavefactory_number" min-width="130" label="出厂编号" show-overflow-tooltip />
<el-table-column prop="drawing_number" min-width="130" label="图号" show-overflow-tooltip />
<el-table-column prop="device_type" min-width="70" label="设备属性" :formatter="device_typeFormat" show-overflow-tooltip />
<el-table-column prop="workprocedure_id" min-width="70" label="工序" :formatter="seriesFormat2" show-overflow-tooltip />
<el-table-column prop="assets_code" min-width="100" label="资产编码" show-overflow-tooltip />
<el-table-column prop="assets_name" min-width="150" label="资产名称" show-overflow-tooltip />
<el-table-column prop="create_name" min-width="90" label="生成人" show-overflow-tooltip />
<el-table-column prop="create_time" min-width="140" label="生成时间" show-overflow-tooltip />
<el-table-column prop="update_optname" min-width="90" label="修改人" show-overflow-tooltip />
<el-table-column prop="update_time" min-width="140" label="修改时间" show-overflow-tooltip />
</el-table>
<!--分页组件-->
<pagination />
@@ -275,7 +294,7 @@ import { download } from '@/api/data'
import { downloadFile } from '@/utils'
export default {
name: 'equipmentfile',
name: 'Equipmentfile',
components: { Treeselect, ChangeDialog, ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination },
cruds() {
return CRUD({ title: '设备档案', idField: 'devicerecord_id', url: 'api/equipmentfile', crudMethod: { ...equipmentfile },
@@ -290,7 +309,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['workorder_status', 'workorder_type', 'product_series', 'device_type', 'is_produceuse', 'device_status'],
dicts: ['device_level', 'workorder_status', 'workorder_type', 'product_series', 'device_type', 'is_produceuse', 'device_status'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -421,10 +440,13 @@ export default {
this.open_flag = true
}
}
}else{
} else {
this.handleCurrentChange()
}
},
device_levelFormat(row) {
return this.dict.label.device_level[row.device_level]
},
stateFormat(row) {
return this.dict.label.device_status[row.status]
},
@@ -449,18 +471,18 @@ export default {
},
submit(status) {
this.checkrows = this.$refs.table.selection
if(this.checkrows.length === 0 ){
if (this.checkrows.length === 0) {
this.crud.notify('请勾选需要操作的记录！')
return false
}
equipmentfile.submit({ 'status': status, rows: this.checkrows}).then(res => {
equipmentfile.submit({ 'status': status, rows: this.checkrows }).then(res => {
this.crud.notify('操作成功！')
this.querytable()
})
},
openWork(row) {
this.checkrows = this.$refs.table.selection
if(this.checkrows.length === 0 ){
if (this.checkrows.length === 0) {
this.crud.notify('请勾选一条需要操作的记录！')
return false
}
@@ -480,6 +502,22 @@ export default {
crud.downloadLoading = false
})
},
cellstyle({ row, column, rowIndex, columnIndex }) {
const stylejson = {}
if (column.label === '设备等级') {
if (row.device_level === 'A') {
stylejson.background = 'red'
stylejson.color = 'white'
} else if (row.device_level === 'B') {
stylejson.background = 'blue'
stylejson.color = 'white'
} else if (row.device_level === 'C') {
stylejson.background = 'green'
stylejson.color = 'white'
}
return stylejson
}
},
printCard() {
const _selectData = this.$refs.table.selection
if (_selectData.length > 1 || _selectData.length === 0) {
@@ -578,7 +616,6 @@ export default {
color: "#CCCFD6";
}
.vue-treeselect--has-value .vue-treeselect__input {