zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

This commit is contained in:
caoqianming 2024-06-11 11:16:45 +08:00
parent 69b7d92105 11ab06f162
commit 8c5b926045
4 changed files with 441 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/inm/mioitem_check.vue
View File

@ -863,7 +863,7 @@ export default {
getUserList() { getUserList() {
let that = this; let that = this;
this.$API.system.user.list this.$API.system.user.list
// .req({ page: 0, belong_dept__name: "检验管理部" }) // .req({ page: 0,posts__name:'检验' })
.req({ page: 0 }) .req({ page: 0 })
.then((res) => { .then((res) => {
that.userList = res; that.userList = res;

244
src/views/qm/behavior_form.vue
View File

@ -45,29 +45,58 @@
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="样品编号" prop="sample_number"> <el-form-item label="样品编号" prop="sample_number">
<el-input v-model="form.sample_number"></el-input> <el-input
v-model="form.sample_number"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="activeName == '透过率'"> <el-col :md="12" :sm="24" v-if="activeName == '透过率'">
<el-form-item label="样品厚度/mm" prop="val_hd"> <el-form-item label="样品厚度/mm" prop="val_hd">
<el-input-number v-model="form.val_hd" :min="0" style="width:100%" controls-position="right"> <el-input-number
v-model="form.val_hd"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="activeName=='中温粘度'||activeName=='膨胀'"> <el-col
:md="12"
:sm="24"
v-if="
activeName == '中温粘度' || activeName == '膨胀'
"
>
<el-form-item label="规格型号" prop="specification"> <el-form-item label="规格型号" prop="specification">
<el-input v-model="form.specification"></el-input> <el-input
v-model="form.specification"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="activeName == '析晶'"> <el-col :md="12" :sm="24" v-if="activeName == '析晶'">
<el-form-item label="样品数量" prop="sample_count"> <el-form-item label="样品数量" prop="sample_count">
<el-input-number v-model="form.sample_count" :min="0" style="width:100%" controls-position="right"> <el-input-number
v-model="form.sample_count"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="activeName=='高温粘度'"> <el-col
<el-form-item label="样品密度" prop="sample_density"> :md="12"
<el-input v-model="form.sample_density"></el-input> :sm="24"
v-if="activeName == '高温粘度'"
>
<el-form-item
label="样品密度"
prop="sample_density"
>
<el-input
v-model="form.sample_density"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
@ -89,13 +118,30 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="activeName == '析晶'"> <el-col :md="12" :sm="24" v-if="activeName == '析晶'">
<el-form-item label="实验温度及保温时间" prop="sample_density"> <el-form-item
<el-input v-model="form.sample_number"></el-input> label="实验温度及保温时间"
prop="sample_density"
>
<el-input
v-model="form.sample_number"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="activeName=='高温粘度'"> <el-col
<el-form-item label="升至最高温度/℃" prop="val_zgwd"> :md="12"
<el-input-number v-model="form.val_zgwd" :min="0" style="width:100%" controls-position="right"> :sm="24"
v-if="activeName == '高温粘度'"
>
<el-form-item
label="升至最高温度/℃"
prop="val_zgwd"
>
<el-input-number
v-model="form.val_zgwd"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -104,50 +150,89 @@
<el-select <el-select
v-model="form.equip_state" v-model="form.equip_state"
placeholder="仪器状态" placeholder="仪器状态"
clearable style="width:100%" clearable
style="width: 100%"
> >
<el-option <el-option
v-for="item in stateOptios" v-for="item in stateOptios"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="activeName == '折射率'"> <el-col :md="12" :sm="24" v-if="activeName == '折射率'">
<el-form-item label="折射率(589nm)" prop="val_zsl"> <el-form-item label="折射率(589nm)" prop="val_zsl">
<el-input-number v-model="form.val_zsl" :min="0" style="width:100%" controls-position="right"> <el-input-number
v-model="form.val_zsl"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="activeName == '透过率'"> <el-col :md="12" :sm="24" v-if="activeName == '透过率'">
<el-form-item label="透过率(550nm)" prop="val_tgl"> <el-form-item label="透过率(550nm)" prop="val_tgl">
<el-input-number v-model="form.val_tgl" :min="0" style="width:100%" controls-position="right"> <el-input-number
v-model="form.val_tgl"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="activeName=='中温粘度'"> <el-col
:md="12"
:sm="24"
v-if="activeName == '中温粘度'"
>
<el-form-item label="Ts/℃" prop="val_ts"> <el-form-item label="Ts/℃" prop="val_ts">
<el-input-number v-model="form.val_ts" :min="0" style="width:100%" controls-position="right"> <el-input-number
v-model="form.val_ts"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="activeName == '膨胀'"> <el-col :md="12" :sm="24" v-if="activeName == '膨胀'">
<el-form-item label="30-300℃膨胀系数" prop="val_pzxs"> <el-form-item
<el-input-number v-model="form.val_pzxs" :min="0" style="width:100%" controls-position="right"> label="30-300℃膨胀系数"
prop="val_pzxs"
>
<el-input-number
v-model="form.val_pzxs"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="activeName == '膨胀'"> <el-col :md="12" :sm="24" v-if="activeName == '膨胀'">
<el-form-item label="Tg/℃" prop="val_tg"> <el-form-item label="Tg/℃" prop="val_tg">
<el-input-number v-model="form.val_tg" :min="0" style="width:100%" controls-position="right"> <el-input-number
v-model="form.val_tg"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="activeName == '膨胀'"> <el-col :md="12" :sm="24" v-if="activeName == '膨胀'">
<el-form-item label="Tf/℃" prop="val_tf"> <el-form-item label="Tf/℃" prop="val_tf">
<el-input-number v-model="form.val_tf" :min="0" style="width:100%" controls-position="right"> <el-input-number
v-model="form.val_tf"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -156,27 +241,34 @@
<el-select <el-select
v-model="form.val_xj" v-model="form.val_xj"
placeholder="析晶状态" placeholder="析晶状态"
clearable style="width:100%" clearable
style="width: 100%"
> >
<el-option <el-option
v-for="item in xjOptios" v-for="item in xjOptios"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="备注"> <el-form-item label="备注">
<el-input v-model="form.note" placeholder="备注"/> <el-input
v-model="form.note"
placeholder="备注"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-main> </el-main>
<el-footer v-if="this.mode !== 'show'"> <el-footer v-if="this.mode !== 'show'">
<el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button> <el-button type="primary" :loading="isSaveing" @click="submit"
>保存</el-button
>
<el-button @click="visible = false">取消</el-button> <el-button @click="visible = false">取消</el-button>
</el-footer> </el-footer>
</el-container> </el-container>
@ -192,25 +284,59 @@ export default {
data() { data() {
return { return {
loading: false, loading: false,
form: { form: {},
},
rules: { rules: {
belong_dept: [{required: true, message: "请选择所属部门", trigger: "blur"}], belong_dept: [
test_date: [{required: true, message: "请选择检验日期", trigger: "blur"}], {
test_user: [{required: true, message: "请选择操作人", trigger: "blur"}], required: true,
check_user: [{required: true, message: "请选择专检人", trigger: "blur"}], message: "请选择所属部门",
test_group:[{required: true, message: "请选择检测工序集", trigger: "blur"}], trigger: "blur",
is_ok: [{required: true, message: "请选择是否合格", trigger: "blur"}], },
],
test_date: [
{
required: true,
message: "请选择检验日期",
trigger: "blur",
},
],
test_user: [
{
required: true,
message: "请选择操作人",
trigger: "blur",
},
],
check_user: [
{
required: true,
message: "请选择专检人",
trigger: "blur",
},
],
test_group: [
{
required: true,
message: "请选择检测工序集",
trigger: "blur",
},
],
is_ok: [
{
required: true,
message: "请选择是否合格",
trigger: "blur",
},
],
}, },
stateOptios: [ stateOptios: [
{id:'R',name:'正常'}, { id: "R", name: "正常" },
{id:'T',name:'异常'}, { id: "T", name: "异常" },
], ],
xjOptios: [ xjOptios: [
{id:'S',name:'析晶'}, { id: "S", name: "析晶" },
{id:'K',name:'不析晶'}, { id: "K", name: "不析晶" },
{id:'θ',name:'未化'}, { id: "θ", name: "未化" },
], ],
visible: false, visible: false,
isSaveing: false, isSaveing: false,
@ -226,8 +352,8 @@ export default {
}; };
}, },
mounted() { mounted() {
console.log(this.activeId) console.log(this.activeId);
console.log(this.activeName) console.log(this.activeName);
this.form.testitem = this.activeId; this.form.testitem = this.activeId;
this.getTextItem(); this.getTextItem();
this.getProcess(); this.getProcess();
@ -244,28 +370,34 @@ export default {
//获取检验项目 //获取检验项目
getTextItem() { getTextItem() {
let that = this; let that = this;
that.$API.qm.getTestItem.get({tag:'performance',page:0}).then(res=>{ that.$API.qm.getTestItem
.get({ tag: "performance", page: 0 })
.then((res) => {
that.behaviors = res; that.behaviors = res;
}) });
}, },
//获取部门列表 //获取部门列表
getDeptOptions() { getDeptOptions() {
this.$API.system.dept.list.req({ page: 0, type__in: 'dept' }).then((res) => { this.$API.system.dept.list
.req({ page: 0, type__in: "dept" })
.then((res) => {
this.deptOptions = res; this.deptOptions = res;
}); });
}, },
//获取员工 //获取员工
getUserList() { getUserList() {
let that = this; let that = this;
this.$API.system.user.list.req({page:0,belong_dept__name:'检验管理部'}).then(res=>{ this.$API.system.user.list
.req({ page: 0, posts__name: "检验" })
.then((res) => {
that.userList = res; that.userList = res;
}); });
}, },
getProcess() { getProcess() {
let that = this; let that = this;
this.$API.mtm.process.list.req({page:0}).then(res=>{ this.$API.mtm.process.list.req({ page: 0 }).then((res) => {
that.processOptions = res; that.processOptions = res;
}) });
}, },
handleClick() {}, handleClick() {},
//提交 //提交
@ -276,9 +408,14 @@ export default {
try { try {
var res; var res;
if (this.mode == "add") { if (this.mode == "add") {
res = await this.$API.qm.ptest.create.req(this.form); res = await this.$API.qm.ptest.create.req(
this.form
);
} else if (this.mode == "edit") { } else if (this.mode == "edit") {
res = await this.$API.qm.ptest.update.req(this.form.id,this.form); res = await this.$API.qm.ptest.update.req(
this.form.id,
this.form
);
} }
this.isSaveing = false; this.isSaveing = false;
this.$emit("success"); this.$emit("success");
@ -295,7 +432,7 @@ export default {
//表单注入数据 //表单注入数据
setData(data) { setData(data) {
Object.assign(this.form, data); Object.assign(this.form, data);
this.form.test_group = this.form.split(',') this.form.test_group = this.form.split(",");
}, },
//设置过滤项 //设置过滤项
setFilters(filters) { setFilters(filters) {
@ -306,5 +443,4 @@ export default {
}; };
</script> </script>
<style> <style></style>
</style>

2
src/views/qm/first_check.vue
View File

@ -280,7 +280,7 @@ export default {
getUserList() { getUserList() {
let that = this; let that = this;
this.$API.system.user.list this.$API.system.user.list
.req({ page: 0, depts__name: "检验管理部" }) .req({ page: 0, posts__name: "检验" })
.then((res) => { .then((res) => {
that.userList = res.results; that.userList = res.results;
}); });

2
src/views/qm/productCheck.vue
View File

@ -390,7 +390,7 @@ export default {
getUserList() { getUserList() {
let that = this; let that = this;
this.$API.system.user.list this.$API.system.user.list
.req({ page: 0, belong_dept__name: "检验管理部" }) .req({ page: 0, posts__name: "检验" })
.then((res) => { .then((res) => {
that.userList = res; that.userList = res;
}); });