Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
This commit is contained in:
commit
6cb44c71ec
|
|
@ -165,15 +165,18 @@ export default {
|
|||
{ id: 10, name: "创建中" },
|
||||
{ id: 20, name: "已提交" },
|
||||
],
|
||||
typeDict: { pur_in: "采购入库" },
|
||||
cateOptions: [{ id: "pur_in", name: "采购入库" }],
|
||||
typeDict: {
|
||||
pur_in: "采购入库",
|
||||
do_out: "领料出库",
|
||||
},
|
||||
cateOptions: [{ id: "pur_in", name: "采购入库" }, { id: "do_out", name: "领料出库" }],
|
||||
dialog: {
|
||||
save: false,
|
||||
record: false,
|
||||
},
|
||||
query: {},
|
||||
params: {
|
||||
type__in: "pur_in",
|
||||
type__in: "pur_in,do_out",
|
||||
materials__type__in: "40, 50, 60, 70",
|
||||
},
|
||||
form: {},
|
||||
|
|
|
|||
|
|
@ -11,16 +11,31 @@
|
|||
>
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<el-select
|
||||
v-model="query.testitem"
|
||||
clearable
|
||||
style="width: 150px"
|
||||
@change="testitemChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in behaviors"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
<el-date-picker
|
||||
v-model="query.test_date"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
style="width: 150px"
|
||||
/>
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
placeholder="编号"
|
||||
clearable
|
||||
style="width: 200px"
|
||||
style="width: 150px"
|
||||
></el-input>
|
||||
<el-button
|
||||
type="primary"
|
||||
|
|
@ -30,192 +45,159 @@
|
|||
>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<!-- <el-radio-group v-model="radio1" class="ml-4">
|
||||
<el-radio
|
||||
v-for="item in behaviors"
|
||||
:key="item.id"
|
||||
:label="item.id"
|
||||
size="large"
|
||||
>
|
||||
{{ item.name }}
|
||||
</el-radio>
|
||||
</el-radio-group> -->
|
||||
<el-container>
|
||||
<el-header style="padding: 13px 15px 7px">
|
||||
<el-tabs
|
||||
v-model="activeId"
|
||||
class="demo-tabs"
|
||||
@tab-click="handleClick"
|
||||
type="card"
|
||||
<scTable
|
||||
ref="table"
|
||||
:data="tableData"
|
||||
:apiObj="apiObj"
|
||||
row-key="id"
|
||||
stripe
|
||||
:params="query"
|
||||
:query="query"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column
|
||||
label="实验日期"
|
||||
prop="test_date"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column label="样品编号" prop="sample_number">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="样品厚度/mm"
|
||||
prop="val_hd"
|
||||
v-if="activeName == '透过率'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="型号规格"
|
||||
prop="specification"
|
||||
v-if="
|
||||
activeName == '中温粘度' || activeName == '膨胀'
|
||||
"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="样品数量"
|
||||
prop="sample_count"
|
||||
v-if="activeName == '析晶'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="样品密度"
|
||||
prop="sample_density"
|
||||
v-if="activeName == '高温粘度'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="检验员"
|
||||
prop="test_user_name"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="实验温度及保温时间"
|
||||
prop="sample_number"
|
||||
v-if="activeName == '析晶'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="升至最高温度/℃"
|
||||
prop="val_zgwd"
|
||||
v-if="activeName == '高温粘度'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="仪器状态"
|
||||
prop="factory"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-tag>{{
|
||||
state_[scope.row.equip_state]
|
||||
}}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="折射率(589nm)"
|
||||
prop="val_zsl"
|
||||
v-if="activeName == '折射率'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="透过率(550nm)"
|
||||
prop="val_tgl"
|
||||
v-if="activeName == '透过率'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="Ts/℃"
|
||||
prop="val_ts"
|
||||
v-if="activeName == '中温粘度'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="30-300℃膨胀系数"
|
||||
prop="val_pzxs"
|
||||
v-if="activeName == '膨胀'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="Tg/℃"
|
||||
prop="val_tg"
|
||||
v-if="activeName == '膨胀'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="Tf/℃"
|
||||
prop="val_tf"
|
||||
v-if="activeName == '膨胀'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="析晶"
|
||||
prop="val_xj"
|
||||
v-if="activeName == '析晶'"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-tag>{{
|
||||
state_xj[scope.row.val_xj]
|
||||
}}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" width="160">
|
||||
<template #default="scope">
|
||||
<el-link
|
||||
type="primary"
|
||||
@click="table_edit(scope.row)"
|
||||
v-auth="'ptest.update'"
|
||||
>编辑</el-link
|
||||
>
|
||||
<el-tab-pane
|
||||
v-for="item in behaviors"
|
||||
v-bind:key="item.id"
|
||||
:label="item.name"
|
||||
:name="item.id"
|
||||
>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable
|
||||
ref="table"
|
||||
:data="tableData"
|
||||
:apiObj="apiObj"
|
||||
row-key="id"
|
||||
stripe
|
||||
:params="query"
|
||||
<el-divider
|
||||
direction="vertical"
|
||||
v-auth="'ptest.update'"
|
||||
></el-divider>
|
||||
<el-link
|
||||
type="primary"
|
||||
@click="table_show(scope.row)"
|
||||
>查看</el-link
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column
|
||||
label="实验日期"
|
||||
prop="test_date"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column label="样品编号" prop="sample_number">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="样品厚度/mm"
|
||||
prop="val_hd"
|
||||
v-if="activeName == '透过率'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="型号规格"
|
||||
prop="specification"
|
||||
v-if="
|
||||
activeName == '中温粘度' || activeName == '膨胀'
|
||||
"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="样品数量"
|
||||
prop="sample_count"
|
||||
v-if="activeName == '析晶'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="样品密度"
|
||||
prop="sample_density"
|
||||
v-if="activeName == '高温粘度'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="检验员"
|
||||
prop="test_user_name"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="实验温度及保温时间"
|
||||
prop="sample_number"
|
||||
v-if="activeName == '析晶'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="升至最高温度/℃"
|
||||
prop="val_zgwd"
|
||||
v-if="activeName == '高温粘度'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="仪器状态"
|
||||
prop="factory"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-tag>{{
|
||||
state_[scope.row.equip_state]
|
||||
}}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="折射率(589nm)"
|
||||
prop="val_zsl"
|
||||
v-if="activeName == '折射率'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="透过率(550nm)"
|
||||
prop="val_tgl"
|
||||
v-if="activeName == '透过率'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="Ts/℃"
|
||||
prop="val_ts"
|
||||
v-if="activeName == '中温粘度'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="30-300℃膨胀系数"
|
||||
prop="val_pzxs"
|
||||
v-if="activeName == '膨胀'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="Tg/℃"
|
||||
prop="val_tg"
|
||||
v-if="activeName == '膨胀'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="Tf/℃"
|
||||
prop="val_tf"
|
||||
v-if="activeName == '膨胀'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="析晶"
|
||||
prop="val_xj"
|
||||
v-if="activeName == '析晶'"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-tag>{{
|
||||
state_xj[scope.row.val_xj]
|
||||
}}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" width="160">
|
||||
<template #default="scope">
|
||||
<el-link
|
||||
type="primary"
|
||||
@click="table_edit(scope.row)"
|
||||
v-auth="'ptest.update'"
|
||||
>编辑</el-link
|
||||
>
|
||||
<el-divider
|
||||
direction="vertical"
|
||||
v-auth="'ptest.update'"
|
||||
></el-divider>
|
||||
<el-link
|
||||
type="primary"
|
||||
@click="table_show(scope.row)"
|
||||
>查看</el-link
|
||||
>
|
||||
<el-divider
|
||||
direction="vertical"
|
||||
v-auth="'ptest.delete'"
|
||||
></el-divider>
|
||||
<el-link
|
||||
type="danger"
|
||||
@click="table_del(scope.row)"
|
||||
v-auth="'ptest.delete'"
|
||||
>删除</el-link
|
||||
>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</el-main>
|
||||
<el-divider
|
||||
direction="vertical"
|
||||
v-auth="'ptest.delete'"
|
||||
></el-divider>
|
||||
<el-link
|
||||
type="danger"
|
||||
@click="table_del(scope.row)"
|
||||
v-auth="'ptest.delete'"
|
||||
>删除</el-link
|
||||
>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
<save-dialog
|
||||
v-if="visible"
|
||||
ref="saveDialog"
|
||||
:activeName="activeName"
|
||||
:activeId="activeId"
|
||||
@success="handleSuccess"
|
||||
@closed="visible = false"
|
||||
>
|
||||
|
|
@ -287,7 +269,6 @@ export default {
|
|||
},
|
||||
],
|
||||
},
|
||||
activeId: "3442815297965547520",
|
||||
activeName: "折射率",
|
||||
visible: false,
|
||||
isSaveing: false,
|
||||
|
|
@ -311,11 +292,14 @@ export default {
|
|||
that.apiObj = that.$API.qm.ptest.list;
|
||||
});
|
||||
},
|
||||
handleClick(val) {
|
||||
this.activeId = val.props.name;
|
||||
this.activeName = val.props.label;
|
||||
this.query.testitem = val.props.name;
|
||||
this.$refs.table.refresh();
|
||||
testitemChange(){
|
||||
let that = this;
|
||||
that.behaviors.forEach((item) => {
|
||||
if(item.id==that.query.testitem){
|
||||
that.activeName = item.name;
|
||||
}
|
||||
that.$refs.table.refresh();
|
||||
})
|
||||
},
|
||||
add() {
|
||||
this.visible = true;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
@closed="$emit('closed')"
|
||||
>
|
||||
<el-container v-loading="loading">
|
||||
<el-main style="padding: 0 20px 20px 20px">
|
||||
<el-main style="padding: 0">
|
||||
<el-form
|
||||
ref="dialogForm"
|
||||
:model="form"
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
placeholder="检验类型"
|
||||
clearable
|
||||
style="width: 100%"
|
||||
disabled
|
||||
@change="testitemChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in behaviors"
|
||||
|
|
@ -279,7 +279,6 @@ export default {
|
|||
emits: ["success", "closed"],
|
||||
props: {
|
||||
activeId: { type: String, default: "" },
|
||||
activeName: { type: String, default: "" },
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -349,6 +348,7 @@ export default {
|
|||
belong_dept_options: [],
|
||||
group: [],
|
||||
behaviors: [],
|
||||
activeName:'折射率'
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
|
|
@ -399,6 +399,14 @@ export default {
|
|||
that.processOptions = res;
|
||||
});
|
||||
},
|
||||
testitemChange(){
|
||||
let that = this;
|
||||
that.behaviors.forEach((item) => {
|
||||
if(item.id==that.form.testitem){
|
||||
that.activeName = item.name;
|
||||
}
|
||||
})
|
||||
},
|
||||
handleClick() {},
|
||||
//提交
|
||||
submit() {
|
||||
|
|
|
|||
|
|
@ -78,6 +78,17 @@
|
|||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="B类合格数">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_ok_b"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
disabled
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="不合格数量">
|
||||
<el-input-number
|
||||
|
|
@ -156,6 +167,74 @@
|
|||
</el-row>
|
||||
<el-divider style="margin-top:0"></el-divider>
|
||||
<el-row v-if="mode=='sizeAdd'||mode=='sizeEdit'||mode=='sizeShow'">
|
||||
<el-col><div>合格B类</div></el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="准合格">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_zhg"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'"
|
||||
@change="handleCountbChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="圆度准合格">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_yz"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row v-else>
|
||||
<el-col><div>合格B类</div></el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="浅水纹">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_qsw"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="小崩边">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_xbb"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="浅划麻">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_qhm"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-divider style="margin-top:0"></el-divider>
|
||||
<el-row v-if="mode=='sizeAdd'||mode=='sizeEdit'||mode=='sizeShow'">
|
||||
<el-col><div>不合格</div></el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="黑圈内径">
|
||||
<el-input-number
|
||||
|
|
@ -163,7 +242,7 @@
|
|||
v-model="count_notok_json.count_n_hqnj"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
:disabled="mode=='sizeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
|
|
@ -175,7 +254,7 @@
|
|||
v-model="count_notok_json.count_n_hqnjyd"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
:disabled="mode=='sizeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
|
|
@ -187,7 +266,7 @@
|
|||
v-model="count_notok_json.count_n_hqwj"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
:disabled="mode=='sizeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
|
|
@ -199,7 +278,7 @@
|
|||
v-model="count_notok_json.count_n_hqwjyd"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
:disabled="mode=='sizeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
|
|
@ -211,19 +290,19 @@
|
|||
v-model="count_notok_json.count_n_wj"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
:disabled="mode=='sizeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="产品圆度">
|
||||
<el-form-item label="产品外径圆度">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_yd"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
:disabled="mode=='sizeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
|
|
@ -235,7 +314,7 @@
|
|||
v-model="count_notok_json.count_n_txd"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
:disabled="mode=='sizeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
|
|
@ -247,37 +326,26 @@
|
|||
v-model="count_notok_json.count_n_hd"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="准合格">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_zhg"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="圆准">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_yz"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
:disabled="mode=='sizeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row v-else>
|
||||
<el-col><div>不合格</div></el-col>
|
||||
<!-- <el-col :md="12" :sm="24">
|
||||
<el-form-item label="返修">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_fx"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col> -->
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="脏">
|
||||
<el-input-number
|
||||
|
|
@ -285,7 +353,7 @@
|
|||
v-model="count_notok_json.count_n_z"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
:disabled="mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
|
|
@ -297,79 +365,7 @@
|
|||
v-model="count_notok_json.count_n_qp"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="水纹">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_swen"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="崩边">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_bb"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="棕边">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_zb"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="棕圈">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_zq"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="划伤">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_hs"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="麻点">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_md"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
:disabled="mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
|
|
@ -381,7 +377,45 @@
|
|||
v-model="count_notok_json.count_n_hqbx"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
:disabled="mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<!-- 麻点 -->
|
||||
<el-form-item label="双面划麻">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_md"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="重水纹">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_swen"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<!-- 棕边 -->
|
||||
<el-form-item label="棕点">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_zb"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
|
|
@ -393,19 +427,31 @@
|
|||
v-model="count_notok_json.count_n_dj"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
:disabled="mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="破损">
|
||||
<el-form-item label="大崩">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_ps"
|
||||
v-model="count_notok_json.count_n_bb"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
:disabled="mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="棕圈">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_zq"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
|
|
@ -417,7 +463,43 @@
|
|||
v-model="count_notok_json.count_n_lq"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='sizeShow'||mode=='facadeShow'"
|
||||
:disabled="mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="破损">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_ps"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="漏光">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_lg"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="尺寸小">
|
||||
<el-input-number
|
||||
controls-position="right"
|
||||
v-model="count_notok_json.count_n_ccx"
|
||||
style="width: 100%"
|
||||
precision="0"
|
||||
:disabled="mode=='facadeShow'"
|
||||
@change="handleCountChange"
|
||||
></el-input-number>
|
||||
</el-form-item>
|
||||
|
|
@ -462,7 +544,14 @@ export default {
|
|||
count_notok: 0,
|
||||
count_notok_json:{}
|
||||
},
|
||||
count_ok_b:0,
|
||||
count_notok_json:{
|
||||
//合格B类
|
||||
count_n_zhg: 0,//准合格
|
||||
count_n_yz: 0,//圆准
|
||||
count_n_xbb: 0,//小崩边
|
||||
count_n_qsw: 0,//浅水纹
|
||||
count_n_qhm: 0,//浅划麻
|
||||
//尺寸
|
||||
count_n_hqnj: 0,
|
||||
count_n_hqnjyd: 0,
|
||||
|
|
@ -472,21 +561,20 @@ export default {
|
|||
count_n_yd: 0,
|
||||
count_n_txd: 0,
|
||||
count_n_hd: 0,
|
||||
count_n_zhg: 0,
|
||||
count_n_yz: 0,
|
||||
//外观和内质
|
||||
count_n_z:0,
|
||||
count_n_qp: 0,
|
||||
count_n_swen: 0,
|
||||
count_n_bb: 0,
|
||||
count_n_zb: 0,
|
||||
count_n_zq: 0,
|
||||
count_n_hs: 0,
|
||||
count_n_md: 0,
|
||||
count_n_hqbx: 0,
|
||||
count_n_hs: 0,//双面划麻
|
||||
count_n_swen: 0,//重水纹
|
||||
count_n_zb: 0,//棕边、棕点
|
||||
count_n_dj: 0,
|
||||
count_n_ps: 0,
|
||||
count_n_bb: 0,//大崩
|
||||
count_n_zq: 0,//棕圈
|
||||
count_n_lq: 0,
|
||||
count_n_ps: 0,
|
||||
count_n_lg: 0,//漏光
|
||||
count_n_ccx: 0,//尺寸小
|
||||
},
|
||||
rules: {
|
||||
test_date: [
|
||||
|
|
@ -536,7 +624,6 @@ export default {
|
|||
},
|
||||
getUsers(){
|
||||
let that = this;
|
||||
let userList = [];
|
||||
that.$API.system.user.list
|
||||
.req({ page: 0, posts__code__contains: "check" })
|
||||
.then((res) => {
|
||||
|
|
@ -552,6 +639,15 @@ export default {
|
|||
handleCheckChange(){
|
||||
this.form.count_ok = this.form.count-this.form.count_notok;
|
||||
},
|
||||
handleCountbChange(){
|
||||
this.count_ok_b =
|
||||
this.count_notok_json.count_n_zhg+
|
||||
this.count_notok_json.count_n_yz+
|
||||
this.count_notok_json.count_n_xbb+
|
||||
this.count_notok_json.count_n_qsw+
|
||||
this.count_notok_json.count_n_qhm;
|
||||
this.count_notok_json.count_ok = this.form.count-this.form.count_notok;
|
||||
},
|
||||
handleCountChange(type){
|
||||
if(type == 'notok'){
|
||||
this.count_notok_json.count_n_hqnj=
|
||||
|
|
@ -562,17 +658,20 @@ export default {
|
|||
this.count_notok_json.count_n_yd=
|
||||
this.count_notok_json.count_n_txd=
|
||||
this.count_notok_json.count_n_hd=
|
||||
|
||||
this.count_notok_json.count_n_z=
|
||||
this.count_notok_json.count_n_qp=
|
||||
this.count_notok_json.count_n_hqbx=
|
||||
this.count_notok_json.count_n_hs=
|
||||
this.count_notok_json.count_n_swen=
|
||||
this.count_notok_json.count_n_zb=
|
||||
this.count_notok_json.count_n_dj=
|
||||
this.count_notok_json.count_n_bb=
|
||||
this.count_notok_json.count_n_zq=
|
||||
this.count_notok_json.count_n_hs=
|
||||
this.count_notok_json.count_n_md=
|
||||
this.count_notok_json.count_n_hqbx=
|
||||
this.count_notok_json.count_n_dj=
|
||||
this.count_notok_json.count_n_lq=
|
||||
this.count_notok_json.count_n_ps=
|
||||
this.count_notok_json.count_n_lq=0;
|
||||
this.count_notok_json.count_n_lg=
|
||||
this.count_notok_json.count_n_ccx=0;
|
||||
}else{
|
||||
this.form.count_notok =
|
||||
this.count_notok_json.count_n_hqnj+
|
||||
|
|
@ -583,20 +682,19 @@ export default {
|
|||
this.count_notok_json.count_n_yd+
|
||||
this.count_notok_json.count_n_txd+
|
||||
this.count_notok_json.count_n_hd+
|
||||
this.count_notok_json.count_n_zhg+
|
||||
this.count_notok_json.count_n_yz+
|
||||
this.count_notok_json.count_n_qp+
|
||||
this.count_notok_json.count_n_z+
|
||||
this.count_notok_json.count_n_qp+
|
||||
this.count_notok_json.count_n_hqbx+
|
||||
this.count_notok_json.count_n_hs+
|
||||
this.count_notok_json.count_n_swen+
|
||||
this.count_notok_json.count_n_zb+
|
||||
this.count_notok_json.count_n_dj+
|
||||
this.count_notok_json.count_n_bb+
|
||||
this.count_notok_json.count_n_zq+
|
||||
this.count_notok_json.count_n_hs+
|
||||
this.count_notok_json.count_n_md+
|
||||
this.count_notok_json.count_n_hqbx+
|
||||
this.count_notok_json.count_n_dj+
|
||||
this.count_notok_json.count_n_lq+
|
||||
this.count_notok_json.count_n_ps+
|
||||
this.count_notok_json.count_n_lq;
|
||||
this.count_notok_json.count_n_lg+
|
||||
this.count_notok_json.count_n_ccx;
|
||||
}
|
||||
this.form.count_ok = this.form.count - this.form.count_notok;
|
||||
},
|
||||
|
|
@ -694,6 +792,12 @@ export default {
|
|||
Object.assign(this.form, data);
|
||||
this.formCount = this.form.count;
|
||||
this.form.count_notok = data.count_notok;
|
||||
this.count_ok_b =
|
||||
data.count_notok_json.count_n_zhg +
|
||||
data.count_notok_json.count_n_yz +
|
||||
data.count_notok_json.count_n_qsw +
|
||||
data.count_notok_json.count_n_xbb +
|
||||
data.count_notok_json.count_n_qhm ;
|
||||
this.count_notok_json = data.count_notok_json;
|
||||
},
|
||||
scanClose(data){
|
||||
|
|
|
|||
|
|
@ -547,6 +547,21 @@
|
|||
</el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="炸头">
|
||||
<el-input-number
|
||||
v-model="form.count_n_zt"
|
||||
controls-position="right"
|
||||
:min="0"
|
||||
:step="1"
|
||||
:step-strictly="true"
|
||||
style="width: 100%"
|
||||
placeholder="炸头"
|
||||
@change="countNotOkSun"
|
||||
>
|
||||
</el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="条纹">
|
||||
<el-input-number
|
||||
|
|
@ -578,15 +593,15 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="弯曲">
|
||||
<el-form-item label="扁">
|
||||
<el-input-number
|
||||
v-model="form.count_n_wq"
|
||||
v-model="form.count_n_b"
|
||||
controls-position="right"
|
||||
:min="0"
|
||||
:step="1"
|
||||
:step-strictly="true"
|
||||
style="width: 100%"
|
||||
placeholder="弯曲"
|
||||
placeholder="扁"
|
||||
@change="countNotOkSun"
|
||||
>
|
||||
</el-input-number>
|
||||
|
|
@ -981,7 +996,9 @@ export default {
|
|||
count_n_zw: 0,
|
||||
count_n_tw: 0,
|
||||
count_n_qp: 0,
|
||||
count_n_wq: 0,
|
||||
count_n_wq:0,
|
||||
count_n_zt: 0,
|
||||
count_n_b: 0,
|
||||
count_n_dl: 0,
|
||||
count_n_pb: 0,
|
||||
count_n_dxt: 0,
|
||||
|
|
@ -1263,7 +1280,8 @@ export default {
|
|||
this.form.count_n_zw +
|
||||
this.form.count_n_tw +
|
||||
this.form.count_n_qp +
|
||||
this.form.count_n_wq +
|
||||
this.form.count_n_zt +
|
||||
this.form.count_n_b +
|
||||
this.form.count_n_qt;
|
||||
} else if (this.activeType == "10车间") {
|
||||
this.form.count_notok =
|
||||
|
|
@ -1312,7 +1330,8 @@ export default {
|
|||
this.form.count_n_zw +
|
||||
this.form.count_n_tw +
|
||||
this.form.count_n_qp +
|
||||
this.form.count_n_wq +
|
||||
this.form.count_n_zt +
|
||||
this.form.count_n_b +
|
||||
this.form.count_n_qt;
|
||||
} else if (this.activeType == "10车间") {
|
||||
this.form.mtask = this.mtask;
|
||||
|
|
|
|||
|
|
@ -59,18 +59,18 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- <el-col :md="12" :sm="24">
|
||||
<el-form-item label="批次序号" prop="qp_num">
|
||||
<el-col :md="12" :sm="24" v-if="mgroupName=='成品抛'">
|
||||
<el-form-item label="批次序号">
|
||||
<el-input-number
|
||||
v-model="form.qp_num"
|
||||
v-model="form.index"
|
||||
:min="0"
|
||||
:max="99"
|
||||
placeholder="该设备的第几炉"
|
||||
class="width100"
|
||||
placeholder="第几炉,追加到批次"
|
||||
style="width: 100%"
|
||||
controls-position="right"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col> -->
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="开始时间" prop="work_start_time">
|
||||
<el-date-picker
|
||||
|
|
@ -406,6 +406,7 @@ export default {
|
|||
work_end_time:[{required: true,message: "请选择生产开始时间",trigger: "blur",},],
|
||||
route: [{required: true,message: "请选择工艺路线",trigger: "blur",},]
|
||||
},
|
||||
mgroupName:'',
|
||||
materialCount:1,//领料批次现有库存数
|
||||
material_in:'',
|
||||
material_out:'',
|
||||
|
|
@ -443,6 +444,7 @@ export default {
|
|||
let that = this;
|
||||
that.$API.mtm.mgroup.item.req(that.mgroup).then((res) => {
|
||||
that.deptId = res.belong_dept;
|
||||
that.mgroupName = res.name;
|
||||
that.process = res.process;
|
||||
that.getEquipment();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-col :md="12" :sm="24" v-if="form.mtype == 20">
|
||||
<el-form-item
|
||||
label="外协单位"
|
||||
prop="supplier"
|
||||
|
|
@ -57,8 +57,6 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="工艺路线" prop="route">
|
||||
<el-select
|
||||
|
|
@ -106,6 +104,18 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24" v-if="mgroupName=='磨抛一次抛'">
|
||||
<el-form-item label="批次序号">
|
||||
<el-input-number
|
||||
v-model="form.index"
|
||||
:min="0"
|
||||
:max="99"
|
||||
placeholder="第几炉,追加到批次"
|
||||
style="width: 100%"
|
||||
controls-position="right"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item
|
||||
label="开始时间"
|
||||
|
|
|
|||
Loading…
Reference in New Issue