Skip to content

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

mesplan

parent 67ccc8b9
Show whitespace changes
Inline Side-by-side
Showing with 787 additions and 798 deletions
pages/mesPlan/index.vue
View file @ f02db6e4
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</div> </div>
<Content class="content" :class="!showMenu?'con_bord':''"> <Content class="content" :class="!showMenu?'con_bord':''">
<!--:data="dataT"--> <!--:data="dataT"-->
<DataGrid :action="action" :columns="columns" :conditions="easySearch" ref="grid" @on-selection-change="onSelect" :batch="true" :border="false" rowKey="id" exportTitle="订单管理" @on-import-data="onImportData"> <DataGrid :action="action" :columns="columns" :conditions="easySearch" ref="grid" @on-selection-change="onSelect" :batch="true" :border="false" rowKey="id">
<template slot="easySearch"> <template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys"> <FormItem prop="keys">
...@@ -376,7 +376,7 @@ export default { ...@@ -376,7 +376,7 @@ export default {
h( h(
"op", { "op", {
attrs: { attrs: {
oprate: "remove" // oprate: "delete"
}, },
on: { on: {
click: () => this.remove(params.row) click: () => this.remove(params.row)
...@@ -389,14 +389,14 @@ export default { ...@@ -389,14 +389,14 @@ export default {
params.row.id != params.row.rootId || params.row.id != params.row.rootId ||
params.row.status != 1 ? params.row.status != 1 ?
"display:none" : "display:none" :
"") : ( "color:red") : (
(params.row.status == 3 && (params.row.status == 3 &&
params.row.id == params.row.rootId && params.row.id == params.row.rootId &&
params.row.divideMark != 0) || params.row.divideMark != 0) ||
params.row.id != params.row.rootId || params.row.id != params.row.rootId ||
params.row.status != 3 ? params.row.status != 3 ?
"display:none" : "display:none" :
"") "color:red")
}, },
"删除" "删除"
), ),
...@@ -770,7 +770,7 @@ export default { ...@@ -770,7 +770,7 @@ export default {
this.delMsg = ""; this.delMsg = "";
this.delNum = 0; this.delNum = 0;
this.actIds = []; this.actIds = [];
this.$refs.grid.cancelFooterToolbar(); //this.$refs.grid.cancelFooterToolbar();
this.actIds.push(row.id); this.actIds.push(row.id);
if (row.id != row.rootId) { if (row.id != row.rootId) {
this.sondeletecheck(row.rootId); this.sondeletecheck(row.rootId);
......
pages/order/quotation/index.vue
View file @ f02db6e4
<template> <template>
<Layout class="quotation"> <Layout class="quotation">
<!-- 左侧树 --> <!-- 左侧树 -->
<!-- <Sider hide-trigger :style="{background: '#fff'}" width="260"> <!-- <Sider hide-trigger :style="{background: '#fff'}" width="260">
<Tree-Type @func="getMsgFormSon" :style="{ height: treeHeight + 'px' }"></Tree-Type> <Tree-Type @func="getMsgFormSon" :style="{ height: treeHeight + 'px' }"></Tree-Type>
...@@ -19,14 +19,7 @@ ...@@ -19,14 +19,7 @@
<div class="search-form"> <div class="search-form">
<Row> <Row>
<Col span="12" style="display: flex;"> <Col span="12" style="display: flex;">
<Input <Input search v-model="mesCode" enter-button placeholder="订单编号、产品编码..." @on-search="easySearch(mesCode)" style="width:235px;flaot:left;" />
search
v-model="mesCode"
enter-button
placeholder="订单编号、产品编码..."
@on-search="easySearch(mesCode)"
style="width:235px;flaot:left;"
/>
<Button @click="advancedSearch" type="primary" style="margin-left:8px;">高级搜索</Button> <Button @click="advancedSearch" type="primary" style="margin-left:8px;">高级搜索</Button>
</Col> </Col>
<Col span="12" style=" text-align: right;"> <Col span="12" style=" text-align: right;">
...@@ -38,52 +31,17 @@ ...@@ -38,52 +31,17 @@
</Row> </Row>
</div> </div>
<div style="margin-top:10px;"> <div style="margin-top:10px;">
<Table <Table border highlight-row ref="selection" :columns="newColumn" :data="dataTable" :loading="loading" :height="tableHeight" class="tableCommon" @on-selection-change="selectInfo"></Table>
border
highlight-row
ref="selection"
:columns="newColumn"
:data="dataTable"
:loading="loading"
:height="tableHeight"
class="tableCommon"
@on-selection-change="selectInfo"
></Table>
</div> </div>
</TabPane> </TabPane>
<TabPane label="报价记录" key="record" name="record"> <TabPane label="报价记录" key="record" name="record">
<Input <Input search enter-button placeholder="订单编号、报价单编号..." v-model="mesCodeT" @on-search="jlSearch(mesCodeT)" style="width:235px;flaot:left;" />
search
enter-button
placeholder="订单编号、报价单编号..."
v-model="mesCodeT"
@on-search="jlSearch(mesCodeT)"
style="width:235px;flaot:left;"
/>
<div style="margin-top:10px;"> <div style="margin-top:10px;">
<Table <Table border ref="selection" :columns="recordColumn" :data="recordTable" :loading="loading" class="tableCommon" :height="tableHeight"></Table>
border
ref="selection"
:columns="recordColumn"
:data="recordTable"
:loading="loading"
class="tableCommon"
:height="tableHeight"
></Table>
</div> </div>
</TabPane> </TabPane>
</Tabs> </Tabs>
<Page <Page style="margin-top:10px;" show-elevator show-sizer :total="total" :page-size-opts="showPagesize" :page-size="pageSize" :current="current" @on-change="pageChange" @on-page-size-change="pageSizeChange" />
style="margin-top:10px;"
show-elevator
show-sizer
:total="total"
:page-size-opts="showPagesize"
:page-size="pageSize"
:current="current"
@on-change="pageChange"
@on-page-size-change="pageSizeChange"
/>
</Content> </Content>
<!-- 待审核弹框 --> <!-- 待审核弹框 -->
<Modal v-model="modalDai" width="360" :mask-closable="false" title="待审核"> <Modal v-model="modalDai" width="360" :mask-closable="false" title="待审核">
...@@ -95,12 +53,7 @@ ...@@ -95,12 +53,7 @@
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem label="备注"> <FormItem label="备注">
<Input <Input v-model="formItem.auditIdea" type="textarea" :autosize="{ minRows: 2, maxRows: 5 }" placeholder="Enter something..."></Input>
v-model="formItem.auditIdea"
type="textarea"
:autosize="{ minRows: 2, maxRows: 5 }"
placeholder="Enter something..."
></Input>
</FormItem> </FormItem>
</Form> </Form>
<div slot="footer"> <div slot="footer">
...@@ -118,13 +71,7 @@ ...@@ -118,13 +71,7 @@
</div> </div>
</Modal> </Modal>
<!-- 列设置抽屉 --> <!-- 列设置抽屉 -->
<Drawer-Set <Drawer-Set :isShow="drawerShow" :tcolumn="column" :newColumn="newColumn" @close="drawerShow = false" @updateCol="updateColumn"></Drawer-Set>
:isShow="drawerShow"
:tcolumn="column"
:newColumn="newColumn"
@close="drawerShow = false"
@updateCol="updateColumn"
></Drawer-Set>
<!-- 高级搜索弹框 --> <!-- 高级搜索弹框 -->
<Search-Box ref="searchBox" @heightSearch="gSearch"></Search-Box> <Search-Box ref="searchBox" @heightSearch="gSearch"></Search-Box>
<!-- 订单报价 --> <!-- 订单报价 -->
...@@ -134,17 +81,9 @@ ...@@ -134,17 +81,9 @@
<Metal-Details ref="metalDetail" :resultDetils="resultDetils"></Metal-Details> <Metal-Details ref="metalDetail" :resultDetils="resultDetils"></Metal-Details>
<Photosensitive-Details ref="photosensitiveDetail" :resultDetils="resultDetils"></Photosensitive-Details> <Photosensitive-Details ref="photosensitiveDetail" :resultDetils="resultDetils"></Photosensitive-Details>
<!-- 报价记录里送审 --> <!-- 报价记录里送审 -->
<MetalQuotation-Generation <MetalQuotation-Generation ref="metalQuotationExamine" :childData="zPhotosensitive" @update="update"></MetalQuotation-Generation>
ref="metalQuotationExamine" <Photosensitive-Generation ref="photosensitiveExamine" :childData="zPhotosensitive" @update="update"></Photosensitive-Generation>
:childData="zPhotosensitive" </Layout>
@update="update"
></MetalQuotation-Generation>
<Photosensitive-Generation
ref="photosensitiveExamine"
:childData="zPhotosensitive"
@update="update"
></Photosensitive-Generation>
</Layout>
</template> </template>
<script> <script>
...@@ -217,8 +156,12 @@ export default { ...@@ -217,8 +156,12 @@ export default {
drawerShow: false, drawerShow: false,
newColumn: [], //订单报价 newColumn: [], //订单报价
tableHeight: "", tableHeight: "",
column: [ column: [{
{ type: "selection", width: 70, align: "center", fixed: "left" }, type: "selection",
width: 70,
align: "center",
fixed: "left"
},
{ {
title: "序号", title: "序号",
type: "index", type: "index",
...@@ -233,7 +176,12 @@ export default { ...@@ -233,7 +176,12 @@ export default {
align: "center", align: "center",
fixed: "left" fixed: "left"
}, },
{ title: "产品名称", key: "productName", width: 120, fixed: "left" }, {
title: "产品名称",
key: "productName",
width: 120,
fixed: "left"
},
{ {
title: "报价状态", title: "报价状态",
key: "orderQuotationStatus", key: "orderQuotationStatus",
...@@ -302,12 +250,17 @@ export default { ...@@ -302,12 +250,17 @@ export default {
props: { props: {
code: "plan.order.material", code: "plan.order.material",
type: "text", type: "text",
value: params.row.materialId + "" value: params.row.materialId ? (params.row.materialId + "") : ""
} }
}); });
} }
}, },
{ title: "数量", key: "quantity", minWidth: 80, align: "right" }, {
title: "数量",
key: "quantity",
minWidth: 80,
align: "right"
},
{ {
title: "甲方客户", title: "甲方客户",
key: "guestName", key: "guestName",
...@@ -337,7 +290,11 @@ export default { ...@@ -337,7 +290,11 @@ export default {
}); });
} }
}, },
{ title: "厂内责任机关", key: "functionaryOffice", width: 140 }, {
title: "厂内责任机关",
key: "functionaryOffice",
width: 140
},
{ {
title: "厂内主体责任部门", title: "厂内主体责任部门",
key: "mainDepartmentId", key: "mainDepartmentId",
...@@ -352,14 +309,23 @@ export default { ...@@ -352,14 +309,23 @@ export default {
}); });
} }
}, },
{ title: "备注", key: "remark", width: 120, tooltip: true }, {
title: "备注",
key: "remark",
width: 120,
tooltip: true
},
{ {
title: "任务输入日期", title: "任务输入日期",
key: "taskInputDate", key: "taskInputDate",
width: 180, width: 180,
align: "center" align: "center"
}, },
{ title: "任务节点要求", key: "taskRequire", width: 150 }, {
title: "任务节点要求",
key: "taskRequire",
width: 150
},
{ {
title: "甲方投产输入文件（编号）", title: "甲方投产输入文件（编号）",
key: "putintDocmentCode", key: "putintDocmentCode",
...@@ -370,12 +336,36 @@ export default { ...@@ -370,12 +336,36 @@ export default {
key: "technologyDocmentCode", key: "technologyDocmentCode",
width: 220 width: 220
}, },
{ title: "外部图号/模型号", key: "outerDrawnNumber", width: 180 }, {
{ title: "模型版本", key: "modelVersion", width: 120 }, title: "外部图号/模型号",
{ title: "甲方任务号", key: "taskCode", width: 120 }, key: "outerDrawnNumber",
{ title: "甲方设计人员", key: "designer", width: 150 }, width: 180
{ title: "厂内机关负责人", key: "officeFunctionary", width: 150 }, },
{ title: "厂内主工艺人员", key: "mainRoutingPeople", width: 150 } {
title: "模型版本",
key: "modelVersion",
width: 120
},
{
title: "甲方任务号",
key: "taskCode",
width: 120
},
{
title: "甲方设计人员",
key: "designer",
width: 150
},
{
title: "厂内机关负责人",
key: "officeFunctionary",
width: 150
},
{
title: "厂内主工艺人员",
key: "mainRoutingPeople",
width: 150
}
], ],
dataTable: [] dataTable: []
}; };
...@@ -395,7 +385,10 @@ export default { ...@@ -395,7 +385,10 @@ export default {
} }
}); });
}, },
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
mounted() { mounted() {
...@@ -494,8 +487,7 @@ export default { ...@@ -494,8 +487,7 @@ export default {
}); });
} }
if (this.selectName == "record") { if (this.selectName == "record") {
this.recordColumn = [ this.recordColumn = [{
{
type: "index", type: "index",
width: 65, width: 65,
title: "序号", title: "序号",
...@@ -508,8 +500,7 @@ export default { ...@@ -508,8 +500,7 @@ export default {
render: (h, params) => render: (h, params) =>
h("div", [ h("div", [
h( h(
"a", "a", {
{
on: { on: {
click: () => { click: () => {
this.infoDetail(params.row); this.infoDetail(params.row);
...@@ -561,8 +552,7 @@ export default { ...@@ -561,8 +552,7 @@ export default {
}, },
render: (h, params) => { render: (h, params) => {
return h( return h(
"a", "a", {
{
// on: { // on: {
// click: () => { // click: () => {
// this.statusData(params.row) // this.statusData(params.row)
...@@ -592,14 +582,15 @@ export default { ...@@ -592,14 +582,15 @@ export default {
width: 150, width: 150,
align: "center", align: "center",
render: (h, params) => { render: (h, params) => {
return h("div", { class: "action" }, [ return h("div", {
class: "action"
}, [
h( h(
params.row.status === 3 || params.row.status === 4 params.row.status === 3 || params.row.status === 4 ?
? "op" "op" :
: params.row.status === 1 params.row.status === 1 ?
? "op" "op" :
: "", "", {
{
attrs: { attrs: {
oprate: "detail" oprate: "detail"
}, },
...@@ -614,11 +605,11 @@ export default { ...@@ -614,11 +605,11 @@ export default {
} }
}, },
(params.row.status === 3 || params.row.status === 4) && (params.row.status === 3 || params.row.status === 4) &&
!params.row.upCode !params.row.upCode ?
? "重新报价" "重新报价" :
: params.row.status === 1 && this.status == 0 params.row.status === 1 && this.status == 0 ?
? "送审" "送审" :
: "" ""
) )
]); ]);
} }
...@@ -855,5 +846,3 @@ export default { ...@@ -855,5 +846,3 @@ export default {
} }
}; };
</script> </script>
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