Skip to content

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

报价单bug

parent 094fd58a
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 78 deletions
pages/order/quotation/components/metalQuotationGeneration.vue
View file @ f94fa56e
......@@ -247,7 +247,7 @@ export default {
.then((res) => {
if (res.success) {
this.$Message.success('订单报价送审成功!')
this.$emit('on-close')
this.$emit("update")
this.modalShow = false
this.easySearch('')
} else {
......
pages/order/quotation/components/photosensitiveGeneration.vue
View file @ f94fa56e
......@@ -105,9 +105,9 @@
</div>
</template>
<script>
import Process from '@/components/orderOperator/process'
import Process from "@/components/orderOperator/process";
export default {
name: '',
name: "",
components: {
Process
},
......@@ -118,149 +118,147 @@ export default {
},
data() {
return {
model1: '',
model1: "",
modalShow: false,
columns: [
{
title: '序号',
type: 'index',
title: "序号",
type: "index",
width: 50,
align: 'center'
align: "center"
},
{
title: '订单编号',
key: 'mesCode',
align: 'center',
title: "订单编号",
key: "mesCode",
align: "center",
minWidth: 120
},
{
title: '产品名称',
key: 'productName',
align: 'center',
title: "产品名称",
key: "productName",
align: "center",
minWidth: 80
},
{
title: '重量（g）',
key: 'materialWeight',
align: 'center',
title: "重量（g）",
key: "materialWeight",
align: "center",
minWidth: 80
},
{
title: '单价（元/g）',
key: 'materialUnitPrice',
align: 'center',
title: "单价（元/g）",
key: "materialUnitPrice",
align: "center",
minWidth: 80
},
{
title: '3D打印费',
key: 'printPrice',
align: 'center',
title: "3D打印费",
key: "printPrice",
align: "center",
minWidth: 60
},
{
title: '尺寸检测费',
key: 'sizeCheckPrice',
align: 'center',
title: "尺寸检测费",
key: "sizeCheckPrice",
align: "center",
minWidth: 60
},
{
title: '单价（元）',
key: 'unitPrice',
align: 'center',
title: "单价（元）",
key: "unitPrice",
align: "center",
minWidth: 80
},
{
title: '数量',
key: 'num',
align: 'center',
title: "数量",
key: "num",
align: "center",
minWidth: 80
},
{
title: '价格（元）',
key: 'unitPrice',
align: 'center',
title: "价格（元）",
key: "unitPrice",
align: "center",
minWidth: 80
},
{
title: '备注',
key: 'itemremark',
align: 'center',
title: "备注",
key: "itemremark",
align: "center",
minWidth: 60
}
],
dataTable: [],
dataListRetrunNew: {
schemaId: 'cf192e27-1e81-4000-98ee-392eeb539616', //订单报价的schemaId
schemaId: "cf192e27-1e81-4000-98ee-392eeb539616", //订单报价的schemaId
idList: [], //订单id List
codeList: [], //订单编号List
operatorIdList: [] //操作员id
} //确定后返回数据
}
};
},
created() {},
methods: {
submitCensorship() {
//alert(JSON.stringify(this.childData))
this.dataListRetrunNew.idList = []
this.dataListRetrunNew.codeList = []
this.dataListRetrunNew.operatorIdList = []
this.dataListRetrunNew.idList = [];
this.dataListRetrunNew.codeList = [];
this.dataListRetrunNew.operatorIdList = [];
this.dataListRetrunNew.idList.push(this.childData.result[0].quotationId)
this.dataListRetrunNew.codeList.push(this.childData.result[0].code)
let ues = this.$refs.userProcess
this.dataListRetrunNew.operatorIdList = ues.immutData
this.dataListRetrunNew.idList.push(this.childData.result[0].quotationId);
this.dataListRetrunNew.codeList.push(this.childData.result[0].code);
let ues = this.$refs.userProcess;
this.dataListRetrunNew.operatorIdList = ues.immutData;
// alert('photo__' + JSON.stringify(this.dataListRetrunNew))
this.$http.order
.batchstart(this.dataListRetrunNew)
.then((res) => {
if (res.success) {
this.$Message.success('订单报价送审成功!')
this.$emit('on-close')
this.easySearch('')
this.modalShow = false
} else {
this.$Message.error('订单报价送审失败!')
}
})
// .catch((error) => {
// this.$Message.error('送审失败')
// })
this.$http.order.batchstart(this.dataListRetrunNew).then(res => {
if (res.success) {
this.$Message.success("订单报价送审成功!");
this.$emit("update");
this.easySearch("");
this.modalShow = false;
} else {
this.$Message.error("订单报价送审失败!");
}
});
// .catch((error) => {
// this.$Message.error('送审失败')
// })
},
//老的报价
submitCensorship1() {
var str = ''
this.childData.result.forEach((element) => {
console.log(element.orderId)
str += element.orderId + ','
})
str = str.substr(0, str.length - 1)
var str = "";
this.childData.result.forEach(element => {
console.log(element.orderId);
str += element.orderId + ",";
});
str = str.substr(0, str.length - 1);
var data = {
id: this.childData.result[0].quotationId,
auditUser: this.model1,
orderIds: str,
status: 2
}
var url = `${PlanUrl}/quotationmain/submit`
};
var url = `${PlanUrl}/quotationmain/submit`;
this.$api
.post(url, data)
.then((res) => {
this.$Message.success('送审成功')
})
.catch((error) => {
this.$Message.error('送审失败')
.then(res => {
this.$Message.success("送审成功");
})
.catch(error => {
this.$Message.error("送审失败");
});
},
previousStep() {
this.modalShow = false
this.modalShow = false;
}
}
}
};
</script>
<style lang="less" scoped>
......
pages/order/quotation/index.vue
View file @ f94fa56e
......@@ -126,8 +126,8 @@
<Metal-Details ref="metalDetail" :resultDetils="resultDetils"></Metal-Details>
<Photosensitive-Details ref="photosensitiveDetail" :resultDetils="resultDetils"></Photosensitive-Details>
<!-- 报价记录里送审 -->
<MetalQuotation-Generation ref="metalQuotationExamine" :childData="zPhotosensitive"></MetalQuotation-Generation>
<Photosensitive-Generation ref="photosensitiveExamine" :childData="zPhotosensitive"></Photosensitive-Generation>
<MetalQuotation-Generation ref="metalQuotationExamine" :childData="zPhotosensitive" @update="update"></MetalQuotation-Generation>
<Photosensitive-Generation ref="photosensitiveExamine" :childData="zPhotosensitive" @update="update"></Photosensitive-Generation>
</Layout>
</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