Commit 496c0920 authored by renjintao's avatar renjintao

details

parents 406d62d3 54059f9d
...@@ -15362,8 +15362,7 @@ ...@@ -15362,8 +15362,7 @@
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -15523,7 +15522,6 @@ ...@@ -15523,7 +15522,6 @@
"version": "2.9.0", "version": "2.9.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -15542,7 +15540,6 @@ ...@@ -15542,7 +15540,6 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -15645,7 +15642,6 @@ ...@@ -15645,7 +15642,6 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -15731,8 +15727,7 @@ ...@@ -15731,8 +15727,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -15768,7 +15763,6 @@ ...@@ -15768,7 +15763,6 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -15832,14 +15826,12 @@ ...@@ -15832,14 +15826,12 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.1.1", "version": "3.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
} }
} }
}, },
...@@ -18617,6 +18609,7 @@ ...@@ -18617,6 +18609,7 @@
"minimatch": { "minimatch": {
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -19485,7 +19478,6 @@ ...@@ -19485,7 +19478,6 @@
"version": "2.9.0", "version": "2.9.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -19504,7 +19496,6 @@ ...@@ -19504,7 +19496,6 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -19607,7 +19598,6 @@ ...@@ -19607,7 +19598,6 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -19693,8 +19683,7 @@ ...@@ -19693,8 +19683,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -19794,14 +19783,12 @@ ...@@ -19794,14 +19783,12 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.1.1", "version": "3.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
} }
} }
}, },
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
<Col :span="6" class="chan-chi">排产池</Col> <Col :span="6" class="chan-chi">排产池</Col>
<Col :span="18" class="l-ringht"> <Col :span="18" class="l-ringht">
<RadioGroup v-model="status" type="button" @on-change="changeStatus" size="small"> <RadioGroup v-model="status" type="button" @on-change="changeStatus" size="small">
<Radio label="-1">全部</Radio>
<Radio label="0">未排产</Radio> <Radio label="0">未排产</Radio>
<Radio label="2">已排查</Radio> <Radio label="2">已排查</Radio>
<!-- <Radio label="-1">全部</Radio> -->
</RadioGroup> </RadioGroup>
</Col> </Col>
</Row> </Row>
...@@ -20,7 +20,11 @@ ...@@ -20,7 +20,11 @@
> >
<Row class="title-i"> <Row class="title-i">
<Col :span="20" class="order-code"> <Col :span="20" class="order-code">
<Checkbox v-model="li.checked" @on-change="checkData(li)">订单号:{{li.mesCode}}</Checkbox> <Checkbox
v-model="li.checked"
@on-change="checkData(li)"
:disabled="isdisabled"
>订单号:{{li.mesCode}}</Checkbox>
</Col> </Col>
<Col :span="4" class="order-ringht"> <Col :span="4" class="order-ringht">
<Icon type="md-close" @click="close(li.id)" /> <Icon type="md-close" @click="close(li.id)" />
...@@ -130,19 +134,18 @@ export default { ...@@ -130,19 +134,18 @@ export default {
}, },
data() { data() {
return { return {
// activeindex: 1,
list: [], list: [],
status: "-1", //全部排产-1,0为未排产;2为已排查; status: "0", //全部排产-1,0为未排产;2为已排查;
isdisabled: false,
formItem: { formItem: {
// resourcesType: 0,
radio: "0", radio: "0",
time: "", time: "",
beginTime: "", beginTime: "",
endTime: "", endTime: "",
remark: "", remark: "",
departmentTitle: "", departmentTitle: "",
shopId: "", shopId: ""
userName: "" // userName: ""
}, },
// listGroup: [ // listGroup: [
// { // {
...@@ -182,13 +185,18 @@ export default { ...@@ -182,13 +185,18 @@ export default {
}; };
}, },
created() { created() {
this.orderlist(-1); this.orderlist(0);
}, },
methods: { methods: {
// 过滤条件 // 过滤条件
changeStatus(name) { changeStatus(name) {
this.status = name; this.status = name;
this.orderlist(this.status); this.orderlist(this.status);
if (this.status == 1) {
this.isdisabled = true;
} else {
this.isdisabled = false;
}
}, },
//排产池列表 //排产池列表
orderlist(a) { orderlist(a) {
...@@ -233,13 +241,14 @@ export default { ...@@ -233,13 +241,14 @@ export default {
userIds: this.formItem.userIds, userIds: this.formItem.userIds,
beginTime: this.formItem.beginTime, beginTime: this.formItem.beginTime,
endTime: this.formItem.endTime, endTime: this.formItem.endTime,
remark: this.formItem.remark, remark: this.formItem.remark
userName: this.formItem.userName // userName: this.formItem.userName
}; };
Api.cmonestepschedule(params1).then(r => { Api.cmonestepschedule(params1).then(r => {
if (r.success) { if (r.success) {
this.$Message.success("下发成功"); this.$Message.success("下发成功");
this.orderlist(this.status); this.orderlist(this.status);
this.orderIds = [];
} else { } else {
this.$Message.success("下发失败"); this.$Message.success("下发失败");
this.formItem = {}; this.formItem = {};
...@@ -259,6 +268,7 @@ export default { ...@@ -259,6 +268,7 @@ export default {
if (r.success) { if (r.success) {
this.$Message.success("下发成功"); this.$Message.success("下发成功");
this.orderlist(this.status); this.orderlist(this.status);
this.orderIds = [];
this.formItem = {}; this.formItem = {};
this.formItem.radio = 0; this.formItem.radio = 0;
} else { } else {
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
<Col :span="6" class="chan-chi">排产池</Col> <Col :span="6" class="chan-chi">排产池</Col>
<Col :span="18" class="l-ringht"> <Col :span="18" class="l-ringht">
<RadioGroup v-model="status" type="button" @on-change="changeStatus" size="small"> <RadioGroup v-model="status" type="button" @on-change="changeStatus" size="small">
<Radio label="-1">全部</Radio>
<Radio label="0">未排产</Radio> <Radio label="0">未排产</Radio>
<Radio label="2">已排查</Radio> <Radio label="2">已排查</Radio>
<Radio label="-1">全部</Radio>
</RadioGroup> </RadioGroup>
</Col> </Col>
</Row> </Row>
...@@ -152,7 +152,7 @@ export default { ...@@ -152,7 +152,7 @@ export default {
active: null, active: null,
activeindex: 1, activeindex: 1,
list: [], list: [],
status: "-1", //全部排产-1,0为未排产;2为已排查; status: "0", //全部排产-1,0为未排产;2为已排查;
result: [], result: [],
isactive: null, isactive: null,
resourcesType: null, resourcesType: null,
...@@ -161,13 +161,13 @@ export default { ...@@ -161,13 +161,13 @@ export default {
maxnum: 1, maxnum: 1,
chaiModal: false, chaiModal: false,
orderId: 0, orderId: 0,
quantity: 0,
routingHeaderId: 0, routingHeaderId: 0,
detailId: 0 detailId: 0
}; };
}, },
created() { created() {
this.orderlist(-1); this.orderlist(0);
}, },
methods: { methods: {
// 排产池过滤条件 // 排产池过滤条件
...@@ -217,7 +217,6 @@ export default { ...@@ -217,7 +217,6 @@ export default {
u.chai = false; u.chai = false;
}); });
this.result = r.result; this.result = r.result;
this.quantity = r.result.quantity;
} }
}); });
}, },
...@@ -303,7 +302,7 @@ export default { ...@@ -303,7 +302,7 @@ export default {
}, },
//下发 //下发
lowerHair() { lowerHair() {
if (this.orderId || this.quantity) { if (this.orderId) {
var items = []; var items = [];
var obj = {}; var obj = {};
if (this.mode == 1) { if (this.mode == 1) {
...@@ -324,7 +323,7 @@ export default { ...@@ -324,7 +323,7 @@ export default {
items: items items: items
}; };
Api.flonestepschedule(data).then(r => { Api.flonestepschedule(data).then(r => {
if (r.success) { if (r.result) {
this.$Message.success("下发成功"); this.$Message.success("下发成功");
this.orderlist(this.status); this.orderlist(this.status);
} else { } else {
...@@ -349,7 +348,7 @@ export default { ...@@ -349,7 +348,7 @@ export default {
items: items items: items
}; };
Api.fltwostepschedule(data).then(r => { Api.fltwostepschedule(data).then(r => {
if (r.success) { if (r.result) {
this.$Message.success("下发成功"); this.$Message.success("下发成功");
this.orderlist(this.status); this.orderlist(this.status);
} else { } else {
......
...@@ -11,7 +11,7 @@ export default { ...@@ -11,7 +11,7 @@ export default {
return Api.post(`${technologyUrl}routingstep/create`,params); return Api.post(`${technologyUrl}routingstep/create`,params);
}, },
update(params){ update(params){
return Api.post(`${technologyUrl}routingstep/update`,params); return Api.put(`${technologyUrl}routingstep/update`,params);
}, },
delete(id) { delete(id) {
return Api.delete(`${technologyUrl}routingstep/delete`,{params:{id:id}}); return Api.delete(`${technologyUrl}routingstep/delete`,{params:{id:id}});
......
<template> <template>
<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"><FormItem :label="l('creationTime')" prop="creationTime"> <DatePicker type="date" v-model="entity.creationTime"></DatePicker> <Col :span="12">
</FormItem></Col> <FormItem :label="l('stepSeq')" prop="stepSeq">
<Col :span="12"><FormItem :label="l('creatorUserId')" prop="creatorUserId"> <InputNumber v-model="entity.creatorUserId"></InputNumber> <!-- <InputNumber v-model="entity.stepSeq"></InputNumber> -->
</FormItem></Col> <Input style="width:300px" v-model="entity.stepSeq"></Input>
<Col :span="12"><FormItem :label="l('lastModificationTime')" prop="lastModificationTime"> <DatePicker type="date" v-model="entity.lastModificationTime"></DatePicker> </FormItem>
</FormItem></Col> </Col>
<Col :span="12"><FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId"> <InputNumber v-model="entity.lastModifierUserId"></InputNumber> <Col :span="12">
</FormItem></Col> <FormItem :label="l('name')" prop="name">
<Col :span="12"><FormItem :label="l('isDeleted')" prop="isDeleted"> <Input v-model="entity.isDeleted"> </Input> <Input style="width:350px" v-model="entity.name"></Input>
</FormItem></Col> </FormItem>
<Col :span="12"><FormItem :label="l('deleterUserId')" prop="deleterUserId"> <InputNumber v-model="entity.deleterUserId"></InputNumber> </Col>
</FormItem></Col> <Col :span="24">
<Col :span="12"><FormItem :label="l('deletionTime')" prop="deletionTime"> <DatePicker type="date" v-model="entity.deletionTime"></DatePicker> <FormItem :label="l('stepContent')" prop="stepContent">
</FormItem></Col> <i-quill
<Col :span="12"><FormItem :label="l('routingHeaderId')" prop="routingHeaderId"> <InputNumber v-model="entity.routingHeaderId"></InputNumber> v-model="entity.stepContent"
</FormItem></Col> :height="260"
<Col :span="12"><FormItem :label="l('routingDetailId')" prop="routingDetailId"> <InputNumber v-model="entity.routingDetailId"></InputNumber> v-paste="handleImg"
</FormItem></Col> />
<Col :span="12"><FormItem :label="l('classId')" prop="classId"> <InputNumber v-model="entity.classId"></InputNumber> <!-- <Input v-model="entity.stepContent" type="textarea" :rows="5"></Input> -->
</FormItem></Col> <!-- <Input v-model="entity.stepContent" type="textarea" :minRows="3", :maxRows="7" ></Input> -->
<Col :span="12"><FormItem :label="l('stepSeq')" prop="stepSeq"> <InputNumber v-model="entity.stepSeq"></InputNumber> </FormItem>
</FormItem></Col> </Col>
<Col :span="12"><FormItem :label="l('name')" prop="name"> <Input v-model="entity.name"> </Input> <Col :span="12">
</FormItem></Col> <FormItem :label="l('status')" prop="status">
<Col :span="24"><FormItem :label="l('description')" prop="description"> <Input v-model="entity.description" type="textarea" :rows="5"></Input> <RadioGroup v-model="entity.status">
</FormItem></Col> <Radio :label="1"></Radio>
<Col :span="12"><FormItem :label="l('status')" prop="status"> <Dictionary code="Process.Status" v-model="entity.status"></Dictionary> <Radio :label="0"></Radio>
</FormItem></Col> </RadioGroup>
<Col :span="24"><FormItem :label="l('remark')" prop="remark"> <Input v-model="entity.remark" type="textarea" :rows="5"></Input> <!-- <Dictionary style="width:100px" code="Process.Status" v-model="entity.status"></Dictionary> -->
</FormItem></Col> </FormItem>
<Col :span="24"><FormItem :label="l('stepContent')" prop="stepContent"> <Input v-model="entity.stepContent" type="textarea" :rows="5"></Input> </Col>
</FormItem></Col> <!--<Col :span="24">
<Col :span="12"><FormItem :label="l('extend')" prop="extend"> <Input v-model="entity.extend"> </Input> <FormItem :label="l('description')" prop="description">
</FormItem></Col> <Input v-model="entity.description" type="textarea" :rows="5"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('creationTime')" prop="creationTime">
<DatePicker type="date" v-model="entity.creationTime"></DatePicker>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('routingHeaderId')" prop="routingHeaderId">
<InputNumber v-model="entity.routingHeaderId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('routingDetailId')" prop="routingDetailId">
<InputNumber v-model="entity.routingDetailId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('creatorUserId')" prop="creatorUserId">
<InputNumber v-model="entity.creatorUserId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('lastModificationTime')" prop="lastModificationTime">
<DatePicker type="date" v-model="entity.lastModificationTime"></DatePicker>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId">
<InputNumber v-model="entity.lastModifierUserId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('isDeleted')" prop="isDeleted">
<Input v-model="entity.isDeleted"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('deleterUserId')" prop="deleterUserId">
<InputNumber v-model="entity.deleterUserId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('deletionTime')" prop="deletionTime">
<DatePicker type="date" v-model="entity.deletionTime"></DatePicker>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('classId')" prop="classId">
<InputNumber v-model="entity.classId"></InputNumber>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('remark')" prop="remark">
<Input v-model="entity.remark" type="textarea" :rows="5"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('extend')" prop="extend">
<Input v-model="entity.extend"></Input>
</FormItem>
</Col> -->
</Row> </Row>
<FormItem> <FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
...@@ -43,18 +105,19 @@ ...@@ -43,18 +105,19 @@
</Form> </Form>
</template> </template>
<script> <script>
import Api from './api' import Api from "./api";
export default { import iQuill from '@/components/quill'
name: 'Edit', export default {
name: "Edit",
components: { iQuill },
data() { data() {
return { return {
disabled: false, disabled: false,
entity: { entity: {},
},
rules: { rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }] name: [{ required: true, message: "必填", trigger: "blur" }]
}
} }
};
}, },
props: { props: {
eid: Number eid: Number
...@@ -67,35 +130,60 @@ ...@@ -67,35 +130,60 @@
methods: { methods: {
load(v) { load(v) {
Api.get({ id: v }).then(r => { Api.get({ id: v }).then(r => {
console.log(r)
this.entity = r.result; this.entity = r.result;
}) // this.entity.status.toString
});
}, },
handleSubmit() { handleSubmit() {
this.$refs.form.validate((v) => { this.$refs.form.validate(v => {
if (v) { if (v) {
this.disabled = true; this.disabled = true;
Api.update(this.entity).then((r) => { Api.update(this.entity)
.then(r => {
this.disabled = false; this.disabled = false;
if (r.success) { if (r.success) {
this.$Message.success('保存成功') this.$Message.success("保存成功");
this.$emit('on-ok') this.$emit("on-ok");
} else { } else {
this.$Message.error('保存失败') this.$Message.error("保存失败");
} }
}).catch(err => {
this.disabled = false;
this.$Message.error('保存失败')
console.warn(err)
}) })
.catch(err => {
this.disabled = false;
this.$Message.error("保存失败");
console.warn(err);
});
} }
}) });
},
handleImg(e) {
console.warn(e)
// let file = null
// if (
// e.clipboardData &&
// e.clipboardData.items[0] &&
// e.clipboardData.items[0].type &&
// e.clipboardData.items[0].type.indexOf('image') > -1
// ) {
// //这里就是判断是否有粘贴进来的文件且文件为图片格式
// file = e.clipboardData.items[0].getAsFile()
// let reader = new FileReader()
// reader.readAsDataURL(file)
// setTimeout(() => {
// var img = '<img src="' + reader.result + '" alt=""/>'
// this.bugForm.content += img
// }, 1000)
// // new R
// }
}, },
handleClose() { handleClose() {
this.$emit('on-close') this.$emit("on-close");
}, },
l(key) { l(key) {
key = "routing_step" + "." + key; key = "routing_step" + "." + key;
return this.$t(key) return this.$t(key);
} }
}, },
watch: { watch: {
...@@ -105,5 +193,5 @@ ...@@ -105,5 +193,5 @@
} }
} }
} }
} };
</script> </script>
\ No newline at end of file
...@@ -3,9 +3,11 @@ ...@@ -3,9 +3,11 @@
<DataGrid :columns="columns" ref="grid" :action="action"> <DataGrid :columns="columns" ref="grid" :action="action">
<template slot="easySearch"> <template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
<!-- <Poptip trigger="focus" title="Title" content="请输入关键字工步名称/描述/备注/工步内容"> -->
<FormItem prop="keys"> <FormItem prop="keys">
<Input placeholder="请输入关键字工步名称/描述/备注/工步内容" v-model="easySearch.keys.value" /> <Input placeholder="请输入关键字工步名称/描述/备注/工步内容" v-model="easySearch.keys.value" />
</FormItem> </FormItem>
<!-- <Poptip/> -->
<FormItem> <FormItem>
<Button type="primary" @click="search">查询</Button> <Button type="primary" @click="search">查询</Button>
</FormItem> </FormItem>
...@@ -79,13 +81,13 @@ export default { ...@@ -79,13 +81,13 @@ export default {
{ {
key: "routingHeaderId", key: "routingHeaderId",
title: this.l("routingHeaderId"), title: this.l("routingHeaderId"),
hide: true, high: true,
align: "left" align: "left"
}, },
{ {
key: "routingDetailId", key: "routingDetailId",
title: this.l("routingDetailId"), title: this.l("routingDetailId"),
hide: true, high: true,
align: "left" align: "left"
}, },
{ key: "classId", title: this.l("classId"), hide: true, align: "left" }, { key: "classId", title: this.l("classId"), hide: true, align: "left" },
...@@ -101,8 +103,13 @@ export default { ...@@ -101,8 +103,13 @@ export default {
key: "description", key: "description",
title: this.l("description"), title: this.l("description"),
align: "left", align: "left",
easy: true, hide: true
high: true },
{
key: "stepContent",
title: this.l("stepContent"),
align: "left",
hide: true
}, },
{ {
key: "status", key: "status",
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
right: 0; right: 0;
// bottom:100%; // bottom:100%;
// right: 100%; // right: 100%;
z-index: 990; z-index: 898;
background-color: white; background-color: white;
// background: red; // background: red;
.top { .top {
......
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