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

代码修改

Browse Source
This commit is contained in:
liyongde
2022-12-28 09:58:53 +08:00
parent 803d291204
commit 8464f85667
12 changed files with 77 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lms/nladmin-ui/src/api/wms/pdm/workorder.js
View File

@@ -32,6 +32,14 @@ export function submits(data) {
})
}
export function executes(data) {
return request({
url: 'api/workorder/executes',
method: 'put',
data
})
}
export function getDevice(data) {
return request({
url: 'api/workorder/getDevice',
@@ -96,4 +104,4 @@ export function getDtl(data) {
})
}
export default { add, edit, del, submits, getDevice, getTable, openStart, saveReport, finish, getReportWork, forceFinish, getDtl }
export default { add, edit, del, submits, executes, getDevice, getTable, openStart, saveReport, finish, getReportWork, forceFinish, getDtl }

12
lms/nladmin-ui/src/views/wms/basedata/material/index.vue
View File

@@ -59,7 +59,7 @@
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
<el-row>
<el-col :span="8">
<el-form-item label="物料编码" prop="material_code">
<el-form-item label="物料柜号" prop="material_code">
<el-input v-model="form.material_code" style="width: 200px;" />
</el-form-item>
</el-col>
@@ -125,6 +125,13 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="物料数量" prop="standing_time">
<el-input-number v-model="form.material_qty" :controls="false" :min="0" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -140,9 +147,10 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="material_code" label="物料编码" width="160" />
<el-table-column prop="material_code" label="物料柜号" width="160" />
<el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" width="140" />
<el-table-column prop="material_qty" label="物料数量" width="100" />
<el-table-column prop="material_model" label="物料型号" />
<el-table-column prop="class_name" label="物料分类" width="140" />
<el-table-column prop="unit_name" label="计量单位" />

9
lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
View File

@@ -157,7 +157,7 @@
/>
</el-form-item>
<el-form-item label="计划数量" prop="plan_qty">
<el-input v-model="form.plan_qty" style="width: 200px;" />
<el-input v-model="form.plan_qty" style="width: 200px;" disabled/>
</el-form-item>
<el-form-item label="载具类型" prop="vehicle_type">
<el-select v-model="form.vehicle_type" style="width: 200px" filterable placeholder="请选择">
@@ -298,7 +298,7 @@
</template>
<script>
import crudWorkorder from '@/api/wms/pdm/workorder'
import crudWorkorder, { executes } from '@/api/wms/pdm/workorder'
import CRUD, { presenter, header, form, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
@@ -454,6 +454,7 @@ export default {
this.form.material_code = row.material_code
this.form.material_name = row.material_name
this.form.material_spec = row.material_spec
this.form.plan_qty = row.material_qty
},
tableChanged(row) {
this.form.device_id = row.device_id
@@ -461,8 +462,8 @@ export default {
},
// 下发
submits(row) {
crudWorkorder.submits({ workorder_id: row.workorder_id }).then(res => {
this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
crudWorkorder.executes({ workorder_id: row.workorder_id }).then(res => {
this.crud.notify('执行成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
}

5
lms/nladmin-ui/src/views/wms/pub/MaterDialog.vue
View File

@@ -58,8 +58,9 @@
<el-table-column prop="material_code" label="物料编码" min-width="150" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" min-width="200" show-overflow-tooltip />
<el-table-column prop="material_spec" label="规格" show-overflow-tooltip />
<el-table-column prop="material_model" label="型号" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" show-overflow-tooltip />
<el-table-column prop="material_model" label="物料型号" show-overflow-tooltip />
<el-table-column prop="material_qty" label="物料数量" width="100" />
<el-table-column prop="class_code" label="分类编码" show-overflow-tooltip />
<el-table-column prop="class_name" label="物料分类" show-overflow-tooltip />
<el-table-column prop="unit_name" label="计量单位" />