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:
shijing 2024-11-19 16:31:22 +08:00
parent 38c84fa1e9 e94d3194ef
commit 05649491ab
6 changed files with 104 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/scTable/index.vue
View File

@ -92,6 +92,7 @@ export default {
tableName: { type: String, default: "" }, tableName: { type: String, default: "" },
apiObj: { type: Object, default: () => { } }, apiObj: { type: Object, default: () => { } },
params: { type: Object, default: () => ({}) }, params: { type: Object, default: () => ({}) },
query: { type: Object, default: () => ({}) },
data: { type: Object, default: () => { } }, data: { type: Object, default: () => { } },
height: { type: [String, Number], default: "100%" }, height: { type: [String, Number], default: "100%" },
size: { type: String, default: "default" }, size: { type: String, default: "default" },
@ -123,9 +124,16 @@ export default {
this.total = this.tableData.length; this.total = this.tableData.length;
}, },
apiObj() { apiObj() {
// this.tableParams = this.params; this.tableParams = this.params;
this.refresh(); this.refresh();
}, },
// query 暂时不监听手动调用
// query: {
// handler() {
// this.refresh();
// },
// deep: true
// }
}, },
computed: { computed: {
_height() { _height() {
@ -210,7 +218,7 @@ export default {
// delete reqData[config.request.page] // delete reqData[config.request.page]
// delete reqData[config.request.pageSize] // delete reqData[config.request.pageSize]
} }
var c = Object.assign({}, this.tableParams, reqData) var c = Object.assign({}, this.query, this.tableParams, reqData)
try { try {
if (this.apiObj) { if (this.apiObj) {
var res = await this.apiObj.req(c); var res = await this.apiObj.req(c);

4
src/components/xtSelect/index.vue
View File

@ -75,7 +75,7 @@ const props = defineProps({
edit: { type: Boolean, default: true }, edit: { type: Boolean, default: true },
hidePagination: { type: Boolean, default: false }, hidePagination: { type: Boolean, default: false },
tableWidth: { type: Number, default: 600 }, tableWidth: { type: Number, default: 600 },
tableHeight: { type: Number, default: 400 }, tableHeight: { type: Number, default: 300 },
apiObj: { type: Object, default: null }, apiObj: { type: Object, default: null },
params: { type: Object, default: () => {} }, params: { type: Object, default: () => {} },
label: { type: [String, Number, Array], default: "" }, label: { type: [String, Number, Array], default: "" },
@ -126,7 +126,7 @@ onMounted(() => {
selectLabel.value = selectedOption selectLabel.value = selectedOption
? selectedOption[props.labelField] ? selectedOption[props.labelField]
: ""; : "";
} else { } else if (props.obj) {
selectLabel.value = props.obj[props.labelField]; selectLabel.value = props.obj[props.labelField];
} }
} }

7
src/views/qm/product.vue
View File

@ -38,6 +38,7 @@
<el-table-column label="物料名" prop="material_name" show-overflow-tooltip> </el-table-column> <el-table-column label="物料名" prop="material_name" show-overflow-tooltip> </el-table-column>
<el-table-column label="总数" prop="count"> </el-table-column> <el-table-column label="总数" prop="count"> </el-table-column>
<el-table-column label="抽检数" prop="count_sampling"> </el-table-column> <el-table-column label="抽检数" prop="count_sampling"> </el-table-column>
<el-table-column label="抽检合格数" prop="count_sampling_ok"> </el-table-column>
<el-table-column label="合格数" prop="count_ok"> </el-table-column> <el-table-column label="合格数" prop="count_ok"> </el-table-column>
<el-table-column label="不合格数" prop="count_notok"> </el-table-column> <el-table-column label="不合格数" prop="count_notok"> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150">
@ -86,7 +87,7 @@
v-if="dialog.check" v-if="dialog.check"
:materialCate="materialCate" :materialCate="materialCate"
:ftestWork="ftestWork" :ftestWork="ftestWork"
@closed="dialog.check = false" @closed="handleCheckClose"
> >
</check-dialog> </check-dialog>
</el-container> </el-container>
@ -169,6 +170,10 @@ export default {
handleQuery() { handleQuery() {
this.$refs.table.queryData(this.query); this.$refs.table.queryData(this.query);
}, },
handleCheckClose() {
this.dialog.check = false;
this.$refs.table.refresh();
},
resetQuery() { resetQuery() {
this.query = {}; this.query = {};
}, },

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

@ -32,7 +32,7 @@
workObj.count_sampling workObj.count_sampling
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="配棒管批次号" v-if=" workObj.mb_&&workObj.mb_.assemb"> <el-descriptions-item label="配棒管批次号" v-if=" workObj.mb_&&workObj.mb_.assemb">
<span v-for="item in workObj.mb_.assemb" :key="item.id">{{item.batch}}、</span> <span v-for="item in workObj.mb_.assemb" :key="item.id">{{item.batch}}; </span>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-button <el-button
@ -87,7 +87,7 @@
</el-input-number> </el-input-number>
</template> </template>
<!-- 整数 --> <!-- 整数 -->
<template v-else-if="ftestitems[$index].field_type == 'input_int'" #default="scope"> <template v-else-if="ftestitems[$index].field_type == 'input-int'" #default="scope">
<el-input-number <el-input-number
v-model="scope.row.ftestitems[$index].test_val_json" v-model="scope.row.ftestitems[$index].test_val_json"
:precision="0" :precision="0"
@ -99,7 +99,7 @@
</el-input-number> </el-input-number>
</template> </template>
<!-- 文本 --> <!-- 文本 -->
<template v-else-if="ftestitems[$index].field_type == 'input_text'" #default="scope"> <template v-else-if="ftestitems[$index].field_type == 'input-text'" #default="scope">
<el-input <el-input
v-model="scope.row.ftestitems[$index].test_val_json" v-model="scope.row.ftestitems[$index].test_val_json"
:disabled="!scope.row.isEdit" :disabled="!scope.row.isEdit"
@ -107,7 +107,7 @@
</el-input> </el-input>
</template> </template>
<!-- 单选 --> <!-- 单选 -->
<template v-else-if="ftestitems[$index].field_type == 'select'" #default="scope"> <template v-else-if="ftestitems[$index].field_type == 'select-text'" #default="scope">
<el-select <el-select
v-model="scope.row.ftestitems[$index].test_val_json" v-model="scope.row.ftestitems[$index].test_val_json"
clearable clearable
@ -124,7 +124,7 @@
</el-select> </el-select>
</template> </template>
<!-- 多选 --> <!-- 多选 -->
<template v-else-if="ftestitems[$index].field_type == 'selects'" #default="scope"> <template v-else-if="ftestitems[$index].field_type == 'selects-text'" #default="scope">
<el-select <el-select
v-model="scope.row.ftestitems[$index].test_val_json" v-model="scope.row.ftestitems[$index].test_val_json"
clearable clearable
@ -164,24 +164,20 @@
<el-table-column <el-table-column
prop="test_user" prop="test_user"
label="检验人" label="检验人"
width="120" width="160"
> >
<template #default="scope"> <template #default="scope">
<el-select <xtSelect
:apiObj="apiUserObj"
:params="apiUserParams"
v-model="scope.row.test_user" v-model="scope.row.test_user"
placeholder="检验人" v-model:label="scope.row.test_user_name"
clearable :edit="scope.row.isEdit"
filterable
:disabled="!scope.row.isEdit"
style="width: 100%" style="width: 100%"
> >
<el-option <el-table-column label="账号" prop="username"></el-table-column>
v-for="item in userList" <el-table-column label="名称" prop="name"></el-table-column>
:key="item.id" </xtSelect>
:label="item.name"
:value="item.id"
/>
</el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="val" label="备注"> <el-table-column prop="val" label="备注">
@ -215,7 +211,7 @@
> >
<el-link <el-link
type="danger" type="danger"
@click="delCheck(scope.row.id)" @click="delCheck(scope.row, scope.$index)"
style="margin-left: 2px" style="margin-left: 2px"
>删除</el-link >删除</el-link
> >
@ -266,6 +262,8 @@ export default {
}, },
data() { data() {
return { return {
apiUserObj: this.$API.system.user.list,
apiUserParams: {posts__code__contains: "check"},
addTemplate: { addTemplate: {
ftestitems: [{ test_val_json: "", check_val: "", testitem: "" ,choices:[],field_type:'',name:''}], ftestitems: [{ test_val_json: "", check_val: "", testitem: "" ,choices:[],field_type:'',name:''}],
test_date: "", //work获取 test_date: "", //work获取
@ -306,7 +304,6 @@ export default {
let tags = that.materialCate; let tags = that.materialCate;
that.getTestItem(tags, that.ftestWork); that.getTestItem(tags, that.ftestWork);
that.getUserList(that.ftestWork);
}, },
methods: { methods: {
open() { open() {
@ -335,15 +332,6 @@ export default {
}); });
}, },
//获取员工
getUserList() {
let that = this;
this.$API.system.user.list
.req({ page: 0, posts__code__contains: "check" })
.then((res) => {
that.userList = res;
});
},
table_edit(row) { table_edit(row) {
this.dialog.worksave = true; this.dialog.worksave = true;
this.$nextTick(() => { this.$nextTick(() => {
@ -381,17 +369,22 @@ export default {
}); });
}, },
//删除 //删除
delCheck(id) { delCheck(row, index) {
if (row.id == undefined) {
this.formTableData.splice(index, 1);
return
}
let that = this; let that = this;
that.$confirm(`确定删除吗？`, "提示", { that.$confirm(`确定删除吗？`, "提示", {
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
that.$API.qm.ftest.delete that.$API.qm.ftest.delete
.req(id) .req(row.id)
.then((res) => { .then((res) => {
that.$message.success("删除成功"); that.$message.success("删除成功");
that.getCheckList(that.ftestWork); that.getCheckList(that.ftestWork);
this.getFtestWork();
return res; return res;
}) })
.catch((err) => { .catch((err) => {
@ -400,9 +393,14 @@ export default {
}) })
.catch(() => {}); .catch(() => {});
}, },
getFtestWork() {
let that = this;
that.$API.qm.ftestwork.item.req(that.ftestWork).then((res) => {
that.workObj = res;
});
},
saveCheck(row) { saveCheck(row) {
let that = this; let that = this;
console.log(row);
let index = this.formTableData.findIndex( let index = this.formTableData.findIndex(
(item) => item.id == row.id (item) => item.id == row.id
); );
@ -413,6 +411,7 @@ export default {
.then((res) => { .then((res) => {
that.formTableData[index].isEdit = false; that.formTableData[index].isEdit = false;
that.$message.success("操作成功"); that.$message.success("操作成功");
this.getFtestWork();
}) })
.catch((err) => { .catch((err) => {
return err; return err;
@ -424,6 +423,7 @@ export default {
that.formTableData[index].isEdit = false; that.formTableData[index].isEdit = false;
that.$message.success("操作成功"); that.$message.success("操作成功");
that.getCheckList(that.ftestWork); that.getCheckList(that.ftestWork);
this.getFtestWork();
}) })
.catch((err) => { .catch((err) => {
return err; return err;

32
src/views/qm/product_form.vue
View File

@ -23,6 +23,7 @@
clearable clearable
style="width: 100%" style="width: 100%"
@change="handleChange" @change="handleChange"
disabled="mode != 'add'"
> >
<el-option <el-option
v-for="item in options" v-for="item in options"
@ -52,16 +53,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24" v-if="form.type2 == 10">
<el-form-item label="抽检数量">
<el-input-number
controls-position="right"
v-model="form.count_sampling"
style="width: 100%"
></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 <el-input-number
controls-position="right" controls-position="right"
@ -71,7 +63,7 @@
></el-input-number> ></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24" v-if="form.type2 == 10">
<el-form-item label="不合格数量"> <el-form-item label="不合格数量">
<el-input-number <el-input-number
controls-position="right" controls-position="right"
@ -83,20 +75,15 @@
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="检验人" prop="test_user"> <el-form-item label="检验人" prop="test_user">
<el-select <xtSelect
:apiObj="apiUserObj"
v-model="form.test_user" v-model="form.test_user"
placeholder="检验人" v-model:label="form.test_user_name"
clearable
filterable
style="width: 100%" style="width: 100%"
> >
<el-option <el-table-column label="账号" prop="username"></el-table-column>
v-for="item in userList" <el-table-column label="名称" prop="name"></el-table-column>
:key="item.id" </xtSelect>
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -116,6 +103,7 @@ export default {
emits: ["success", "closed"], emits: ["success", "closed"],
data() { data() {
return { return {
apiUserObj: this.$API.system.user.list,
loading: false, loading: false,
form: { form: {
type:'prod', type:'prod',

44
src/views/wpm_gx/mtask.vue
View File

@ -27,6 +27,18 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="可用批" v-if="mgroupName!='切片'">
<template #default="scope">
<el-button
link
size="small"
type="primary"
v-if="scope.row.state == 20"
@click="viewBatches(scope.row)">
查看
</el-button>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="90"> <el-table-column label="操作" fixed="right" width="90">
<template #default="scope"> <template #default="scope">
<el-button <el-button
@ -60,6 +72,27 @@
@closed="detailClose" @closed="detailClose"
> >
</deliver-drawer> </deliver-drawer>
<el-dialog v-model="dialogVisible">
<scTable hidePagination hideDo :apiObj="m_apiObj" :query="m_query" ref="mTable">
<el-table-column
label="物料名称"
prop="material_name"
min-width="150"
>
<template #default="scope">
{{ scope.row.material_name }}
<span v-if="scope.row.material_origin != null"
>（{{ scope.row.material_origin_name }}）</span
>
</template>
</el-table-column>
<el-table-column
label="批次号"
prop="batch"
min-width="120"
></el-table-column>
</scTable>
</el-dialog>
</el-container> </el-container>
</template> </template>
<script> <script>
@ -77,6 +110,9 @@ export default {
name: "mtask", name: "mtask",
data() { data() {
return { return {
dialogVisible: false,
m_apiObj: null,
m_query: null,
apiObj: null, apiObj: null,
params: { mgroup: "",state:20 }, params: { mgroup: "",state:20 },
query: {}, query: {},
@ -123,6 +159,14 @@ export default {
}); });
}, },
methods: { methods: {
viewBatches(row){
this.dialogVisible = true;
this.$nextTick(() => {
this.m_query = {mtaskx: row.id};
this.m_apiObj = this.$API.wpm.wmaterial.list;
this.$refs.mTable.queryData(this.m_query);
});
},
elTagType(state) { elTagType(state) {
return this.type_[state]; return this.type_[state];
}, },