Commit 76379a2e authored by 沈翠玲's avatar 沈翠玲

1、生产报工回显中文 nickName

2、搜索 报工人nickName字段
3、报工时间加时分秒
parent fc6fffd4
......@@ -51,9 +51,9 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="报工人" prop="userName">
<el-form-item label="报工人" prop="nickName">
<el-input
v-model="queryParams.userName"
v-model="queryParams.nickName"
placeholder="请输入报工人名称"
clearable
@keyup.enter.native="handleQuery"
......@@ -143,7 +143,7 @@
<el-table-column label="报工人" width="100" align="center" prop="nickName" />
<el-table-column label="报工时间" align="center" prop="feedbackTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.feedbackTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.feedbackTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="审核人" width="100" align="center" prop="recordNick" />
......@@ -263,34 +263,24 @@
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.isCheck == 'N'">
<el-row>
<el-col :span="8">
<el-form-item label="报工数量" prop="quantityFeedback">
<el-input readonly="readonly" v-model="form.quantityFeedback" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合格品数量" prop="quantityQualified">
<el-input-number :min="0" @change="handleQuantityChanged" v-model="form.quantityQualified" placeholder="请输入合格品数量" />
<el-form-item label="良品报工" prop="quantityQualify">
<el-input-number :min="0" @change="handleQuantityChanged" v-model="form.quantityQualify" placeholder="请输入良品报工" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不良品数量" prop="quantityUnquanlified">
<el-input-number :min="0" @change="handleQuantityChanged" v-model="form.quantityUnquanlified" placeholder="请输入不良品数量" />
<el-form-item label="不良品报工" prop="quantityUnqualify">
<el-input-number :min="0" @change="handleQuantityChanged" v-model="form.quantityUnqualify" placeholder="请输入不良品报工" />
</el-form-item>
</el-col>
</el-row>
<el-row v-else>
<el-col :span="8">
<el-form-item label="报工数量" prop="quantityFeedback">
<el-input readonly="readonly" v-model="form.quantityFeedback" />
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="待检测数量" prop="quantityUncheck">
<el-input-number :min="0" @change="handleQuantityChanged" v-model="form.quantityUncheck" placeholder="请输入待检测数量" />
</el-form-item>
</el-col> -->
<el-row>
<el-col :span="8">
<el-form-item label="加工工时" prop="machineTime">
<el-input-number :min="0" v-model="form.machineTime" placeholder="请输入加工工时" />
......@@ -299,8 +289,8 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="报工人" prop="userName">
<el-input v-model="form.userName" placeholder="请选择报工人" >
<el-form-item label="报工人" prop="nickName">
<el-input v-model="form.nickName" placeholder="请选择报工人" >
<el-button slot="append" @click="handleUserSelect" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
......@@ -310,8 +300,8 @@
<el-form-item label="报工时间" prop="feedbackTime">
<el-date-picker clearable
v-model="form.feedbackTime"
type="date"
value-format="yyyy-MM-dd"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择报工时间">
</el-date-picker>
</el-form-item>
......@@ -400,8 +390,8 @@ export default {
specification: null,
quantity: null,
quantityFeedback: null,
quantityQualified: null,
quantityUnquanlified: null,
quantityQualify: null,
quantityUnqualify: null,
feedbackTime: null,
userName: null,
nickName: null,
......@@ -497,12 +487,12 @@ export default {
quantity: 0,
machineTime: 0,
quantityFeedback: 0,
quantityQualified: 0,
quantityUnquanlified: 0,
quantityQualify: 0,
quantityUnqualify: 0,
userName: null,
nickName: null,
feedbackChannel: null,
feedbackTime: dayjs().format('YYYY-MM-DD'),
feedbackTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
recordUser: null,
recordNick: null,
status: "PREPARE",
......@@ -519,7 +509,7 @@ export default {
this.resetForm("form");
},
handleQuantityChanged(){
this.form.quantityFeedback = this.form.quantityQualified + this.form.quantityUnquanlified;
this.form.quantityFeedback = this.form.quantityQualify + this.form.quantityUnqualify;
},
/** 搜索按钮操作 */
handleQuery() {
......@@ -550,6 +540,9 @@ export default {
const recordId = row.recordId || this.ids
getFeedback(recordId).then(response => {
this.form = response.data;
if(dayjs(response.data.feedbackTime, 'YYYY-MM-DD', true).isValid()){
this.form.feedbackTime = response.data.feedbackTime + ' 00:00:00'
}
this.open = true;
this.title = "修改生产报工记录";
this.optType = "edit";
......@@ -561,6 +554,9 @@ export default {
const recordId = row.recordId || this.ids;
getFeedback(recordId).then(response => {
this.form = response.data;
if(dayjs(response.data.feedbackTime, 'YYYY-MM-DD', true).isValid()){
this.form.feedbackTime = response.data.feedbackTime + ' 00:00:00'
}
this.open = true;
this.title = "查看生产报工单信息";
this.optType = "view";
......@@ -686,8 +682,8 @@ export default {
if(row.isCheck == 'N'){
this.form.quantityUncheck = 0;
}else {
this.form.quantityQualified =0;
this.form.quantityUnquanlified = 0;
this.form.quantityQualify =0;
this.form.quantityUnqualify = 0;
}
}
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment