Commit 92f58224 authored by 仇晓婷's avatar 仇晓婷

报价单流程判断优化

parent 01c2b987
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
fullscreen fullscreen
footer-hide footer-hide
> >
{{status}}
<Form :model="formItem" :label-width="80"> <Form :model="formItem" :label-width="80">
<Row type="flex" justify="space-between"> <Row type="flex" justify="space-between">
<Col span="8"> <Col span="8">
...@@ -350,10 +349,8 @@ export default { ...@@ -350,10 +349,8 @@ export default {
// console.log(this.newList) // console.log(this.newList)
if (this.status == 0) { if (this.status == 0) {
this.formItem.status = 1; this.formItem.status = 1;
alert(this.formItem.status);
} else { } else {
this.formItem.status = 3; this.formItem.status = 3;
alert(this.formItem.status);
} }
let item = []; let item = [];
let quotationMain = {}; let quotationMain = {};
......
...@@ -229,10 +229,8 @@ export default { ...@@ -229,10 +229,8 @@ export default {
//订单报价 //订单报价
if (this.status == 0) { if (this.status == 0) {
this.formItem.status = 1; this.formItem.status = 1;
alert(this.formItem.status);
} else { } else {
this.formItem.status = 3; this.formItem.status = 3;
alert(this.formItem.status);
} }
let item = []; let item = [];
let quotationMain = {}; let quotationMain = {};
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!-- 左侧树 --> <!-- 左侧树 -->
<!-- <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>
...@@ -134,8 +134,16 @@ ...@@ -134,8 +134,16 @@
<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 ref="metalQuotationExamine" :childData="zPhotosensitive" @update="update"></MetalQuotation-Generation> <MetalQuotation-Generation
<Photosensitive-Generation ref="photosensitiveExamine" :childData="zPhotosensitive" @update="update"></Photosensitive-Generation> ref="metalQuotationExamine"
:childData="zPhotosensitive"
@update="update"
></MetalQuotation-Generation>
<Photosensitive-Generation
ref="photosensitiveExamine"
:childData="zPhotosensitive"
@update="update"
></Photosensitive-Generation>
</Layout> </Layout>
</template> </template>
...@@ -148,7 +156,7 @@ import MetalQuotation from "./components/metalQuotation.vue"; //订单报价弹 ...@@ -148,7 +156,7 @@ import MetalQuotation from "./components/metalQuotation.vue"; //订单报价弹
import Photosensitive from "./components/photosensitive.vue"; //订单报价弹框光敏 import Photosensitive from "./components/photosensitive.vue"; //订单报价弹框光敏
import MetalDetails from "./components/metalDetails.vue"; //报价历史记录铺粉详情弹框 import MetalDetails from "./components/metalDetails.vue"; //报价历史记录铺粉详情弹框
import PhotosensitiveDetails from "./components/photosensitiveDetails.vue"; //报价历史记录光敏详情弹框 import PhotosensitiveDetails from "./components/photosensitiveDetails.vue"; //报价历史记录光敏详情弹框
import ProductTree from "@/components/page/productTree.vue";//左侧树列表 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 {
...@@ -160,7 +168,8 @@ export default { ...@@ -160,7 +168,8 @@ export default {
MetalQuotation, MetalQuotation,
Photosensitive, Photosensitive,
MetalDetails, MetalDetails,
PhotosensitiveDetails,ProductTree, PhotosensitiveDetails,
ProductTree,
MetalQuotationGeneration, MetalQuotationGeneration,
PhotosensitiveGeneration PhotosensitiveGeneration
}, },
...@@ -169,6 +178,7 @@ export default { ...@@ -169,6 +178,7 @@ export default {
zPhotosensitive: { zPhotosensitive: {
result: [] result: []
}, },
status: "",
userId: 0, userId: 0,
showMenu: true, showMenu: true,
model1: "", model1: "",
...@@ -375,6 +385,15 @@ export default { ...@@ -375,6 +385,15 @@ export default {
this.tableHeight = window.innerHeight - 250; this.tableHeight = window.innerHeight - 250;
this.newColumn = this.column; this.newColumn = this.column;
this.tableTata(this.selectName); 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 }) { async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
...@@ -398,7 +417,7 @@ export default { ...@@ -398,7 +417,7 @@ export default {
}, },
productSearch(id, item, ids) { productSearch(id, item, ids) {
// console.log(item) // console.log(item)
this.getMsgFormSon(ids) this.getMsgFormSon(ids);
// let where = { productId: { op: "In", value: ids } }; // let where = { productId: { op: "In", value: ids } };
// this.$refs.grid.reload(where); // this.$refs.grid.reload(where);
}, },
...@@ -597,7 +616,7 @@ export default { ...@@ -597,7 +616,7 @@ 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 : params.row.status === 1 && this.status == 0
? "送审" ? "送审"
: "" : ""
) )
......
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