Skip to content

M
mes-ui
Commit 8d0f20dc authored by kangzhenfei's avatar kangzhenfei
Browse files
Options

质量判定

parent 8c246756
Show whitespace changes
Inline Side-by-side
Showing with 479 additions and 334 deletions
package-lock.json
View file @ 8d0f20dc
...@@ -21586,8 +21586,8 @@ ...@@ -21586,8 +21586,8 @@
}, },
"throttle-debounce": { "throttle-debounce": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-2.1.0.tgz", "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.1.0.tgz",
"integrity": "sha1-JX5kjwpWvZ5U/g8TLEq4YR304dU=" "integrity": "sha512-AOvyNahXQuU7NN+VVvOOX+uW6FPaWdAOdRP5HfwYxAfCzXTFKRMoIMk+n+po318+ktcChx+F1Dd91G3YHeMKyg=="
}, },
"through": { "through": {
"version": "2.3.8", "version": "2.3.8",
...@@ -22126,8 +22126,8 @@ ...@@ -22126,8 +22126,8 @@
}, },
"v-viewer": { "v-viewer": {
"version": "1.5.1", "version": "1.5.1",
"resolved": "https://registry.npm.taobao.org/v-viewer/download/v-viewer-1.5.1.tgz?cache=0&sync_timestamp=1576116938938&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fv-viewer%2Fdownload%2Fv-viewer-1.5.1.tgz", "resolved": "https://registry.npmjs.org/v-viewer/-/v-viewer-1.5.1.tgz",
"integrity": "sha1-lIBNg4FMylZuaRM5/h5keTSG8gA=", "integrity": "sha512-Q5ICKzmYQD0qTf+hti2Lhgy6UYY2zgFr+YrN9a3yPgr7pOjYrG405Pz4+6Z6FXlhdhGysCWFJUNCI2tsIyvjWQ==",
"requires": { "requires": {
"throttle-debounce": "^2.0.1", "throttle-debounce": "^2.0.1",
"viewerjs": "^1.5.0" "viewerjs": "^1.5.0"
...@@ -22180,8 +22180,8 @@ ...@@ -22180,8 +22180,8 @@
}, },
"viewerjs": { "viewerjs": {
"version": "1.5.0", "version": "1.5.0",
"resolved": "https://registry.npm.taobao.org/viewerjs/download/viewerjs-1.5.0.tgz", "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.5.0.tgz",
"integrity": "sha1-3r6pSSGJ+kEiPMVn3pFdeUNYmdA=" "integrity": "sha512-ZiJ0vrXDvomLSY3ixaZCJtmdenomsvPPQwZKwvtXUMCiO2HHtFGoB/KqpS9QzABSeKaRLfcENp1uRYJ7l1MkYQ=="
}, },
"vm-browserify": { "vm-browserify": {
"version": "1.1.2", "version": "1.1.2",
......
pages/produce/execute/api.js
View file @ 8d0f20dc
import Api from '@/plugins/request' import Api from '@/plugins/request'
export default { export default {
index: `${PlanUrl}/orderexecutequalityrecord/dispatchproductcodes`, index: `${PlanUrl}/orderexecutequalityrecord/dispatchproductcodes`,
// 质量判定获取所有产品数据
getpaged(params) { getpaged(params) {
return Api.get(`${PlanUrl}/orderexecutequalityrecord/dispatchproductcodes`, params); return Api.get(`${PlanUrl}/orderexecutequalityrecord/dispatchproductcodes`, params);
}, },
// 质量判定提交
submitData(params) { submitData(params) {
return Api.post(`${PlanUrl}/orderexecutequalityrecord/checkdispatchproduct`, params); return Api.post(`${PlanUrl}/orderexecutequalityrecord/checkdispatchproduct`, params);
}, },
......
pages/produce/execute/execute.less
View file @ 8d0f20dc
...@@ -391,8 +391,9 @@ ...@@ -391,8 +391,9 @@
} }
.mass_box{ .mass_box{
h2{ height: 40px;} h2{ height: 40px;}
.heger{ color: #2680EB;} .weizhix{ color: #4d5055;}
.rangb{ color: #515A6E;} .rangb{ color: #515A6E;}
.hege{ color: #2680EB;}
.fanxiu{ color: #FFA000;} .fanxiu{ color: #FFA000;}
.feipin{ color: #FE7777;} .feipin{ color: #FE7777;}
.chuanse{ .chuanse{
...@@ -403,6 +404,7 @@ ...@@ -403,6 +404,7 @@
margin: 0 30px 0 0; margin: 0 30px 0 0;
color: #fff; color: #fff;
} }
.button04{ background: #2680EB; }
.button01{ background: #515A6E; } .button01{ background: #515A6E; }
.button02{ background: #FFA000; } .button02{ background: #FFA000; }
.button03{ background: #FE7777; } .button03{ background: #FE7777; }
...@@ -439,6 +441,11 @@ ...@@ -439,6 +441,11 @@
} }
} }
} }
.hege_box{
.ivu-tag-dot-inner{
background: #2680EB;
}
}
.rangbu{ .rangbu{
.list02{ .list02{
.tag_card02{ .tag_card02{
......
pages/produce/execute/index.vue
View file @ 8d0f20dc
...@@ -17,29 +17,17 @@ ...@@ -17,29 +17,17 @@
<div class="header"> <div class="header">
<a class="gd_tt" @click="goToOrder"><Icon type="ios-undo-outline" />工单列表</a> <a class="gd_tt" @click="goToOrder"><Icon type="ios-undo-outline" />工单列表</a>
<Dictionary code="taskList.status" class="select_star fr" v-model="odermodel" @on-change="searchOrder"></Dictionary> <Dictionary code="taskList.status" class="select_star fr" v-model="odermodel" @on-change="searchOrder"></Dictionary>
<!-- <Select v-model="odermodel" style="width:100px" @on-change="searchOrder">
<Option v-for="item in oderList" :value="item.value" :key="item.index">{{ item.label }} -->
<!-- <state
code="taskList.status"
ref="state" class="fr"
:value="item.value"
type="text"
></state>-->
</Option> </Option>
</Select> </Select>
<!-- <a class="openAll"><Icon type="ios-list" size="18" /> 展开全部列表</a> -->
</div> </div>
<div class="select_t"> <div class="select_t">
<!-- <Select v-model="odermodel" style="width:100px" @on-change="searchOrder">
<Option v-for="item in oderList" :value="item.value" :key="item.index">{{ item.label }}</Option>
</Select>-->
<!-- <span class="gd_length">{{listLength}}</span> -->
<Button class>时间正序排列</Button> <Button class>时间正序排列</Button>
</div> </div>
</div> </div>
<!-- 列表卡片主内容 -->
<orderlist ref="orderlist" /> <orderlist ref="orderlist" />
</Drawer> </Drawer>
<!-- title="功能区" --> <!-- 功能区 -->
<Drawer <Drawer
class="gn_box" class="gn_box"
:closable="false" :closable="false"
......
pages/produce/execute/judgment/index.vue
View file @ 8d0f20dc
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<template> <template>
<div class="wu_bg"> <div class="wu_bg">
<div class="mass_box"> <div class="mass_box">
<h2 class="heger">合格（{{cardlist.length}}）</h2> <h2 class="weizhix">未执行（{{cardlist.length}}）</h2>
<div class="mass_list"> <div class="mass_list">
<p class="btn_play"> <p class="btn_play">
<Button class="button" type="primary" @click="allcheck">全选</Button> <Button class="button" type="primary" @click="allcheck">全选</Button>
...@@ -10,79 +10,142 @@ ...@@ -10,79 +10,142 @@
</p> </p>
<div class="list01"> <div class="list01">
<!-- --> <!-- -->
<Tag type="dot" :checkable="true" class="tag_card" size="large" v-for="(item,index) in cardlist" :name="item.id" :key="index" :checked="item.checked" <Tag
color="primary" @on-change="changeCards" > type="dot"
{{item.prefix}}.{{item.code}}</Tag> :checkable="true"
class="tag_card"
size="large"
v-for="(item,index) in cardlist"
:name="item.id"
:key="index"
:checked="item.checked"
color="primary"
@on-change="changeCards"
>{{item.prefix}}.{{item.code}}</Tag>
</div> </div>
</div> </div>
<div class="chuanse"> <div class="chuanse">
<Button class="button04" @click="chansehege">合格</Button>
<Button class="button01" @click="chanserang">让步</Button> <Button class="button01" @click="chanserang">让步</Button>
<Button class="button02" @click="chansefan">返修</Button> <Button class="button02" @click="chansefan">返修</Button>
<Button class="button03" @click="chansefei">不合格品</Button> <Button class="button03" @click="chansefei">不合格品</Button>
</div> </div>
<div class="mass_list hege_box" v-if="hegelist.length>0">
<h2 class="hege">
合格（{{hegelist.length}}）
<Button class="fr" @click="consoleFun(0)">
<Icon type="md-close" />
</Button>
</h2>
<div class="list02">
<Tag
type="dot"
class="tag_card02"
v-for="(item,index) in hegelist"
:key="index"
:name="item.id"
:checkable="false"
closable
@on-close="hegeClose"
>{{ item.code}}</Tag>
</div>
</div>
<div class="mass_list rangbu" v-if="ranglist.length>0"> <div class="mass_list rangbu" v-if="ranglist.length>0">
<h2 class="rangb">让步（{{ranglist.length}}） <h2 class="rangb">
让步（{{ranglist.length}}）
<!-- consoleFun cansolRang --> <!-- consoleFun cansolRang -->
<Button class="fr" @click="consoleFun(1)"><Icon type="md-close" /></Button> <Button class="fr" @click="consoleFun(1)">
<Icon type="md-close" />
</Button>
</h2> </h2>
<div class="list02"> <div class="list02">
<Tag type="dot" class="tag_card02" v-for="(item,index) in ranglist" :key="index" :name="item.id" :checkable="false" closable @on-close="handleClose">{{ item.code}}</Tag> <Tag
type="dot"
class="tag_card02"
v-for="(item,index) in ranglist"
:key="index"
:name="item.id"
: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">
<h2 class="fanxiu">返修（{{fanlist.length}}） <h2 class="fanxiu">
<!-- consoleFun(1) cansolfan --> 返修（{{fanlist.length}}）
<Button class="fr" @click="consoleFun(2)"><Icon type="md-close" /></Button> <Button class="fr" @click="consoleFun(2)">
<Icon type="md-close" />
</Button>
</h2> </h2>
<div class="list02"> <div class="list02">
<Tag type="dot" class="tag_card02" v-for="(item,index) in fanlist" :key="index" :name="item.id" :checkable="false" closable @on-close="fanClose">{{ item.code}}</Tag> <Tag
type="dot"
class="tag_card02"
v-for="(item,index) in fanlist"
:key="index"
:name="item.id"
: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">
<h2 class="feipin">不合格品（{{feilist.length}}） <h2 class="feipin">
<!-- consoleFun(1) cansolfei--> 不合格品（{{feilist.length}}）
<Button class="fr" @click="consoleFun(3)"><Icon type="md-close" /></Button> <Button class="fr" @click="consoleFun(3)">
<Icon type="md-close" />
</Button>
</h2> </h2>
<div class="list02"> <div class="list02">
<Tag type="dot" class="tag_card02" v-for="(item,index) in feilist" :key="index" :name="item.id" :checkable="false" closable @on-close="feiClose">{{ item.code}}</Tag> <Tag
type="dot"
class="tag_card02"
v-for="(item,index) in feilist"
:key="index"
:name="item.id"
: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">
<Form <Form :model="orderForm" :label-width="110" :rules="rules" ref="formValidate">
:model="orderForm"
:label-width="110"
:rules="rules"
ref="formValidate"
>
<FormItem label="问题原因：" prop="question" style="width:100%"> <FormItem label="问题原因：" prop="question" style="width:100%">
<Select v-model="orderForm.question"style="width:80%"> <Select v-model="orderForm.question" style="width:80%">
<Option value="" class="option-text">请选择</Option><!-- :disabled="feilist.length == 0 ? true:false" placeholder="选择问题原因" --> <Option value class="option-text">请选择</Option>
<Option v-for="item in problemList" :value="item.problem" :key="item.index">{{ item.problem }}</Option> <!-- :disabled="feilist.length == 0 ? true:false" placeholder="选择问题原因" -->
<Option
v-for="item in problemList"
:value="item.problem"
:key="item.index"
>{{ item.problem }}</Option>
</Select> </Select>
</FormItem> </FormItem>
<FormItem label="责任归属：" prop="useroption" style="width:100%"> <FormItem label="责任归属：" prop="useroption" style="width:100%">
<Select v-model="orderForm.useroption" style="width:80%"> <Select v-model="orderForm.useroption" style="width:80%">
<Option value="" class="option-text">请选择</Option> <Option value class="option-text">请选择</Option>
<Option v-for="item in blameList" :value="item.user" :key="item.index">{{ item.user }}</Option> <Option v-for="item in blameList" :value="item.user" :key="item.index">{{ item.user }}</Option>
</Select> </Select>
</FormItem> </FormItem>
</Form> </Form>
</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 class="button" size='large' type="primary" @click="sendOrder" v-if="feilist.length>0"> 送审</Button> <Button
<Button class="button" size='large' type="primary" @click="submit" v-else> 提交</Button> class="button"
<Button class="button" size='large' @click="toOrder"> 取消</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" @click="toOrder">取消</Button>
</div> </div>
<!-- 订单送审 --> <!-- 订单送审 -->
<Modal <Modal v-model="ModalOrder" title="订单送审" :mask-closable="false" :scrollable="true" fullscreen>
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>
...@@ -90,29 +153,26 @@ ...@@ -90,29 +153,26 @@
</div> </div>
</Modal> </Modal>
<!-- 确定弹框 @on-cancel="cancelModal"--> <!-- 确定弹框 @on-cancel="cancelModal"-->
<Modal <Modal v-model="suModal" :title="mTitle" @on-ok="okModal">
v-model="suModal"
:title="mTitle"
@on-ok="okModal">
<p>是否全部取消？</p> <p>是否全部取消？</p>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from "../api"; import Api from "../api";
import OrderSendReview from '@/components/orderOperator/orderSendReview' import OrderSendReview from "@/components/orderOperator/orderSendReview";
export default { export default {
name:'starOrder', name: "starOrder",
components:{OrderSendReview}, components: { OrderSendReview },
data(){ data() {
return{ return {
checkedflag:false, checkedflag: false,
ModalOrder:false, ModalOrder: false,
suModal:false, suModal: false,
mTitle:'确认弹框', mTitle: "确认弹框",
num:'', num: "",
surMasg:'', surMasg: "",
rules:{ rules: {
question: [ question: [
{ {
required: true, required: true,
...@@ -126,30 +186,31 @@ export default { ...@@ -126,30 +186,31 @@ export default {
message: "请选择责任人", message: "请选择责任人",
trigger: "change" trigger: "change"
} }
], ]
}, },
orderForm:{ orderForm: {
question:'', question: "",
useroption:'' useroption: ""
}, },
cardlist:[], cardlist: [],
ranglist:[], hegelist: [],
fanlist:[], ranglist: [],
feilist:[], fanlist: [],
problemList:[ feilist: [],
{ problem:"问题描述01" , }, problemList: [
{ problem:"问题描述02" , }, { problem: "问题描述01" },
{ problem:"问题描述03" , }, { problem: "问题描述02" },
{ problem: "问题描述03" }
], ],
blameList:[ blameList: [
{ user:"责任人01" , }, { user: "责任人01" },
{ user:"责任人02" , }, { user: "责任人02" },
{ user:"责任人03" , }, { user: "责任人03" }
], ]
} };
}, },
created() { created() {
this.loadFun() this.loadFun();
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
...@@ -163,167 +224,245 @@ export default { ...@@ -163,167 +224,245 @@ export default {
}; };
}, },
methods: { methods: {
loadFun(){ loadFun() {
let pid = this.$route.query.id // JSON.stringify() let pid = 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=>{ u.checked = false}) resoult.filter(u => {
this.cardlist = resoult u.checked = false;
}else{ });
console.log(res.error) this.cardlist = resoult;
} else {
console.log(res.error);
} }
}) });
}, },
// 全选 // 全选
allcheck(){ allcheck() {
let cardslist = this.cardlist let cardslist = this.cardlist;
cardslist.map((a)=>{ cardslist.map(a => {
a.checked = true a.checked = true;
}) });
}, },
// 反选 // 反选
rechecked(){ rechecked() {
let cardslist = this.cardlist let cardslist = this.cardlist;
cardslist.map((b)=>{ b.checked = !b.checked }) cardslist.map(b => {
b.checked = !b.checked;
});
}, },
// 单选 // 单选
changeCards(checked,name){ changeCards(checked, name) {
let lists = this.cardlist let lists = this.cardlist;
lists.map((u,i)=>{ lists.map((u, i) => {
if(u.id==name){ u.checked = true } if (u.id == name) {
}) u.checked = true;
}
});
}, },
// 让步 // 合格 1
chanserang(){ chansehege() {
let oldList = this.cardlist let oldList = this.cardlist;
let indese=[] let indese = [];
oldList.map((u,i)=>{ oldList.map((u, i) => {
if(u.checked){ if (u.checked) {
this.ranglist.push(u) u.productStatus = 1;
this.hegelist.push(u);
} }
}) });
indese = oldList.filter(item => !this.ranglist.includes(item)) indese = oldList.filter(item => !this.hegelist.includes(item));
this.cardlist = indese this.cardlist = indese;
}, },
// 返工 // 让步 3
chansefan(){ chanserang() {
let oldList = this.cardlist let oldList = this.cardlist;
let indese=[] let indese = [];
oldList.map((u,i)=>{ oldList.map((u, i) => {
if(u.checked){ if (u.checked) {
this.fanlist.push(u) u.productStatus = 3;
this.ranglist.push(u);
} }
}) });
indese = oldList.filter(item => !this.fanlist.includes(item)) indese = oldList.filter(item => !this.ranglist.includes(item));
this.cardlist = indese this.cardlist = indese;
}, },
// 不合格品 // 返修 4
chansefei(){ chansefan() {
let oldList = this.cardlist let oldList = this.cardlist;
let indese=[] let indese = [];
oldList.map((u,i)=>{ oldList.map((u, i) => {
if(u.checked){ if (u.checked) {
this.feilist.push(u) u.productStatus = 4;
this.fanlist.push(u);
} }
}) });
indese = oldList.filter(item => !this.feilist.includes(item)) indese = oldList.filter(item => !this.fanlist.includes(item));
this.cardlist = indese this.cardlist = indese;
}, },
handleClose(event,name){ // 不合格品（报废）2
let rangold = this.ranglist chansefei() {
let oldList = this.cardlist;
let indese = [];
oldList.map((u, i) => {
if (u.checked) {
u.productStatus = 2;
this.feilist.push(u);
}
});
indese = oldList.filter(item => !this.feilist.includes(item));
this.cardlist = indese;
},
// 让步关闭
handleClose(event, name) {
let rangold = this.ranglist;
let index = this.ranglist.findIndex(item => { let index = this.ranglist.findIndex(item => {
return item.id === name; return item.id === name;
}); });
let itemlist = rangold.filter(item => { let itemlist = rangold.filter(item => {
if(item.id === name){ return item } if (item.id === name) {
}) item.productStatus = 0
return item;
}
});
this.ranglist.splice(index, 1); this.ranglist.splice(index, 1);
this.cardlist.splice( 0,0, itemlist[0]); this.cardlist.splice(0, 0, itemlist[0]);
}, },
consoleFun(u){ consoleFun(u) {
this.suModal = true this.suModal = true;
this.num = u this.num = u;
}, },
okModal(){ okModal() {
let unmb = this.num let unmb = this.num;
if(unmb==1){ if (unmb == 1) {
this.cansolRang() this.cansolRang();
this.suModal = false this.suModal = false;
} }
if(unmb==2){ if (unmb == 2) {
this.cansolfan() this.cansolfan();
this.suModal = false this.suModal = false;
} }
if(unmb==3){ if (unmb == 3) {
this.cansolfei() this.cansolfei();
this.suModal = false this.suModal = false;
} else {
this.cansolhege();
this.suModal = false;
} }
}, },
cansolRang(){ cansolhege() {
let rangblist = this.ranglist let hegeplist = this.hegelist;
rangblist.map(v =>{ hegeplist.map(v => {
v.productStatus = 0
this.cardlist.unshift(v); this.cardlist.unshift(v);
}) });
this.ranglist = [] this.hegeplist = [];
}, },
fanClose(event,name){ hegeClose(event, name) {
let fanold = this.fanlist let hegeold = this.hegelist;
let inde = this.hegelist.findIndex(item => {
return item.id === name;
});
let utemlist = hegeold.filter(utem => {
if (utem.id == name) {
utem.productStatus = 0
return utem;
}
});
this.hegelist.splice(inde, 1);
this.cardlist.splice(0, 0, utemlist[0]);
},
cansolRang() {
let rangblist = this.ranglist;
rangblist.map(v => {
v.productStatus = 0
this.cardlist.unshift(v);
});
this.ranglist = [];
},
fanClose(event, name) {
let fanold = this.fanlist;
let inde = this.fanlist.findIndex(item => { let inde = this.fanlist.findIndex(item => {
return item.id === name; return item.id === name;
}); });
let utemlist = fanold.filter(utem => { let utemlist = fanold.filter(utem => {
if(utem.id == name){ return utem } if (utem.id == name) {
}) utem.productStatus = 0
return utem;
}
});
this.fanlist.splice(inde, 1); this.fanlist.splice(inde, 1);
this.cardlist.splice(0, 0, utemlist[0]); this.cardlist.splice(0, 0, utemlist[0]);
}, },
cansolfan(){ cansolfan() {
let fanglist = this.fanlist let fanglist = this.fanlist;
fanglist.map(v =>{ fanglist.map(v => {
v.productStatus = 0
this.cardlist.unshift(v); this.cardlist.unshift(v);
}) });
this.fanlist = [] this.fanlist = [];
}, },
feiClose(event,name){ feiClose(event, name) {
let feiold = this.feilist let feiold = this.feilist;
let indexed = this.feilist.findIndex(item => { let indexed = this.feilist.findIndex(item => {
return item.id === name; return item.id === name;
}); });
let rtemlist = feiold.filter(rtem => { let rtemlist = feiold.filter(rtem => {
if(rtem.id == name){ return rtem } if (rtem.id == name) {
}) rtem.productStatus = 0
return rtem;
}
});
this.feilist.splice(indexed, 1); this.feilist.splice(indexed, 1);
this.cardlist.splice(0, 0, rtemlist[0]); this.cardlist.splice(0, 0, rtemlist[0]);
}, },
cansolfei(){ cansolfei() {
let feipinlist = this.feilist let feipinlist = this.feilist;
feipinlist.map(v =>{ feipinlist.map(v => {
v.productStatus = 0
this.cardlist.unshift(v); this.cardlist.unshift(v);
}) });
this.feilist = [] this.feilist = [];
}, },
// 提交 // 提交
submit(){ submit() {
this.$Message.success("提交中...") this.$Message.success("提交中...");
let parmes={
dispatchId: this.$route.query.id,
list: [
{
"productStatus": 0,
"prodcutIds": [
0
],
"cause": "string",
"reporter": "string"
}
]
};
let orderId = this.$route.query.orderId;
let executeId = this.$route.query.executeId;
console.log()
// Api.submitData().then(res=>{
// })
}, },
// 送审 // 送审
sendOrder(){ sendOrder() {
this.$refs['formValidate'].validate((valid) => { this.$refs["formValidate"].validate(valid => {
if(valid){ if (valid) {
// this.$Message.success("送审...") // this.$Message.success("送审...")
this.ModalOrder = true this.ModalOrder = true;
} }
}) });
}, },
orderSendOk(){ orderSendOk() {
ahis.$Message.success("送审中...") ahis.$Message.success("送审中...");
}, },
// 取消 // 取消 返回工单列表
toOrder(){ toOrder() {
this.$router.push("/produce/orderlist"); this.$router.push("/produce/orderlist");
}, }
}, }
} };
</script> </script>
pages/produce/execute/starOrder/index.vue
View file @ 8d0f20dc
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<Button class="button" size="large" type="primary"> <Button class="button" size="large" type="primary">
<Icon type="ios-checkmark-circle-outline" />完工 <Icon type="ios-checkmark-circle-outline" />完工
</Button> </Button>
<Button class="button" size="large" type="primary"> <Button class="button" size="large" type="primary" @click="transferFn">
<Icon type="md-swap" />转序交接 <Icon type="md-swap" />转序交接
</Button> </Button>
</div> </div>
...@@ -77,6 +77,10 @@ ...@@ -77,6 +77,10 @@
<vie /> <vie />
</div> </div>
</div> </div>
<Modal v-model="ransferModal" :title="transferTitle" width="800" >
<!-- <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" footer-hide/> -->
<p>转序交接</p>
</Modal>
</div> </div>
</template> </template>
<script> <script>
...@@ -91,6 +95,8 @@ export default { ...@@ -91,6 +95,8 @@ export default {
starmodal: true, starmodal: true,
contentMsge: contentMsge:
"<ul><li>暂停 2020-02-06 15:35</li><li>继续 2020-02-06 15:35</li></ul>", "<ul><li>暂停 2020-02-06 15:35</li><li>继续 2020-02-06 15:35</li></ul>",
ransferModal: false,
transferTitle: "确认转序",
}; };
}, },
created() { created() {
...@@ -111,6 +117,9 @@ export default { ...@@ -111,6 +117,9 @@ export default {
starFun() { starFun() {
this.$Message.success("开工..."); this.$Message.success("开工...");
}, },
transferFn(){
this.ransferModal = true
},
inited(viewer) { inited(viewer) {
this.$viewer = viewer; this.$viewer = viewer;
}, },
......
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