Skip to content

M
mes-ui
Commit f01440b8 authored by renjintao's avatar renjintao
Browse files
Options

Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

parents 5d5bcee3 b1bc1b04
Hide whitespace changes
Inline Side-by-side
Showing with 809 additions and 143 deletions
pages/materiel/classification/add.vue
View file @ f01440b8
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
<div> <div>
<Form ref="form" :model="entity" :rules="rules" :label-width="90"> <Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row> <Row>
<Col :span="12"> <!-- <Col :span="12">
<FormItem label="编码" prop="code"> <FormItem label="编码" prop="code">
<Input v-model="entity.code" placeholder="请输入" disabled></Input> <Input v-model="entity.code" placeholder="请输入" disabled></Input>
</FormItem> </FormItem>
</Col> </Col>-->
<Col :span="12"> <Col :span="12">
<FormItem label="名称" prop="name"> <FormItem label="名称" prop="name">
<Input v-model="entity.name" placeholder="请输入"></Input> <Input v-model="entity.name" placeholder="请输入"></Input>
...@@ -179,8 +179,9 @@ export default { ...@@ -179,8 +179,9 @@ export default {
let pro = this.checkList; let pro = this.checkList;
Api.create({ categoryDto: categoryDto, pro: pro }) Api.create({ categoryDto: categoryDto, pro: pro })
.then(r => { .then(r => {
if (r.result) { if (r.success) {
this.$Message.success("保存成功"); this.$Message.success("保存成功");
this.$emit("on-ok");
} else { } else {
this.$Message.error("保存失败"); this.$Message.error("保存失败");
} }
......
pages/materiel/classification/edit.vue
View file @ f01440b8
<template> <template>
<div>55555555</div> <div>
</template> <Form ref="form" :model="entity" :rules="rules" :label-width="90">
\ No newline at end of file <Row>
<!-- <Col :span="12">
<FormItem label="编码" prop="code">
<Input v-model="entity.code" placeholder="请输入" disabled></Input>
</FormItem>
</Col>-->
<Col :span="12">
<FormItem label="名称" prop="name">
<Input v-model="entity.name" placeholder="请输入"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem label="状态" prop="status" placeholder="请选择">
<Dictionary
code="materail.category.status"
v-model="entity.status"
type="select"
:value="entity.status"
:key="entity.status"
></Dictionary>
</FormItem>
</Col>
<Col :span="24">
<FormItem label="描述" prop="description">
<Input v-model="entity.description" type="textarea" placeholder="请输入..."></Input>
</FormItem>
</Col>
<Col :span="24">
<h4>属性配置</h4>
</Col>
<Col :span="24" style="padding:20px 0 0px 10px;margin-bottom:10px;" class="table-solt">
<Table border :columns="columns" :data="checkList" class="tableCommon" height="300">
<template slot-scope="{ row, index }" slot="note">
<Input v-model="row.note" placeholder="请输入" @on-blur="setRow(row,index)" />
</template>
<template slot-scope="{ row, index }" slot="datatype">
<!-- <Input v-model="row.datatype" placeholder="请输入" @on-blur="setRow(row,index)" /> -->
<Select v-model="row.datatype" style="width:200px" @on-change="setRow(row,index)">
<Option
v-for="item in cityList"
:value="item.value"
:key="item.value"
>{{ item.label }}</Option>
</Select>
</template>
<!-- <template slot-scope="{ row, index }" slot="result">
<Input v-model="row.result" placeholder="请输入" @on-blur="setRow(row,index)" />
</template>-->
<template slot-scope="{ row, index }" slot="required">
<Checkbox v-model="row.required" @on-change="setRow(row,index)"></Checkbox>
</template>
<template slot-scope="{ row, index }" slot="isunique">
<Checkbox v-model="row.isunique" @on-change="setRow(row,index)"></Checkbox>
</template>
</Table>
</Col>
<Col :span="24" style="margin-bottom:20px;">
<Button type="primary" long @click="addNew" class="mt10">添加</Button>
</Col>
<Col :span="24" style="text-align: right;">
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Col>
</Row>
</Form>
</div>
</template>
<script>
import Api from "./api";
export default {
data() {
return {
entity: {
upId: 0,
code: 0
},
cityList: [
{
value: "0",
label: "Number"
},
{
value: "1",
label: "string"
},
{
value: "2",
label: "Null"
},
{
value: "3",
label: "Boolean"
},
{
value: "4",
label: "Undefined"
}
],
disabled: false,
columns: [
{
title: "序号",
type: "index",
width: 80,
align: "center"
},
{
title: "属性名称",
key: "title",
align: "center"
},
{
title: "备注",
key: "note",
align: "center",
slot: "note"
},
{
title: "属性类型",
key: "datatype",
align: "center",
slot: "datatype"
},
// {
// title: "是否显示",
// key: "result",
// align: "center",
// slot: "result"
// },
{
title: "是否必填",
key: "required",
align: "center",
slot: "required"
},
{
title: "是否唯一属性",
key: "isunique",
align: "center",
slot: "isunique"
}
],
checkList: [],
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }]
}
};
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
this.tableData();
},
methods: {
tableData() {
let conditions = [];
Api.listTable({ conditions: conditions }).then(r => {
if (r.result) {
console.log(r);
this.checkList = r.result;
}
});
},
setRow() {
this.$set(this.checkList, index, row);
},
addNew() {},
handleSubmit() {
this.$refs.form.validate(v => {
if (v) {
let categoryDto = this.entity;
let pro = this.checkList;
Api.create({ categoryDto: categoryDto, pro: pro })
.then(r => {
if (r.success) {
this.$Message.success("保存成功");
this.$emit("on-ok");
} else {
this.$Message.error("保存失败");
}
})
.catch(err => {
this.disabled = false;
this.$Message.error("保存失败");
});
}
});
},
handleClose() {
this.$emit("on-close");
}
}
};
</script>
pages/materiel/classification/index.vue
View file @ f01440b8
...@@ -85,8 +85,8 @@ export default { ...@@ -85,8 +85,8 @@ export default {
} }
}; };
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
created() { created() {
this.loadTree(); this.loadTree();
...@@ -104,19 +104,26 @@ async fetch({ store, params }) { ...@@ -104,19 +104,26 @@ async fetch({ store, params }) {
addNew() { addNew() {
// this.nodeInfo.id = 0; // this.nodeInfo.id = 0;
// let conditions = []; // let conditions = [];
// debugger
this.add(); this.curId = 0;
this.title = "新增";
this.detail = () => import("./add");
this.modal = true;
}, },
add() { add() {
// this.curId = 0; this.curId = 0;
this.title = "新增"; this.title = "新增";
this.detail = () => import("./add"); this.detail = () => import("./sonAdd");
this.modal = true; this.modal = true;
}, },
edit() { edit() {
if (this.nodeInfo.upId == 0) {
this.detail = () => import("./edit");
} else {
this.detail = () => import("./sonEdit");
}
this.curId = this.nodeInfo.id; this.curId = this.nodeInfo.id;
this.title = "编辑"; this.title = "编辑";
this.detail = () => import("./edit");
this.modal = true; this.modal = true;
}, },
remove() { remove() {
...@@ -172,17 +179,16 @@ async fetch({ store, params }) { ...@@ -172,17 +179,16 @@ async fetch({ store, params }) {
loadTree() { loadTree() {
let conditions = []; let conditions = [];
Api.list({ conditions: conditions }).then(r => { Api.list({ conditions: conditions }).then(r => {
setTree(r.result); var data = this.$u.toTree(
function setTree(data) { r.result,
data.map(u => { 0,
u.title = u.name; u => {
u.title = u.code + u.name;
u.value = u.id; u.value = u.id;
if (u.children) { u.expand = true;
setTree(u.children); },
} "upId"
}); );
}
var data = r.result;
this.list = this.$u.clone(data); this.list = this.$u.clone(data);
}); });
}, },
......
pages/materiel/classification/masterData/index.vue 0 → 100644
View file @ f01440b8
<template>
<div class="master-data">
<DataGrid :columns="columns" ref="grid" :action="action">
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys">
<Input placeholder="请输入编码/名称" v-width="200" v-model="easySearch.keys.value" clearable />
</FormItem>
<FormItem>
<Button type="primary" @click="search">查询</Button>
</FormItem>
</Form>
</template>
<template slot="buttons">
<Button type="primary" @click="add">新增</Button>
</template>
</DataGrid>
<Modal v-model="modal" :title="title" width="1120" footer-hide>
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
</Modal>
</div>
</template>
<script>
export default {
data() {
return {
action: "",
detail: null,
modal: false,
curId: 0,
easySearch: {
keys: { op: "name,code", value: null }
},
title: "",
columns: [
{
key: "code",
title: "编码",
align: "left",
width: 200,
easy: true,
high: true
},
{
key: "name",
title: "名称",
align: "left",
easy: true,
high: true,
tooltip: true
},
{
title: "操作",
key: "action",
width: 260,
align: "left",
render: (h, params) => {
return h("div", { class: "action" }, [
h(
"op",
{
attrs: { oprate: "edit" },
on: { click: () => this.edit(params.row) }
},
"编辑"
),
h(
"op",
{
attrs: { oprate: "delete" },
on: { click: () => this.remove(params.row.id) }
},
"删除"
)
]);
}
}
]
};
},
methods: {
edit() {
this.modal = true;
this.detail = () => import("./add");
},
remove() {},
add() {
this.modal = true;
this.detail = () => import("./add");
},
search() {
this.$refs.grid.reload(this.easySearch);
},
ok() {
// this.$refs.grid.load();
this.modal = false;
this.curId = 0;
},
cancel() {
this.curId = 0;
this.modal = false;
}
}
};
</script>
<style lang="less" scoped>
.spare-parts {
width: 100%;
height: 100%;
}
</style>
\ No newline at end of file
pages/materiel/classification/sonAdd.vue 0 → 100644
View file @ f01440b8
<template>
<div>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col :span="12">
<FormItem label="上级名称" prop="upName">
<Input v-model="upName" placeholder="请输入" disabled></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem label="编码" prop="code">
<Input v-model="entity.code" placeholder="请输入" disabled></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem label="名称" prop="name">
<Input v-model="entity.name" placeholder="请输入"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem label="状态" prop="status" placeholder="请选择">
<Dictionary
code="materail.category.status"
v-model="entity.status"
type="select"
:value="entity.status"
:key="entity.status"
></Dictionary>
</FormItem>
</Col>
<Col :span="24">
<FormItem label="描述" prop="description">
<Input v-model="entity.description" type="textarea" placeholder="请输入..."></Input>
</FormItem>
</Col>
<Col :span="24" style="text-align: right;">
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Col>
</Row>
</Form>
</div>
</template>
<script>
import Api from "./api";
export default {
data() {
return {
entity: {
upId: this.nodeInfo.id,
code: 0
},
upName: this.nodeInfo.title,
disabled: false,
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }]
}
};
},
props: ["nodeInfo"],
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {},
methods: {
handleSubmit() {
this.$refs.form.validate(v => {
if (v) {
Api.create({ categoryDto: this.entity, pro: [] })
.then(r => {
if (r.success) {
this.$Message.success("保存成功");
this.$emit("on-ok");
} else {
this.$Message.error("保存失败");
}
})
.catch(err => {
this.disabled = false;
this.$Message.error("保存失败");
});
}
});
},
handleClose() {
this.$emit("on-close");
}
}
};
</script>
pages/materiel/classification/sonEdit.vue 0 → 100644
View file @ f01440b8
<template>
<div>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col :span="12">
<FormItem label="上级名称" prop="upName">
<Input v-model="upName" placeholder="请输入" disabled></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem label="编码" prop="code">
<Input v-model="entity.code" placeholder="请输入" disabled></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem label="名称" prop="name">
<Input v-model="entity.name" placeholder="请输入"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem label="状态" prop="status" placeholder="请选择">
<Dictionary
code="materail.category.status"
v-model="entity.status"
type="select"
:value="entity.status"
:key="entity.status"
></Dictionary>
</FormItem>
</Col>
<Col :span="24">
<FormItem label="描述" prop="description">
<Input v-model="entity.description" type="textarea" placeholder="请输入..."></Input>
</FormItem>
</Col>
<Col :span="24" style="text-align: right;">
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Col>
</Row>
</Form>
</div>
</template>
<script>
import Api from "./api";
export default {
data() {
return {
entity: {
upId: 0,
code: 0
},
upName: this.nodeInfo.title,
disabled: false,
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }]
}
};
},
props: ["nodeInfo"],
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
this.get();
},
methods: {
get() {
Api.get({ id: this.nodeInfo.id }).then(r => {
if (r.result) {
this.entity = r.result;
}
});
},
handleSubmit() {
this.$refs.form.validate(v => {
if (v) {
Api.update({ categoryDto: this.entity, pro: [] })
.then(r => {
if (r.success) {
this.$Message.success("保存成功");
this.$emit("on-ok");
} else {
this.$Message.error("保存失败");
}
})
.catch(err => {
this.disabled = false;
this.$Message.error("保存失败");
});
}
});
},
handleClose() {
this.$emit("on-close");
}
}
};
</script>
pages/materiel/classification/spareParts/index.vue deleted 100644 → 0
View file @ 5d5bcee3
<template>
<div class="spare-parts">
<Button type="dashed" @click="add">新增</Button>
<Modal v-model="addModal" title="新增" footer-hide width='1000'>
<Add @on-close="cancel" @on-ok="addOk" ref="add" />
</Modal>
</div>
</template>
<script>
import Add from "./add";
export default {
components: {
Add
},
data() {
return {
addModal: false
};
},
methods: {
add() {
this.addModal = true;
},
remove(){
},
addOk() {
this.addModal = false;
},
cancel() {
this.addModal = false;
}
}
};
</script>
<style lang="less" scoped>
.spare-parts {
width: 100%;
height: 100%;
}
</style>
\ No newline at end of file
pages/processDesign/ChangeSingle/index.vue
View file @ f01440b8
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
<Changesingle /> <Changesingle />
</TabPane> </TabPane>
<TabPane label="不合格审理单" name="unqualifiedorder"> <TabPane label="不合格审理单" name="unqualifiedorder">
<unqualifiedorder ref="unqualifiedorder"></unqualifiedorder> <unqualifiedorder ref="unqualifiedorder"></unqualifiedorder>
</TabPane> </TabPane>
<TabPane label="生产协调单" name="technicalcoordination"> <TabPane label="生产协调单" name="technicalcoordination">
......
pages/produce/execute/execute.less
View file @ f01440b8
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
} }
.ivu-drawer-body { .ivu-drawer-body {
padding: 0; padding: 0;
height: calc(100% - 210px); height: calc(100% - 115px);
.order_list{ .order_list{
.select_t { .select_t {
padding: 15px 20px; padding: 15px 20px;
......
pages/produce/execute/judgment/index.vue
View file @ f01440b8
...@@ -9,18 +9,12 @@ ...@@ -9,18 +9,12 @@
<Button class="button" type="primary" @click="rechecked">反选</Button> <Button class="button" type="primary" @click="rechecked">反选</Button>
</p> </p>
<div class="list01"> <div class="list01">
<!-- -->
<Tag <Tag
type="dot" type="dot" :checkable="true"
:checkable="true" class="tag_card" size="large"
class="tag_card"
size="large"
v-for="(item,index) in cardlist" v-for="(item,index) in cardlist"
:name="item.id" :name="item.id" :key="index" :checked="item.checked"
:key="index" color="primary" @on-change="changeCards"
:checked="item.checked"
color="primary"
@on-change="changeCards"
>{{item.prefix}}.{{item.code}}</Tag> >{{item.prefix}}.{{item.code}}</Tag>
</div> </div>
</div> </div>
...@@ -47,7 +41,7 @@ ...@@ -47,7 +41,7 @@
:checkable="false" :checkable="false"
closable closable
@on-close="hegeClose" @on-close="hegeClose"
>{{ item.code}}</Tag> >{{item.prefix}}.{{ item.code}}</Tag>
</div> </div>
</div> </div>
<div class="mass_list rangbu" v-if="ranglist.length>0"> <div class="mass_list rangbu" v-if="ranglist.length>0">
...@@ -60,15 +54,11 @@ ...@@ -60,15 +54,11 @@
</h2> </h2>
<div class="list02"> <div class="list02">
<Tag <Tag
type="dot" type="dot" class="tag_card02"
class="tag_card02" v-for="(item,index) in ranglist" :key="index"
v-for="(item,index) in ranglist" :name="item.id" :checkable="false"
:key="index" closable @on-close="handleClose"
:name="item.id" >{{item.prefix}}.{{ item.code}}</Tag>
:checkable="false"
closable
@on-close="handleClose"
>{{ item.code}}</Tag>
</div> </div>
</div> </div>
<div class="mass_list fanxiu_box" v-if="fanlist.length>0"> <div class="mass_list fanxiu_box" v-if="fanlist.length>0">
...@@ -80,15 +70,11 @@ ...@@ -80,15 +70,11 @@
</h2> </h2>
<div class="list02"> <div class="list02">
<Tag <Tag
type="dot" type="dot" class="tag_card02"
class="tag_card02" v-for="(item,index) in fanlist" :key="index"
v-for="(item,index) in fanlist" :name="item.id" :checkable="false"
:key="index" closable @on-close="fanClose"
:name="item.id" >{{item.prefix}}.{{ item.code}}</Tag>
:checkable="false"
closable
@on-close="fanClose"
>{{ item.code}}</Tag>
</div> </div>
</div> </div>
<div class="mass_list fei_box" v-if="feilist.length>0"> <div class="mass_list fei_box" v-if="feilist.length>0">
...@@ -100,15 +86,11 @@ ...@@ -100,15 +86,11 @@
</h2> </h2>
<div class="list02"> <div class="list02">
<Tag <Tag
type="dot" type="dot" class="tag_card02"
class="tag_card02" v-for="(item,index) in feilist" :key="index"
v-for="(item,index) in feilist" :name="item.id" :checkable="false"
:key="index" closable @on-close="feiClose"
:name="item.id" >{{item.prefix}}.{{ item.code}}</Tag>
:checkable="false"
closable
@on-close="feiClose"
>{{ item.code}}</Tag>
</div> </div>
</div> </div>
<div class="fei_right" v-if="feilist.length>0"> <div class="fei_right" v-if="feilist.length>0">
...@@ -134,14 +116,9 @@ ...@@ -134,14 +116,9 @@
</div> </div>
</div> </div>
<div class="futer flex fc-ev" v-if="ranglist.length>0||fanlist.length>0||feilist.length>0"> <div class="futer flex fc-ev" v-if="ranglist.length>0||fanlist.length>0||feilist.length>0">
<Button <Button class="button" size="large" type="primary" @click="sendOrder" v-if="feilist.length>0" >送审</Button>
class="button"
size="large"
type="primary"
@click="sendOrder"
v-if="feilist.length>0"
>送审</Button>
<Button class="button" size="large" type="primary" @click="submit" v-else>提交</Button> <Button class="button" size="large" type="primary" @click="submit" v-else>提交</Button>
<!-- :disabled="hegelist.length!=0&&fanlist.length!=0&&ranglist.length!=0" -->
<Button class="button" size="large" @click="toOrder">取消</Button> <Button class="button" size="large" @click="toOrder">取消</Button>
</div> </div>
<!-- 订单送审 --> <!-- 订单送审 -->
...@@ -160,7 +137,7 @@ ...@@ -160,7 +137,7 @@
</template> </template>
<script> <script>
import Api from "../api"; import Api from "../api";
import OrderSendReview from "@/components/orderOperator/orderSendReview"; import OrderSendReview from "./orderSendReview";
export default { export default {
name: "starOrder", name: "starOrder",
components: { OrderSendReview }, components: { OrderSendReview },
...@@ -172,6 +149,7 @@ export default { ...@@ -172,6 +149,7 @@ export default {
mTitle: "确认弹框", mTitle: "确认弹框",
num: "", num: "",
surMasg: "", surMasg: "",
entity: {},//获取展示数据
rules: { rules: {
question: [ question: [
{ {
...@@ -225,18 +203,37 @@ export default { ...@@ -225,18 +203,37 @@ export default {
}, },
methods: { methods: {
loadFun() { loadFun() {
let pid = this.$route.query.id; // JSON.stringify() let pid = Number(this.$route.query.id); // JSON.stringify()
Api.getpaged({ id: pid }).then(res => { Api.getpaged({ id: pid }).then(res => {
if (res.success) { if (res.success) {
let resoult = res.result; let resoult = res.result;
resoult.filter(u => { resoult.filter(u => {
u.checked = false; u.checked = false;
if(u.productStatus==1){
this.hegelist.push(u)
}
if(u.productStatus==2){
this.feilist.push(u)
}
if(u.productStatus==3){
this.ranglist.push(u)
}
if(u.productStatus==4){
this.fanlist.push(u)
}if(u.productStatus==0){
this.cardlist.push(u)
}
}); });
this.cardlist = resoult;
} else {
console.log(res.error);
} }
})
.catch(e => {
this.$Message.error("连接错误");
}); });
Api.orderanddispatchinfos({ id: pid }).then(res=>{
if (res.success && res.result) {
this.entity = res.result;
}
})
}, },
// 全选 // 全选
allcheck() { allcheck() {
...@@ -345,7 +342,8 @@ export default { ...@@ -345,7 +342,8 @@ export default {
if (unmb == 3) { if (unmb == 3) {
this.cansolfei(); this.cansolfei();
this.suModal = false; this.suModal = false;
} else { }
if (unmb == 0) {
this.cansolhege(); this.cansolhege();
this.suModal = false; this.suModal = false;
} }
...@@ -356,21 +354,21 @@ export default { ...@@ -356,21 +354,21 @@ export default {
v.productStatus = 0 v.productStatus = 0
this.cardlist.unshift(v); this.cardlist.unshift(v);
}); });
this.hegeplist = []; this.hegelist = [];
}, },
hegeClose(event, name) { hegeClose(event, name) {
let hegeold = this.hegelist; let hegeold = this.hegelist;
let inde = this.hegelist.findIndex(item => { let ind = this.hegelist.findIndex(hgitem => {
return item.id === name; return hgitem.id === name;
}); });
let utemlist = hegeold.filter(utem => { let hgtemlist = hegeold.filter(hgtem => {
if (utem.id == name) { if (hgtem.id == name) {
utem.productStatus = 0 hgtem.productStatus = 0
return utem; return hgtem;
} }
}); });
this.hegelist.splice(inde, 1); this.hegelist.splice(ind, 1);
this.cardlist.splice(0, 0, utemlist[0]); this.cardlist.splice(0, 0, hgtemlist[0]);
}, },
cansolRang() { cansolRang() {
let rangblist = this.ranglist; let rangblist = this.ranglist;
...@@ -426,26 +424,54 @@ export default { ...@@ -426,26 +424,54 @@ export default {
}, },
// 提交 // 提交
submit() { submit() {
this.$Message.success("提交中..."); console.log(this.ranglist)
// this.feilist.cause = this.orderForm.question;
// this.feilist.reporter = this.orderForm.useroption;
let hegeops = {
prodcutIds: [],
productStatus: this.hegelist[0].productStatus||''
};
let rangops = {
prodcutIds: [],
productStatus: this.ranglist[0].productStatus||''
};
let fanxops = {
prodcutIds: [],
productStatus: this.fanlist[0].productStatus||''
};
// let prodcutIds = [],productStatus=this.hegelist[0].productStatus;
this.hegelist.map(uh=>{hegeops.prodcutIds.push(uh.id)})
this.ranglist.map(ur=>{rangops.prodcutIds.push(ur.id)})
this.fanlist.map(uf=>{fanxops.prodcutIds.push(uf.id)})
let lists = [hegeops,rangops,fanxops];
let parmes={ let parmes={
dispatchId: this.$route.query.id, dispatchId: this.$route.query.id,
list: [ orderId: this.$route.query.orderId,
{ list: lists
"productStatus": 0, // [
"prodcutIds": [ // this.feilist,
0 // this.hegelist,
], // this.ranglist,
"cause": "string", // this.fanlist,
"reporter": "string" // {
} // "productStatus": 0,
] // "prodcutIds": [
}; // 0
let orderId = this.$route.query.orderId; // ],
let executeId = this.$route.query.executeId; // "cause": "string",
console.log() // "reporter": "string"
// Api.submitData().then(res=>{ // }
// ]
// }) };
// let executeId = this.$route.query.executeId;
console.log(parmes)
Api.submitData(parmes).then(res=>{
if(res.success){
this.$Message.success("提交成功!");
}else{
this.$Message.success("提交失败~");
}
})
}, },
// 送审 // 送审
sendOrder() { sendOrder() {
...@@ -453,6 +479,7 @@ export default { ...@@ -453,6 +479,7 @@ export default {
if (valid) { if (valid) {
// this.$Message.success("送审...") // this.$Message.success("送审...")
this.ModalOrder = true; this.ModalOrder = true;
this.$refs.orderSendReview.intData(this.entity);
} }
}); });
}, },
......
pages/produce/execute/judgment/orderInfos.vue 0 → 100644
View file @ f01440b8
<template>
<div class="detail">
<Row>
<Filed :span="12" :name="l('productName')">{{info.orderInfo.productName}}</Filed>
<Filed :span="12" :name="l('drawnNumber')">{{info.orderInfo.drawnNumber}}</Filed>
<Filed :span="12" :name="l('status')">{{info.orderInfo.projectNumber}}</Filed>
<Filed :span="12" :name="l('mesCode')">{{info.orderInfo.mesCode}}</Filed>
<Filed :span="12" name="批次号">{{info.orderInfo.batchNumber}}</Filed>
<!-- <Filed :span="8" :name="l('batchNumber')">{{info.orderInfo.batchNumber}}</Filed> -->
<Filed :span="12" :name="l('quantity')">{{info.orderInfo.quantity}}</Filed>
<Filed :span="12" name="节点日期">{{info.orderInfo.demandFinishDate}}</Filed>
<Filed :span="12" name="不合格产品数量">{{info.orderInfo.demandFinishDate}}</Filed>
<Filed :span="12" name="问题原因">{{info.orderInfo.demandFinishDate}}</Filed>
<Filed :span="12" name="责任归属">{{info.orderInfo.demandFinishDate}}</Filed>
<Filed :span="24" name="不合格产品号">{{info.orderInfo.demandFinishDate}}</Filed>
<!-- <Filed :span="8" :name="l('stage')">
<state code="plan.order.stage" :value="info.orderInfo.stage+''" type="text"></state>
</Filed>
<Filed :span="8" :name="l('taskType')">
<state code="plan.order.taskType" :value="info.orderInfo.taskType+''" type="text"></state>
</Filed>
<Filed :span="8" :name="l('materialId')">
<state code="plan.order.material" :value="info.orderInfo.materialId+''" type="text"></state>
</Filed> -->
</Row>
</div>
</template>
<script>
export default {
name: 'orderInfos',
props: ['info'],
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
data() {
return {}
},
methods: {
arry2Name(arryList, values) {
//预警类别转换
var codes = arryList
var name = ''
for (let i in codes) {
if (values == codes[i].value) {
name = codes[i].name
}
}
return name
},
l(key) {
key = 'order_list' + '.' + key
return this.$t(key)
}
}
}
</script>
\ No newline at end of file
pages/produce/execute/judgment/orderSendReview.vue 0 → 100644
View file @ f01440b8
<template>
<div style="width:80%;margin:0 auto" :style="{ height: divHeight }">
<OrderInfos v-if="info.status" :info="info"></OrderInfos>
<!-- 批量送审展示列表 -->
<!-- <Table :info1="info1"
:loading="loading"
border
:columns="columns1"
:data="dataList"
class="tableCommon"
v-if="osrMoreList"
></Table> -->
<Process ref="userProcess" schemaIdVal="c2e09c9b-02a9-4188-97a6-cdb68d50a64a"/>
</div>
</template>
<script>
import OrderInfos from './orderInfos'
import Process from '@/components/orderOperator/process'
export default {
name: 'orderSendReview',
components: {
OrderInfos,
Process
},
data() {
return {
loading: false,
divHeight: '300px',
osrOneList: false, //一条数据显示详细
osrMoreList: false, //多条数据只显示列表
info: {
status: true,
orderInfo: [],
},
orderSearchForm: {
reviewUser: '' //订单名称
},
columns1: [
{
title: '订单编码',
key: 'mesCode',
width: 180,
tooltip: true
},
{
title: '任务类型',
key: 'taskType',
align: 'center',
width: 100,
tooltip: true
},
{
title: '产品名称',
key: 'productName',
tooltip: true
},
{
title: '阶段',
key: 'stage',
width: 80
},
{
title: '材料',
key: 'materialId',
width: 100,
tooltip: true
},
{
title: '数量',
key: 'quantity',
align: 'right',
width: 70
}
],
dataList: [],
dataListRetrun: [], //确定后返回数据
operatorIdList: [], //操作员id
// } //确定后返回数据
}
},
created() {
var theight = window.innerHeight - 630 + 'px'
this.divHeight = theight
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight
this.divHeight = window.screenHeight - 630 + 'px'
})()
}
},
methods: {
intData(data) {
//打开modal层时给订单list赋值
if(data){
this.info.Unqualified = data
}
},
returnDataList() {
let ues = this.$refs.userProcess
this.operatorIdList = ues.immutData
return this.operatorIdList
}
}
}
</script>
pages/technology/search.vue
View file @ f01440b8
<template> <template>
<Form ref="form" :model="condition" :label-width="100"> <Form ref="form" :model="condition" :label-width="100">
<Row> <Row>
<Col :span="12" v-if="condition.id.show">
<FormItem :label="编号" prop="id">
<Input v-model="condition.id.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.classId.show"> <Col :span="12" v-if="condition.classId.show">
<FormItem :label="l('classId')" prop="classId"> <FormItem :label="l('classId')" prop="classId">
<Input v-model="condition.classId.value"></Input> <Input v-model="condition.classId.value"></Input>
...@@ -151,6 +156,7 @@ export default { ...@@ -151,6 +156,7 @@ export default {
condition: { condition: {
creationTime: { op: "Range", value: null, show: true }, creationTime: { op: "Range", value: null, show: true },
creatorUserId: { op: "Equal", value: null, show: true }, creatorUserId: { op: "Equal", value: null, show: true },
id: { op: "Equal", value: null, show: true },
lastModificationTime: { op: "Range", value: null, show: true }, lastModificationTime: { op: "Range", value: null, show: true },
lastModifierUserId: { op: "Equal", value: null, show: true }, lastModifierUserId: { op: "Equal", value: null, show: true },
classId: { op: "Equal", value: null, show: false }, classId: { op: "Equal", value: null, show: false },
......
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