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-11-28 18:19:59 +08:00
parent fb88546733
commit 7b1f9fb61f
27 changed files with 240 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
mes/qd/src/views/wms/basedata/master/storagevehicleinfo/index.vue
View File

@@ -121,27 +121,10 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="storagevehicle_id" label="载具标识" />
<el-table-column prop="storagevehicle_type_name" label="载具类型" />
<el-table-column prop="storagevehicle_code" label="载具编码" />
<el-table-column prop="storagevehicle_name" label="载具名称" />
<el-table-column label="是否启用" align="center" prop="is_used">
<template slot-scope="scope">
<el-switch
:value="format_is_used(scope.row.is_used)"
active-color="#409EFF"
inactive-color="#F56C6C"
@change="changeEnabled(scope.row, scope.row.is_used)"
/>
</template>
</el-table-column>
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" />
<el-table-column
v-permission="['admin','storagevehicleinfo:edit','storagevehicleinfo:del']"
label="操作"
width="50px"
min-width="90px"
align="center"
fixed="right"
>
@@ -153,6 +136,22 @@
/>
</template>
</el-table-column>
<el-table-column type="selection" width="55" />
<el-table-column prop="storagevehicle_type_name" label="载具类型" min-width="120" />
<el-table-column prop="storagevehicle_code" label="载具编码" min-width="120" />
<el-table-column prop="storagevehicle_name" label="载具名称" min-width="120" />
<el-table-column label="是否启用" align="center" prop="is_used" min-width="120" >
<template slot-scope="scope">
<el-switch
:value="format_is_used(scope.row.is_used)"
active-color="#409EFF"
inactive-color="#F56C6C"
@change="changeEnabled(scope.row, scope.row.is_used)"
/>
</template>
</el-table-column>
<el-table-column prop="create_name" label="创建人" min-width="120" />
<el-table-column prop="create_time" label="创建时间" width="150" />
</el-table>
<!--分页组件-->
<pagination />

24
mes/qd/src/views/wms/basedata/pdm/productProcessParam/index.vue
View File

@@ -24,11 +24,11 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="material_code" label="物料编码" min-width="100" show-overflow-tooltip fixed />
<el-table-column prop="material_name" label="物料名称" min-width="100" show-overflow-tooltip fixed />
<el-table-column prop="material_code" label="物料编码" min-width="130" fixed />
<el-table-column prop="material_name" label="物料名称" min-width="100" fixed />
<template v-for="(col,index) in cols">
<el-table-column v-if="col.isVisiable" :prop="col.prop" :label="col.label" width="130px" show-overflow-tooltip />
<el-table-column v-if="col.isVisiable" :prop="col.prop" :label="col.label" width="130px" />
</template>
<el-table-column v-permission="[]" label="操作" fixed="right" width="150px" align="center">
<template slot-scope="scope">
@@ -40,7 +40,7 @@
/>
</div>
<div class="btn2">
<el-button slot="left" type="danger" icon="el-icon-delete" size="mini" @click="delid(scope.row)" />
<el-button slot="left" type="text" icon="el-icon-delete" size="mini" @click="delid(scope.row)" >删除</el-button>
</div>
</template>
</el-table-column>
@@ -62,6 +62,7 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import SetDialog from '@/views/wms/basedata/pdm/productProcessParam/SetDialog'
import crudBagrecord from '@/api/wms/basedata/master/bagrecord'
export default {
name: 'ProductProcessParam',
@@ -148,10 +149,17 @@ export default {
return false
},
delid(row) {
const ids = row.material_id
crudProductProcessParam.del(ids).then(res => {
this.crud.toQuery()
this.crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
const msg = '是否确认删除？'
this.$confirm(msg, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
row.workprocedure_code = this.workprocedure_code
crudProductProcessParam.del(row).then(res => {
this.crud.toQuery()
this.crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
})
}
}

119
mes/qd/src/views/wms/basedata/st/stor/index.vue
View File

@@ -312,10 +312,10 @@ export default {
methods: {
// 新增与编辑前做的操作
[CRUD.HOOK.afterToCU](crud, form) {
if (form.id == null) {
if (form.stor_id == null) {
this.getDepts()
} else {
this.getSupDepts(form.dept.id)
this.getSupDepts(form.sysdeptid)
}
},
[CRUD.HOOK.beforeSubmit](crud, form) {
@@ -369,7 +369,9 @@ export default {
})
},
getSupDepts(deptId) {
getDeptSuperior(deptId).then(res => {
const ids = []
ids.push(deptId)
getDeptSuperior(ids).then(res => {
const date = res.content
this.buildDepts(date)
this.depts = date
@@ -408,6 +410,115 @@ export default {
}
</script>
<style scoped>
<style rel="stylesheet/scss" lang="scss" scoped>
::v-deep {
.vue-treeselect__menu {
overflow-x: auto !important;
width: 300px;
max-height: 300px !important;
}
.vue-treeselect__label {
overflow: unset;
text-overflow: unset;
}
.vue-treeselect__control {
height: 20px !important;
}
.vue-treeselect__multi-value-item-container,
.vue-treeselect--has-value .vue-treeselect__multi-value {
height: 30px;
line-height: 24px;
padding: 0;
}
.vue-treeselect__limit-tip,
.vue-treeselect--searchable.vue-treeselect--multi.vue-treeselect--has-value
.vue-treeselect__input-container {
padding-top: 0;
}
.vue-treeselect--has-value .vue-treeselect__multi-value {
// margin-bottom: 15px;
}
.vue-treeselect__placeholder,
.vue-treeselect__single-value {
height: 28px;
line-height: 32px;
font-size: small;
color: "#CCCFD6";
}
.vue-treeselect--has-value .vue-treeselect__input {
height: 18px !important;
line-height: 18px !important;
}
.vue-treeselect div,
.vue-treeselect span {
box-sizing: content-box;
}
// 选中后的溢出隐藏
.vue-treeselect__multi-value-label {
display: block;
width: 140px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.vue-treeselect__value-container {
display: block;
height: 32px;
}
}
</style>

12
mes/qd/src/views/wms/pdm/base/productRoute/index.vue
View File

@@ -82,18 +82,18 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column prop="status_name" label="工艺路线状态"/>
<el-table-column prop="processroute_code" label="工艺路线编码">
<el-table-column prop="status_name" min-width="120" label="工艺路线状态"/>
<el-table-column prop="processroute_code" min-width="120" label="工艺路线编码">
<template slot-scope="scope">
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.processroute_code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="processroute_name" label="工艺路线名称"/>
<el-table-column prop="material_code" label="产品编码" min-width="120" show-overflow-tooltip/>
<el-table-column prop="processroute_name" label="工艺路线名称" min-width="120" />
<el-table-column prop="material_code" label="产品编码" min-width="140" />
<el-table-column prop="create_name" label="创建人"/>
<el-table-column prop="create_time" label="创建时间" show-overflow-tooltip min-width="130"/>
<el-table-column prop="create_time" label="创建时间" min-width="140"/>
<el-table-column prop="audit_optname" label="审核人"/>
<el-table-column prop="audit_time" label="审核时间" show-overflow-tooltip min-width="130"/>
<el-table-column prop="audit_time" label="审核时间" min-width="140"/>
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation

2
mes/qd/src/views/wms/pub/PointDialog.vue
View File

@@ -144,7 +144,7 @@ export default {
},
open() {
this.crud.query.ids = this.areaType
this.crud.query.lock_type = this.lock
this.crud.query.lock = this.lock
checkoutbill.schAreaType({ ids: this.areaType }).then(res => {
this.sch_area_type = res
})

6
mes/qd/src/views/wms/pub/StructDialog.vue
View File

@@ -79,7 +79,7 @@ export default {
url: 'api/structattr',
idField: 'struct_id',
sort: 'struct_id,desc',
query: { search: '', is_lock: '1', lock_type: '',sect_id: '', stor_id: '' },
query: { search: '', is_lock: '1', lock: '',sect_id: '', stor_id: '' },
crudMethod: { ...crudStructattr }
})
},
@@ -128,7 +128,7 @@ export default {
this.lock = '00'
},
[CRUD.HOOK.beforeRefresh]() {
this.query.lock_type = this.lock
this.query.lock = this.lock
return true
},
open() {
@@ -152,7 +152,7 @@ export default {
}
}
this.query.is_lock = '1'
this.query.lock_type = this.lock
this.query.lock = this.lock
this.query.is_used = '1'
this.crud.toQuery()
},

6
mes/qd/src/views/wms/sb/inbill/StructDialog.vue
View File

@@ -79,7 +79,7 @@ export default {
url: 'api/structattr',
idField: 'struct_id',
sort: 'struct_id,desc',
query: { search: '', is_lock: '1', lock_type: '',sect_id: '', stor_id: '' },
query: { search: '', is_lock: '1', lock: '',sect_id: '', stor_id: '' },
crudMethod: { ...crudStructattr }
})
},
@@ -128,7 +128,7 @@ export default {
this.lock = '00'
},
[CRUD.HOOK.beforeRefresh]() {
this.query.lock_type = this.lock
this.query.lock = this.lock
return true
},
open() {
@@ -152,7 +152,7 @@ export default {
}
}
this.query.is_lock = '1'
this.query.lock_type = this.lock
this.query.lock = this.lock
this.query.is_used = '1'
this.crud.toQuery()
},

2
mes/qd/src/views/wms/st/core/inbill/rawassist/StructUpdateDialog.vue
View File

@@ -187,7 +187,7 @@ export default {
},
methods: {
[CRUD.HOOK.beforeRefresh]() {
this.crud.query.lock_type = '00'
this.crud.query.lock = '00'
},
open() {
crudSectattr.getSect({ 'is_materialstore': '1', 'sect_type_attr': '00' }).then(res => {