Skip to content

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

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

parents 550d0867 1a8e8973
Expand all Show whitespace changes
Inline Side-by-side
Showing with 673 additions and 585 deletions
layouts/basic-layout/tabs/index.vue
View file @ 3608078b
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
:closable="page.meta && page.meta.closable" :closable="page.meta && page.meta.closable"
/> />
</Tabs> </Tabs>
<Dropdown class="i-layout-tabs-close" @on-click="handleClose"> <Dropdown class="i-layout-tabs-close" @on-click="handleClose" placement="bottom-end">
<div class="i-layout-tabs-close-main"> <div class="i-layout-tabs-close-main">
<Icon type="ios-arrow-down" /> <Icon type="ios-arrow-down" />
</div> </div>
......
pages/handle/examine10/detail.vue
View file @ 3608078b
...@@ -12,7 +12,13 @@ ...@@ -12,7 +12,13 @@
type="text" type="text"
></state> ></state>
</Filed> </Filed>
<Filed :span="8" :name="l('repair_file_url')">{{formValidate.repair_file_url}}</Filed> <Filed :span="8" :name="l('repair_file_url')">
<a
v-if="formValidate.repair_file_url"
:href="url(formValidate.repair_file_url)"
target="_balck"
>下载</a>
</Filed>
<Filed :span="8" :name="l('supporting_file_name')">{{formValidate.supporting_file_name}}</Filed> <Filed :span="8" :name="l('supporting_file_name')">{{formValidate.supporting_file_name}}</Filed>
<Filed :span="8" :name="l('supporting_file_status')"> <Filed :span="8" :name="l('supporting_file_status')">
...@@ -22,7 +28,13 @@ ...@@ -22,7 +28,13 @@
type="text" type="text"
></state> ></state>
</Filed> </Filed>
<Filed :span="8" :name="l('supporting_file_url')">{{formValidate.supporting_file_ulr}}</Filed> <Filed :span="8" :name="l('supporting_file_url')">
<a
v-if="formValidate.supporting_file_ulr"
:href="url(formValidate.supporting_file_ulr)"
target="_balck"
>下载</a>
</Filed>
<Filed :span="8" :name="l('slicing_file_name')">{{formValidate.slicing_file_name}}</Filed> <Filed :span="8" :name="l('slicing_file_name')">{{formValidate.slicing_file_name}}</Filed>
<Filed :span="8" :name="l('slicing_file_status')"> <Filed :span="8" :name="l('slicing_file_status')">
<state <state
...@@ -31,57 +43,66 @@ ...@@ -31,57 +43,66 @@
type="text" type="text"
></state> ></state>
</Filed> </Filed>
<Filed :span="8" :name="l('slicing_file_url')">{{formValidate.slicing_file_url}}</Filed> <Filed :span="8" :name="l('slicing_file_url')">
<a
v-if="formValidate.slicing_file_url"
:href="url(formValidate.slicing_file_url)"
target="_balck"
>下载</a>
</Filed>
</Row> </Row>
</div> </div>
</template> </template>
<script> <script>
import Api from '../api' import Api from "../api";
export default { export default {
name: 'detail', name: "detail",
components: {}, components: {},
props: { props: {
idVal: { idVal: {
type: String, type: String,
default: '' default: ""
} }
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
data() { data() {
return { return {
formValidate: { formValidate: {
state: '' state: ""
}
} }
};
}, },
created() { created() {
this.dataImmut = [] this.dataImmut = [];
this.dataMut = [] this.dataMut = [];
Api.get({ Id: this.idVal }).then((r) => { Api.get({ Id: this.idVal }).then(r => {
if (r.success) { if (r.success) {
let farmData = {} let farmData = {};
farmData = JSON.parse(r.result.formData) farmData = JSON.parse(r.result.formData);
console.log(farmData) console.log(farmData);
this.formValidate = farmData this.formValidate = farmData;
// let formStr = r.result.formData.replace(/\"/g, '"') // let formStr = r.result.formData.replace(/\"/g, '"')
// this.formValidate = JSON.parse(formStr)[0] // this.formValidate = JSON.parse(formStr)[0]
} else { } else {
this.$Message.error('加载失败') this.$Message.error("加载失败");
} }
}) });
}, },
methods: { methods: {
load(v) {}, load(v) {},
url(path) {
return fileUrlDown + path
},
l(key) { l(key) {
key = 'OrderDataReview' + '.' + key key = "OrderDataReview" + "." + key;
return this.$t(key) return this.$t(key);
} }
}, },
watch: {} watch: {}
} };
</script> </script>
<style lang="less"> <style lang="less">
.detail { .detail {
......
pages/handle/examine11/detail.vue
View file @ 3608078b
...@@ -12,7 +12,13 @@ ...@@ -12,7 +12,13 @@
type="text" type="text"
></state> ></state>
</Filed> </Filed>
<Filed :span="8" :name="l('slicing_file_url')">{{formValidate.slicing_file_url}}</Filed> <Filed :span="8" :name="l('slicing_file_url')">
<a
v-if="formValidate.slicing_file_url"
:href="url(formValidate.slicing_file_url)"
target="_balck"
>下载</a>
</Filed>
<Filed :span="8" :name="l('supporting_file_name')">{{formValidate.supporting_file_name}}</Filed> <Filed :span="8" :name="l('supporting_file_name')">{{formValidate.supporting_file_name}}</Filed>
<Filed :span="8" :name="l('supporting_file_status')"> <Filed :span="8" :name="l('supporting_file_status')">
<state <state
...@@ -21,7 +27,13 @@ ...@@ -21,7 +27,13 @@
type="text" type="text"
></state> ></state>
</Filed> </Filed>
<Filed :span="8" :name="l('repair_file_url')">{{formValidate.repair_file_url}}</Filed> <Filed :span="8" :name="l('repair_file_url')">
<a
v-if="formValidate.repair_file_url"
:href="url(formValidate.repair_file_url)"
target="_balck"
>下载</a>
</Filed>
<Filed :span="8" :name="l('slicing_file_name')">{{formValidate.slicing_file_name}}</Filed> <Filed :span="8" :name="l('slicing_file_name')">{{formValidate.slicing_file_name}}</Filed>
<Filed :span="8" :name="l('slicing_file_status')"> <Filed :span="8" :name="l('slicing_file_status')">
<state <state
...@@ -30,58 +42,67 @@ ...@@ -30,58 +42,67 @@
type="text" type="text"
></state> ></state>
</Filed> </Filed>
<Filed :span="8" :name="l('supporting_file_url')">{{formValidate.supporting_file_ulr}}</Filed> <Filed :span="8" :name="l('supporting_file_url')">
<a
v-if="formValidate.supporting_file_ulr"
:href="url(formValidate.supporting_file_ulr)"
target="_balck"
>下载</a>
</Filed>
</Row> </Row>
</div> </div>
</template> </template>
<script> <script>
import Api from '../api' import Api from "../api";
export default { export default {
name: 'detail', name: "detail",
components: {}, components: {},
props: { props: {
idVal: { idVal: {
type: String, type: String,
default: '' default: ""
} }
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
data() { data() {
return { return {
formValidate: { formValidate: {
state: '' state: ""
}
} }
};
}, },
created() { created() {
this.dataImmut = [] this.dataImmut = [];
this.dataMut = [] this.dataMut = [];
Api.get({ Id: this.idVal }).then((r) => { Api.get({ Id: this.idVal }).then(r => {
// console.log(r) // console.log(r)
if (r.success) { if (r.success) {
let farmData = {} let farmData = {};
farmData = JSON.parse(r.result.formData) farmData = JSON.parse(r.result.formData);
console.log(farmData) console.log(farmData);
this.formValidate = farmData this.formValidate = farmData;
// let formStr = r.result.formData.replace(/\"/g, '"') // let formStr = r.result.formData.replace(/\"/g, '"')
// this.formValidate = JSON.parse(formStr)[0] // this.formValidate = JSON.parse(formStr)[0]
} else { } else {
this.$Message.error('加载失败') this.$Message.error("加载失败");
} }
}) });
}, },
methods: { methods: {
load(v) {}, load(v) {},
url(path) {
return fileUrlDown + path;
},
l(key) { l(key) {
key = 'OrderDataReview' + '.' + key key = "OrderDataReview" + "." + key;
return this.$t(key) return this.$t(key);
} }
}, },
watch: {} watch: {}
} };
</script> </script>
<style lang="less"> <style lang="less">
.detail { .detail {
......
pages/handle/examine12/detail.vue
View file @ 3608078b
...@@ -12,7 +12,13 @@ ...@@ -12,7 +12,13 @@
type="text" type="text"
></state> ></state>
</Filed> </Filed>
<Filed :span="8" :name="l('repair_file_url')">{{formValidate.repair_file_url}}</Filed> <Filed :span="8" :name="l('repair_file_url')">
<a
v-if="formValidate.repair_file_url"
:href="url(formValidate.repair_file_url)"
target="_balck"
>下载</a>
</Filed>
<Filed :span="8" :name="l('supporting_file_name')">{{formValidate.supporting_file_name}}</Filed> <Filed :span="8" :name="l('supporting_file_name')">{{formValidate.supporting_file_name}}</Filed>
<Filed :span="8" :name="l('supporting_file_status')"> <Filed :span="8" :name="l('supporting_file_status')">
...@@ -22,7 +28,13 @@ ...@@ -22,7 +28,13 @@
type="text" type="text"
></state> ></state>
</Filed> </Filed>
<Filed :span="8" :name="l('supporting_file_url')">{{formValidate.supporting_file_ulr}}</Filed> <Filed :span="8" :name="l('supporting_file_url')">
<a
v-if="formValidate.supporting_file_ulr"
:href="url(formValidate.supporting_file_ulr)"
target="_balck"
>下载</a>
</Filed>
<Filed :span="8" :name="l('slicing_file_name')">{{formValidate.slicing_file_name}}</Filed> <Filed :span="8" :name="l('slicing_file_name')">{{formValidate.slicing_file_name}}</Filed>
<Filed :span="8" :name="l('slicing_file_status')"> <Filed :span="8" :name="l('slicing_file_status')">
<state <state
...@@ -31,58 +43,67 @@ ...@@ -31,58 +43,67 @@
type="text" type="text"
></state> ></state>
</Filed> </Filed>
<Filed :span="8" :name="l('slicing_file_url')">{{formValidate.slicing_file_url}}</Filed> <Filed :span="8" :name="l('slicing_file_url')">
<a
v-if="formValidate.slicing_file_url"
:href="url(formValidate.slicing_file_url)"
target="_balck"
>下载</a>
</Filed>
</Row> </Row>
</div> </div>
</template> </template>
<script> <script>
import Api from '../api' import Api from "../api";
export default { export default {
name: 'detail', name: "detail",
components: {}, components: {},
props: { props: {
idVal: { idVal: {
type: String, type: String,
default: '' default: ""
} }
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
data() { data() {
return { return {
formValidate: { formValidate: {
state: '' state: ""
}
} }
};
}, },
created() { created() {
this.dataImmut = [] this.dataImmut = [];
this.dataMut = [] this.dataMut = [];
Api.get({ Id: this.idVal }).then((r) => { Api.get({ Id: this.idVal }).then(r => {
console.log(r) console.log(r);
if (r.success) { if (r.success) {
let farmData = {} let farmData = {};
farmData = JSON.parse(r.result.formData) farmData = JSON.parse(r.result.formData);
console.log(farmData) console.log(farmData);
this.formValidate = farmData this.formValidate = farmData;
// let formStr = r.result.formData.replace(/\"/g, '"') // let formStr = r.result.formData.replace(/\"/g, '"')
// this.formValidate = JSON.parse(formStr)[0] // this.formValidate = JSON.parse(formStr)[0]
} else { } else {
this.$Message.error('加载失败') this.$Message.error("加载失败");
} }
}) });
}, },
methods: { methods: {
load(v) {}, load(v) {},
url(path) {
return fileUrlDown + path
},
l(key) { l(key) {
key = 'OrderDataReview' + '.' + key key = "OrderDataReview" + "." + key;
return this.$t(key) return this.$t(key);
} }
}, },
watch: {} watch: {}
} };
</script> </script>
<style lang="less"> <style lang="less">
.detail { .detail {
......
pages/handle/process.vue
View file @ 3608078b
...@@ -144,12 +144,13 @@ export default { ...@@ -144,12 +144,13 @@ export default {
this.cur = i this.cur = i
}; };
// if(u.defaultUsers.mutable&&u.defaultUsers.mutable.length>0){ // if(u.defaultUsers.mutable&&u.defaultUsers.mutable.length>0){
u.defaultUsers.immutable=u.defaultUsers.immutable.concat(u.defaultUsers.mutable) // u.defaultUsers.immutable=u.defaultUsers.immutable.concat(u.defaultUsers.mutable)
u.defaultUsers.immutable=u.defaultUsers.immutable||(u.defaultUsers.mutable)//审核人员bug
// } // }
}) })
if (this.dataImmut.length > this.cur + 1) { if (this.dataImmut.length > this.cur + 1) {
console.log("this.dataImmut[this.cur + 1]:",this.dataImmut[this.cur + 1],this.cur,this.dataImmut.length ) // console.log("this.dataImmut[this.cur + 1]:",this.dataImmut[this.cur + 1],this.cur,this.dataImmut.length )
this.immutData = this.dataImmut[this.cur + 1].defaultUsers.immutable.concat(this.dataImmut[this.cur + 1].defaultUsers.mutable) this.immutData = this.dataImmut[this.cur + 1].defaultUsers.immutable||(this.dataImmut[this.cur + 1].defaultUsers.mutable)//审核人员bug
} }
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
......
pages/mainProcess/index.vue
View file @ 3608078b
...@@ -425,8 +425,8 @@ export default { ...@@ -425,8 +425,8 @@ export default {
detailId: u.detailId, //工序id--后端接收 detailId: u.detailId, //工序id--后端接收
detailNumber: u.detailNumber, //工序序号 detailNumber: u.detailNumber, //工序序号
detailTitle: u.detailTitle, //工序名称 detailTitle: u.detailTitle, //工序名称
quantity: u.boardQuantity, //投产数量--后端接收 u.quantity quantity: u.quantity, //投产数量--后端接收 u.quantity
quantityOld: u.boardQuantityOld, //拆分前的投产数量 u.quantityOld quantityOld: u.quantityOld, //拆分前的投产数量 u.quantityOld
pid: u.pid, //拆分添加的项使用 pid: u.pid, //拆分添加的项使用
userIds: u.userIds, //人员id--后端接收 userIds: u.userIds, //人员id--后端接收
userTitles: u.userTitles, //人员名字 userTitles: u.userTitles, //人员名字
......
pages/order/quotation/components/metalQuotationGeneration.vue
View file @ 3608078b
...@@ -247,7 +247,7 @@ export default { ...@@ -247,7 +247,7 @@ export default {
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {
this.$Message.success('订单报价送审成功!') this.$Message.success('订单报价送审成功!')
this.$emit('on-close') this.$emit("update")
this.modalShow = false this.modalShow = false
this.easySearch('') this.easySearch('')
} else { } else {
......
pages/order/quotation/components/photosensitive.vue
View file @ 3608078b
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
:mask-closable="false" :mask-closable="false"
fullscreen fullscreen
footer-hide footer-hide
@on-cancel="cancel"
> >
<Form :model="formItem" :label-width="80"> <Form :model="formItem" :label-width="80">
<Row type="flex" justify="space-between"> <Row type="flex" justify="space-between">
...@@ -70,12 +71,12 @@ ...@@ -70,12 +71,12 @@
</template> </template>
<script> <script>
import PhotosensitiveGeneration from '../components/photosensitiveGeneration.vue' //生成报价单弹框 import PhotosensitiveGeneration from "../components/photosensitiveGeneration.vue"; //生成报价单弹框
export default { export default {
components: { components: {
PhotosensitiveGeneration PhotosensitiveGeneration
}, },
name: '', name: "",
props: { props: {
gmData: Array gmData: Array
}, },
...@@ -85,98 +86,98 @@ export default { ...@@ -85,98 +86,98 @@ export default {
result: [] result: []
}, },
row: {}, row: {},
index: '', index: "",
newList: [], newList: [],
formItem: { formItem: {
postCompany: '', postCompany: "",
contactUser: '', contactUser: "",
contactTel: '', contactTel: "",
quotationType: '光敏树脂', quotationType: "光敏树脂",
remark: '' remark: ""
}, },
values1: '', values1: "",
values2: '', values2: "",
values3: '', values3: "",
modalShow: false, modalShow: false,
columns: [ columns: [
{ {
title: '序号', title: "序号",
type: 'index', type: "index",
width: 50, width: 50,
align: 'center' align: "center"
}, },
{ {
title: '订单编号', title: "订单编号",
key: 'mesCode', key: "mesCode",
align: 'center', align: "center",
minWidth: 120 minWidth: 120
}, },
{ {
title: '产品名称', title: "产品名称",
key: 'productName', key: "productName",
align: 'center', align: "center",
minWidth: 80 minWidth: 80
}, },
{ {
title: '重量（g）', title: "重量（g）",
key: 'materialWeight', key: "materialWeight",
align: 'center', align: "center",
minWidth: 80, minWidth: 80,
slot: 'slot1' slot: "slot1"
}, },
{ {
title: '单价（元/g）', title: "单价（元/g）",
key: 'materialUnitPrice', key: "materialUnitPrice",
align: 'center', align: "center",
minWidth: 80, minWidth: 80,
slot: 'slot2' slot: "slot2"
}, },
{ {
title: '3D打印费', title: "3D打印费",
align: 'center', align: "center",
key: 'printPrice', key: "printPrice",
minWidth: 60, minWidth: 60,
slot: 'slot3' slot: "slot3"
}, },
{ {
title: '尺寸检测费', title: "尺寸检测费",
key: 'sizeCheckPrice', key: "sizeCheckPrice",
align: 'center', align: "center",
minWidth: 60, minWidth: 60,
slot: 'slot4' slot: "slot4"
}, },
{ {
title: '单价（元）', title: "单价（元）",
key: 'unitPrice', key: "unitPrice",
align: 'center', align: "center",
minWidth: 60, minWidth: 60,
slot: 'slot6' slot: "slot6"
}, },
{ {
title: '数量', title: "数量",
key: 'num', key: "num",
align: 'center', align: "center",
minWidth: 70 minWidth: 70
}, },
{ {
title: '价格（元）', title: "价格（元）",
key: 'price', key: "price",
align: 'center', align: "center",
minWidth: 80, minWidth: 80,
slot: 'slot7' slot: "slot7"
}, },
{ {
title: '备注', title: "备注",
key: 'remark1', key: "remark1",
align: 'center', align: "center",
minWidth: 200, minWidth: 200,
slot: 'slot5', slot: "slot5",
tooltip: true tooltip: true
} }
] ]
} };
}, },
// watch: { // watch: {
// row: { // row: {
...@@ -195,102 +196,105 @@ export default { ...@@ -195,102 +196,105 @@ export default {
//计算3D打印费=重量（g）*单价（元/g） //计算3D打印费=重量（g）*单价（元/g）
return (this.row.printPrice = return (this.row.printPrice =
parseInt(this.row.materialWeight) * parseInt(this.row.materialWeight) *
parseInt(this.row.materialUnitPrice)) parseInt(this.row.materialUnitPrice));
}, },
unitPrices() { unitPrices() {
//单价=3D打印费+尺寸检测费 //单价=3D打印费+尺寸检测费
return (this.row.unitPrice = return (this.row.unitPrice =
parseInt(this.row.printPrice) + parseInt(this.row.sizeCheckPrice)) parseInt(this.row.printPrice) + parseInt(this.row.sizeCheckPrice));
}, },
prices() { prices() {
// 价格=单价*数量 // 价格=单价*数量
return (this.row.price = return (this.row.price =
parseInt(this.row.unitPrice) * parseInt(this.row.num)) parseInt(this.row.unitPrice) * parseInt(this.row.num));
} }
}, },
methods: { methods: {
previousStep() { previousStep() {
this.modalShow = false this.modalShow = false;
}, },
quotationBox() { quotationBox() {
//订单报价 //订单报价
let item = [] let item = [];
let quotationMain = {} let quotationMain = {};
let data = { let data = {
quotationMain: this.formItem, quotationMain: this.formItem,
item: this.gmData item: this.gmData
} };
var url = `${PlanUrl}/quotationmain/createorupdate` var url = `${PlanUrl}/quotationmain/createorupdate`;
this.$api this.$api
.post(url, data) .post(url, data)
.then((res) => { .then(res => {
if (res.success) { if (res.success) {
this.$Message.success('保存成功') this.$Message.success("保存成功");
this.$refs.photosensitive.modalShow = true this.$refs.photosensitive.modalShow = true;
let id = res.result.id let id = res.result.id;
this.$http.quotation this.$http.quotation
.orderList({ .orderList({
id: id id: id
}) })
.then((res) => { .then(res => {
console.log(res) console.log(res);
res.result.forEach((data, index) => { res.result.forEach((data, index) => {
res.result[index].quotationId = id res.result[index].quotationId = id;
}) });
this.zPhotosensitive.result = res.result this.zPhotosensitive.result = res.result;
})
.catch((error) => {
this.$Message.error('请求失败')
}) })
.catch(error => {
this.$Message.error("请求失败");
});
} }
}) })
.catch((error) => { .catch(error => {
this.$Message.error('保存失败') this.$Message.error("保存失败");
}) });
}, },
close() { close() {
this.modalShow = false this.modalShow = false;
this.$emit('update') this.$emit("update");
}, },
show1(row, index) { show1(row, index) {
this.row = row this.row = row;
this.gmData.forEach((data, index) => { this.gmData.forEach((data, index) => {
if (this.gmData[index].mesCode === row.mesCode) { if (this.gmData[index].mesCode === row.mesCode) {
this.gmData[index] = row this.gmData[index] = row;
} }
}) });
}, },
show2(row, index) { show2(row, index) {
this.row = row this.row = row;
this.gmData.forEach((data, index) => { this.gmData.forEach((data, index) => {
if (this.gmData[index].mesCode === row.mesCode) { if (this.gmData[index].mesCode === row.mesCode) {
this.gmData[index] = row this.gmData[index] = row;
} }
}) });
}, },
show3(row, index) { show3(row, index) {
this.row = row this.row = row;
this.gmData.forEach((data, index) => { this.gmData.forEach((data, index) => {
if (this.gmData[index].mesCode === row.mesCode) { if (this.gmData[index].mesCode === row.mesCode) {
this.gmData[index] = row this.gmData[index] = row;
} }
}) });
}, },
//备注 //备注
show4(row, index) { show4(row, index) {
this.row = row this.row = row;
this.gmData.forEach((data, index) => { this.gmData.forEach((data, index) => {
if (this.gmData[index].mesCode === row.mesCode) { if (this.gmData[index].mesCode === row.mesCode) {
this.gmData[index] = row this.gmData[index] = row;
} }
}) });
},
cancel() {
this.$emit("update");
} }
} }
} };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.footers { .footers {
......
pages/order/quotation/components/photosensitiveGeneration.vue
View file @ 3608078b
...@@ -105,9 +105,9 @@ ...@@ -105,9 +105,9 @@
</div> </div>
</template> </template>
<script> <script>
import Process from '@/components/orderOperator/process' import Process from "@/components/orderOperator/process";
export default { export default {
name: '', name: "",
components: { components: {
Process Process
}, },
...@@ -118,149 +118,147 @@ export default { ...@@ -118,149 +118,147 @@ export default {
}, },
data() { data() {
return { return {
model1: '', model1: "",
modalShow: false, modalShow: false,
columns: [ columns: [
{ {
title: '序号', title: "序号",
type: 'index', type: "index",
width: 50, width: 50,
align: 'center' align: "center"
}, },
{ {
title: '订单编号', title: "订单编号",
key: 'mesCode', key: "mesCode",
align: 'center', align: "center",
minWidth: 120 minWidth: 120
}, },
{ {
title: '产品名称', title: "产品名称",
key: 'productName', key: "productName",
align: 'center', align: "center",
minWidth: 80 minWidth: 80
}, },
{ {
title: '重量（g）', title: "重量（g）",
key: 'materialWeight', key: "materialWeight",
align: 'center', align: "center",
minWidth: 80 minWidth: 80
}, },
{ {
title: '单价（元/g）', title: "单价（元/g）",
key: 'materialUnitPrice', key: "materialUnitPrice",
align: 'center', align: "center",
minWidth: 80 minWidth: 80
}, },
{ {
title: '3D打印费', title: "3D打印费",
key: 'printPrice', key: "printPrice",
align: 'center', align: "center",
minWidth: 60 minWidth: 60
}, },
{ {
title: '尺寸检测费', title: "尺寸检测费",
key: 'sizeCheckPrice', key: "sizeCheckPrice",
align: 'center', align: "center",
minWidth: 60 minWidth: 60
}, },
{ {
title: '单价（元）', title: "单价（元）",
key: 'unitPrice', key: "unitPrice",
align: 'center', align: "center",
minWidth: 80 minWidth: 80
}, },
{ {
title: '数量', title: "数量",
key: 'num', key: "num",
align: 'center', align: "center",
minWidth: 80 minWidth: 80
}, },
{ {
title: '价格（元）', title: "价格（元）",
key: 'unitPrice', key: "unitPrice",
align: 'center', align: "center",
minWidth: 80 minWidth: 80
}, },
{ {
title: '备注', title: "备注",
key: 'itemremark', key: "itemremark",
align: 'center', align: "center",
minWidth: 60 minWidth: 60
} }
], ],
dataTable: [], dataTable: [],
dataListRetrunNew: { dataListRetrunNew: {
schemaId: 'cf192e27-1e81-4000-98ee-392eeb539616', //订单报价的schemaId schemaId: "cf192e27-1e81-4000-98ee-392eeb539616", //订单报价的schemaId
idList: [], //订单id List idList: [], //订单id List
codeList: [], //订单编号List codeList: [], //订单编号List
operatorIdList: [] //操作员id operatorIdList: [] //操作员id
} //确定后返回数据 } //确定后返回数据
} };
}, },
created() {}, created() {},
methods: { methods: {
submitCensorship() { submitCensorship() {
//alert(JSON.stringify(this.childData)) //alert(JSON.stringify(this.childData))
this.dataListRetrunNew.idList = [] this.dataListRetrunNew.idList = [];
this.dataListRetrunNew.codeList = [] this.dataListRetrunNew.codeList = [];
this.dataListRetrunNew.operatorIdList = [] this.dataListRetrunNew.operatorIdList = [];
this.dataListRetrunNew.idList.push(this.childData.result[0].quotationId) this.dataListRetrunNew.idList.push(this.childData.result[0].quotationId);
this.dataListRetrunNew.codeList.push(this.childData.result[0].code) this.dataListRetrunNew.codeList.push(this.childData.result[0].code);
let ues = this.$refs.userProcess let ues = this.$refs.userProcess;
this.dataListRetrunNew.operatorIdList = ues.immutData this.dataListRetrunNew.operatorIdList = ues.immutData;
// alert('photo__' + JSON.stringify(this.dataListRetrunNew)) // alert('photo__' + JSON.stringify(this.dataListRetrunNew))
this.$http.order this.$http.order.batchstart(this.dataListRetrunNew).then(res => {
.batchstart(this.dataListRetrunNew)
.then((res) => {
if (res.success) { if (res.success) {
this.$Message.success('订单报价送审成功!') this.$Message.success("订单报价送审成功!");
this.$emit('on-close') this.$emit("update");
this.easySearch('') this.easySearch("");
this.modalShow = false this.modalShow = false;
} else { } else {
this.$Message.error('订单报价送审失败!') this.$Message.error("订单报价送审失败!");
} }
}) });
// .catch((error) => { // .catch((error) => {
// this.$Message.error('送审失败') // this.$Message.error('送审失败')
// }) // })
}, },
//老的报价 //老的报价
submitCensorship1() { submitCensorship1() {
var str = '' var str = "";
this.childData.result.forEach((element) => { this.childData.result.forEach(element => {
console.log(element.orderId) console.log(element.orderId);
str += element.orderId + ',' str += element.orderId + ",";
}) });
str = str.substr(0, str.length - 1) str = str.substr(0, str.length - 1);
var data = { var data = {
id: this.childData.result[0].quotationId, id: this.childData.result[0].quotationId,
auditUser: this.model1, auditUser: this.model1,
orderIds: str, orderIds: str,
status: 2 status: 2
} };
var url = `${PlanUrl}/quotationmain/submit` var url = `${PlanUrl}/quotationmain/submit`;
this.$api this.$api
.post(url, data) .post(url, data)
.then((res) => { .then(res => {
this.$Message.success('送审成功') this.$Message.success("送审成功");
})
.catch((error) => {
this.$Message.error('送审失败')
}) })
.catch(error => {
this.$Message.error("送审失败");
});
}, },
previousStep() { previousStep() {
this.modalShow = false this.modalShow = false;
} }
} }
} };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
......
pages/order/quotation/index.vue
View file @ 3608078b
...@@ -120,14 +120,14 @@ ...@@ -120,14 +120,14 @@
<!-- 高级搜索弹框 --> <!-- 高级搜索弹框 -->
<Search-Box ref="searchBox" @heightSearch="gSearch"></Search-Box> <Search-Box ref="searchBox" @heightSearch="gSearch"></Search-Box>
<!-- 订单报价 --> <!-- 订单报价 -->
<Quotation-Box ref="quotationBox" :bjData="newJsData"></Quotation-Box> <Quotation-Box ref="quotationBox" :bjData="newJsData" @update="update"></Quotation-Box>
<Metal-Quotation ref="metalQuotation" :gmData="newJsData" @update="update"></Metal-Quotation> <Metal-Quotation ref="metalQuotation" :gmData="newJsData" @update="update"></Metal-Quotation>
<Photosensitive ref="photosensitive" :gmData="newJsData" @update="update"></Photosensitive> <Photosensitive ref="photosensitive" :gmData="newJsData" @update="update"></Photosensitive>
<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"></MetalQuotation-Generation> <MetalQuotation-Generation ref="metalQuotationExamine" :childData="zPhotosensitive" @update="update"></MetalQuotation-Generation>
<Photosensitive-Generation ref="photosensitiveExamine" :childData="zPhotosensitive"></Photosensitive-Generation> <Photosensitive-Generation ref="photosensitiveExamine" :childData="zPhotosensitive" @update="update"></Photosensitive-Generation>
</Layout> </Layout>
</template> </template>
......
pages/processDesign/setProcess/index.vue
View file @ 3608078b
...@@ -322,7 +322,7 @@ ...@@ -322,7 +322,7 @@
<OrderSendReview ref="orderSendReview"></OrderSendReview> <OrderSendReview ref="orderSendReview"></OrderSendReview>
<div slot="footer"> <div slot="footer">
<Button @click="canCelFn">取消</Button> <Button @click="canCelFn">取消</Button>
<Button type="primary" @click="upSave">确定送审</Button> <Button type="primary" :disabled='sendDisable' @click="upSave">确定送审</Button>
</div> </div>
</Modal> </Modal>
<Modal <Modal
...@@ -423,6 +423,7 @@ export default { ...@@ -423,6 +423,7 @@ export default {
modal1: false, modal1: false,
processviewModal: false, //工艺预览 processviewModal: false, //工艺预览
documentShow: false, //工艺送审 documentShow: false, //工艺送审
sendDisable:false,//料单送审确定按钮
modalliao: false, modalliao: false,
orderDatadia: false, orderDatadia: false,
ProductingPreparationPeople: 0, ProductingPreparationPeople: 0,
...@@ -1851,10 +1852,10 @@ export default { ...@@ -1851,10 +1852,10 @@ export default {
}, },
upSave() { upSave() {
let operatorIdList = this.$refs.orderSendReview.returnDataList() let operatorIdList = this.$refs.orderSendReview.returnDataList()
let itemCode = this.formdata.data01.code let itemCode = this.formdata.data01.code// this.dataListRetrunNew.codeList.push(itemCode)
// this.dataListRetrunNew.codeList.push(itemCode)
this.dataListRetrunNew.code = itemCode this.dataListRetrunNew.code = itemCode
this.dataListRetrunNew.operatorIdList = operatorIdList this.dataListRetrunNew.operatorIdList = operatorIdList
this.sendDisable = true//防止多次点击确定送审
this.$http.order this.$http.order
.batchOrderStart(this.dataListRetrunNew) .batchOrderStart(this.dataListRetrunNew)
.then((response) => { .then((response) => {
...@@ -1869,6 +1870,8 @@ export default { ...@@ -1869,6 +1870,8 @@ export default {
this.$Message.error(response.error.message) this.$Message.error(response.error.message)
} }
this.modalInfo = false this.modalInfo = false
this.sendDisable = false
this.loaddata('')
}) })
.catch((err) => { .catch((err) => {
console.log(err) console.log(err)
......
pages/qc/certificate/endIssued/index.vue
View file @ 3608078b
...@@ -8,8 +8,15 @@ ...@@ -8,8 +8,15 @@
:high="false" :high="false"
:height="tdHeight" :height="tdHeight"
></DataGrid> ></DataGrid>
<Modal v-model="detailModal" title="查看合格证" footer-hide width="1000" :mask-closable="false"> <Modal
<Detail @on-close="cancel" @on-ok="addOk" :eid="curId" /> v-model="detailModal"
title="查看合格证"
@on-cancel="reload"
footer-hide
width="1000"
:mask-closable="false"
>
<Detail @on-close="cancel" @on-ok="addOk" :eid="curId" ref="listDetail" />
</Modal> </Modal>
</div> </div>
</template> </template>
...@@ -153,7 +160,9 @@ export default { ...@@ -153,7 +160,9 @@ export default {
this.detailModal = false; this.detailModal = false;
}, },
reload() { reload() {
if (this.$refs.listDetail.checkboxList.length == 0) {
this.$refs.grid.load(); this.$refs.grid.load();
}
}, },
detail(id) { detail(id) {
this.detailModal = true; this.detailModal = true;
......
pages/qc/check/waitReview/index.vue
View file @ 3608078b
...@@ -106,16 +106,18 @@ export default { ...@@ -106,16 +106,18 @@ export default {
easy: true, easy: true,
high: true, high: true,
hide:true, hide:true,
},{
key: 'reinspectionDate',
title: this.l('reinspectionDate'),
align: 'center',
render: (h, paras) => {
return h('span', paras.row.reinspectionDate)
}, },
high: true, // {
width:180, // key: 'reinspectionDate',
},{ // title: this.l('reinspectionDate'),
// align: 'center',
// render: (h, paras) => {
// return h('span', paras.row.reinspectionDate)
// },
// high: true,
// width:180,
// },
{
key: 'remainingAmount', key: 'remainingAmount',
title: this.l('remainingAmount'), title: this.l('remainingAmount'),
align: 'left', align: 'left',
......
store/admin/page.js
View file @ 3608078b
...@@ -270,9 +270,9 @@ export const actions = { ...@@ -270,9 +270,9 @@ export const actions = {
state.opened.splice(1, currentIndex - 1).forEach(({ name }) => commit('keepAliveRemove', name)); state.opened.splice(1, currentIndex - 1).forEach(({ name }) => commit('keepAliveRemove', name));
} }
if (state.opened.length == 2) { // if (state.opened.length == 2) {
state.opened.splice(0, 1); // state.opened.splice(0, 1);
} // }
state.current = pageAim; state.current = pageAim;
if ($nuxt.$router.fullPath !== pageAim) { if ($nuxt.$router.fullPath !== pageAim) {
$nuxt.$router.push(pageAim); $nuxt.$router.push(pageAim);
...@@ -329,9 +329,9 @@ export const actions = { ...@@ -329,9 +329,9 @@ export const actions = {
state.opened.splice(currentIndex + 1).forEach(({ name }) => commit('keepAliveRemove', name)); state.opened.splice(currentIndex + 1).forEach(({ name }) => commit('keepAliveRemove', name));
state.opened.splice(1, currentIndex - 1).forEach(({ name }) => commit('keepAliveRemove', name)); state.opened.splice(1, currentIndex - 1).forEach(({ name }) => commit('keepAliveRemove', name));
} }
if (state.opened.length == 2) { // if (state.opened.length == 2) {
state.opened.splice(0, 1); // state.opened.splice(0, 1);
} // }
// 设置新的页面 // 设置新的页面
state.current = pageAim; state.current = pageAim;
if ($nuxt.$router.fullPath !== pageAim) { if ($nuxt.$router.fullPath !== pageAim) {
...@@ -354,11 +354,11 @@ export const actions = { ...@@ -354,11 +354,11 @@ export const actions = {
// 持久化 // 持久化
await dispatch('opened2db'); await dispatch('opened2db');
// 关闭所有的标签页后需要判断一次现在是不是在首页 // 关闭所有的标签页后需要判断一次现在是不是在首页
// if ($nuxt.$router.name !== 'index') { if ($nuxt.$router.name !== 'index') {
// $nuxt.$router.push({ $nuxt.$router.push({
// name: 'index' name: 'index'
// }, () => { }); }, () => { });
// } }
// end // end
resolve(); resolve();
}); });
...@@ -386,9 +386,9 @@ export const mutations = { ...@@ -386,9 +386,9 @@ export const mutations = {
list.splice(index, 1); list.splice(index, 1);
state.keepAlive = list; state.keepAlive = list;
} }
if (state.opened.length == 2) { // if (state.opened.length == 2) {
state.opened.splice(0, 1); // state.opened.splice(0, 1);
} // }
}, },
/** /**
......
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