Skip to content

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

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

parents a37624a4 9d41ddb6
Hide whitespace changes
Inline Side-by-side
Showing with 431 additions and 164 deletions
pages/materiel/classification/add.vue
View file @ d314e858
...@@ -33,18 +33,33 @@ ...@@ -33,18 +33,33 @@
</Col> </Col>
<Col :span="24" style="padding:20px 0 0px 10px;margin-bottom:10px;" class="table-solt"> <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"> <Table border :columns="columns" :data="checkList" class="tableCommon" height="300">
<template slot-scope="{ row, index }" slot="title">
<div v-if="row.fieldType==1||row.fieldType==2">{{row.title}}</div>
<Input
v-if="row.fieldType==3"
v-model="row.title"
placeholder="请输入"
@on-blur="setRow(row,index)"
/>
</template>
<template slot-scope="{ row, index }" slot="note"> <template slot-scope="{ row, index }" slot="note">
<Input v-model="row.note" placeholder="请输入" @on-blur="setRow(row,index)" /> <div v-if="row.fieldType==1">{{row.note}}</div>
<Input v-model="row.note" placeholder="请输入" @on-blur="setRow(row,index)" v-else />
</template> </template>
<template slot-scope="{ row, index }" slot="datatype"> <template slot-scope="{ row, index }" slot="dataType">
<!-- <Input v-model="row.datatype" placeholder="请输入" @on-blur="setRow(row,index)" /> --> <state
<Select v-model="row.datatype" style="width:200px" @on-change="setRow(row,index)"> v-if="row.fieldType==1"
<Option code="materail.category.dataType"
v-for="item in cityList" :value="row.dataType"
:value="item.value" type="text"
:key="item.value" ></state>
>{{ item.label }}</Option> <Dictionary
</Select> v-else
code="materail.category.dataType"
type="select"
:value="row.dataType"
:key="row.dataType"
></Dictionary>
</template> </template>
<!-- <template slot-scope="{ row, index }" slot="result"> <!-- <template slot-scope="{ row, index }" slot="result">
<Input v-model="row.result" placeholder="请输入" @on-blur="setRow(row,index)" /> <Input v-model="row.result" placeholder="请输入" @on-blur="setRow(row,index)" />
...@@ -52,8 +67,15 @@ ...@@ -52,8 +67,15 @@
<template slot-scope="{ row, index }" slot="required"> <template slot-scope="{ row, index }" slot="required">
<Checkbox v-model="row.required" @on-change="setRow(row,index)"></Checkbox> <Checkbox v-model="row.required" @on-change="setRow(row,index)"></Checkbox>
</template> </template>
<template slot-scope="{ row, index }" slot="isunique"> <template slot-scope="{ row, index }" slot="isUnique">
<Checkbox v-model="row.isunique" @on-change="setRow(row,index)"></Checkbox> <Checkbox v-model="row.isUnique" @on-change="setRow(row,index)"></Checkbox>
</template>
<template
slot-scope="{ row, index }"
slot="action"
v-if="row.fieldType==2||row.fieldType==3"
>
<a @click="remove(index,row)" style="color:#FF7A8B">删除</a>
</template> </template>
</Table> </Table>
</Col> </Col>
...@@ -75,32 +97,11 @@ import Api from "./api"; ...@@ -75,32 +97,11 @@ import Api from "./api";
export default { export default {
data() { data() {
return { return {
arr: [],
entity: { entity: {
upId: 0, upId: 0,
code: 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, disabled: false,
columns: [ columns: [
{ {
...@@ -112,7 +113,8 @@ export default { ...@@ -112,7 +113,8 @@ export default {
{ {
title: "属性名称", title: "属性名称",
key: "title", key: "title",
align: "center" align: "center",
slot: "title"
}, },
{ {
title: "备注", title: "备注",
...@@ -122,9 +124,9 @@ export default { ...@@ -122,9 +124,9 @@ export default {
}, },
{ {
title: "属性类型", title: "属性类型",
key: "datatype", key: "dataType",
align: "center", align: "center",
slot: "datatype" slot: "dataType"
}, },
// { // {
// title: "是否显示", // title: "是否显示",
...@@ -140,9 +142,15 @@ export default { ...@@ -140,9 +142,15 @@ export default {
}, },
{ {
title: "是否唯一属性", title: "是否唯一属性",
key: "isunique", key: "isUnique",
align: "center", align: "center",
slot: "isunique" slot: "isUnique"
},
{
title: "操作",
slot: "action",
width: 100,
align: "center"
} }
], ],
checkList: [], checkList: [],
...@@ -159,24 +167,62 @@ export default { ...@@ -159,24 +167,62 @@ export default {
}, },
methods: { methods: {
tableData() { tableData() {
let conditions = []; let conditions = [
{
conditionalType: "In",
fieldName: "fieldType",
fieldValue: "1,2"
},
{
conditionalType: "Equal",
fieldName: "categoryId",
fieldValue: "0"
}
];
Api.listTable({ conditions: conditions }).then(r => { Api.listTable({ conditions: conditions }).then(r => {
if (r.result) { if (r.result) {
console.log(r); var arr = r.result;
this.checkList = r.result; this.checkList = arr.filter(function(item) {
delete item["id"];
return item;
});
} }
}); });
}, },
remove(index, row) {
if (row.add == 0) {
//新增的删除，直接删
this.checkList.splice(index, 1);
} else {
row.action = 2; //返回的默认删除，删除后保存在arr数组中，添加标识action = 2，然后点击保存的时候，一起传给后台
this.$set(this.checkList, index, row);
this.arr.push(row);
this.checkList.splice(index, 1);
}
},
setRow() { setRow() {
this.$set(this.checkList, index, row); this.$set(this.checkList, index, row);
}, },
addNew() {}, addNew() {
let obj = {
title: "",
note: "",
dataType: "",
required: false,
isunique: false,
fieldType: 3,
categoryId: 0,
action: 1,
add: 0 //新增标识
};
this.checkList.push(obj);
},
handleSubmit() { handleSubmit() {
this.$refs.form.validate(v => { this.$refs.form.validate(v => {
if (v) { if (v) {
let categoryDto = this.entity; let categoryDto = this.entity;
let pro = this.checkList; let pro = this.checkList.concat(this.arr);
Api.create({ categoryDto: categoryDto, pro: pro }) Api.create({ categoryDto: categoryDto, pro: pro })
.then(r => { .then(r => {
if (r.success) { if (r.success) {
......
pages/materiel/classification/edit.vue
View file @ d314e858
...@@ -32,19 +32,30 @@ ...@@ -32,19 +32,30 @@
<h4>属性配置</h4> <h4>属性配置</h4>
</Col> </Col>
<Col :span="24" style="padding:20px 0 0px 10px;margin-bottom:10px;" class="table-solt"> <Col :span="24" style="padding:20px 0 0px 10px;margin-bottom:10px;" class="table-solt">
<!--fieldType 1.固有，2.默认，3自定义； -->
<Table border :columns="columns" :data="checkList" class="tableCommon" height="300"> <Table border :columns="columns" :data="checkList" class="tableCommon" height="300">
<template slot-scope="{ row, index }" slot="title">
<div v-if="row.fieldType==1||row.fieldType==2">{{row.title}}</div>
<Input v-else v-model="row.title" placeholder="请输入" @on-blur="setRow(row,index)" />
</template>
<template slot-scope="{ row, index }" slot="note"> <template slot-scope="{ row, index }" slot="note">
<Input v-model="row.note" placeholder="请输入" @on-blur="setRow(row,index)" /> <div v-if="row.fieldType==1">{{row.note}}</div>
<Input v-model="row.note" placeholder="请输入" @on-blur="setRow(row,index)" v-else />
</template> </template>
<template slot-scope="{ row, index }" slot="datatype"> <template slot-scope="{ row, index }" slot="dataType">
<!-- <Input v-model="row.datatype" placeholder="请输入" @on-blur="setRow(row,index)" /> --> <state
<Select v-model="row.datatype" style="width:200px" @on-change="setRow(row,index)"> v-if="row.fieldType==1"
<Option code="materail.category.dataType"
v-for="item in cityList" :value="row.dataType"
:value="item.value" type="text"
:key="item.value" ></state>
>{{ item.label }}</Option> <Dictionary
</Select> v-else
code="materail.category.dataType"
type="select"
:value="row.dataType"
:key="row.dataType"
></Dictionary>
</template> </template>
<!-- <template slot-scope="{ row, index }" slot="result"> <!-- <template slot-scope="{ row, index }" slot="result">
<Input v-model="row.result" placeholder="请输入" @on-blur="setRow(row,index)" /> <Input v-model="row.result" placeholder="请输入" @on-blur="setRow(row,index)" />
...@@ -52,8 +63,15 @@ ...@@ -52,8 +63,15 @@
<template slot-scope="{ row, index }" slot="required"> <template slot-scope="{ row, index }" slot="required">
<Checkbox v-model="row.required" @on-change="setRow(row,index)"></Checkbox> <Checkbox v-model="row.required" @on-change="setRow(row,index)"></Checkbox>
</template> </template>
<template slot-scope="{ row, index }" slot="isunique"> <template slot-scope="{ row, index }" slot="isUnique">
<Checkbox v-model="row.isunique" @on-change="setRow(row,index)"></Checkbox> <Checkbox v-model="row.isUnique" @on-change="setRow(row,index)"></Checkbox>
</template>
<template
slot-scope="{ row, index }"
slot="action"
v-if="row.fieldType==2||row.fieldType==3"
>
<a @click="remove(index,row)" style="color:#FF7A8B">删除</a>
</template> </template>
</Table> </Table>
</Col> </Col>
...@@ -73,34 +91,14 @@ ...@@ -73,34 +91,14 @@
<script> <script>
import Api from "./api"; import Api from "./api";
export default { export default {
props: ["nodeInfo"],
data() { data() {
return { return {
entity: { entity: {
upId: 0, upId: 0,
code: 0 code: 0
}, },
cityList: [ arr: [],
{
value: "0",
label: "Number"
},
{
value: "1",
label: "string"
},
{
value: "2",
label: "Null"
},
{
value: "3",
label: "Boolean"
},
{
value: "4",
label: "Undefined"
}
],
disabled: false, disabled: false,
columns: [ columns: [
{ {
...@@ -112,7 +110,8 @@ export default { ...@@ -112,7 +110,8 @@ export default {
{ {
title: "属性名称", title: "属性名称",
key: "title", key: "title",
align: "center" align: "center",
slot: "title"
}, },
{ {
title: "备注", title: "备注",
...@@ -122,9 +121,9 @@ export default { ...@@ -122,9 +121,9 @@ export default {
}, },
{ {
title: "属性类型", title: "属性类型",
key: "datatype", key: "dataType",
align: "center", align: "center",
slot: "datatype" slot: "dataType"
}, },
// { // {
// title: "是否显示", // title: "是否显示",
...@@ -143,6 +142,12 @@ export default { ...@@ -143,6 +142,12 @@ export default {
key: "isunique", key: "isunique",
align: "center", align: "center",
slot: "isunique" slot: "isunique"
},
{
title: "操作",
slot: "action",
width: 100,
align: "center"
} }
], ],
checkList: [], checkList: [],
...@@ -151,15 +156,30 @@ export default { ...@@ -151,15 +156,30 @@ export default {
} }
}; };
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
mounted() { mounted() {
this.tableData(); this.get();
}, },
methods: { methods: {
get() {
Api.get({ id: this.nodeInfo.id }).then(r => {
if (r.result) {
this.entity = r.result;
this.tableData();
}
});
},
tableData() { tableData() {
let conditions = []; let conditions = [
{
conditionalType: "Equal",
fieldName: "categoryId",
fieldValue: this.nodeInfo.id
}
];
Api.listTable({ conditions: conditions }).then(r => { Api.listTable({ conditions: conditions }).then(r => {
if (r.result) { if (r.result) {
console.log(r); console.log(r);
...@@ -167,17 +187,41 @@ export default { ...@@ -167,17 +187,41 @@ export default {
} }
}); });
}, },
remove(index, row) {
if (row.add == 0) {
this.checkList.splice(index, 1);
} else {
row.action = 2;
this.$set(this.checkList, index, row);
this.arr.push(row);
this.checkList.splice(index, 1);
}
},
setRow() { setRow() {
this.$set(this.checkList, index, row); this.$set(this.checkList, index, row);
}, },
addNew() {}, addNew() {
let arr = this.$u.clone(this.checkList);
let obj = {
title: "",
note: "",
dataType: "",
required: false,
isunique: false,
fieldType: 3,
categoryId: 0,
action: 1,
add: 0
};
arr.push(obj);
this.checkList = arr;
},
handleSubmit() { handleSubmit() {
this.$refs.form.validate(v => { this.$refs.form.validate(v => {
if (v) { if (v) {
let categoryDto = this.entity; let categoryDto = this.entity;
let pro = this.checkList; let pro = this.checkList.concat(this.arr);
Api.create({ categoryDto: categoryDto, pro: pro }) Api.update({ categoryDto: categoryDto, pro: pro })
.then(r => { .then(r => {
if (r.success) { if (r.success) {
this.$Message.success("保存成功"); this.$Message.success("保存成功");
......
pages/materiel/classification/index.vue
View file @ d314e858
...@@ -56,8 +56,15 @@ ...@@ -56,8 +56,15 @@
<!-- <Product :parent="parent" /> --> <!-- <Product :parent="parent" /> -->
</Content> </Content>
</Layout> </Layout>
<Modal v-model="modal" :title="title" width="1000" footer-hide> <Modal v-model="modal" :title="title" width="1000" footer-hide :mask-closable="false">
<component :is="detail" :eid="curId" :nodeInfo="nodeInfo" @on-close="cancel" @on-ok="ok" /> <component
:is="detail"
:eid="curId"
:nodeInfo="nodeInfo"
@on-close="cancel"
@on-ok="ok"
ref="chlidren"
/>
</Modal> </Modal>
</div> </div>
</template> </template>
...@@ -109,6 +116,7 @@ export default { ...@@ -109,6 +116,7 @@ export default {
this.title = "新增"; this.title = "新增";
this.detail = () => import("./add"); this.detail = () => import("./add");
this.modal = true; this.modal = true;
this.$refs.chlidren.arr = [];
}, },
add() { add() {
this.curId = 0; this.curId = 0;
...@@ -119,6 +127,7 @@ export default { ...@@ -119,6 +127,7 @@ export default {
edit() { edit() {
if (this.nodeInfo.upId == 0) { if (this.nodeInfo.upId == 0) {
this.detail = () => import("./edit"); this.detail = () => import("./edit");
this.$refs.chlidren.arr = [];
} else { } else {
this.detail = () => import("./sonEdit"); this.detail = () => import("./sonEdit");
} }
......
pages/produce/execute/datafilling/index.vue
View file @ d314e858
...@@ -256,7 +256,7 @@ export default { ...@@ -256,7 +256,7 @@ export default {
columns12: [ columns12: [
{ title: "序号", type: "index", width: "70", align: "center" }, { title: "序号", type: "index", width: "70", align: "center" },
{ title: "参数名称", key: "check_params" }, { title: "参数名称", key: "check_params" },
{ title: "检验标记", key: "check_type" }, { title: "检验类型", key: "check_type" },
{ title: "汇报类型", key: "fillintype" }, { title: "汇报类型", key: "fillintype" },
{ title: "标准指标", key: "standard" }, { title: "标准指标", key: "standard" },
{ title: "生产要求", key: "production_requirement", tooltip: true }, { title: "生产要求", key: "production_requirement", tooltip: true },
......
pages/produce/execute/execute.less
View file @ d314e858
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
} }
.gd_list{ .gd_list{
position: absolute; position: absolute;
top: 40%; top: 43%;
left: 0px; left: 0px;
background: #2680EB; background: #2680EB;
color: #fff; color: #fff;
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
} }
.gn_area{ .gn_area{
position: absolute; position: absolute;
top: 40%; top: 43%;
right: 0px; right: 0px;
background: #515A6E; background: #515A6E;
color: #fff; color: #fff;
...@@ -374,7 +374,7 @@ ...@@ -374,7 +374,7 @@
} }
} }
.wu_bg{ .wu_bg{
height: calc(100vh - 100px); height: calc(100vh - 115px);
.mass_box{ .mass_box{
padding: 0 50px; padding: 0 50px;
} }
...@@ -391,7 +391,7 @@ ...@@ -391,7 +391,7 @@
} }
.mass_box{ .mass_box{
h2{ height: 40px;} h2{ height: 40px;}
.weizhix{ color: #4d5055;} // .weizhix{ color: #4d5055;}
.rangb{ color: #515A6E;} .rangb{ color: #515A6E;}
.hege{ color: #2680EB;} .hege{ color: #2680EB;}
.fanxiu{ color: #FFA000;} .fanxiu{ color: #FFA000;}
...@@ -416,6 +416,7 @@ ...@@ -416,6 +416,7 @@
margin: 15px 0; margin: 15px 0;
.btn_play{ .btn_play{
margin: 0 0 20px 0; margin: 0 0 20px 0;
color: #4d5055;
} }
.list01{ .list01{
min-height: 50px; min-height: 50px;
...@@ -595,4 +596,11 @@ ...@@ -595,4 +596,11 @@
// margin: 15px 43px; // margin: 15px 43px;
color: #515a6e; color: #515a6e;
} }
}
.zhuanx{
text-align: center;
line-height: 50px;
.line_p{
}
} }
\ No newline at end of file
pages/produce/execute/index.vue
View file @ d314e858
...@@ -93,18 +93,21 @@ export default { ...@@ -93,18 +93,21 @@ export default {
this.detail = () => import("./starOrder/index"); this.detail = () => import("./starOrder/index");
} //进度汇报 } //进度汇报
if (number == 1) { if (number == 1) {
this.detail = () => import("./MaterialCollec/index"); this.$Message.info("尊敬的用户，您没有该权限！")
// this.detail = () => import("./MaterialCollec/index");
} //物料领用 } //物料领用
if (number == 2) { if (number == 2) {
this.detail = () => import("./productSet/index"); // this.detail = () => import("./productSet/index");
this.$Message.info("尊敬的用户，您没有该权限！")
} //产品装配 } //产品装配
if (number == 3) { if (number == 3) {
this.detail = () => import("./taskTime/index"); this.detail = () => import("./taskTime/index");
} //工时分配 } //工时分配
if (number == 4) { if (number == 4) {
this.detail = () => import("./preparation/index"); this.$Message.info("尊敬的用户，您没有该权限！")
// this.detail = () => import("./preparation/index");
} //生产准备 } //生产准备
if (number == 5) { if (number == 5) {
this.detail = () => import("./ProcessCheck/index"); this.detail = () => import("./ProcessCheck/index");
} //工艺查看 } //工艺查看
if (number == 6) { if (number == 6) {
...@@ -117,7 +120,8 @@ export default { ...@@ -117,7 +120,8 @@ export default {
this.detail = () => import("./datafilling/index"); this.detail = () => import("./datafilling/index");
} //数据填报 } //数据填报
if (number == 9) { if (number == 9) {
this.detail = () => import("./testdata/index"); this.$Message.info("尊敬的用户，您没有该权限！")
// this.detail = () => import("./testdata/index");
} //测试数据 } //测试数据
}, },
changeAsc() changeAsc()
......
pages/produce/execute/judgment/index.vue
View file @ d314e858
...@@ -2,12 +2,11 @@ ...@@ -2,12 +2,11 @@
<template> <template>
<div class="wu_bg"> <div class="wu_bg">
<div class="mass_box"> <div class="mass_box">
<h2 class="weizhix">未执行（{{cardlist.length}}）</h2>
<div class="mass_list"> <div class="mass_list">
<p class="btn_play"> <h2 class="btn_play">未完工（{{cardlist.length}}）
<Button class="button" type="primary" @click="allcheck">全选</Button> <Button class="button" type="primary" @click="allcheck">全选</Button>
<Button class="button" type="primary" @click="rechecked">反选</Button> <Button class="button" type="primary" @click="rechecked">反选</Button>
</p> </h2>
<div class="list01"> <div class="list01">
<Tag <Tag
type="dot" :checkable="true" type="dot" :checkable="true"
...@@ -121,8 +120,8 @@ ...@@ -121,8 +120,8 @@
<!-- :disabled="hegelist.length!=0&&fanlist.length!=0&&ranglist.length!=0" --> <!-- :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>
<!-- 订单送审 --> <!-- 不合格品送审 -->
<Modal v-model="ModalOrder" title="订单送审" :mask-closable="false" :scrollable="true" fullscreen> <Modal v-model="ModalOrder" title="不合格品送审" :mask-closable="false" :scrollable="true" fullscreen>
<OrderSendReview ref="orderSendReview"></OrderSendReview> <OrderSendReview ref="orderSendReview"></OrderSendReview>
<div slot="footer"> <div slot="footer">
<Button @click="ModalOrder = false">取消</Button> <Button @click="ModalOrder = false">取消</Button>
...@@ -332,19 +331,19 @@ export default { ...@@ -332,19 +331,19 @@ export default {
okModal() { okModal() {
let unmb = this.num; let unmb = this.num;
if (unmb == 1) { if (unmb == 1) {
this.cansolRang(); this.cansolhege();
this.suModal = false; this.suModal = false;
} }
if (unmb == 2) { if (unmb == 2) {
this.cansolfan(); this.cansolfei();
this.suModal = false; this.suModal = false;
} }
if (unmb == 3) { if (unmb == 3) {
this.cansolfei(); this.cansolRang();
this.suModal = false; this.suModal = false;
} }
if (unmb == 0) { if (unmb == 4) {
this.cansolhege(); this.cansolfan();
this.suModal = false; this.suModal = false;
} }
}, },
...@@ -424,47 +423,132 @@ export default { ...@@ -424,47 +423,132 @@ export default {
}, },
// 提交 // 提交
submit() { submit() {
console.log(this.ranglist) let hegeops={};
// this.feilist.cause = this.orderForm.question; let rangops={};
// this.feilist.reporter = this.orderForm.useroption; let fanxops={};
let hegeops = { let feipops={};
prodcutIds: [], let cardseops={};
productStatus: this.hegelist[0].productStatus||'' let lists = [];
}; let pass01 = this.hegelist.length>0;
let rangops = { let pass02 = this.ranglist.length>0;
prodcutIds: [], let pass03 = this.fanlist.length>0;
productStatus: this.ranglist[0].productStatus||'' let pass04 = this.feilist.length>0;
}; cardseops = {
let fanxops = { prodcutIds: [],
productStatus: this.cardlist[0].productStatus
}
this.cardlist.map(ch=>{cardseops.prodcutIds.push(ch.id)})
if(pass01){
hegeops = {
prodcutIds: [], prodcutIds: [],
productStatus: this.fanlist[0].productStatus||'' productStatus: this.hegelist[0].productStatus
}; };
// let prodcutIds = [],productStatus=this.hegelist[0].productStatus; this.hegelist.map(uh=>{hegeops.prodcutIds.push(uh.id)})
this.hegelist.map(uh=>{hegeops.prodcutIds.push(uh.id)}) lists = [cardseops,hegeops];
this.ranglist.map(ur=>{rangops.prodcutIds.push(ur.id)}) if(pass02){
this.fanlist.map(uf=>{fanxops.prodcutIds.push(uf.id)}) rangops = {
let lists = [hegeops,rangops,fanxops]; prodcutIds: [],
productStatus: this.ranglist[0].productStatus
};
this.ranglist.map(ur=>{rangops.prodcutIds.push(ur.id)})
lists = [cardseops,hegeops,rangops];
if(pass03){
fanxops = {
prodcutIds: [],
productStatus: this.fanlist[0].productStatus
};
this.fanlist.map(uf=>{fanxops.prodcutIds.push(uf.id)})
lists = [cardseops,hegeops,rangops,fanxops];
}
}
}
if(pass02){
rangops = {
prodcutIds: [],
productStatus: this.ranglist[0].productStatus
};
this.ranglist.map(ur=>{rangops.prodcutIds.push(ur.id)})
lists = [cardseops,rangops];
if(pass01){
hegeops = {
prodcutIds: [],
productStatus: this.hegelist[0].productStatus
};
this.hegelist.map(uh=>{hegeops.prodcutIds.push(uh.id)})
lists = [cardseops,hegeops,rangops];
if(pass03){
fanxops = {
prodcutIds: [],
productStatus: this.fanlist[0].productStatus
};
this.fanlist.map(uf=>{fanxops.prodcutIds.push(uf.id)})
lists = [cardseops,hegeops,rangops,fanxops];
}
}
}
if(pass03){
fanxops = {
prodcutIds: [],
productStatus: this.fanlist[0].productStatus
};
this.fanlist.map(uf=>{fanxops.prodcutIds.push(uf.id)})
lists = [cardseops,fanxops];
if(pass01){
hegeops = {
prodcutIds: [],
productStatus: this.hegelist[0].productStatus
};
this.hegelist.map(uh=>{hegeops.prodcutIds.push(uh.id)})
lists = [cardseops,hegeops,fanxops];
if(pass02){
rangops = {
prodcutIds: [],
productStatus: this.ranglist[0].productStatus
};
this.ranglist.map(ur=>{rangops.prodcutIds.push(ur.id)})
lists = [cardseops,hegeops,rangops,fanxops];
}
}
}
if(pass04){
feipops = {
prodcutIds: [],
productStatus: this.feilist[0].productStatus,
cause: this.orderForm.question,
reporter: this.orderForm.useroption
};
this.feilist.map(un=>{feipops.prodcutIds.push(un.id)})
lists = [cardseops,feipops];
if(pass01){
hegeops = {
prodcutIds: [],
productStatus: this.hegelist[0].productStatus
};
this.hegelist.map(uh=>{hegeops.prodcutIds.push(uh.id)})
lists = [cardseops,hegeops,feipops];
if(pass02){
rangops = {
prodcutIds: [],
productStatus: this.ranglist[0].productStatus
};
this.ranglist.map(ur=>{rangops.prodcutIds.push(ur.id)})
lists = [cardseops,hegeops,rangops,feipops];
if(pass03){
fanxops = {
prodcutIds: [],
productStatus: this.fanlist[0].productStatus
};
this.fanlist.map(uf=>{fanxops.prodcutIds.push(uf.id)})
lists = [cardseops,hegeops,rangops,fanxops,feipops];
}
}
}
}
let parmes={ let parmes={
dispatchId: this.$route.query.id, dispatchId: this.$route.query.id,
orderId: this.$route.query.orderId, orderId: this.$route.query.orderId,
list: lists list: lists
// [ };
// this.feilist,
// this.hegelist,
// this.ranglist,
// this.fanlist,
// {
// "productStatus": 0,
// "prodcutIds": [
// 0
// ],
// "cause": "string",
// "reporter": "string"
// }
// ]
};
// let executeId = this.$route.query.executeId;
console.log(parmes)
Api.submitData(parmes).then(res=>{ Api.submitData(parmes).then(res=>{
if(res.success){ if(res.success){
this.$Message.success("提交成功!"); this.$Message.success("提交成功!");
...@@ -473,18 +557,44 @@ export default { ...@@ -473,18 +557,44 @@ export default {
} }
}) })
}, },
// 送审 // 打开送审
sendOrder() { sendOrder() {
let orderse = []
this.feilist.map(item=>{
orderse.push(item.prefix+'.'+item.code)
})
let strOder = orderse.join(",")// console.log(strOder)
this.entity.cause = this.orderForm.question;
this.entity.reporter = this.orderForm.useroption;
this.entity.strOder = strOder; // console.log(this.entity)
this.$refs["formValidate"].validate(valid => { this.$refs["formValidate"].validate(valid => {
if (valid) { if (valid) {
// this.$Message.success("送审...") this.submit()//提交状态改变
let parmeseData = this.entity// console.log(parmeseData) this.$Message.success("送审")
this.ModalOrder = true; this.ModalOrder = true;
this.$refs.orderSendReview.intData(this.entity); this.$refs.orderSendReview.alertFun(parmeseData);
} }
}); });
}, },
// 确定送审
orderSendOk() { orderSendOk() {
ahis.$Message.success("送审中..."); ahis.$Message.success("送审中...");
// let operatorIdList = this.$refs.orderSendReview.returnDataList();
// let itemCode = this.formdata.unqualified_order_code;
// this.dataListRetrunNew.code = itemCode;
// this.dataListRetrunNew.operatorIdList = operatorIdList;
// this.$http.order
// .batchOrderStart(this.dataListRetrunNew)
// .then(response => {
// if (response.success) {
// this.loadchangelist();
// this.$Message.info("送审成功!");
// this.dataListRetrunNew.idList = [];
// } else {
// this.$Message.error("送审失败!");
// }
// this.modalInfo = false;
// });
}, },
// 取消 返回工单列表 // 取消 返回工单列表
toOrder() { toOrder() {
......
pages/produce/execute/judgment/orderInfos.vue
View file @ d314e858
...@@ -3,24 +3,18 @@ ...@@ -3,24 +3,18 @@
<Row> <Row>
<Filed :span="12" :name="l('productName')">{{info.orderInfo.productName}}</Filed> <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('drawnNumber')">{{info.orderInfo.drawnNumber}}</Filed>
<Filed :span="12" :name="l('status')">{{info.orderInfo.projectNumber}}</Filed> <Filed :span="12" :name="l('status')">{{info.orderInfo.status}}</Filed>
<Filed :span="12" :name="l('mesCode')">{{info.orderInfo.mesCode}}</Filed> <Filed :span="12" :name="l('mesCode')">{{info.orderInfo.mesCode}}</Filed>
<Filed :span="12" name="批次号">{{info.orderInfo.batchNumber}}</Filed> <Filed :span="12" name="批次号">{{info.orderInfo.batchNumber}}</Filed>
<!-- <Filed :span="8" :name="l('batchNumber')">{{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="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.cause}}</Filed>
<Filed :span="12" name="问题原因">{{info.orderInfo.demandFinishDate}}</Filed> <Filed :span="12" name="责任归属">{{info.orderInfo.reporter}}</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="24" name="不合格产品">{{info.orderInfo.strOder}}</Filed>
<!-- <Filed :span="8" :name="l('stage')"> <!-- <Filed :span="8" :name="l('stage')">
<state code="plan.order.stage" :value="info.orderInfo.stage+''" type="text"></state> <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> --> </Filed> -->
</Row> </Row>
</div> </div>
......
pages/produce/execute/judgment/orderSendReview.vue
View file @ d314e858
...@@ -93,10 +93,16 @@ export default { ...@@ -93,10 +93,16 @@ export default {
} }
}, },
methods: { methods: {
alertFun(parmeseData){
console.warn(parmeseData)
this.info.orderInfo = parmeseData
alert("加载数据")
},
intData(data) { intData(data) {
//打开modal层时给订单list赋值 console.warn(data)
//打开modal层时给orderInfo赋值
if(data){ if(data){
this.info.Unqualified = data this.info.orderInfo = data
} }
}, },
returnDataList() { returnDataList() {
......
pages/produce/execute/starOrder/index.vue
View file @ d314e858
...@@ -77,7 +77,15 @@ ...@@ -77,7 +77,15 @@
</div> </div>
<Modal v-model="ransferModal" :title="transferTitle" width="800"> <Modal v-model="ransferModal" :title="transferTitle" width="800">
<!-- <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" footer-hide/> --> <!-- <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" footer-hide/> -->
<p>转序交接</p> <div class="zhuanx">
<p class="line_p">
<Input prefix="ios-contact-outline" placeholder="请输入人员编号" style="width: auto" />
<!-- <UserSelect ref="userSelected" :multiple="true" style="width: 220px;margin:0 auto;"/> -->
</p>
<p class="line_p">
<Input prefix="ios-lock-outline" placeholder="请输入人员密码" style="width: auto" />
</p>
</div>
</Modal> </Modal>
</div> </div>
</template> </template>
......
pages/produce/reorder/index.vue 0 → 100644
View file @ d314e858
<template>
<div class="p20">
<div class="">
转序交接
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/technology/search.vue
View file @ d314e858
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<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"> <Col :span="12" v-if="condition.id.show">
<FormItem :label="编号" prop="id"> <FormItem label="编号" prop="id">
<Input v-model="condition.id.value"></Input> <Input v-model="condition.id.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
......
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