Skip to content

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

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

parents 901606f3 dacc7af0
Show whitespace changes
Inline Side-by-side
Showing with 1322 additions and 1057 deletions
components/page/actions.vue
View file @ ed1b43bc
<template> <template>
<ul class="actions"> <div class="actions">
<li class="item" v-for="(li, i) in items" @click="detail(li)"> <div
:class="li.confirm ? 'confirm' : 'item'"
v-for="(li, i) in items"
@click="detail(li)"
>
<span v-if="mode == 'text'" class="text" v-text="li.label"></span> <span v-if="mode == 'text'" class="text" v-text="li.label"></span>
<Tooltip v-if="mode == 'icon'" :content="li.label" <Tooltip v-if="mode == 'icon'" :content="li.label"
><Icon :type="li.icon" ><Icon :type="li.icon"
...@@ -9,8 +13,8 @@ ...@@ -9,8 +13,8 @@
<Icon type="li.icon" /> <Icon type="li.icon" />
<span class="text" v-text="li.label"></span> <span class="text" v-text="li.label"></span>
</div> </div>
</li> </div>
</ul> </div>
</template> </template>
<script> <script>
...@@ -29,9 +33,14 @@ export default { ...@@ -29,9 +33,14 @@ export default {
return [ return [
{ label: "复制", icon: "md-copy", vclick: "" }, { label: "复制", icon: "md-copy", vclick: "" },
{ label: "新增", icon: "md-add", vclick: "" }, { label: "新增", icon: "md-add", vclick: "" },
{ label: "删除", icon: "md-trash", vclick: "" }, { label: "删除", icon: "md-trash", vclick: "", confirm: true },
{ label: "移动", icon: "md-move", vclick: "" }, { label: "移动", icon: "md-move", vclick: "" },
{ label: "派发", icon: "ios-alarm", vclick: "" }, {
label: "派发",
icon: "ios-alarm",
vclick: "",
confirm: "确认要进行派发吗？",
},
]; ];
}, },
}, },
...@@ -77,17 +86,32 @@ export default { ...@@ -77,17 +86,32 @@ export default {
</script> </script>
<style lang="less"> <style lang="less">
@size:20px;//按钮大小
@distince:5px;//按钮间距
@color:black;//主色
@color-hover:#106ffe;//主悬浮色
@color-confirm:red;// 二次确认色
.actions { .actions {
ul { display: inline-block;
li { .item,
float: left; .confirm {
display: inline-block;
list-style: none; list-style: none;
width: 20px; width: @size;
height: 20px; height: @size;
text-align: center; text-align: center;
margin-left: 5px; margin-left:@distince;
color: red; cursor: pointer;
border: 1px dotted @color;
line-height: @size;
}
.item:hover {
border: 1px solid @color-hover;
color: @color-hover;
} }
.confirm:hover {
border: 1px solid @color-confirm;
color: @color-confirm;
} }
} }
</style> </style>
\ No newline at end of file
pages/aps/ai/editDuration.vue
View file @ ed1b43bc
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</Form> </Form>
<Row> <Row>
<Col span="24" style="text-align:right;height:60px;line-height:60px"> <Col span="24" style="text-align:right;height:60px;line-height:60px">
<Button type="primary" @click="handleSubmit">确定</Button> <Button type="primary" @click="handleSubmit" v-noClick>确定</Button>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</Col> </Col>
</Row> </Row>
......
pages/aps/ai/options.vue
View file @ ed1b43bc
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
</Col> </Col>
</Row> </Row>
<FormItem class="click-btn"> <FormItem class="click-btn">
<Button type="primary" @click="handleSubmit">确定</Button> <Button type="primary" @click="handleSubmit" v-noClick>确定</Button>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
</Form> </Form>
......
pages/aps/aps/editDuration.vue
View file @ ed1b43bc
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</Form> </Form>
<Row> <Row>
<Col span="24" style="text-align:right;height:60px;line-height:60px"> <Col span="24" style="text-align:right;height:60px;line-height:60px">
<Button type="primary" @click="handleSubmit">确定</Button> <Button type="primary" @click="handleSubmit" v-noClick>确定</Button>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</Col> </Col>
</Row> </Row>
......
pages/aps/aps/options.vue
View file @ ed1b43bc
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
</Col> </Col>
</Row> </Row>
<FormItem class="click-btn"> <FormItem class="click-btn">
<Button type="primary" @click="handleSubmit">确定</Button> <Button type="primary" @click="handleSubmit" v-noClick>确定</Button>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
</Form> </Form>
......
pages/aps/complete/index.vue
View file @ ed1b43bc
<template> <template>
<div>
<div class="back-href">
<a @click="viewClose">
<Icon type="ios-undo-outline" size="24" />返回计划管理
</a>
</div>
<div class="scheduling"> <div class="scheduling">
<div class="aps-l"> <div class="aps-l">
<Row class="row-p"> <Row class="row-p">
...@@ -96,11 +102,12 @@ ...@@ -96,11 +102,12 @@
</FormItem> </FormItem>
<FormItem> <FormItem>
<Button style="margin-left: 8px" @click="closeOk">取消</Button> <Button style="margin-left: 8px" @click="closeOk">取消</Button>
<Button type="primary" @click="lowerHair">下发</Button> <Button type="primary" @click="lowerHair" v-noClick>下发</Button>
</FormItem> </FormItem>
</Form> </Form>
</div> </div>
</div> </div>
</div>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
...@@ -126,7 +133,7 @@ export default { ...@@ -126,7 +133,7 @@ export default {
showSet: false, showSet: false,
// userName: "" // userName: ""
}, },
user:'', user: "",
showSet: false, showSet: false,
// listGroup: [ // listGroup: [
// { // {
...@@ -169,6 +176,9 @@ export default { ...@@ -169,6 +176,9 @@ export default {
this.orderlist(0); this.orderlist(0);
}, },
methods: { methods: {
viewClose() {
this.$router.push("/aps/plan");
},
// 过滤条件 // 过滤条件
changeStatus(name) { changeStatus(name) {
this.status = name; this.status = name;
...@@ -338,6 +348,9 @@ export default { ...@@ -338,6 +348,9 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import "../../../assets/css/custom.less"; @import "../../../assets/css/custom.less";
.back-href {
height: 35px;
}
.addclass { .addclass {
border-color: rgba(38, 128, 235, 0.2) !important; border-color: rgba(38, 128, 235, 0.2) !important;
.title-i { .title-i {
......
pages/aps/dispatch/index.vue
View file @ ed1b43bc
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
</Row> </Row>
<FormItem> <FormItem>
<Button style="margin-right: 8px" @click="cancle">取消</Button> <Button style="margin-right: 8px" @click="cancle">取消</Button>
<Button type="primary" @click="sendSheBei">派工</Button> <Button type="primary" @click="sendSheBei" v-noClick>派工</Button>
</FormItem> </FormItem>
</Form> </Form>
</Drawer> </Drawer>
......
pages/aps/plan/addAccessory.vue
View file @ ed1b43bc
...@@ -42,7 +42,6 @@ export default { ...@@ -42,7 +42,6 @@ export default {
name: "addAccessory", name: "addAccessory",
data() { data() {
return { return {
disabled: false,
deletelModal: false, deletelModal: false,
curId: 0, curId: 0,
editIndex: -1, editIndex: -1,
......
pages/aps/plan/detailAccessory.vue
View file @ ed1b43bc
...@@ -43,7 +43,7 @@ export default { ...@@ -43,7 +43,7 @@ export default {
name: "detailAccessory", name: "detailAccessory",
data() { data() {
return { return {
disabled: false,
deletelModal: false, deletelModal: false,
statuList: this.$store.getters.dictionaryByKey("accessory.status") || [], statuList: this.$store.getters.dictionaryByKey("accessory.status") || [],
statuList1: this.$store.getters.dictionaryByKey("outstore.status") || [], statuList1: this.$store.getters.dictionaryByKey("outstore.status") || [],
......
pages/aps/plan/dispatch.vue
View file @ ed1b43bc
...@@ -2,99 +2,104 @@ ...@@ -2,99 +2,104 @@
<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="l('DistributeMainRouting')" prop="DistributeMainRouting"> <FormItem
<UserSelect ref="userSelected" v-model="entity.DistributeMainRouting" /> :label="l('DistributeMainRouting')"
prop="DistributeMainRouting"
>
<UserSelect
ref="userSelected"
v-model="entity.DistributeMainRouting"
/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="完成时间" style="width:100%" prop="MainRoutingFinishDate"> <FormItem
label="完成时间"
style="width: 100%"
prop="MainRoutingFinishDate"
>
<DatePicker <DatePicker
v-model="entity.MainRoutingFinishDate" v-model="entity.MainRoutingFinishDate"
type="datetime" type="datetime"
placeholder="请选择日期" placeholder="请选择日期"
style="width:240px" style="width: 240px"
@on-change="getTimeMainRFD" @on-change="getTimeMainRFD"
></DatePicker> ></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
<Row > <Row> &nbsp; </Row>
&nbsp; <Row> &nbsp; </Row>
</Row>
<Row >
&nbsp;
</Row>
<FormItem> <FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
</Form> </Form>
</template> </template>
<script> <script>
import Api from './api' import Api from "./api";
export default { export default {
name: 'Dispatch', name: "Dispatch",
props: { props: {
ids: Array ids: Array,
}, },
data() { data() {
return { return {
disabled: false,
entity: { entity: {
DistributeMainRouting: null, DistributeMainRouting: null,
MainRoutingFinishDate: '' MainRoutingFinishDate: "",
}, },
rules: { rules: {
DistributeMainRouting: [ DistributeMainRouting: [
{ {
required: true, required: true,
message: '请选择人员', message: "请选择人员",
trigger: 'change', trigger: "change",
type: 'number' type: "number",
} },
], ],
MainRoutingFinishDate: [ MainRoutingFinishDate: [
{ {
required: true, required: true,
message: '请选择时间', message: "请选择时间",
trigger: 'change' trigger: "change",
} },
] ],
} },
} };
}, },
methods: { methods: {
handleSubmit() { handleSubmit() {
this.$refs.form.validate((v) => { this.$refs.form.validate((v) => {
if (v) { if (v) {
this.entity.ids = this.ids this.entity.ids = this.ids;
Api.routingdistribute(this.entity) Api.routingdistribute(this.entity)
.then((r) => { .then((r) => {
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("工艺派发失败");
} }
this.$emit('on-ok') this.$emit("on-ok");
}) })
.catch((err) => { .catch((err) => {
this.$Message.error('工艺派发失败') this.$Message.error("工艺派发失败");
}) });
} }
}) });
}, },
handleClose() { handleClose() {
this.$emit('on-close') this.$emit("on-close");
}, },
l(key) { l(key) {
key = 'mes_order' + '.' + key key = "mes_order" + "." + key;
return this.$t(key) return this.$t(key);
}, },
getTimeMainRFD(value) { getTimeMainRFD(value) {
this.entity.MainRoutingFinishDate = value this.entity.MainRoutingFinishDate = value;
} },
}, },
watch: {} watch: {},
} };
</script> </script>
pages/aps/stream/index.vue
View file @ ed1b43bc
<template> <template>
<div>
<div class="back-href">
<a @click="viewClose">
<Icon type="ios-undo-outline" size="24" />返回计划管理
</a>
</div>
<div class="scheduling"> <div class="scheduling">
<div class="aps-l"> <div class="aps-l">
<Row class="row-p"> <Row class="row-p">
...@@ -156,6 +163,7 @@ ...@@ -156,6 +163,7 @@
></Slider> ></Slider>
</Modal> </Modal>
</div> </div>
</div>
</template> </template>
<script> <script>
import Set from "./set"; import Set from "./set";
...@@ -197,6 +205,9 @@ export default { ...@@ -197,6 +205,9 @@ export default {
this.orderlist(0); this.orderlist(0);
}, },
methods: { methods: {
viewClose() {
this.$router.push("/aps/plan");
},
// 排产池过滤条件 // 排产池过滤条件
changeStatus(a) { changeStatus(a) {
this.status = a; this.status = a;
......
pages/basicData/userManagent/userInfo.vue
View file @ ed1b43bc
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</Row> </Row>
<Row> <Row>
<FormItem label=" "> <FormItem label=" ">
<Button type="primary" @click="pwdOk">保存</Button> <Button type="primary" @click="pwdOk" v-noClick>保存</Button>
</FormItem> </FormItem>
</Row> </Row>
</Form> </Form>
......
pages/mesPlan/split.vue
View file @ ed1b43bc
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<Col span="12"> <Col span="12">
<FormItem label="分解数量" style="width:100%" prop="splitQuantity"> <FormItem label="分解数量" style="width:100%" prop="splitQuantity">
<InputNumber :min="0" v-model="orderForm.splitQuantity" style="width:180px"></InputNumber> <InputNumber :min="0" v-model="orderForm.splitQuantity" style="width:180px"></InputNumber>
<Button type="primary" @click="addSplitOrder">确定</Button> <Button type="primary" @click="addSplitOrder" v-noClick>确定</Button>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
......
pages/mordent/OQCcarry/waitReview/index.vue
View file @ ed1b43bc
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<Col span="15">&nbsp;</Col> <Col span="15">&nbsp;</Col>
<Col span="9"> <Col span="9">
<Button @click="handleClose" class="mr20">取消</Button> <Button @click="handleClose" class="mr20">取消</Button>
<Button type="primary" @click="suerUp()">保存</Button> <Button type="primary" @click="suerUp()" v-noClick>保存</Button>
</Col> </Col>
</Row> </Row>
</Form> </Form>
......
pages/mordent/Sluggish/powder/index.vue
View file @ ed1b43bc
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<Col span="16">&nbsp;</Col> <Col span="16">&nbsp;</Col>
<Col span="8"> <Col span="8">
<Button @click="cancel" class="ml20">取消</Button> <Button @click="cancel" class="ml20">取消</Button>
<Button type="primary" @click="setNumOk">设置</Button> <Button type="primary" @click="setNumOk" v-noClick>设置</Button>
</Col> </Col>
</Row> </Row>
</Form> </Form>
......
pages/processDesign/Process/quotationBox2.vue
View file @ ed1b43bc
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</template> </template>
<template slot-scope="{ row, index }" slot="action"> <template slot-scope="{ row, index }" slot="action">
<div v-if="editIndex === index"> <div v-if="editIndex === index">
<Button @click="handleSave(index)">保存</Button> <Button @click="handleSave(index)" v-noClick>保存</Button>
<Button @click="editIndex = -1">取消</Button> <Button @click="editIndex = -1">取消</Button>
</div> </div>
<div v-else> <div v-else>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</template> </template>
<template slot-scope="{ row, index }" slot="action"> <template slot-scope="{ row, index }" slot="action">
<div v-if="editIndex02 === index"> <div v-if="editIndex02 === index">
<Button @click="handleSave02(index)">保存</Button> <Button @click="handleSave02(index)" v-noClick>保存</Button>
<Button @click="editIndex02 = -1">取消</Button> <Button @click="editIndex02 = -1">取消</Button>
</div> </div>
<div v-else> <div v-else>
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
</template> </template>
<template slot-scope="{ row, index }" slot="action"> <template slot-scope="{ row, index }" slot="action">
<div v-if="editIndex03 === index"> <div v-if="editIndex03 === index">
<Button @click="handleSave03(index)">保存</Button> <Button @click="handleSave03(index)" v-noClick>保存</Button>
<Button @click="handlecancel(row, index)">取消</Button> <Button @click="handlecancel(row, index)">取消</Button>
</div> </div>
<div v-else> <div v-else>
......
pages/processDesign/Process/quotationBox3.vue
View file @ ed1b43bc
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</template> </template>
<template slot-scope="{ row, index }" slot="action"> <template slot-scope="{ row, index }" slot="action">
<div v-if="editIndex02 === index"> <div v-if="editIndex02 === index">
<Button @click="handleSave02(index)">保存</Button> <Button @click="handleSave02(index)" v-noClick>保存</Button>
<Button @click="editIndex02 = -1">取消</Button> <Button @click="editIndex02 = -1">取消</Button>
</div> </div>
<div v-else> <div v-else>
......
pages/processDesign/Process/routingchangeorder.vue
View file @ ed1b43bc
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
</div> </div>
<div slot="footer"> <div slot="footer">
<Button type="text" size="large" @click="saveCancelModel">取消</Button> <Button type="text" size="large" @click="saveCancelModel">取消</Button>
<Button type="primary" size="large" @click="modalOk">保存</Button> <Button type="primary" size="large" @click="modalOk" v-noClick>保存</Button>
<Checkbox v-show="submitShow" v-model="checked" class="ml10" label="送审">送审</Checkbox> <Checkbox v-show="submitShow" v-model="checked" class="ml10" label="送审">送审</Checkbox>
</div> </div>
<changeSendReview ref="changeSendReview" ></changeSendReview> <changeSendReview ref="changeSendReview" ></changeSendReview>
......
pages/processDesign/setProcess/index.vue
View file @ ed1b43bc
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
<template v-if="createtype==1"> <template v-if="createtype==1">
<Button type="text" size="large" @click="saveCancelModel">取消</Button> <Button type="text" size="large" @click="saveCancelModel">取消</Button>
<Checkbox v-model="issendAudit" label="送审">送审</Checkbox> <Checkbox v-model="issendAudit" label="送审">送审</Checkbox>
<Button type="primary" size="large" @click="modalOk">保存</Button> <Button type="primary" size="large" @click="modalOk" v-noClick>保存</Button>
<Button type="primary" size="large" @click="nextStepandSave">下一步</Button> <Button type="primary" size="large" @click="nextStepandSave">下一步</Button>
</template> </template>
<template v-else-if="createtype==2"> <template v-else-if="createtype==2">
......
pages/project/plan/add.vue
View file @ ed1b43bc
...@@ -101,9 +101,7 @@ ...@@ -101,9 +101,7 @@
></Col> ></Col>
</Row> </Row>
<FormItem> <FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled" <Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
>保存</Button
>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
</Form> </Form>
...@@ -114,7 +112,6 @@ export default { ...@@ -114,7 +112,6 @@ export default {
name: "Add", name: "Add",
data() { data() {
return { return {
disabled: false,
entity: { entity: {
// creationTime: null, // creationTime: null,
// creatorUserId: null, // creatorUserId: null,
...@@ -152,10 +149,8 @@ export default { ...@@ -152,10 +149,8 @@ export default {
handleSubmit() { handleSubmit() {
this.$refs.form.validate((v) => { this.$refs.form.validate((v) => {
if (v) { if (v) {
this.disabled = true;
Api.create(this.entity) Api.create(this.entity)
.then((r) => { .then((r) => {
this.disabled = false;
if (r.success) { if (r.success) {
this.$Message.success("保存成功"); this.$Message.success("保存成功");
this.$emit("on-ok"); this.$emit("on-ok");
...@@ -164,7 +159,6 @@ export default { ...@@ -164,7 +159,6 @@ export default {
} }
}) })
.catch((err) => { .catch((err) => {
this.disabled = false;
this.$Message.error("保存失败"); this.$Message.error("保存失败");
console.warn(err); console.warn(err);
}); });
......
pages/project/plan/edit.vue
View file @ ed1b43bc
<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('creationTime')" prop="creationTime">
<Col :span="12"><FormItem :label="l('creatorUserId')" prop="creatorUserId"> <InputNumber v-model="entity.creatorUserId"></InputNumber> <DatePicker
</FormItem></Col> type="date"
<Col :span="12"><FormItem :label="l('lastModificationTime')" prop="lastModificationTime"> <DatePicker type="date" v-model="entity.lastModificationTime"></DatePicker> v-model="entity.creationTime"
</FormItem></Col> ></DatePicker> </FormItem
<Col :span="12"><FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId"> <InputNumber v-model="entity.lastModifierUserId"></InputNumber> ></Col>
</FormItem></Col> <Col :span="12"
<Col :span="12"><FormItem :label="l('isDeleted')" prop="isDeleted"> <InputNumber v-model="entity.isDeleted"></InputNumber> ><FormItem :label="l('creatorUserId')" prop="creatorUserId">
</FormItem></Col> <InputNumber v-model="entity.creatorUserId"></InputNumber> </FormItem
<Col :span="12"><FormItem :label="l('deletionTime')" prop="deletionTime"> <DatePicker type="date" v-model="entity.deletionTime"></DatePicker> ></Col>
</FormItem></Col> <Col :span="12"
<Col :span="12"><FormItem :label="l('deleterUserId')" prop="deleterUserId"> <InputNumber v-model="entity.deleterUserId"></InputNumber> ><FormItem
</FormItem></Col> :label="l('lastModificationTime')"
<Col :span="12"><FormItem :label="l('projectId')" prop="projectId"> <InputNumber v-model="entity.projectId"></InputNumber> prop="lastModificationTime"
</FormItem></Col> >
<Col :span="12"><FormItem :label="l('upId')" prop="upId"> <InputNumber v-model="entity.upId"></InputNumber> <DatePicker
</FormItem></Col> type="date"
<Col :span="12"><FormItem :label="l('title')" prop="title"> <Input v-model="entity.title"> </Input> v-model="entity.lastModificationTime"
</FormItem></Col> ></DatePicker> </FormItem
<Col :span="12"><FormItem :label="l('status')" prop="status"> <Dictionary code="mes.project_plan.Status" v-model="entity.status"></Dictionary> ></Col>
</FormItem></Col> <Col :span="12"
<Col :span="24"><FormItem :label="l('note')" prop="note"> <Input v-model="entity.note" type="textarea" :rows="5"></Input> ><FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId">
</FormItem></Col> <InputNumber
<Col :span="12"><FormItem :label="l('startDate')" prop="startDate"> <DatePicker type="date" v-model="entity.startDate"></DatePicker> v-model="entity.lastModifierUserId"
</FormItem></Col> ></InputNumber> </FormItem
<Col :span="12"><FormItem :label="l('endDate')" prop="endDate"> <DatePicker type="date" v-model="entity.endDate"></DatePicker> ></Col>
</FormItem></Col> <Col :span="12"
<Col :span="12"><FormItem :label="l('type')" prop="type"> <Dictionary code="mes.project_plan.Type" v-model="entity.type"></Dictionary> ><FormItem :label="l('isDeleted')" prop="isDeleted">
</FormItem></Col> <InputNumber v-model="entity.isDeleted"></InputNumber> </FormItem
<Col :span="12"><FormItem :label="l('attachment')" prop="attachment"> <Input v-model="entity.attachment"> </Input> ></Col>
</FormItem></Col> <Col :span="12"
<Col :span="12"><FormItem :label="l('executor')" prop="executor"> <Input v-model="entity.executor"> </Input> ><FormItem :label="l('deletionTime')" prop="deletionTime">
</FormItem></Col> <DatePicker
type="date"
v-model="entity.deletionTime"
></DatePicker> </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('projectId')" prop="projectId">
<InputNumber v-model="entity.projectId"></InputNumber> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('upId')" prop="upId">
<InputNumber v-model="entity.upId"></InputNumber> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('title')" prop="title">
<Input v-model="entity.title"> </Input> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('status')" prop="status">
<Dictionary
code="mes.project_plan.Status"
v-model="entity.status"
></Dictionary> </FormItem
></Col>
<Col :span="24"
><FormItem :label="l('note')" prop="note">
<Input
v-model="entity.note"
type="textarea"
:rows="5"
></Input> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('startDate')" prop="startDate">
<DatePicker
type="date"
v-model="entity.startDate"
></DatePicker> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('endDate')" prop="endDate">
<DatePicker
type="date"
v-model="entity.endDate"
></DatePicker> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('type')" prop="type">
<Dictionary
code="mes.project_plan.Type"
v-model="entity.type"
></Dictionary> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('attachment')" prop="attachment">
<Input v-model="entity.attachment"> </Input> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('executor')" prop="executor">
<Input v-model="entity.executor"> </Input> </FormItem
></Col>
</Row> </Row>
<FormItem> <FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
</Form> </Form>
</template> </template>
<script> <script>
import Api from './api' import Api from "./api";
export default { export default {
name: 'Edit', name: "Edit",
data() { data() {
return { return {
disabled: false, entity: {},
entity: {
},
rules: { rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }] name: [{ required: true, message: "必填", trigger: "blur" }],
} },
} };
}, },
props: { props: {
eid: Number eid: Number,
}, },
mounted() { mounted() {
if (this.eid > 0) { if (this.eid > 0) {
...@@ -66,44 +128,43 @@ ...@@ -66,44 +128,43 @@
}, },
methods: { methods: {
load(v) { load(v) {
Api.get({ id: v }).then(r => { Api.get({ id: v }).then((r) => {
this.entity = r.result; this.entity = r.result;
}) });
}, },
handleSubmit() { handleSubmit() {
this.$refs.form.validate((v) => { this.$refs.form.validate((v) => {
if (v) { if (v) {
this.disabled = true; Api.update(this.entity)
Api.update(this.entity).then((r) => { .then((r) => {
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.$Message.error("保存失败");
console.warn(err);
});
} }
}) });
}, },
handleClose() { handleClose() {
this.$emit('on-close') this.$emit("on-close");
}, },
l(key) { l(key) {
key = "project_plan" + "." + key; key = "project_plan" + "." + key;
return this.$t(key) return this.$t(key);
} },
}, },
watch: { watch: {
eid(v) { eid(v) {
if (v != 0) { if (v != 0) {
this.load(v); this.load(v);
} }
} },
} },
} };
</script> </script>
\ No newline at end of file
pages/project/plan/index.vue
View file @ ed1b43bc
...@@ -79,18 +79,19 @@ export default { ...@@ -79,18 +79,19 @@ export default {
key: "action", key: "action",
width: 150, width: 150,
align: "center", align: "center",
// render:(h,params)=>{ render:(h,params)=>{
// return h("Actions" return h("Actions"
// ,{ ,{
// attrs:{ attrs:{
// row:params, row:params,
// },
// on:{ },
// 'on-click':()=>this.rowclick on:{
// } 'on-click':this.rowclick
// } }
// ) }
// } )
}
// render: (h, params) => { // render: (h, params) => {
// return h("div", { class: "action" }, [ // return h("div", { class: "action" }, [
// h( // h(
......
pages/project/project/add.vue
View file @ ed1b43bc
<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="8"> <Col span="8" class="projct-img">
<FormItem :label="l('picture')" prop="picture"> <FormItem :label="l('picture')" prop="picture">
<inputFile <inputFile
class="tphoto" class="tphoto"
...@@ -137,7 +137,7 @@ export default { ...@@ -137,7 +137,7 @@ export default {
name: "Add", name: "Add",
data() { data() {
return { return {
disabled: false,
imgName: "", imgName: "",
avatorPath: "", avatorPath: "",
entity: { entity: {
...@@ -196,7 +196,7 @@ export default { ...@@ -196,7 +196,7 @@ export default {
} }
Api.create(this.entity) Api.create(this.entity)
.then((r) => { .then((r) => {
this.disabled = false;
if (r.success) { if (r.success) {
this.$Message.success("保存成功"); this.$Message.success("保存成功");
this.$emit("on-ok"); this.$emit("on-ok");
...@@ -205,7 +205,7 @@ export default { ...@@ -205,7 +205,7 @@ export default {
} }
}) })
.catch((err) => { .catch((err) => {
this.disabled = false;
this.$Message.error("保存失败"); this.$Message.error("保存失败");
console.warn(err); console.warn(err);
}); });
...@@ -246,3 +246,18 @@ export default { ...@@ -246,3 +246,18 @@ export default {
}, },
}; };
</script> </script>
<style lang="less">
.projct-img {
.img-touxiang {
width: 300px;
height: 300px;
margin: 0px 10px 15px 20px;
overflow: hidden;
border-radius: 5px;
.img1 {
width: 100%;
height: 100%;
}
}
}
</style>
\ No newline at end of file
pages/project/project/detail.vue
View file @ ed1b43bc
...@@ -33,8 +33,12 @@ ...@@ -33,8 +33,12 @@
<Filed :span="12" :name="l('type')"> <Filed :span="12" :name="l('type')">
<state code="project.main.type" :value="entity.type" /> <state code="project.main.type" :value="entity.type" />
</Filed> </Filed>
<Filed :span="12" :name="l('picture')">{{ entity.picture }}</Filed> <Filed :span="12" :name="l('picture')"
<Filed :span="12" :name="l('attachment')">{{ entity.attachment }}</Filed> ><a @click="imgClick(entity.picture)">查看图片</a></Filed
>
<Filed :span="12" :name="l('attachment')">
<files ref="refFile" :parms="parms" fileFormat :showList="false" />
</Filed>
<Filed :span="24" :name="l('note')">{{ entity.note }}</Filed> <Filed :span="24" :name="l('note')">{{ entity.note }}</Filed>
</Row> </Row>
</div> </div>
...@@ -50,6 +54,12 @@ export default { ...@@ -50,6 +54,12 @@ export default {
name: [{ required: true, message: "必填", trigger: "blur" }], name: [{ required: true, message: "必填", trigger: "blur" }],
code: [{ required: true, message: "必填", trigger: "blur" }], code: [{ required: true, message: "必填", trigger: "blur" }],
}, },
parms: {
app: "material",
eid: null,
name: "",
field: "",
},
}; };
}, },
props: ["eid"], props: ["eid"],
...@@ -57,11 +67,17 @@ export default { ...@@ -57,11 +67,17 @@ export default {
this.load(this.eid); this.load(this.eid);
}, },
methods: { methods: {
imgClick(img) {
window.open(fileUrlDown + img, "_blank");
},
load(v) { load(v) {
Api.get({ id: v }).then((r) => { Api.get({ id: v }).then((r) => {
this.entity = r.result; this.entity = r.result;
this.entity.type = r.result.type+''; this.entity.type = r.result.type + "";
this.entity.state = r.result.state+''; this.entity.state = r.result.state + "";
this.parms.eid = r.result.attachment;
this.$emit("on-load"); this.$emit("on-load");
}); });
}, },
......
pages/project/project/edit.vue
View file @ ed1b43bc
<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="8"> <Col span="8" class="projct-img">
<FormItem :label="l('picture')" prop="picture"> <FormItem :label="l('picture')" prop="picture">
<inputFile <inputFile
class="tphoto" class="tphoto"
...@@ -174,3 +174,6 @@ export default { ...@@ -174,3 +174,6 @@ export default {
}, },
}; };
</script> </script>
<style lang="less">
</style>
\ No newline at end of file
pages/project/project/index.vue
View file @ ed1b43bc
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
:conditions="easySearch" :conditions="easySearch"
:type="typeInfo" :type="typeInfo"
:span="6" :span="6"
:format="formatFun"
><template slot="easySearch" ><template slot="easySearch"
><Form ref="formInline" :model="easySearch" inline ><Form ref="formInline" :model="easySearch" inline
><FormItem prop="keys" ><FormItem prop="keys"
...@@ -34,11 +35,16 @@ ...@@ -34,11 +35,16 @@
></Button> ></Button>
</template> </template>
<template slot="card" slot-scope="{ row }"> <template slot="card" slot-scope="{ row }">
<div class="body-card"> <Card
class="body-card"
:style="row._checked ? 'border:1px solid #2680eb;' : ''"
>
<Row class="title-i"> <Row class="title-i">
<Col :span="10" class="title-l"> <Col :span="10" class="title-l">
<Checkbox v-model="row._checked"></Checkbox>
<Ellipsis :text="row.title" :length="18" tooltip /> <Ellipsis :text="row.title" :length="18" tooltip />
</Col> </Col>
<Col :span="10" class="btn-click"> <Col :span="10" class="btn-click">
<!-- <Ellipsis :text="row.code" :length="18" tooltip/> --> <!-- <Ellipsis :text="row.code" :length="18" tooltip/> -->
</Col> </Col>
...@@ -104,10 +110,10 @@ ...@@ -104,10 +110,10 @@
</div> </div>
</Col> </Col>
</Row> </Row>
</div> </Card>
</template> </template>
</DataGrid> </DataGrid>
<Modal v-model="modal" :title="title" width="1200" footer-hide> <Modal v-model="modal" :title="title" width="1200" footer-hide :mask-closable="false">
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" /> <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
</Modal> </Modal>
</div> </div>
...@@ -131,6 +137,7 @@ export default { ...@@ -131,6 +137,7 @@ export default {
easySearch: { easySearch: {
keys: { op: "title", value: null }, keys: { op: "title", value: null },
}, },
// single: false,
modal: false, modal: false,
title: "新增", title: "新增",
detail: null, detail: null,
...@@ -338,10 +345,17 @@ export default { ...@@ -338,10 +345,17 @@ export default {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
methods: { methods: {
//格式化原始数据
formatFun(data) {
data.map((e) => {
return (e._checked = false);
});
return data;
},
tdStyle(val) { tdStyle(val) {
//动态根据状态值加载状态值对应的颜色 //动态根据状态值加载状态值对应的颜色 #19c919
let temDic = this.$store.getters.dictionaryByKey("taskList.status"); let temDic = this.$store.getters.dictionaryByKey("project.main.state");
let temColor = "#666"; let temColor = "#19c919";
temDic.forEach((data) => { temDic.forEach((data) => {
if (Number(data.code) == val) { if (Number(data.code) == val) {
temColor = data.color; temColor = data.color;
...@@ -425,21 +439,25 @@ export default { ...@@ -425,21 +439,25 @@ export default {
</script> </script>
<style lang="less"> <style lang="less">
.project { .project {
.ivu-card-body {
padding: 0 !important;
}
.body-card { .body-card {
border: 1px solid rgba(38, 128, 235, 1); // border: 1px solid rgba(38, 128, 235, 1);
margin: 5px 0; margin: 5px 0;
border-radius: 4px; border-radius: 4px;
height: 280px; // height: 280px;
.title-i { .title-i {
border-bottom: 1px solid #2680eb; // border-bottom: 1px solid #2680eb;
// padding: 0 10px; // padding: 0 10px;
height: 35px; height: 35px;
line-height: 35px; line-height: 35px;
background: rgba(38, 128, 235, 0.2); background: rgba(38, 128, 235, 0.2);
color: #2680eb; color: #2680eb;
.title-l {
padding-left: 10px; padding-left: 10px;
.title-l {
display: -webkit-inline-box;
} }
.btn-click { .btn-click {
text-align: right; text-align: right;
...@@ -477,22 +495,18 @@ export default { ...@@ -477,22 +495,18 @@ export default {
} }
.row-down { .row-down {
padding: 14px; padding: 14px;
// height: 110px;
.img-i { .img-i {
height: 170px; height: 170px;
width: 170px; width: 170px;
// img {
// width: 90px;
// height: 90px;
// }
} }
.c { .c {
padding-left: 14px; padding-left: 14px;
height: 170px; height: 170px;
div { div {
height: 30px; height: 33px;
line-height: 33px;
} }
} }
.shuo-ming { .shuo-ming {
...@@ -501,8 +515,8 @@ export default { ...@@ -501,8 +515,8 @@ export default {
} }
} }
.bottom-b { .bottom-b {
line-height: 40px; // line-height: 40px;
padding-left: 14px; padding: 0 0 6px 14px;
.a-icon { .a-icon {
text-align: right; text-align: right;
} }
......
pages/qc/certificate/endIssued/edit.vue
View file @ ed1b43bc
...@@ -23,7 +23,10 @@ ...@@ -23,7 +23,10 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="6"> <Col :span="6">
<FormItem :label="l('productSerialNumber')" prop="productSerialNumber"> <FormItem
:label="l('productSerialNumber')"
prop="productSerialNumber"
>
<ProductNumberSelect <ProductNumberSelect
v-model="entity.productSerialNumber" v-model="entity.productSerialNumber"
:eid="eid" :eid="eid"
...@@ -43,50 +46,92 @@ ...@@ -43,50 +46,92 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="6"> <Col :span="6">
<FormItem :label="l('materialSerialNumber')" prop="materialSerialNumber"> <FormItem
:label="l('materialSerialNumber')"
prop="materialSerialNumber"
>
<Input v-model="entity.materialSerialNumber"></Input> <Input v-model="entity.materialSerialNumber"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="6"> <Col :span="6">
<FormItem :label="l('materialCertificationNumber')" prop="materialCertificationNumber"> <FormItem
:label="l('materialCertificationNumber')"
prop="materialCertificationNumber"
>
<Input v-model="entity.materialCertificationNumber"></Input> <Input v-model="entity.materialCertificationNumber"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="6"> <Col :span="6">
<FormItem :label="l('productQuantity')" prop="productQuantity"> <FormItem :label="l('productQuantity')" prop="productQuantity">
<Input v-model="entity.productQuantity" :disabled="isDisabled"></Input> <Input
v-model="entity.productQuantity"
:disabled="isDisabled"
></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24" style="margin:20px 0;"> <Col :span="24" style="margin: 20px 0">
<div style="margin-left:10px;font-weight:bold">检验内容</div> <div style="margin-left: 10px; font-weight: bold">检验内容</div>
<div class="jy-boder"></div> <div class="jy-boder"></div>
</Col> </Col>
<Col :span="24" style="padding:20px 0 0px 10px;margin-bottom:10px;" class="table-solt"> <Col
<Table border :columns="columns" :data="checkList" class="tableCommon"> :span="24"
style="padding: 20px 0 0px 10px; margin-bottom: 10px"
class="table-solt"
>
<Table
border
:columns="columns"
:data="checkList"
class="tableCommon"
>
<template slot-scope="{ row, index }" slot="name"> <template slot-scope="{ row, index }" slot="name">
<Input v-model="row.name" placeholder="请输入" @on-blur="setRow(row,index)" /> <Input
v-model="row.name"
placeholder="请输入"
@on-blur="setRow(row, index)"
/>
</template> </template>
<template slot-scope="{ row, index }" slot="require"> <template slot-scope="{ row, index }" slot="require">
<Input v-model="row.require" placeholder="请输入" @on-blur="setRow(row,index)" /> <Input
v-model="row.require"
placeholder="请输入"
@on-blur="setRow(row, index)"
/>
</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)"
/>
</template> </template>
<template slot-scope="{ row, index }" slot="pash"> <template slot-scope="{ row, index }" slot="pash">
<inputFile v-model="row.file" :files="true" :parms="getParams(row.fileId)" /> <inputFile
v-model="row.file"
:files="true"
:parms="getParams(row.fileId)"
/>
</template> </template>
<template slot-scope="{ row, index }" slot="conclusion" class="dd"> <template slot-scope="{ row, index }" slot="conclusion" class="dd">
<Dictionary code="qms.certificate.conclusion" v-model="row.conclusion" type="select"></Dictionary> <Dictionary
code="qms.certificate.conclusion"
v-model="row.conclusion"
type="select"
></Dictionary>
</template> </template>
<template slot-scope="{ row, index }" slot="remark"> <template slot-scope="{ row, index }" slot="remark">
<Input v-model="row.remark" placeholder="请输入" @on-blur="setRow(row,index)" /> <Input
v-model="row.remark"
placeholder="请输入"
@on-blur="setRow(row, index)"
/>
</template> </template>
<template slot-scope="{ row, index }" slot="action"> <template slot-scope="{ row, index }" slot="action">
<a @click="remove(index)" style="color:#FF7A8B">删除</a> <a @click="remove(index)" style="color: #ff7a8b">删除</a>
</template> </template>
</Table> </Table>
</Col> </Col>
<Col :span="24" style="margin-bottom:20px;"> <Col :span="24" style="margin-bottom: 20px">
<Button type="primary" long @click="addNew" class="mt10">添加</Button> <Button type="primary" long @click="addNew" class="mt10">添加</Button>
</Col> </Col>
<Col :span="6"> <Col :span="6">
...@@ -117,7 +162,13 @@ ...@@ -117,7 +162,13 @@
<Checkbox v-model="submit" class="ml20">是否送审</Checkbox> <Checkbox v-model="submit" class="ml20">是否送审</Checkbox>
</FormItem> </FormItem>
</Form> </Form>
<Modal v-model="examineModal" title="合格证送审" footer-hide fullscreen :mask-closable="false"> <Modal
v-model="examineModal"
title="合格证送审"
footer-hide
fullscreen
:mask-closable="false"
>
<Examine :isId="isId" ref="examine"></Examine> <Examine :isId="isId" ref="examine"></Examine>
</Modal> </Modal>
</div> </div>
...@@ -213,14 +264,15 @@ export default { ...@@ -213,14 +264,15 @@ export default {
created() { created() {
this.addNew(); this.addNew();
this.isDisabled = true; this.isDisabled = true;
this.load(this.eid);
}, },
methods: { methods: {
load(v) { load(v) {
Api.getCertificate({ id: v }).then((r) => { Api.getCertificate({ id: v }).then((r) => {
this.entity = r.result;
let productSerialNumber = []; let productSerialNumber = [];
productSerialNumber = r.result.productSerialNumber.split(","); productSerialNumber = r.result.productSerialNumber.split(",");
r.result.productSerialNumber = productSerialNumber; this.entity.productSerialNumber = productSerialNumber.map(Number);
this.entity = r.result;
this.checkList = r.result.items; this.checkList = r.result.items;
console.log(this.entity); console.log(this.entity);
}); });
...@@ -234,7 +286,8 @@ export default { ...@@ -234,7 +286,8 @@ export default {
}, },
handleSubmit() { handleSubmit() {
this.entity.items = this.checkList; this.entity.items = this.checkList;
this.entity.items.forEach((c) => { this.entity.items.forEach((c, index) => {
c.index = index;
return delete c.id; return delete c.id;
}); });
this.$refs.form.validate((v) => { this.$refs.form.validate((v) => {
......
pages/qc/certificate/waitOpened/add.vue
View file @ ed1b43bc
...@@ -211,7 +211,7 @@ export default { ...@@ -211,7 +211,7 @@ export default {
disabled: false, disabled: false,
entity: { entity: {
id: 0, id: 0,
status: "", status: 0,
items: [], items: [],
}, },
rules: { rules: {
...@@ -225,6 +225,7 @@ export default { ...@@ -225,6 +225,7 @@ export default {
columns: [ columns: [
{ {
title: "序号", title: "序号",
// key: "index",
type: "index", type: "index",
width: 80, width: 80,
align: "center", align: "center",
...@@ -308,7 +309,8 @@ export default { ...@@ -308,7 +309,8 @@ export default {
let item = []; let item = [];
item = this.checkList; item = this.checkList;
if (item) { if (item) {
item.forEach((c) => { item.forEach((c, index) => {
c.index = index;
return delete c.id; return delete c.id;
}); });
} }
......
pages/resource/resource/index.vue
View file @ ed1b43bc
<template> <template>
<Layout class="full"> <Layout class="full">
<Sider hide-trigger v-if="showMenu" class="menu_side" width="300"> <Sider hide-trigger v-if="showMenu" class="menu_side" width="300">
<StoreTree @on-hide="onHide" @on-select="productSearch" /> <StoreTree @on-hide="onHide" @on-select="productSearch" />
</Sider> </Sider>
...@@ -10,12 +10,27 @@ ...@@ -10,12 +10,27 @@
</a> </a>
</div> </div>
<Content class="content" :class="!showMenu?'con_bord':''"> <Content class="content" :class="!showMenu ? 'con_bord' : ''">
<DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :batch="true" :format="checkData" @all-change="allchange" @on-selection-change="onSelect" exportTitle="制造资源"> <DataGrid
:columns="columns"
ref="grid"
:action="action"
:conditions="easySearch"
:batch="true"
:format="checkData"
@all-change="allchange"
@on-selection-change="onSelect"
exportTitle="制造资源"
>
<template slot="easySearch"> <template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys"> <FormItem prop="keys">
<Input clearable placeholder="请输入资源名称/资源编码/编码" v-model.trim="easySearch.keys.value" v-width="260" /> <Input
clearable
placeholder="请输入资源名称/资源编码/编码"
v-model.trim="easySearch.keys.value"
v-width="260"
/>
</FormItem> </FormItem>
<FormItem> <FormItem>
<Button type="primary" @click="search">查询</Button> <Button type="primary" @click="search">查询</Button>
...@@ -28,21 +43,55 @@ ...@@ -28,21 +43,55 @@
<template slot="buttons"> <template slot="buttons">
<Button type="primary" @click="add">入库</Button> <Button type="primary" @click="add">入库</Button>
<!-- <Button type="primary" @click="returnModel=true">归还</Button> --> <!-- <Button type="primary" @click="returnModel=true">归还</Button> -->
<Badge :count="this.$store.state.count" overflow-count="99" style="margin-right:5px;" :offset='postion'> <Badge
:count="this.$store.state.count"
overflow-count="99"
style="margin-right: 5px"
:offset="postion"
>
<Button icon="md-cart" @click="showCart">借出车</Button> <Button icon="md-cart" @click="showCart">借出车</Button>
</Badge> </Badge>
<Button @click="openModalIm">导入</Button> <Button @click="openModalIm">导入</Button>
</template> </template>
<template slot="batch"> <template slot="batch">
<Button type="primary" class="mr10 ml10" @click="addCart">加入借出车</Button> <Button type="primary" class="mr10 ml10" @click="addCart"
>加入借出车</Button
>
</template> </template>
</DataGrid> </DataGrid>
<Modal v-model="modal" :title="title" width="1200" footer-hide :fullscreen="fscreeen"> <Modal
<component :is="detail" :eid="curId" :rootName="rootName" :storeTitle="storeTitle" :materialType="materialType" :codeRuleType="codeRuleType" :storeId="storeId" :mcode="mCode" :cartList="this.$u.clone(this.$store.state.cart)" @on-close="cancel" @on-ok="ok" @substr="substr" /> v-model="modal"
:title="title"
width="1200"
footer-hide
:fullscreen="fscreeen"
>
<component
:is="detail"
:eid="curId"
:rootName="rootName"
:storeTitle="storeTitle"
:materialType="materialType"
:codeRuleType="codeRuleType"
:storeId="storeId"
:mcode="mCode"
:cartList="this.$u.clone(this.$store.state.cart)"
@on-close="cancel"
@on-ok="ok"
@substr="substr"
/>
</Modal> </Modal>
<ImportExcel ref="importExcel" @on-get-data="getData" modalTitle="制造资源" :columns="columns" :open="ModalIm" @on-cancel="ModalImCancel" @on-ok="ok" /> <ImportExcel
ref="importExcel"
@on-get-data="getData"
modalTitle="制造资源"
:columns="columns"
:open="ModalIm"
@on-cancel="ModalImCancel"
@on-ok="ok"
/>
</Content> </Content>
</Layout> </Layout>
</template> </template>
<script> <script>
...@@ -79,7 +128,8 @@ export default { ...@@ -79,7 +128,8 @@ export default {
storeTitle: "", storeTitle: "",
materialType: "", materialType: "",
mCode: "", mCode: "",
columns: [{ columns: [
{
key: "selection", key: "selection",
type: "selection", type: "selection",
width: 50, width: 50,
...@@ -101,8 +151,13 @@ export default { ...@@ -101,8 +151,13 @@ export default {
width: 60, width: 60,
render: (h, params) => { render: (h, params) => {
return h( return h(
"div", { "Tooltip",
{
class: "action", class: "action",
props: {
content: "请加入借出车",
placement: "top",
},
}, },
[ [
h(params.row.numberAvailable > 0 ? "op" : "", { h(params.row.numberAvailable > 0 ? "op" : "", {
...@@ -257,18 +312,22 @@ export default { ...@@ -257,18 +312,22 @@ export default {
hide: false, hide: false,
render: (h, params) => { render: (h, params) => {
return h( return h(
"div", { "div",
{
class: "action", class: "action",
}, },
[ [
h( h(
"op", { "op",
{
attrs: { attrs: {
oprate: "delete", oprate: "delete",
title: "删除", title: "删除",
}, },
class: params.row.totalNum === params.row.numberAvailable ? class:
"remove" : "disable", params.row.totalNum === params.row.numberAvailable
? "remove"
: "disable",
on: { on: {
click: () => this.remove(params.row), click: () => this.remove(params.row),
}, },
...@@ -276,7 +335,8 @@ export default { ...@@ -276,7 +335,8 @@ export default {
"删除" "删除"
), ),
h( h(
"op", { "op",
{
attrs: { attrs: {
oprate: "detail", oprate: "detail",
title: "查看日志", title: "查看日志",
...@@ -317,10 +377,7 @@ export default { ...@@ -317,10 +377,7 @@ export default {
})(); })();
}; };
}, },
async fetch({ async fetch({ store, params }) {
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
computed: {}, computed: {},
......
pages/store/add.vue
View file @ ed1b43bc
...@@ -116,12 +116,11 @@ export default { ...@@ -116,12 +116,11 @@ export default {
let obj = this.list[i]; let obj = this.list[i];
for (let j = 0; j < val.length; j++) { for (let j = 0; j < val.length; j++) {
if (obj.id == val[j]) { if (obj.id == val[j]) {
code.push(obj.code); code.push(obj.name);
type.push(obj.codeRuleType); type.push(obj.codeRuleType);
} }
} }
} }
this.entity.materialTypeName = code.join(","); this.entity.materialTypeName = code.join(",");
this.entity.codeRuleType = type.join(","); this.entity.codeRuleType = type.join(",");
}, },
......
pages/store/edit.vue
View file @ ed1b43bc
...@@ -57,9 +57,7 @@ export default { ...@@ -57,9 +57,7 @@ export default {
materialType: [], materialType: [],
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }], name: [{ required: true, message: "必填", trigger: "blur" }],
materialType: [ materialType: [{ required: true, message: "必填", trigger: "blur" }],
{ required: true, message: "必填", trigger: "blur", },
],
}, },
}; };
}, },
...@@ -101,7 +99,7 @@ export default { ...@@ -101,7 +99,7 @@ export default {
let obj = this.list[i]; let obj = this.list[i];
for (let j = 0; j < val.length; j++) { for (let j = 0; j < val.length; j++) {
if (obj.id == val[j]) { if (obj.id == val[j]) {
code.push(obj.code); code.push(obj.name);
type.push(obj.codeRuleType); type.push(obj.codeRuleType);
} }
} }
......
pages/technology/details/routingsupporting/index.vue
View file @ ed1b43bc
...@@ -94,15 +94,15 @@ export default { ...@@ -94,15 +94,15 @@ export default {
import: true, import: true,
}, },
{ // {
key: "materialType", // key: "materialType",
title: this.l("materialType"), // title: this.l("materialType"),
align: "center", // align: "center",
easy: true, // easy: true,
high: true, // high: true,
code: "mes_xingchi_resource.material.materialReType", // code: "mes_xingchi_resource.material.materialReType",
width: 100, // width: 100,
}, // },
{ {
key: "materialNumber", key: "materialNumber",
title: this.l("materialNumber"), title: this.l("materialNumber"),
......
pages/word/classification/add.vue
View file @ ed1b43bc
...@@ -461,7 +461,7 @@ export default { ...@@ -461,7 +461,7 @@ export default {
} }
}) })
.catch((err) => { .catch((err) => {
this.disabled = false;
this.$Message.error("保存失败"); this.$Message.error("保存失败");
console.warn(err); console.warn(err);
}); });
......
pages/workflow/form/design.vue
View file @ ed1b43bc
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<fm-making-form ref="makingform" style="height: 880px;" :data="jsonData" generate-json> <fm-making-form ref="makingform" style="height: 880px;" :data="jsonData" generate-json>
<template slot="action"> <template slot="action">
<!-- 自定义操作区域插槽 --> <!-- 自定义操作区域插槽 -->
<el-button type="text" icon="el-icon-upload">保存</el-button> <el-button type="text" icon="el-icon-upload" v-noClick>保存</el-button>
</template> </template>
</fm-making-form> </fm-making-form>
</template> </template>
......
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