Skip to content

M
mes-ui
Commit ee4bd9b2 authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

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

parents 7f4784df 27770b8e
Hide whitespace changes
Inline Side-by-side
Showing with 1028 additions and 1045 deletions
npm-shrinkwrap.json
View file @ ee4bd9b2
...@@ -4938,7 +4938,7 @@ ...@@ -4938,7 +4938,7 @@
"dependencies": { "dependencies": {
"commander": { "commander": {
"version": "2.14.1", "version": "2.14.1",
"resolved": "https://registry.npm.taobao.org/commander/download/commander-2.14.1.tgz?cache=0&sync_timestamp=1595168224685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.14.1.tgz", "resolved": "http://r.cnpmjs.org/commander/download/commander-2.14.1.tgz",
"integrity": "sha1-IjUSPjevjKPGXfRbAm29NXsBuao=" "integrity": "sha1-IjUSPjevjKPGXfRbAm29NXsBuao="
} }
} }
...@@ -5467,7 +5467,7 @@ ...@@ -5467,7 +5467,7 @@
}, },
"crc-32": { "crc-32": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npm.taobao.org/crc-32/download/crc-32-1.2.0.tgz", "resolved": "http://r.cnpmjs.org/crc-32/download/crc-32-1.2.0.tgz",
"integrity": "sha1-yy224puIUI4y2d0OwWk+e0Ghggg=", "integrity": "sha1-yy224puIUI4y2d0OwWk+e0Ghggg=",
"requires": { "requires": {
"exit-on-epipe": "~1.0.1", "exit-on-epipe": "~1.0.1",
...@@ -6338,11 +6338,11 @@ ...@@ -6338,11 +6338,11 @@
} }
}, },
"echarts": { "echarts": {
"version": "4.8.0", "version": "4.9.0",
"resolved": "https://registry.npm.taobao.org/echarts/download/echarts-4.8.0.tgz", "resolved": "https://registry.npm.taobao.org/echarts/download/echarts-4.9.0.tgz?cache=0&sync_timestamp=1598587691066&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fecharts%2Fdownload%2Fecharts-4.9.0.tgz",
"integrity": "sha1-ssHPuSKbE9No7hBPyO6mALV01MQ=", "integrity": "sha1-qbm6oD8Doqcx5jQMVb77V6nhNH0=",
"requires": { "requires": {
"zrender": "4.3.1" "zrender": "4.3.2"
} }
}, },
"echarts-liquidfill": { "echarts-liquidfill": {
...@@ -7364,7 +7364,7 @@ ...@@ -7364,7 +7364,7 @@
}, },
"exit-on-epipe": { "exit-on-epipe": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz", "resolved": "http://r.cnpmjs.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz",
"integrity": "sha1-C92S6H1ShdJn2qgXHQ6wYVlolpI=" "integrity": "sha1-C92S6H1ShdJn2qgXHQ6wYVlolpI="
}, },
"expand-brackets": { "expand-brackets": {
...@@ -8015,7 +8015,7 @@ ...@@ -8015,7 +8015,7 @@
}, },
"frac": { "frac": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npm.taobao.org/frac/download/frac-1.1.2.tgz", "resolved": "http://r.cnpmjs.org/frac/download/frac-1.1.2.tgz",
"integrity": "sha1-PXT39keMiKG1AgMG10fcYxPHTQs=" "integrity": "sha1-PXT39keMiKG1AgMG10fcYxPHTQs="
}, },
"fragment-cache": { "fragment-cache": {
...@@ -15087,7 +15087,7 @@ ...@@ -15087,7 +15087,7 @@
}, },
"printj": { "printj": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npm.taobao.org/printj/download/printj-1.1.2.tgz", "resolved": "http://r.cnpmjs.org/printj/download/printj-1.1.2.tgz",
"integrity": "sha1-2Q3rKXWoufYA+zoclOP0xTx4oiI=" "integrity": "sha1-2Q3rKXWoufYA+zoclOP0xTx4oiI="
}, },
"private": { "private": {
...@@ -20540,7 +20540,7 @@ ...@@ -20540,7 +20540,7 @@
}, },
"script-loader": { "script-loader": {
"version": "0.7.2", "version": "0.7.2",
"resolved": "https://registry.npm.taobao.org/script-loader/download/script-loader-0.7.2.tgz", "resolved": "http://r.cnpmjs.org/script-loader/download/script-loader-0.7.2.tgz",
"integrity": "sha1-IBbbb4byX1z1baOJFdgzeLsWa6c=", "integrity": "sha1-IBbbb4byX1z1baOJFdgzeLsWa6c=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -21128,7 +21128,7 @@ ...@@ -21128,7 +21128,7 @@
}, },
"ssf": { "ssf": {
"version": "0.10.3", "version": "0.10.3",
"resolved": "https://registry.npm.taobao.org/ssf/download/ssf-0.10.3.tgz", "resolved": "http://r.cnpmjs.org/ssf/download/ssf-0.10.3.tgz",
"integrity": "sha1-jq4fwpyQpVLnkhII+BiS1vd6yys=", "integrity": "sha1-jq4fwpyQpVLnkhII+BiS1vd6yys=",
"requires": { "requires": {
"frac": "~1.1.2" "frac": "~1.1.2"
...@@ -23778,7 +23778,7 @@ ...@@ -23778,7 +23778,7 @@
}, },
"wmf": { "wmf": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npm.taobao.org/wmf/download/wmf-1.0.2.tgz", "resolved": "http://r.cnpmjs.org/wmf/download/wmf-1.0.2.tgz",
"integrity": "sha1-fRnWIQcaCMK9xrfmiKnENSmMwto=" "integrity": "sha1-fRnWIQcaCMK9xrfmiKnENSmMwto="
}, },
"word-wrap": { "word-wrap": {
...@@ -23933,7 +23933,7 @@ ...@@ -23933,7 +23933,7 @@
}, },
"xlsx": { "xlsx": {
"version": "0.15.6", "version": "0.15.6",
"resolved": "https://registry.npm.taobao.org/xlsx/download/xlsx-0.15.6.tgz?cache=0&sync_timestamp=1597272342311&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fxlsx%2Fdownload%2Fxlsx-0.15.6.tgz", "resolved": "http://r.cnpmjs.org/xlsx/download/xlsx-0.15.6.tgz",
"integrity": "sha1-Rh+EHW2eoag3XizSRr8jrs4IodU=", "integrity": "sha1-Rh+EHW2eoag3XizSRr8jrs4IodU=",
"requires": { "requires": {
"adler-32": "~1.2.0", "adler-32": "~1.2.0",
...@@ -23948,7 +23948,7 @@ ...@@ -23948,7 +23948,7 @@
"dependencies": { "dependencies": {
"commander": { "commander": {
"version": "2.17.1", "version": "2.17.1",
"resolved": "https://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz?cache=0&sync_timestamp=1595168224685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.17.1.tgz", "resolved": "http://r.cnpmjs.org/commander/download/commander-2.17.1.tgz",
"integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78=" "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78="
} }
} }
...@@ -24117,9 +24117,9 @@ ...@@ -24117,9 +24117,9 @@
} }
}, },
"zrender": { "zrender": {
"version": "4.3.1", "version": "4.3.2",
"resolved": "https://registry.npm.taobao.org/zrender/download/zrender-4.3.1.tgz?cache=0&sync_timestamp=1597683748542&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fzrender%2Fdownload%2Fzrender-4.3.1.tgz", "resolved": "https://registry.npm.taobao.org/zrender/download/zrender-4.3.2.tgz?cache=0&sync_timestamp=1597683748542&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fzrender%2Fdownload%2Fzrender-4.3.2.tgz",
"integrity": "sha1-uviqbcgYei+BlpLX1fm+36K5D6M=" "integrity": "sha1-7HQy+UFcgsc1hLa3uMR+GwFiCcY="
} }
} }
} }
package.json
View file @ ee4bd9b2
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
"better-scroll": "^1.12.1", "better-scroll": "^1.12.1",
"cross-env": "^5.2.0", "cross-env": "^5.2.0",
"dayjs": "^1.8.27", "dayjs": "^1.8.27",
"echarts": "^4.8.0", "echarts": "^4.9.0",
"echarts-liquidfill": "^2.0.5", "echarts-liquidfill": "^2.0.5",
"file-saver": "^2.0.2", "file-saver": "^2.0.2",
"gantt-elastic": "^1.0.11", "gantt-elastic": "^1.0.11",
......
pages/basicData/userManagent/api.js
View file @ ee4bd9b2
...@@ -36,7 +36,7 @@ export default { ...@@ -36,7 +36,7 @@ export default {
}, },
//10010修改密码 //10010修改密码
authChangepassword(params) { authChangepassword(params) {
return Api.post(`${authUrl}/api/services/app/useraccount/changepassword`, params); return Api.post(`${UserUrl}/api/services/app/account/changepassword`, params);
}, },
//在10020上更新用户AccountId信息 //在10020上更新用户AccountId信息
updateAccount(params) { updateAccount(params) {
......
pages/mesPlan/index.vue
View file @ ee4bd9b2
...@@ -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 @ ee4bd9b2
<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>
</Sider>--> </Sider>-->
<Sider hide-trigger v-if="showMenu" class="menu_side" width="300"> <Sider hide-trigger v-if="showMenu" class="menu_side" width="300">
<ProductTree @on-hide="onHide" @on-select="productSearch" /> <ProductTree @on-hide="onHide" @on-select="productSearch" />
</Sider> </Sider>
<div v-if="!showMenu" class="show_menu"> <div v-if="!showMenu" class="show_menu">
<a class="menu_play fr" @click="showMenuFn" title="展开"> <a class="menu_play fr" @click="showMenuFn" title="展开">
<Icon type="ios-arrow-forward" size="24" /> <Icon type="ios-arrow-forward" size="24" />
</a> </a>
</div> </div>
<!-- 右侧内容 --> <!-- 右侧内容 -->
<Content class="content" :class="!showMenu?'con_bord':''"> <Content class="content" :class="!showMenu?'con_bord':''">
<Tabs v-model="selectName" @on-click="handleClick"> <Tabs v-model="selectName" @on-click="handleClick">
<TabPane label="订单报价" key="offer" name="offer"> <TabPane label="订单报价" key="offer" name="offer">
<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 <Button @click="advancedSearch" type="primary" style="margin-left:8px;">高级搜索</Button>
v-model="mesCode" </Col>
enter-button <Col span="12" style=" text-align: right;">
placeholder="订单编号、产品编码..." <Button type="primary" @click="orderQuotation">订单报价</Button>
@on-search="easySearch(mesCode)" <div @click="drawerShow = true" class="divIco">
style="width:235px;flaot:left;" <Icon type="ios-list" class="icoListInfo" />
/> </div>
<Button @click="advancedSearch" type="primary" style="margin-left:8px;">高级搜索</Button> </Col>
</Col> </Row>
<Col span="12" style=" text-align: right;">
<Button type="primary" @click="orderQuotation">订单报价</Button>
<div @click="drawerShow = true" class="divIco">
<Icon type="ios-list" class="icoListInfo" />
</div> </div>
</Col> <div style="margin-top:10px;">
</Row> <Table border highlight-row ref="selection" :columns="newColumn" :data="dataTable" :loading="loading" :height="tableHeight" class="tableCommon" @on-selection-change="selectInfo"></Table>
</div> </div>
<div style="margin-top:10px;"> </TabPane>
<Table <TabPane label="报价记录" key="record" name="record">
border <Input search enter-button placeholder="订单编号、报价单编号..." v-model="mesCodeT" @on-search="jlSearch(mesCodeT)" style="width:235px;flaot:left;" />
highlight-row <div style="margin-top:10px;">
ref="selection" <Table border ref="selection" :columns="recordColumn" :data="recordTable" :loading="loading" class="tableCommon" :height="tableHeight"></Table>
:columns="newColumn" </div>
:data="dataTable" </TabPane>
:loading="loading" </Tabs>
:height="tableHeight" <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" />
class="tableCommon"
@on-selection-change="selectInfo"
></Table>
</div>
</TabPane>
<TabPane label="报价记录" key="record" name="record">
<Input
search
enter-button
placeholder="订单编号、报价单编号..."
v-model="mesCodeT"
@on-search="jlSearch(mesCodeT)"
style="width:235px;flaot:left;"
/>
<div style="margin-top:10px;">
<Table
border
ref="selection"
:columns="recordColumn"
:data="recordTable"
:loading="loading"
class="tableCommon"
:height="tableHeight"
></Table>
</div>
</TabPane>
</Tabs>
<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"
/>
</Content> </Content>
<!-- 待审核弹框 --> <!-- 待审核弹框 -->
<Modal v-model="modalDai" width="360" :mask-closable="false" title="待审核"> <Modal v-model="modalDai" width="360" :mask-closable="false" title="待审核">
<Form :model="formItem" :label-width="80"> <Form :model="formItem" :label-width="80">
<FormItem label="审核状态"> <FormItem label="审核状态">
<RadioGroup v-model="formItem.animal"> <RadioGroup v-model="formItem.animal">
<Radio label="3">通过</Radio> <Radio label="3">通过</Radio>
<Radio label="4">未通过</Radio> <Radio label="4">未通过</Radio>
</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" </FormItem>
type="textarea" </Form>
:autosize="{ minRows: 2, maxRows: 5 }" <div slot="footer">
placeholder="Enter something..." <Button type="primary" size="large" @click="dal">确认</Button>
></Input> </div>
</FormItem>
</Form>
<div slot="footer">
<Button type="primary" size="large" @click="dal">确认</Button>
</div>
</Modal> </Modal>
<!-- 待送审弹框--> <!-- 待送审弹框-->
<Modal v-model="modalSong" width="360" :mask-closable="false" title="待审核"> <Modal v-model="modalSong" width="360" :mask-closable="false" title="待审核">
<div class="shenpi"> <div class="shenpi">
<label>审批人：</label> <label>审批人：</label>
<UserSelect ref="userSelected" v-model="model1" style="width:240px;" /> <UserSelect ref="userSelected" v-model="model1" style="width:240px;" />
</div> </div>
<div slot="footer"> <div slot="footer">
<Button type="primary" size="large" @click="dalSong">确认</Button> <Button type="primary" size="large" @click="dalSong">确认</Button>
</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>
...@@ -160,700 +99,755 @@ import ProductTree from "@/components/page/productTree.vue"; //左侧树列表 ...@@ -160,700 +99,755 @@ import ProductTree from "@/components/page/productTree.vue"; //左侧树列表
import MetalQuotationGeneration from "./components/metalQuotationGeneration.vue"; //生成报价单弹框 import MetalQuotationGeneration from "./components/metalQuotationGeneration.vue"; //生成报价单弹框
import PhotosensitiveGeneration from "./components/photosensitiveGeneration.vue"; //生成报价单弹框 import PhotosensitiveGeneration from "./components/photosensitiveGeneration.vue"; //生成报价单弹框
export default { export default {
components: { components: {
DrawerSet, DrawerSet,
QuotationBox, QuotationBox,
TreeType, TreeType,
SearchBox, SearchBox,
MetalQuotation, MetalQuotation,
Photosensitive, Photosensitive,
MetalDetails, MetalDetails,
PhotosensitiveDetails, PhotosensitiveDetails,
ProductTree, ProductTree,
MetalQuotationGeneration, MetalQuotationGeneration,
PhotosensitiveGeneration PhotosensitiveGeneration
}, },
data() { data() {
return { return {
zPhotosensitive: { zPhotosensitive: {
result: [] result: []
}, },
status: "", status: "",
userId: 0, userId: 0,
showMenu: true, showMenu: true,
model1: "", model1: "",
rows: {}, rows: {},
modalDai: false, //待审核 modalDai: false, //待审核
modal_loading: false, modal_loading: false,
modalSong: false, modalSong: false,
formItem: { formItem: {
auditIdea: "", auditIdea: "",
animal: "3" animal: "3"
}, },
cxResult: [], cxResult: [],
orderSearchForm: {}, //高级搜索 orderSearchForm: {}, //高级搜索
mesCode: "", //搜索 mesCode: "", //搜索
mesCodeT: "", mesCodeT: "",
simpleSearch: "", simpleSearch: "",
resultDetils: [], //报价记录详情 resultDetils: [], //报价记录详情
materialId: "", //用料id判断订单报价为铺粉还是光敏 materialId: "", //用料id判断订单报价为铺粉还是光敏
total: null, total: null,
bjData: [], bjData: [],
newJsData: [], newJsData: [],
remark: "", remark: "",
Party: false, Party: false,
productId: "", productId: "",
selectName: "offer", selectName: "offer",
recordColumn: [], //报价记录 recordColumn: [], //报价记录
recordTable: [], //报价记录 recordTable: [], //报价记录
loading: true, loading: true,
treeHeight: "", treeHeight: "",
showPagesize: [20, 50, 100], showPagesize: [20, 50, 100],
pageSize: 20, pageSize: 20,
current: 1, //当前页 整形 选填 默认1 current: 1, //当前页 整形 选填 默认1
treeData: [], treeData: [],
value1: false, value1: false,
drawerShow: false, drawerShow: false,
newColumn: [], //订单报价 newColumn: [], //订单报价
tableHeight: "", tableHeight: "",
column: [ column: [{
{ type: "selection", width: 70, align: "center", fixed: "left" }, type: "selection",
{ width: 70,
title: "序号", align: "center",
type: "index", fixed: "left"
width: 70, },
align: "center", {
fixed: "left" title: "序号",
type: "index",
width: 70,
align: "center",
fixed: "left"
},
{
title: "订单编号",
key: "mesCode",
minWidth: 200,
align: "center",
fixed: "left"
},
{
title: "产品名称",
key: "productName",
width: 120,
fixed: "left"
},
{
title: "报价状态",
key: "orderQuotationStatus",
align: "center",
width: 120,
fixed: "left",
filters: this.getArry(
this.$store.getters.dictionaryByKey(
"plan.quotation.orderQuotationStatusName"
)
),
filterMethod(value, row) {
let statusChar = row.orderQuotationStatus + "";
return statusChar.indexOf(value) > -1;
},
render: (h, params) => {
return h("state", {
props: {
code: "plan.quotation.orderQuotationStatusName",
type: "text",
value: params.row.orderQuotationStatus + ""
}
});
}
},
{
title: "任务类型",
key: "taskType",
width: 120,
filters: this.getArry(
this.$store.getters.dictionaryByKey("plan.order.taskType")
),
filterMethod(value, row) {
return row.taskType.indexOf(value) > -1;
},
render: (h, params) => {
return h("state", {
props: {
code: "plan.order.taskType",
type: "text",
value: params.row.taskType + ""
}
});
}
},
{
title: "阶段",
key: "stage",
width: 80,
render: (h, params) => {
return h("state", {
props: {
code: "plan.order.stage",
type: "text",
value: params.row.stage + ""
}
});
}
},
{
title: "材料",
key: "materialId",
width: 100,
render: (h, params) => {
return h("state", {
props: {
code: "plan.order.material",
type: "text",
value: params.row.materialId ? (params.row.materialId + "") : ""
}
});
}
},
{
title: "数量",
key: "quantity",
minWidth: 80,
align: "right"
},
{
title: "甲方客户",
key: "guestName",
width: 120,
tooltip: true,
render: (h, params) => {
return h("state", {
props: {
code: "plan.order.guestName",
type: "text",
value: params.row.guestName + ""
}
});
}
},
{
title: "3D打印承制单位",
key: "printSupply",
width: 160,
render: (h, params) => {
return h("state", {
props: {
code: "plan.order.printSupply",
type: "text",
value: params.row.printSupply + ""
}
});
}
},
{
title: "厂内责任机关",
key: "functionaryOffice",
width: 140
},
{
title: "厂内主体责任部门",
key: "mainDepartmentId",
width: 180,
render: (h, params) => {
return h("state", {
props: {
code: "plan.order.mainDepartment",
type: "text",
value: params.row.mainDepartmentId + ""
}
});
}
},
{
title: "备注",
key: "remark",
width: 120,
tooltip: true
},
{
title: "任务输入日期",
key: "taskInputDate",
width: 180,
align: "center"
},
{
title: "任务节点要求",
key: "taskRequire",
width: 150
},
{
title: "甲方投产输入文件（编号）",
key: "putintDocmentCode",
width: 220
},
{
title: "甲方技术输入文件（编号）",
key: "technologyDocmentCode",
width: 220
},
{
title: "外部图号/模型号",
key: "outerDrawnNumber",
width: 180
},
{
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: []
};
},
created() {
this.treeHeight = window.innerHeight - 140;
this.tableHeight = window.innerHeight - 250;
this.newColumn = this.column;
this.tableTata(this.selectName);
var data = {
id: "cf192e27-1e81-4000-98ee-392eeb539616"
};
this.$api.get(`${workflowUrl}/schema/getbyid`, data).then(res => {
//流程判断
if (res.success) {
this.status = res.result.status;
}
});
},
async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight;
this.treeHeight = window.screenHeight - 140;
this.tableHeight = window.innerHeight - 250;
})();
};
},
methods: {
onHide() {
this.showMenu = false;
}, },
{ showMenuFn() {
title: "订单编号", this.showMenu = true;
key: "mesCode",
minWidth: 200,
align: "center",
fixed: "left"
}, },
{ title: "产品名称", key: "productName", width: 120, fixed: "left" }, productSearch(id, item, ids) {
{ // console.log(item)
title: "报价状态", this.getMsgFormSon(ids);
key: "orderQuotationStatus", // let where = { productId: { op: "In", value: ids } };
align: "center", // this.$refs.grid.reload(where);
width: 120,
fixed: "left",
filters: this.getArry(
this.$store.getters.dictionaryByKey(
"plan.quotation.orderQuotationStatusName"
)
),
filterMethod(value, row) {
let statusChar = row.orderQuotationStatus + "";
return statusChar.indexOf(value) > -1;
},
render: (h, params) => {
return h("state", {
props: {
code: "plan.quotation.orderQuotationStatusName",
type: "text",
value: params.row.orderQuotationStatus + ""
}
});
}
}, },
{ update() {
title: "任务类型", this.tableTata(this.selectName);
key: "taskType",
width: 120,
filters: this.getArry(
this.$store.getters.dictionaryByKey("plan.order.taskType")
),
filterMethod(value, row) {
return row.taskType.indexOf(value) > -1;
},
render: (h, params) => {
return h("state", {
props: {
code: "plan.order.taskType",
type: "text",
value: params.row.taskType + ""
}
});
}
}, },
{ getMsgFormSon(data) {
title: "阶段", // console.log(data)
key: "stage", this.productId = data.join(",");
width: 80, this.tableTata(this.selectName);
render: (h, params) => {
return h("state", {
props: {
code: "plan.order.stage",
type: "text",
value: params.row.stage + ""
}
});
}
}, },
{ //select选项 多选
title: "材料", selectInfo(val) {
key: "materialId", this.bjData = val;
width: 100, var list = [];
render: (h, params) => { var listId = [];
return h("state", { val.forEach(data => {
props: { list.push(data.guestName);
code: "plan.order.material", listId.push(data.materialId);
type: "text", for (var i = 0; i < list.length; i++) {
value: params.row.materialId + "" if (list[i] === data.guestName) {
} for (var j = 0; j < listId.length; j++) {
if (listId[j] === data.materialId) {
return (this.Party = true);
} else {
this.$Message.info("请选择同一个材质进行报价");
return (this.Party = false);
}
}
} else {
this.$Message.info("请选择同一个甲方客户");
return (this.Party = false);
}
}
}); });
}
}, },
{ title: "数量", key: "quantity", minWidth: 80, align: "right" }, //tab切换
{ handleClick(name) {
title: "甲方客户", this.selectName = name;
key: "guestName", this.tableTata(this.selectName);
width: 120,
tooltip: true,
render: (h, params) => {
return h("state", {
props: {
code: "plan.order.guestName",
type: "text",
value: params.row.guestName + ""
}
});
}
}, },
{ tableTata() {
title: "3D打印承制单位", console.log(this.selectName);
key: "printSupply", if (this.selectName == "offer") {
width: 160, this.$http.quotation
render: (h, params) => { .getListTable({
return h("state", { productId: this.productId,
props: { pageSize: this.pageSize,
code: "plan.order.printSupply", current: this.current,
type: "text", mesCode: this.mesCode,
value: params.row.printSupply + "" productName: this.orderSearchForm.productName, //产品名称
} orderQuotationStatus: this.orderSearchForm.status, //状态
}); taskType: this.orderSearchForm.taskType, //任务类型
} stage: this.orderSearchForm.stage, //阶段
materialId: this.orderSearchForm.materialId, //材料
putintDocmentCode: this.orderSearchForm.putintDocmentCode, //甲方投产输入文件(编号)
guestName: this.orderSearchForm.guestName, //甲方客户
printSupply: this.orderSearchForm.printSupply, //3D打印
functionaryOffice: this.orderSearchForm.functionaryOffice, //厂内责任机关
mainDepartmentId: this.orderSearchForm.mainDepartmentId //厂内责任主体部门
})
.then(res => {
this.loading = false;
this.total = res.result.totalCount;
res.result.items.forEach(u => {
if (u.orderQuotationStatus === 0) {
u._disabled = false;
} else {
u._disabled = true;
}
});
this.dataTable = res.result.items;
try {
this.materialId = res.result.items[0].materialId
} catch (err) {
this.materialId = null
}
});
}
if (this.selectName == "record") {
this.recordColumn = [{
type: "index",
width: 65,
title: "序号",
align: "center"
},
{
title: "报价单编号",
key: "code",
align: "center",
render: (h, params) =>
h("div", [
h(
"a", {
on: {
click: () => {
this.infoDetail(params.row);
}
}
},
params.row.code
)
])
},
{
title: "报价时间",
key: "creationTime",
align: "center"
},
{
title: "制单人",
key: "maker",
align: "center"
},
{
title: "发往单位",
key: "postCompany",
align: "center"
},
{
title: "联系人",
key: "contactUser",
align: "center"
},
{
title: "电话",
key: "contactTel",
align: "center"
},
{
title: "报价状态",
key: "status",
align: "center",
width: 120,
filters: this.getArry(
this.$store.getters.dictionaryByKey(
"plan.quotation.orderQuotationStatusName"
)
),
filterMethod(value, row) {
let statusChar = row.status + "";
return statusChar.indexOf(value) > -1;
},
render: (h, params) => {
return h(
"a", {
// on: {
// click: () => {
// this.statusData(params.row)
// }
// }
},
[
h("state", {
props: {
code: "plan.quotation.orderQuotationStatusName",
type: "text",
value: params.row.status + ""
}
})
]
);
}
},
{
title: "备注",
key: "remark",
align: "center"
},
{
title: "操作",
key: "action",
width: 150,
align: "center",
render: (h, params) => {
return h("div", {
class: "action"
}, [
h(
params.row.status === 3 || params.row.status === 4 ?
"op" :
params.row.status === 1 ?
"op" :
"", {
attrs: {
oprate: "detail"
},
on: {
click: () => {
if (params.row.status === 1) {
this.resetGeneration(params.row);
} else {
this.requote(params.row);
}
}
}
},
(params.row.status === 3 || params.row.status === 4) &&
!params.row.upCode ?
"重新报价" :
params.row.status === 1 && this.status == 0 ?
"送审" :
""
)
]);
}
}
];
this.$http.quotation
.quotationRecordList({
pageSize: this.pageSize,
current: this.current,
mesCode: this.mesCodeT
})
.then(res => {
console.log(res);
this.loading = false;
this.recordTable = res.result.items;
this.total = res.result.totalCount;
// recordTable
})
.catch(error => {});
}
},
updateColumn(checkShowColumn) {
this.newColumn = checkShowColumn;
},
//订单报价按钮
orderQuotation() {
// 通过甲方客户判断定价报单的类型（类型分为三种情况：铺粉、光敏、外协）
this.newJsData = [];
if (this.Party === true) {
this.bjData.forEach(data => {
let obj = {
mesCode: data.mesCode,
orderId: data.id,
productName: data.productName,
num: data.quantity,
sizeCheckPrice: ""
};
this.newJsData.push(obj);
this.materialId = data.materialId;
});
//用料id判断订单报价为铺粉还是光敏
if (this.materialId == 2) {
//光敏
this.$refs.photosensitive.modalShow = true;
this.$refs.photosensitive.formItem = {};
this.$refs.photosensitive.formItem.quotationType = "光敏树脂";
} else {
//铺粉
this.$refs.metalQuotation.modalShow = true;
this.$refs.metalQuotation.formItem = {};
this.$refs.metalQuotation.formItem.quotationType = "AlSi10Mg";
}
} else {
this.$Message.info("请选择至少一个订单，并为同一个甲方客户");
}
},
//报价状态
statusData(row) {
this.userId = this.$store.state.userInfo.userId;
if (row.status === 2) {
if (row.auditUser == this.userId) {
//待审核
this.modalDai = true;
this.rows = {};
this.rows = row;
} else {
this.$Message.error("您不是当前数据处理的指定人员");
}
} else if (row.status === 1) {
if (row.creatorUserId == this.userId) {
//待送审
this.modalSong = true;
this.rows = {};
this.rows = row;
} else {
this.$Message.error("您不是当前数据的创建人员，不能进行送审");
}
}
}, },
{ title: "厂内责任机关", key: "functionaryOffice", width: 140 }, dal() {
{ var data = {
title: "厂内主体责任部门", id: this.rows.id,
key: "mainDepartmentId", status: this.formItem.animal,
width: 180, auditIdea: this.formItem.auditIdea,
render: (h, params) => { orderIds: this.rows.orderIds.join(",")
return h("state", { };
props: { this.$http.quotation
code: "plan.order.mainDepartment", .submitCensorship(data)
type: "text", .then(res => {
value: params.row.mainDepartmentId + "" this.modalDai = false;
} this.tableTata(this.selectName);
})
.then(error => {
this.$Message.error(error.result.message);
});
},
dalSong() {
var data = {
auditUser: parseInt(this.model1),
id: this.rows.id,
status: this.rows.status + 1,
orderIds: this.rows.orderIds.join(",")
};
this.$http.quotation.submitCensorship(data).then(res => {
this.modalSong = false;
this.tableTata(this.selectName);
}); });
}
}, },
{ title: "备注", key: "remark", width: 120, tooltip: true }, //高级搜索
{ advancedSearch() {
title: "任务输入日期", this.$refs.searchBox.modalShow = true;
key: "taskInputDate",
width: 180,
align: "center"
}, },
{ title: "任务节点要求", key: "taskRequire", width: 150 }, gSearch(data) {
{ this.orderSearchForm = data;
title: "甲方投产输入文件（编号）", this.$refs.searchBox.modalShow = false;
key: "putintDocmentCode", this.tableTata(this.selectName);
width: 220
}, },
{ //搜索查询
title: "甲方技术输入文件（编号）", easySearch(val) {
key: "technologyDocmentCode", this.mesCode = val;
width: 220 this.simpleSearch = "SimpleSearch";
this.tableTata(this.selectName);
}, },
{ title: "外部图号/模型号", key: "outerDrawnNumber", width: 180 }, //报价记录搜索
{ title: "模型版本", key: "modelVersion", width: 120 }, jlSearch(val) {
{ title: "甲方任务号", key: "taskCode", width: 120 }, console.log(val);
{ title: "甲方设计人员", key: "designer", width: 150 }, this.mesCodeT = val;
{ title: "厂内机关负责人", key: "officeFunctionary", width: 150 }, // this.simpleSearch = 'SimpleSearch'
{ title: "厂内主工艺人员", key: "mainRoutingPeople", width: 150 } this.tableTata(this.selectName);
], },
dataTable: [] //重新报价
}; requote(row) {
}, this.newJsData = [];
created() { if (row.quotationType == "AlSi10Mg") {
this.treeHeight = window.innerHeight - 140; //铺粉
this.tableHeight = window.innerHeight - 250; this.$refs.metalQuotation.modalShow = true;
this.newColumn = this.column; } else if (row.quotationType == "光敏树脂") {
this.tableTata(this.selectName); this.$refs.photosensitive.modalShow = true;
var data = {
id: "cf192e27-1e81-4000-98ee-392eeb539616"
};
this.$api.get(`${workflowUrl}/schema/getbyid`, data).then(res => {
//流程判断
if (res.success) {
this.status = res.result.status;
}
});
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight;
this.treeHeight = window.screenHeight - 140;
this.tableHeight = window.innerHeight - 250;
})();
};
},
methods: {
onHide() {
this.showMenu = false;
},
showMenuFn() {
this.showMenu = true;
},
productSearch(id, item, ids) {
// console.log(item)
this.getMsgFormSon(ids);
// let where = { productId: { op: "In", value: ids } };
// this.$refs.grid.reload(where);
},
update() {
this.tableTata(this.selectName);
},
getMsgFormSon(data) {
// console.log(data)
this.productId = data.join(",");
this.tableTata(this.selectName);
},
//select选项 多选
selectInfo(val) {
this.bjData = val;
var list = [];
var listId = [];
val.forEach(data => {
list.push(data.guestName);
listId.push(data.materialId);
for (var i = 0; i < list.length; i++) {
if (list[i] === data.guestName) {
for (var j = 0; j < listId.length; j++) {
if (listId[j] === data.materialId) {
return (this.Party = true);
} else {
this.$Message.info("请选择同一个材质进行报价");
return (this.Party = false);
}
} }
} else {
this.$Message.info("请选择同一个甲方客户"); this.$http.quotation
return (this.Party = false); .orderList({
} id: row.id
} })
}); .then(res => {
}, this.loading = false;
//tab切换 this.newJsData = res.result;
handleClick(name) { this.cxResult = res.result;
this.selectName = name; this.newJsData.forEach(el => {
this.tableTata(this.selectName); return (el.id = null);
}, });
tableTata() { this.$refs.metalQuotation.formItem.quotationId = row.id;
console.log(this.selectName); this.$refs.metalQuotation.formItem.postCompany = this.cxResult[0].postCompany;
if (this.selectName == "offer") { this.$refs.metalQuotation.formItem.contactUser = this.cxResult[0].contactUser;
this.$http.quotation this.$refs.metalQuotation.formItem.contactUser = this.cxResult[0].contactTel;
.getListTable({ this.$refs.metalQuotation.formItem.contactUser = this.cxResult[0].quotationType;
productId: this.productId, this.$refs.metalQuotation.formItem.contactUser = this.cxResult[0].remark;
pageSize: this.pageSize, this.$refs.photosensitive.formItem.postCompany = this.cxResult[0].postCompany;
current: this.current, this.$refs.photosensitive.formItem.contactUser = this.cxResult[0].contactUser;
mesCode: this.mesCode, this.$refs.photosensitive.formItem.contactUser = this.cxResult[0].contactTel;
productName: this.orderSearchForm.productName, //产品名称 this.$refs.photosensitive.formItem.contactUser = this.cxResult[0].quotationType;
orderQuotationStatus: this.orderSearchForm.status, //状态 this.$refs.photosensitive.formItem.contactUser = this.cxResult[0].remark;
taskType: this.orderSearchForm.taskType, //任务类型 this.$refs.metalQuotation.formItem.quotationId = row.id;
stage: this.orderSearchForm.stage, //阶段 })
materialId: this.orderSearchForm.materialId, //材料 .catch(error => {
putintDocmentCode: this.orderSearchForm.putintDocmentCode, //甲方投产输入文件(编号) this.$Message.error("请求失败");
guestName: this.orderSearchForm.guestName, //甲方客户 });
printSupply: this.orderSearchForm.printSupply, //3D打印 },
functionaryOffice: this.orderSearchForm.functionaryOffice, //厂内责任机关
mainDepartmentId: this.orderSearchForm.mainDepartmentId //厂内责任主体部门 // 分页
}) pageChange(num) {
.then(res => { this.current = num;
this.loading = false; this.tableTata(this.selectName);
this.total = res.result.totalCount; },
res.result.items.forEach(u => { pageSizeChange(limit) {
if (u.orderQuotationStatus === 0) { //console.log(limit)
u._disabled = false; this.pageSize = limit;
} else { this.tableTata(this.selectName);
u._disabled = true; },
} //详情
}); infoDetail(row) {
this.dataTable = res.result.items; //判断报价单类型是金属还是光敏
this.materialId = res.result.items[0].materialId; if (row.quotationType == "AlSi10Mg") {
}); this.$refs.metalDetail.modalShow = true;
}
if (this.selectName == "record") {
this.recordColumn = [
{
type: "index",
width: 65,
title: "序号",
align: "center"
},
{
title: "报价单编号",
key: "code",
align: "center",
render: (h, params) =>
h("div", [
h(
"a",
{
on: {
click: () => {
this.infoDetail(params.row);
}
}
},
params.row.code
)
])
},
{
title: "报价时间",
key: "creationTime",
align: "center"
},
{
title: "制单人",
key: "maker",
align: "center"
},
{
title: "发往单位",
key: "postCompany",
align: "center"
},
{
title: "联系人",
key: "contactUser",
align: "center"
},
{
title: "电话",
key: "contactTel",
align: "center"
},
{
title: "报价状态",
key: "status",
align: "center",
width: 120,
filters: this.getArry(
this.$store.getters.dictionaryByKey(
"plan.quotation.orderQuotationStatusName"
)
),
filterMethod(value, row) {
let statusChar = row.status + "";
return statusChar.indexOf(value) > -1;
},
render: (h, params) => {
return h(
"a",
{
// on: {
// click: () => {
// this.statusData(params.row)
// }
// }
},
[
h("state", {
props: {
code: "plan.quotation.orderQuotationStatusName",
type: "text",
value: params.row.status + ""
}
})
]
);
} }
}, if (row.quotationType == "光敏树脂") {
{ this.$refs.photosensitiveDetail.modalShow = true;
title: "备注",
key: "remark",
align: "center"
},
{
title: "操作",
key: "action",
width: 150,
align: "center",
render: (h, params) => {
return h("div", { class: "action" }, [
h(
params.row.status === 3 || params.row.status === 4
? "op"
: params.row.status === 1
? "op"
: "",
{
attrs: {
oprate: "detail"
},
on: {
click: () => {
if (params.row.status === 1) {
this.resetGeneration(params.row);
} else {
this.requote(params.row);
}
}
}
},
(params.row.status === 3 || params.row.status === 4) &&
!params.row.upCode
? "重新报价"
: params.row.status === 1 && this.status == 0
? "送审"
: ""
)
]);
} }
} this.$http.quotation
]; .orderList({
this.$http.quotation id: row.id
.quotationRecordList({ })
pageSize: this.pageSize, .then(res => {
current: this.current, console.log(res);
mesCode: this.mesCodeT this.resultDetils = res.result;
}) console.log(this.resultDetils);
.then(res => { })
console.log(res); .catch(error => {
this.loading = false; this.$Message.error("请求失败");
this.recordTable = res.result.items; });
this.total = res.result.totalCount; },
// recordTable //重新送审
}) resetGeneration(row) {
.catch(error => {}); //判断报价单类型是金属还是光敏 当前除了ALSi10Mg的类型以外，其他的都是光敏树脂型
} if (row.quotationType == "AlSi10Mg") {
}, this.$refs.metalQuotationExamine.modalShow = true;
updateColumn(checkShowColumn) { }
this.newColumn = checkShowColumn; if (row.quotationType == "光敏树脂") {
}, this.$refs.photosensitiveExamine.modalShow = true;
//订单报价按钮 }
orderQuotation() { this.$http.quotation
// 通过甲方客户判断定价报单的类型（类型分为三种情况：铺粉、光敏、外协） .orderList({
this.newJsData = []; id: row.id
if (this.Party === true) { })
this.bjData.forEach(data => { .then(res => {
let obj = { this.zPhotosensitive.result = res.result;
mesCode: data.mesCode, })
orderId: data.id, .catch(error => {
productName: data.productName, this.$Message.error("请求失败");
num: data.quantity, });
sizeCheckPrice: "" },
}; //得到数据字典对应的label和value，用于table排序
this.newJsData.push(obj); getArry(arryList) {
this.materialId = data.materialId; let arry = [];
}); arryList.forEach(data => {
//用料id判断订单报价为铺粉还是光敏 var that = this;
if (this.materialId == 2) { let arryObj = {};
//光敏 arryObj["label"] = data.name;
this.$refs.photosensitive.modalShow = true; arryObj["value"] = data.code;
this.$refs.photosensitive.formItem = {}; arry.push(arryObj);
this.$refs.photosensitive.formItem.quotationType = "光敏树脂"; });
} else { return arry;
//铺粉
this.$refs.metalQuotation.modalShow = true;
this.$refs.metalQuotation.formItem = {};
this.$refs.metalQuotation.formItem.quotationType = "AlSi10Mg";
}
} else {
this.$Message.info("请选择至少一个订单，并为同一个甲方客户");
}
},
//报价状态
statusData(row) {
this.userId = this.$store.state.userInfo.userId;
if (row.status === 2) {
if (row.auditUser == this.userId) {
//待审核
this.modalDai = true;
this.rows = {};
this.rows = row;
} else {
this.$Message.error("您不是当前数据处理的指定人员");
}
} else if (row.status === 1) {
if (row.creatorUserId == this.userId) {
//待送审
this.modalSong = true;
this.rows = {};
this.rows = row;
} else {
this.$Message.error("您不是当前数据的创建人员，不能进行送审");
} }
}
},
dal() {
var data = {
id: this.rows.id,
status: this.formItem.animal,
auditIdea: this.formItem.auditIdea,
orderIds: this.rows.orderIds.join(",")
};
this.$http.quotation
.submitCensorship(data)
.then(res => {
this.modalDai = false;
this.tableTata(this.selectName);
})
.then(error => {
this.$Message.error(error.result.message);
});
},
dalSong() {
var data = {
auditUser: parseInt(this.model1),
id: this.rows.id,
status: this.rows.status + 1,
orderIds: this.rows.orderIds.join(",")
};
this.$http.quotation.submitCensorship(data).then(res => {
this.modalSong = false;
this.tableTata(this.selectName);
});
},
//高级搜索
advancedSearch() {
this.$refs.searchBox.modalShow = true;
},
gSearch(data) {
this.orderSearchForm = data;
this.$refs.searchBox.modalShow = false;
this.tableTata(this.selectName);
},
//搜索查询
easySearch(val) {
this.mesCode = val;
this.simpleSearch = "SimpleSearch";
this.tableTata(this.selectName);
},
//报价记录搜索
jlSearch(val) {
console.log(val);
this.mesCodeT = val;
// this.simpleSearch = 'SimpleSearch'
this.tableTata(this.selectName);
},
//重新报价
requote(row) {
this.newJsData = [];
if (row.quotationType == "AlSi10Mg") {
//铺粉
this.$refs.metalQuotation.modalShow = true;
} else if (row.quotationType == "光敏树脂") {
this.$refs.photosensitive.modalShow = true;
}
this.$http.quotation
.orderList({
id: row.id
})
.then(res => {
this.loading = false;
this.newJsData = res.result;
this.cxResult = res.result;
this.newJsData.forEach(el => {
return (el.id = null);
});
this.$refs.metalQuotation.formItem.quotationId = row.id;
this.$refs.metalQuotation.formItem.postCompany = this.cxResult[0].postCompany;
this.$refs.metalQuotation.formItem.contactUser = this.cxResult[0].contactUser;
this.$refs.metalQuotation.formItem.contactUser = this.cxResult[0].contactTel;
this.$refs.metalQuotation.formItem.contactUser = this.cxResult[0].quotationType;
this.$refs.metalQuotation.formItem.contactUser = this.cxResult[0].remark;
this.$refs.photosensitive.formItem.postCompany = this.cxResult[0].postCompany;
this.$refs.photosensitive.formItem.contactUser = this.cxResult[0].contactUser;
this.$refs.photosensitive.formItem.contactUser = this.cxResult[0].contactTel;
this.$refs.photosensitive.formItem.contactUser = this.cxResult[0].quotationType;
this.$refs.photosensitive.formItem.contactUser = this.cxResult[0].remark;
this.$refs.metalQuotation.formItem.quotationId = row.id;
})
.catch(error => {
this.$Message.error("请求失败");
});
},
// 分页
pageChange(num) {
this.current = num;
this.tableTata(this.selectName);
},
pageSizeChange(limit) {
//console.log(limit)
this.pageSize = limit;
this.tableTata(this.selectName);
},
//详情
infoDetail(row) {
//判断报价单类型是金属还是光敏
if (row.quotationType == "AlSi10Mg") {
this.$refs.metalDetail.modalShow = true;
}
if (row.quotationType == "光敏树脂") {
this.$refs.photosensitiveDetail.modalShow = true;
}
this.$http.quotation
.orderList({
id: row.id
})
.then(res => {
console.log(res);
this.resultDetils = res.result;
console.log(this.resultDetils);
})
.catch(error => {
this.$Message.error("请求失败");
});
},
//重新送审
resetGeneration(row) {
//判断报价单类型是金属还是光敏 当前除了ALSi10Mg的类型以外，其他的都是光敏树脂型
if (row.quotationType == "AlSi10Mg") {
this.$refs.metalQuotationExamine.modalShow = true;
}
if (row.quotationType == "光敏树脂") {
this.$refs.photosensitiveExamine.modalShow = true;
}
this.$http.quotation
.orderList({
id: row.id
})
.then(res => {
this.zPhotosensitive.result = res.result;
})
.catch(error => {
this.$Message.error("请求失败");
});
},
//得到数据字典对应的label和value，用于table排序
getArry(arryList) {
let arry = [];
arryList.forEach(data => {
var that = this;
let arryObj = {};
arryObj["label"] = data.name;
arryObj["value"] = data.code;
arry.push(arryObj);
});
return arry;
} }
}
}; };
</script> </script>
pages/resourceManagement/train/index.vue
View file @ ee4bd9b2
<template> <template>
<div class="train"> <div class="train">
<Row :gutter="16" style="margin-bottom:10px"> <Row :gutter="16" style="margin-bottom:10px">
<Col span="4"> <Col span="4">
<Input v-model="keys" search placeholder="请输入车辆编号" clearable /> <Input v-model="keys" search placeholder="请输入车辆编号" clearable />
</Col> </Col>
<Col span="20" style="text-align:right"> <Col span="20" style="text-align:right">
<Button type="primary" @click="add">新增</Button> <Button type="primary" @click="add">新增</Button>
</Col> </Col>
</Row> </Row>
<Table border :columns="columns" :data="projectList"></Table> <Table border :columns="columns" :data="projectList"></Table>
<div class="page-v"> <div class="page-v">
<Page :total="4" size="small" show-elevator show-sizer show-total :page-size="20" /> <Page :total="4" size="small" show-elevator show-sizer show-total :page-size="20" />
</div> </div>
<Modal v-model="modal" :title="title" @on-ok="ok" @on-cancel="cancel" width="600"> <Modal v-model="modal" :title="title" @on-ok="ok" @on-cancel="cancel" width="600">
<Form :model="formItem" :label-width="100"> <Form :model="formItem" :label-width="100">
<FormItem label="车辆编号"> <FormItem label="车辆编号">
<Input v-model="formItem.name" placeholder="请输入车辆编号"></Input> <Input v-model="formItem.name" placeholder="请输入车辆编号"></Input>
</FormItem> </FormItem>
<FormItem label="车辆类型"> <FormItem label="车辆类型">
<Select v-model="formItem.name1" style="width:200px"> <Select v-model="formItem.name1" style="width:200px">
<Option value="1">CR2001</Option> <Option value="1">CR2001</Option>
<Option value="2">CR200J</Option> <Option value="2">CR200J</Option>
<Option value="3">CR2008</Option> <Option value="3">CR2008</Option>
</Select> </Select>
</FormItem> </FormItem>
<FormItem label="类型编号"> <FormItem label="类型编号">
<Input v-model="formItem.a2" placeholder="请输入类型编号"></Input> <Input v-model="formItem.a2" placeholder="请输入类型编号"></Input>
</FormItem> </FormItem>
<FormItem label="生产厂家"> <FormItem label="生产厂家">
<Select v-model="formItem.a" style="width:200px"> <Select v-model="formItem.a" style="width:200px">
<Option value="1">长客</Option> <Option value="1">长客</Option>
<Option value="2">唐厂</Option> <Option value="2">唐厂</Option>
</Select> </Select>
</FormItem> </FormItem>
<FormItem label="出厂时间"> <FormItem label="出厂时间">
<DatePicker <DatePicker type="date" placeholder="Select startTime" v-model="formItem.startTime" style="width: 408px"></DatePicker>
type="date" </FormItem>
placeholder="Select startTime" <FormItem label="配属时间">
v-model="formItem.startTime" <DatePicker type="date" placeholder="Select startTime" v-model="formItem.a1" style="width: 408px"></DatePicker>
style="width: 408px" </FormItem>
></DatePicker> </Form>
</FormItem>
<FormItem label="配属时间">
<DatePicker
type="date"
placeholder="Select startTime"
v-model="formItem.a1"
style="width: 408px"
></DatePicker>
</FormItem>
</Form>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: "", name: "",
data() { data() {
return { return {
title: "", title: "",
formInline: { formInline: {
name: "", name: "",
}, },
keys: "", keys: "",
formItem: { formItem: {
name: "", name: "",
name1: "", name1: "",
startTime: "", startTime: "",
a2: "", a2: "",
a: "", a: "",
a1: "", a1: "",
}, },
modal: false, modal: false,
modal1: false, modal1: false,
columns: [ columns: [{
{ title: "序号",
title: "序号", type: "index",
type: "index", width: 60,
width: 60, align: "center",
align: "center", },
},
{
title: "车辆编号",
key: "name",
},
{
title: "车辆类型",
key: "name1",
},
{
title: "类型编号",
key: "a2",
},
{
title: "生产厂家",
key: "a",
},
{
title: "出厂时间",
key: "startTime",
},
{
title: "配属时间",
key: "a1",
},
{
title: "操作",
key: "action",
width: 120,
align: "center",
render: (h, params) => {
return h("div", [
h(
"op",
{ {
props: { title: "车辆编号",
type: "detail", key: "name",
size: "small", },
}, {
style: { title: "车辆类型",
marginRight: "5px", key: "name1",
}, },
on: { {
click: () => { title: "类型编号",
this.edit(params.row); key: "a2",
}, },
}, {
title: "生产厂家",
key: "a",
},
{
title: "出厂时间",
key: "startTime",
},
{
title: "配属时间",
key: "a1",
}, },
"编辑"
),
h(
"op",
{ {
props: { title: "操作",
type: "detail", key: "action",
size: "small", width: 120,
}, align: "center",
style: { render: (h, params) => {
marginRight: "5px", return h("div", [
}, h(
on: { "op", {
click: () => { props: {
this.remover(params.index); type: "detail",
size: "small",
},
style: {
marginRight: "5px",
},
on: {
click: () => {
this.edit(params.row);
},
},
},
"编辑"
),
h(
"op", {
props: {
type: "detail",
size: "small",
},
style: {
marginRight: "5px",
},
on: {
click: () => {
this.remover(params.index);
},
},
},
"删除"
),
]);
}, },
},
}, },
"删除" ],
), data: [{
]); name: "CR200J3001",
}, name1: "CR200J",
startTime: "2017-02-05",
a2: "003",
a: "长客",
a1: "2018-03-01",
},
{
name: "CR200J3003",
name1: "CR200J",
startTime: "2017-02-15",
a2: "003",
a: "长客",
a1: "2018-03-01",
},
{
name: "CR200J1009",
name1: "CR200J",
startTime: "2017-02-15",
a2: "001",
a: "唐厂",
a1: "2018-03-01",
},
{
name: "CR200J1021",
name1: "CR200J",
startTime: "2017-02-09",
a2: "001",
a: "唐厂",
a1: "2018-03-01",
},
],
};
},
computed: {
projectList() {
return this.data.filter((u) => {
return u.name.indexOf(this.keys) > -1;
});
}, },
], },
data: [ methods: {
{ handleSubmit(name) {
name: "CR200J3001", this.$refs[name].validate((valid) => {
name1: "CR200J", if (valid) {
startTime: "2017-02-05", this.$Message.success("Success!");
a2: "003", } else {
a: "长客", this.$Message.error("Fail!");
a1: "2018-03-01", }
});
}, },
{ reset() {},
name: "CR200J3003", add() {
name1: "CR200J", this.title = "新建";
startTime: "2017-02-15", this.modal = true;
a2: "003",
a: "长客",
a1: "2018-03-01",
}, },
{ edit(row) {
name: "CR200J1009", console.log(row);
name1: "CR200J", this.title = "编辑";
startTime: "2017-02-15", this.modal = true;
a2: "001", this.formItem.name = row.name;
a: "唐厂", this.formItem.startTime = row.startTime;
a1: "2018-03-01", this.formItem.a2 = row.a2;
this.formItem.a1 = row.a1;
this.formItem.name1 = "2";
if (row.a == "唐厂") {
this.formItem.a = "2";
} else {
this.formItem.a = "1";
}
}, },
{ remover() {
name: "CR200J1021", this.$Modal.confirm({
name1: "CR200J", title: "删除",
startTime: "2017-02-09", content: "<p>您确定删除此信息？</p>",
a2: "001", onOk: () => {
a: "唐厂", this.$Message.info("操作成功");
a1: "2018-03-01", },
onCancel: () => {
this.$Message.info("取消操作");
},
});
}, },
], ok() {
}; this.$Message.info("操作成功");
},
computed: {
projectList() {
return this.data.filter((u) => {
return u.name.indexOf(this.keys) > -1;
});
},
},
methods: {
handleSubmit(name) {
this.$refs[name].validate((valid) => {
if (valid) {
this.$Message.success("Success!");
} else {
this.$Message.error("Fail!");
}
});
},
reset() {},
add() {
this.title = "新建";
this.modal = true;
},
edit(row) {
console.log(row);
this.title = "编辑";
this.modal = true;
this.formItem.name = row.name;
this.formItem.startTime = row.startTime;
this.formItem.a2 = row.a2;
this.formItem.a1 = row.a1;
this.formItem.name1 = "2";
if (row.a == "唐厂") {
this.formItem.a = "2";
} else {
this.formItem.a = "1";
}
},
remover() {
this.$Modal.confirm({
title: "删除",
content: "<p>您确定删除此信息？</p>",
onOk: () => {
this.$Message.info("Clicked ok");
}, },
onCancel: () => { cancel() {
this.$Message.info("Clicked cancel"); this.$Message.info("取消操作");
}, },
});
}, },
ok() {
this.$Message.info("Clicked ok");
},
cancel() {
this.$Message.info("Clicked cancel");
},
},
}; };
</script> </script>
<style lang="less"> <style lang="less">
.train { .train {
padding-top: 10px; padding-top: 10px;
.ivu-form-item-content {
float: left; .ivu-form-item-content {
} float: left;
.page-v { }
text-align: right;
margin-top: 10px; .page-v {
} text-align: right;
margin-top: 10px;
}
} }
</style> </style>
\ No newline at end of file
static/config.js
View file @ ee4bd9b2
...@@ -11,6 +11,7 @@ let address=systemApi.dev; ...@@ -11,6 +11,7 @@ let address=systemApi.dev;
window.systemUrl = `http://${address}:10000/system`; //System-api 系统管理（基础数据） window.systemUrl = `http://${address}:10000/system`; //System-api 系统管理（基础数据）
window.authUrl = `http://${address}:10010`; //Authentication-api //统一登录认证 window.authUrl = `http://${address}:10010`; //Authentication-api //统一登录认证
window.UserUrl = `http://${address}:10130`; //Authentication-api //用户信息 密码修改。重置等
window.designUrl = `http://${address}:10000/process`; // 工艺规程 window.designUrl = `http://${address}:10000/process`; // 工艺规程
window.PlanUrl = `http://${address}:10000/plan`; //订单 window.PlanUrl = `http://${address}:10000/plan`; //订单
// window.PlanUrl = `http://localhost:10050/api/services/app`; //Process-api // window.PlanUrl = `http://localhost:10050/api/services/app`; //Process-api
......
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