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

Merge branch 'master' of http://121.40.234.130:8899/root/hl_one

Browse Source 
# Conflicts:
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java
#	mes/qd/src/views/wms/old_manage/old_package/index.vue
This commit is contained in:
ZHOUZ\Noble'lift
2023-05-26 16:29:08 +08:00
parent 40ec3496ff 5dc0a51695
commit effd8d5c79
118 changed files with 3786 additions and 1974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mes/qd/src/views/wms/scheduler_manage/scheduler/index.vue
View File

@@ -10,8 +10,8 @@
width="500px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="物料系列/生产区域" prop="code">
<el-input v-model="form.rule_code" style="width: 370px;" />
<el-form-item label="物料系列" prop="code">
<el-input v-model="form.material_spec" style="width: 370px;" />
</el-form-item>
<el-form-item label="工序调度编号">
<el-input v-model="form.process_id" style="width: 370px;" />
@@ -52,7 +52,7 @@
@current-change="handleCurrentChange"
>
<el-table-column type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="rule_code" label="物料系列" />
<el-table-column show-overflow-tooltip prop="material_spec" label="物料系列" />
<el-table-column show-overflow-tooltip prop="process_id" label="工序调度编号" />
<el-table-column show-overflow-tooltip prop="process_name" label="工序调度名称" />
<el-table-column
@@ -84,14 +84,14 @@ import pagination from '@crud/Pagination'
import rrOperation from '@crud/RR.operation'
import udOperation from '@crud/UD.operation'
const defaultForm = { rule_code: null, process_id: null, process_name: null }
const defaultForm = { material_spec: null, process_id: null, process_name: null }
export default {
name: 'SchedulerRoute',
components: { crudOperation, pagination, rrOperation, udOperation },
cruds() {
return [
CRUD({ title: '物料对应工序调度', url: '/api/shceduler/route', idField: 'rule_code', crudMethod: { ...crudRoute }})
CRUD({ title: '物料对应工序调度', url: '/api/shceduler/route', idField: 'material_spec', crudMethod: { ...crudRoute }})
]
},
mixins: [presenter(), header(), form(defaultForm)],
@@ -102,7 +102,7 @@ export default {
{ key: 'description', display_name: '描述' }
],
rules: {
rule_code: [
material_spec: [
{ required: true, message: '请输入编码', trigger: 'blur' }
]
},