Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
This commit is contained in:
曹前明
commit
ea69946fca
|
|
@ -160,7 +160,7 @@
|
|||
</el-form-item>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="编号">
|
||||
<el-input v-model="number" @input="checkValue" placeholder="编号"/>
|
||||
<el-input v-model="numbers" @input="checkValue" placeholder="编号"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
|
|
@ -211,7 +211,7 @@
|
|||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
number: {
|
||||
numbers: {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
|
|
@ -307,7 +307,7 @@
|
|||
},
|
||||
methods: {
|
||||
checkValue() {
|
||||
this.number = this.number.replace(/[^0-9a-zA-Z]/g, '');
|
||||
this.numbers = this.numbers.replace(/[^0-9a-zA-Z]/g, '');
|
||||
},
|
||||
filterBlock(rule, index, field_key) {
|
||||
let that = this;
|
||||
|
|
@ -719,6 +719,7 @@
|
|||
}
|
||||
},
|
||||
fieldData() {
|
||||
debugger;
|
||||
let that = this;
|
||||
that.field = []; //检查项目
|
||||
that.formData.forEach((item) => {
|
||||
|
|
@ -740,7 +741,7 @@
|
|||
that.testrecord.record_data = that.field;//检查项列表
|
||||
that.testrecord.is_testok = that.is_testok;//检查表检查结果
|
||||
that.testrecord.id = that.recordId;//记录id
|
||||
that.testrecord.number = that.number;//编号
|
||||
that.testrecord.number = that.numbers;//编号
|
||||
that.testrecord.remark = that.remark;//备注
|
||||
if (that.index === '2') {//提交
|
||||
this.$emit('recordSubmit', that.testrecord);
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@
|
|||
>
|
||||
<template slot-scope="scope">
|
||||
<el-link
|
||||
v-if="checkPermission(['plan_toggle'])&&scope.row.state !== 70"
|
||||
v-if="checkPermission(['plan_toggle'])&&scope.row.state!==70&&scope.row.state!==80"
|
||||
type="warning"
|
||||
@click="handlestatesuspended(scope)"
|
||||
>
|
||||
|
|
@ -101,6 +101,7 @@
|
|||
>
|
||||
启用
|
||||
</el-link>
|
||||
<!--暂停时才能终止-->
|
||||
<el-link
|
||||
v-if="checkPermission(['plan_stop'])&&scope.row.state === 70"
|
||||
type="danger"
|
||||
|
|
@ -116,7 +117,7 @@
|
|||
查看子计划
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="checkPermission(['plan_subcreate'])&&!scope.row.is_planed"
|
||||
v-if="checkPermission(['plan_subcreate'])&&!scope.row.is_planed&&scope.row.state!==70&&scope.row.state!==80"
|
||||
type="primary"
|
||||
@click="handleWork(scope)"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -69,14 +69,14 @@
|
|||
>
|
||||
<template slot-scope="scope">
|
||||
<el-link
|
||||
v-if="scope.row.state===10&&checkPermission['subplan_issue']"
|
||||
v-if="scope.row.state===10&&checkPermission(['subplan_issue'])&&scope.row.production_plan_.state!==70&&scope.row.production_plan_.state!==80"
|
||||
type="primary"
|
||||
@click="handleclick(scope)"
|
||||
>
|
||||
修改日期
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="scope.row.state===10&&checkPermission['subplan_issue']"
|
||||
v-if="scope.row.state===10&&checkPermission(['subplan_issue'])&&scope.row.production_plan_.state!==70&&scope.row.production_plan_.state!==80"
|
||||
type="primary"
|
||||
@click="handleissuedclick(scope)"
|
||||
>
|
||||
|
|
@ -244,7 +244,10 @@
|
|||
20: '已下达',
|
||||
30: '已接受',
|
||||
40: '生产中',
|
||||
50: '已完成'
|
||||
50: '已完成',
|
||||
60: "军检完成",
|
||||
70: "暂停",
|
||||
80: "终止",
|
||||
}
|
||||
};
|
||||
},
|
||||
|
|
|
|||
|
|
@ -521,7 +521,7 @@
|
|||
:formID="recordform"
|
||||
:wproduct="wproduct"
|
||||
:remark="remark"
|
||||
:number="number"
|
||||
:numbers="numbers"
|
||||
:recordId="recordId"
|
||||
:isDisabled="isDisabled"
|
||||
:isMidTesting="is_midtesting"
|
||||
|
|
@ -939,7 +939,7 @@
|
|||
{text: '镀膜', value: '镀膜'}, {text: '断膜', value: '断膜'}, {text: '汇流条制备', value: '汇流条制备'},
|
||||
{text: '夹层', value: '夹层'}, {text: '包边', value: '包边'}],
|
||||
remark:'',
|
||||
number:'',
|
||||
numbers:null,
|
||||
};
|
||||
},
|
||||
computed: {},
|
||||
|
|
@ -1231,6 +1231,8 @@
|
|||
that.innerIndex = index;
|
||||
// this.outerVisible = true;
|
||||
that.wproduct = scope.row.id;//半成品ID
|
||||
this.numbers = null;
|
||||
this.remark = '';
|
||||
that.listQueryrecordform.material = scope.row.material;
|
||||
if (index === '3') {
|
||||
that.listQueryrecordform.type = 40;
|
||||
|
|
@ -1280,13 +1282,14 @@
|
|||
|
||||
//点击记录里的检验
|
||||
handleInspectionRecord(scope) {
|
||||
debugger;
|
||||
let that = this;
|
||||
that.fieldList = [];
|
||||
that.recordVisible = false;
|
||||
that.recordId = scope.row.id;
|
||||
that.recordform = scope.row.form;
|
||||
that.number = scope.row.number;
|
||||
that.remark = scope.row.remark;
|
||||
that.numbers = scope.row.number?scope.row.number:null;
|
||||
that.remark = scope.row.remark?scope.row.remark:'';
|
||||
that.formName = scope.row.form_.name;
|
||||
if (that.innerIndex !== '2') {//非复检
|
||||
getrffieldList({form: this.recordform, enabled: true, page: 1, page_size: 100}).then((response) => {
|
||||
|
|
@ -1370,8 +1373,8 @@
|
|||
that.recordFinishedVisible = true;
|
||||
that.formName = res.data.form_.name;
|
||||
that.fieldList = res.data.record_data;
|
||||
that.number = res.data.number;
|
||||
that.remark = res.data.remark;
|
||||
that.numbers = res.data.number?res.data.number:'';
|
||||
that.remark = res.data.remark?res.data.remark:'';
|
||||
}
|
||||
})
|
||||
},
|
||||
|
|
@ -1507,8 +1510,12 @@
|
|||
let params = {};
|
||||
params.record_data = value.record_data;
|
||||
params.is_testok = value.is_testok;
|
||||
if(value.number){
|
||||
params.number = value.number;
|
||||
}
|
||||
if(value.remark){
|
||||
params.remark = value.remark;
|
||||
}
|
||||
putTestRecordItem(id, params).then((res) => {
|
||||
if (res.code >= 200) {
|
||||
that.recordVisible = false;
|
||||
|
|
@ -1533,8 +1540,13 @@
|
|||
params.id = value.id;
|
||||
params.is_testok = value.is_testok;
|
||||
params.record_data = value.record_data;
|
||||
debugger;
|
||||
if(value.number){
|
||||
params.number = value.number;
|
||||
}
|
||||
if(value.remark){
|
||||
params.remark = value.remark;
|
||||
}
|
||||
that.params = params;
|
||||
that.limitedPhoto = true;
|
||||
},
|
||||
|
|
@ -1545,6 +1557,12 @@
|
|||
let params = new Object();
|
||||
params.is_testok = that.params.is_testok;
|
||||
params.record_data = that.params.record_data;
|
||||
if(this.params.number){
|
||||
params.number = this.params.number;
|
||||
}
|
||||
if(this.params.remark){
|
||||
params.remark = this.params.remark;
|
||||
}
|
||||
params.token = data.token;
|
||||
let text = '确定以操作员'+data.name+'身份提交？';
|
||||
if (data.token !== '' && data.token !== null && data.token !== undefined) {
|
||||
|
|
|
|||
|
|
@ -67,6 +67,11 @@
|
|||
{{ state_[scope.row.state] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务状态">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.production_plan_"> {{ state_[scope.row.production_plan_.state] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="领料状态" width="80">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.is_picked == false">未领料</el-tag>
|
||||
|
|
@ -86,21 +91,21 @@
|
|||
>
|
||||
<template slot-scope="scope">
|
||||
<el-link
|
||||
v-if="checkPermission(['wmaterial_pick'])&&!scope.row.is_picked"
|
||||
v-if="checkPermission(['wmaterial_pick'])&&!scope.row.is_picked&&scope.row.production_plan_.state!==70&&scope.row.production_plan_.state!==80"
|
||||
type="success"
|
||||
@click="handleNeed(scope)"
|
||||
>
|
||||
领料
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="checkPermission(['wmaterial_pick'])&&scope.row.is_picked"
|
||||
v-if="checkPermission(['wmaterial_pick'])&&scope.row.is_picked&&scope.row.production_plan_.state!==70&&scope.row.production_plan_.state!==80"
|
||||
type="success"
|
||||
@click="handleNeed(scope)"
|
||||
>
|
||||
继续领料
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="checkPermission(['wmaterial_pick'])"
|
||||
v-if="checkPermission(['wmaterial_pick'])&&scope.row.production_plan_.state!==70&&scope.row.production_plan_.state!==80"
|
||||
type="primary"
|
||||
@click="handlepick(scope)"
|
||||
>
|
||||
|
|
@ -778,11 +783,14 @@
|
|||
|
||||
},
|
||||
state_: {
|
||||
0: "制定中",
|
||||
1: "已下达",
|
||||
2: "已接受",
|
||||
3: "生产中",
|
||||
4: "已完成",
|
||||
10: "制定中",
|
||||
20: "已下达",
|
||||
30: "已接受",
|
||||
40: "生产中",
|
||||
50: "已完成",
|
||||
60: "军检完成",
|
||||
70: "暂停",
|
||||
80: "终止",
|
||||
},
|
||||
listLoading: true,
|
||||
id: "",
|
||||
|
|
|
|||
Loading…
Reference in New Issue