Merge branch 'master' of http://115.190.214.62:3001/Teams/kunshan-bzfm-mes-vue
This commit is contained in:
@@ -22,6 +22,9 @@
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="工单号" prop="workorder">
|
||||
<el-input v-model="queryParams.workorder" placeholder="请输入工单号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="操作员" prop="operator">
|
||||
<el-select v-model="queryParams.operator" filterable placeholder="请选择操作员">
|
||||
<el-option v-for="item in options.operatorOptions" :key="item.userId" :label="item.nickName" :value="item.nickName"></el-option>
|
||||
@@ -203,8 +206,8 @@
|
||||
</el-col> -->
|
||||
|
||||
<el-col :lg="12">
|
||||
<el-form-item label="关联订单号" prop="orderNo">
|
||||
<el-input v-model="form.orderNo" placeholder="请输入关联订单号" />
|
||||
<el-form-item label="工单号" prop="workorder">
|
||||
<el-input v-model="form.workorder" placeholder="请输入工单号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
@@ -303,7 +306,7 @@ const columns = ref([
|
||||
{ visible: false, align: 'center', type: '', prop: 'unit', label: '计量单位', showOverflowTooltip: true },
|
||||
{ visible: true, align: 'center', type: 'dict', prop: 'transactionType', label: '出库类型', showOverflowTooltip: true },
|
||||
{ visible: false, align: 'center', type: '', prop: 'batchNo', label: '批次号', showOverflowTooltip: true },
|
||||
{ visible: true, align: 'center', type: '', prop: 'orderNo', label: '关联订单号', showOverflowTooltip: true },
|
||||
{ visible: true, align: 'center', type: '', prop: 'workorder', label: '工单号', showOverflowTooltip: true },
|
||||
{ visible: true, align: 'center', type: '', prop: 'operator', label: '操作员', showOverflowTooltip: true },
|
||||
{ visible: false, align: 'center', type: '', prop: 'remarks', label: '备注', showOverflowTooltip: true }
|
||||
//{ visible: false, prop: 'actions', label: '操作', type: 'slot', width: '160' }
|
||||
@@ -421,7 +424,7 @@ function reset() {
|
||||
unit: null,
|
||||
transactionType: null,
|
||||
batchNo: null,
|
||||
orderNo: null,
|
||||
workorder: null,
|
||||
operator: userStore.name, // 自动填充当前登录用户
|
||||
remarks: null,
|
||||
createdTime: null
|
||||
|
||||
Reference in New Issue
Block a user