rev:手持开发
This commit is contained in:
@@ -31,17 +31,6 @@
|
||||
<!-- >-->
|
||||
<!-- 物料同步-->
|
||||
<!-- </el-button>-->
|
||||
<el-button
|
||||
slot="right"
|
||||
class="filter-item"
|
||||
type="success"
|
||||
icon="el-icon-thumb"
|
||||
size="mini"
|
||||
:loading="showDtlLoading"
|
||||
@click="down"
|
||||
>
|
||||
导出
|
||||
</el-button>
|
||||
</crudOperation>
|
||||
<!--表单组件-->
|
||||
<el-dialog
|
||||
@@ -63,62 +52,6 @@
|
||||
<el-input v-model="form.material_name" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
|
||||
<el-form-item label="物料分类" prop="material_type_id">
|
||||
<el-select
|
||||
v-model="form.material_type_id"
|
||||
filterable
|
||||
size="mini"
|
||||
placeholder="物料分类"
|
||||
class="filter-item"
|
||||
style="width: 200px;"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in classList"
|
||||
:label="item.class_name"
|
||||
:value="item.class_id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="供应商" prop="supp_code">
|
||||
<el-select
|
||||
v-model="form.supp_code"
|
||||
filterable
|
||||
size="mini"
|
||||
placeholder="供应商"
|
||||
class="filter-item"
|
||||
style="width: 200px;"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in suppList"
|
||||
:label="item.supp_name"
|
||||
:value="item.supp_code"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="生产商" prop="produce_name">
|
||||
<el-input v-model="form.produce_name" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="质量代码" prop="quality_code">
|
||||
<el-input v-model="form.quality_code" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="储存条件" prop="storage_conditions">
|
||||
<el-input v-model="form.storage_conditions" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="计量单位" prop="base_unit_id">
|
||||
<el-select
|
||||
@@ -137,6 +70,13 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="物料规格" prop="material_spec">
|
||||
<el-input v-model="form.material_spec" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="是否启用" prop="is_used">
|
||||
<el-radio v-model="form.is_used" label="0">否</el-radio>
|
||||
@@ -147,75 +87,9 @@
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="text" @click="crud.cancelCU">取消</el-button>
|
||||
<!-- <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>-->
|
||||
<el-button type="primary" @click="userDialog = true">复核确认</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<el-dialog
|
||||
title="复核确认"
|
||||
append-to-body
|
||||
width="400px"
|
||||
:visible.sync="userDialog"
|
||||
>
|
||||
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="用户账号" prop="username">
|
||||
<el-input v-model="form.username" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="用户密码" prop="password">
|
||||
<!-- <el-input v-model="form.password" style="width: 200px;" />-->
|
||||
<el-input
|
||||
v-model="form.password"
|
||||
type="password"
|
||||
show-password
|
||||
style="width: 200px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="text" @click="userDialog = false">取消</el-button>
|
||||
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<el-dialog
|
||||
title="复核确认"
|
||||
append-to-body
|
||||
width="400px"
|
||||
:visible.sync="deleteDialog"
|
||||
>
|
||||
<el-form ref="form2" :model="form2" :rules="rules" size="mini" label-width="110px">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="用户账号" prop="username">
|
||||
<el-input v-model="form2.username" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="用户密码" prop="password">
|
||||
<el-input
|
||||
v-model="form2.password"
|
||||
type="password"
|
||||
show-password
|
||||
style="width: 200px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="text" @click="deleteDialog = false">取消</el-button>
|
||||
<el-button type="primary" @click="deleteRow">确认</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
@@ -227,11 +101,7 @@
|
||||
>
|
||||
<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="quality_code" label="质量代码" width="140" />
|
||||
<el-table-column prop="supp_name" label="供应商名称" width="200" />
|
||||
<el-table-column prop="produce_name" label="生产商" width="200" />
|
||||
<el-table-column prop="class_name" label="物料分类" width="140" />
|
||||
<el-table-column prop="storage_conditions" label="储存条件" width="200" />
|
||||
<el-table-column prop="material_spec" label="物料规格" width="140" />
|
||||
<el-table-column prop="unit_name" label="计量单位" />
|
||||
<el-table-column label="启用" align="center" prop="is_used">
|
||||
<template slot-scope="scope">
|
||||
@@ -372,14 +242,8 @@ export default {
|
||||
is_used: [
|
||||
{ required: true, message: '是否启用不能为空', trigger: 'blur' }
|
||||
],
|
||||
supp_code: [
|
||||
{ required: true, message: '供应商不能为空', trigger: 'blur' }
|
||||
],
|
||||
base_unit_id: [
|
||||
{ required: true, message: '计量单位不能为空', trigger: 'blur' }
|
||||
],
|
||||
material_type_id: [
|
||||
{ required: true, message: '物料类别不能为空', trigger: 'blur' }
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -452,14 +316,6 @@ export default {
|
||||
openDelete(row) {
|
||||
this.form2 = row
|
||||
this.deleteDialog = true
|
||||
},
|
||||
deleteRow() {
|
||||
crudMaterial.deleteRow(this.form2).then(res => {
|
||||
this.form2 = {}
|
||||
this.deleteDialog = false
|
||||
this.crud.notify('操作成功!', CRUD.NOTIFICATION_TYPE.SUCCESS)
|
||||
this.crud.toQuery()
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -217,9 +217,9 @@
|
||||
<el-table-column prop="material_pcsn" label="物料批次" :min-width="flexWidth('material_pcsn',crud.data,'物料批次')" />
|
||||
<el-table-column prop="material_qty" label="物料重量" :min-width="flexWidth('material_qty',crud.data,'物料重量')" />
|
||||
<el-table-column prop="unit_name" label="单位" :min-width="flexWidth('unit_name',crud.data,'单位')" />
|
||||
<el-table-column prop="handle_status" label="备注" :min-width="flexWidth('handle_status',crud.data,'备注')" />
|
||||
<el-table-column v-if="false" prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')" />
|
||||
<el-table-column v-if="false" prop="handle_class" label="处理类" :min-width="flexWidth('handle_class',crud.data,'处理类')" />
|
||||
<el-table-column v-if="false" prop="handle_status" label="处理状态" :min-width="flexWidth('handle_status',crud.data,'处理状态')" />
|
||||
<!-- <el-table-column prop="car_no" label="车号" :min-width="flexWidth('car_no',crud.data,'车号')" />-->
|
||||
<!-- <el-table-column prop="task_group_seq" label="任务组顺序号" :min-width="flexWidth('task_group_seq',crud.data,'任务组顺序号')" />-->
|
||||
<el-table-column prop="finished_type" label="任务完成类型" :min-width="flexWidth('finished_type',crud.data,'任务完成类型')">
|
||||
|
||||
Reference in New Issue
Block a user