Skip to content

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

Merge branch 'master' of git.mes123.com:zhouyx/mes-ui

parents 198fcd9e a69e7fd5
Show whitespace changes
Inline Side-by-side
Showing with 227 additions and 299 deletions
pages/basicData/code/index.vue
View file @ 8930155a
...@@ -33,14 +33,14 @@ ...@@ -33,14 +33,14 @@
</div> </div>
</template> </template>
<script> <script>
import Api from './api' import Api from "./api";
import Add from './add' import Add from "./add";
import Edit from './edit' import Edit from "./edit";
import Detail from './detail' import Detail from "./detail";
import Search from './search' import Search from "./search";
import Set from './set' import Set from "./set";
export default { export default {
name: 'list', name: "list",
components: { components: {
Add, Add,
Edit, Edit,
...@@ -52,7 +52,7 @@ export default { ...@@ -52,7 +52,7 @@ export default {
return { return {
action: Api.index, action: Api.index,
easySearch: { easySearch: {
keys: { op: 'businessName', value: null } keys: { op: "businessName", value: null }
}, },
addModal: false, addModal: false,
editModal: false, editModal: false,
...@@ -61,200 +61,204 @@ export default { ...@@ -61,200 +61,204 @@ export default {
deletelModal: false, deletelModal: false,
curId: 0, curId: 0,
columns: [ columns: [
{ key: 'id', title: this.l('id'), hide: true, align: 'left' }, { key: "id", title: this.l("id"), hide: true, align: "left" },
{ {
key: 'businessName', title: "序号",
title: this.l('businessName'), type: "index",
align: 'left', width: 60,
align: "center"
},
{
key: "businessName",
title: this.l("businessName"),
align: "left",
easy: true, easy: true,
high: true high: true
}, },
{ {
key: 'businessCode', key: "businessCode",
title: this.l('businessCode'), title: this.l("businessCode"),
align: 'left', align: "left",
easy: true, easy: true,
high: true high: true
}, },
{ {
key: 'prefix', key: "prefix",
title: this.l('prefix'), title: this.l("prefix"),
align: 'left', align: "left",
easy: true, easy: true,
high: true high: true
}, },
{ {
key: 'maxSerial', key: "maxSerial",
title: this.l('maxSerial'), title: this.l("maxSerial"),
align: 'left', align: "left",
high: true high: true
}, },
{ {
key: 'day', key: "day",
title: this.l('day'), title: this.l("day"),
align: 'left', align: "left",
high: true, high: true,
code: 'mes_xingchi_system.business_code_config.day' code: "mes_xingchi_system.business_code_config.day"
}, },
{ {
key: 'remark', key: "remark",
title: this.l('remark'), title: this.l("remark"),
align: 'left', align: "left",
easy: true, easy: true,
high: true high: true
}, },
{ {
key: 'creationTime', key: "creationTime",
title: this.l('creationTime'), title: this.l("creationTime"),
hide: true, hide: true,
align: 'left' align: "left"
}, },
{ {
key: 'creatorUserId', key: "creatorUserId",
title: this.l('creatorUserId'), title: this.l("creatorUserId"),
hide: true, hide: true,
align: 'left' align: "left"
}, },
{ {
key: 'lastModificationTime', key: "lastModificationTime",
title: this.l('lastModificationTime'), title: this.l("lastModificationTime"),
hide: true, hide: true,
align: 'left' align: "left"
}, },
{ {
key: 'lastModifierUserId', key: "lastModifierUserId",
title: this.l('lastModifierUserId'), title: this.l("lastModifierUserId"),
hide: true, hide: true,
align: 'left' align: "left"
}, },
{ {
key: 'isDeleted', key: "isDeleted",
title: this.l('isDeleted'), title: this.l("isDeleted"),
hide: true, hide: true,
align: 'left' align: "left"
}, },
{ {
key: 'deletionTime', key: "deletionTime",
title: this.l('deletionTime'), title: this.l("deletionTime"),
hide: true, hide: true,
align: 'left' align: "left"
}, },
{ {
key: 'deleterUserId', key: "deleterUserId",
title: this.l('deleterUserId'), title: this.l("deleterUserId"),
hide: true, hide: true,
align: 'left' align: "left"
}, },
{ {
title: '操作', title: "操作",
key: 'id', key: "id",
width: 220, width: 220,
align: 'center', align: "center",
render: (h, params) => { render: (h, params) => {
return h('div', { class: 'action' }, [ return h("div", { class: "action" }, [
h( h(
'op', "op",
{ {
attrs: { attrs: {
oprate: 'set' oprate: "set"
}, },
on: { click: () => this.set(params.row.id) } on: { click: () => this.set(params.row.id) }
}, },
'设置' "设置"
), ),
h( h(
'op', "op",
{ {
attrs: { attrs: {
oprate: 'detail' oprate: "detail"
}, },
on: { click: () => this.detail(params.row.id) } on: { click: () => this.detail(params.row.id) }
}, },
'查看' "查看"
), ),
h( h(
'op', "op",
{ {
attrs: { attrs: {
oprate: 'detail', oprate: "detail",
class: 'edit' class: "edit"
}, },
on: { click: () => this.edit(params.row.id) } on: { click: () => this.edit(params.row.id) }
}, },
'编辑' "编辑"
), ),
h( h(
'op', "op",
{ {
attrs: { attrs: {
oprate: 'delete', oprate: "delete",
class: 'remove' class: "remove"
}, },
on: { click: () => this.remove(params.row.id) } on: { click: () => this.remove(params.row.id) }
}, },
'删除' "删除"
) )
]) ]);
} }
} }
] ]
} };
},
mounted() {
}, },
mounted() {},
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
await store.dispatch('loadDictionary') // 加载数据字典
}, },
methods: { methods: {
addOk() { addOk() {
this.$refs.grid.load() this.$refs.grid.load();
this.addModal = false this.addModal = false;
this.detailModal = false this.detailModal = false;
this.editModal = false this.editModal = false;
this.setModal = false this.setModal = false;
this.curId = 0 this.curId = 0;
}, },
search() { search() {
this.$refs.grid.reload(this.easySearch) this.$refs.grid.reload(this.easySearch);
}, },
detail(id) { detail(id) {
this.detailModal = true this.detailModal = true;
this.curId = id this.curId = id;
}, },
edit(id) { edit(id) {
this.editModal = true this.editModal = true;
this.curId = id this.curId = id;
}, },
set(id) { set(id) {
this.setModal = true this.setModal = true;
this.curId = id this.curId = id;
}, },
remove(id) { remove(id) {
this.deletelModal = true this.deletelModal = true;
this.curId = id this.curId = id;
}, },
removeOk() { removeOk() {
Api.delete({ id: this.curId }).then((r) => { Api.delete({ id: this.curId }).then(r => {
if (r.success) { if (r.success) {
this.$refs.grid.load() this.$refs.grid.load();
this.deletelModal = false this.deletelModal = false;
this.$Message.success('删除成功') this.$Message.success("删除成功");
} }
}) });
}, },
removeCancel() { removeCancel() {
this.deletelModal = false this.deletelModal = false;
}, },
cancel() { cancel() {
this.curId = 0 this.curId = 0;
this.addModal = false this.addModal = false;
this.detailModal = false this.detailModal = false;
this.editModal = false this.editModal = false;
this.deletedlModal = false this.deletedlModal = false;
this.setModal = false this.setModal = false;
}, },
l(key) { l(key) {
/* /*
...@@ -278,11 +282,11 @@ export default { ...@@ -278,11 +282,11 @@ export default {
deleterUserId:'', deleterUserId:'',
} }
*/ */
let vkey = 'business_code_config' + '.' + key let vkey = "business_code_config" + "." + key;
return this.$t(vkey) || key return this.$t(vkey) || key;
} }
} }
} };
</script> </script>
<style lang="less"> <style lang="less">
</style> </style>
\ No newline at end of file
pages/crm/project/detail.vue
View file @ 8930155a
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<Filed :span="12" :name="l('status')"> <Filed :span="12" :name="l('status')">
<state code="crm.project.status" :value="entity.status" /> <state code="crm.project.status" :value="entity.status" />
</Filed> </Filed>
<Filed :span="12" :name="l('budget')">{{entity.budget}}</Filed> <Filed :span="24" :name="l('budget')">{{entity.budget}}</Filed>
<Filed :span="24" :name="l('notes')">{{entity.notes}}</Filed> <Filed :span="24" :name="l('notes')">{{entity.notes}}</Filed>
</Row> </Row>
</div> </div>
......
pages/crm/project/index.vue
View file @ 8930155a
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
<Modal v-model="editModal" title="编辑" footer-hide> <Modal v-model="editModal" title="编辑" footer-hide>
<Edit :eid="curId" @on-close="cancel" @on-ok="addOk" /> <Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
</Modal> </Modal>
<Modal v-model="detailModal" title="详情"> <Modal v-model="detailModal" title="详情" footer-hide>
<Detail :eid="curId" /> <Detail :eid="curId" />
</Modal> </Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel"> <Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
......
pages/crm/sales/projectList.vue
View file @ 8930155a
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<Modal v-model="editModal" title="编辑" footer-hide> <Modal v-model="editModal" title="编辑" footer-hide>
<Edit :eid="curId" @on-close="cancel" @on-ok="addOk" /> <Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
</Modal> </Modal>
<Modal v-model="detailModal" title="详情"> <Modal v-model="detailModal" title="详情" footer-hide>
<Detail :eid="curId" /> <Detail :eid="curId" />
</Modal> </Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel"> <Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
......
pages/order/monitoring/index.vue
View file @ 8930155a
...@@ -65,6 +65,12 @@ export default { ...@@ -65,6 +65,12 @@ export default {
curId: 0, curId: 0,
columns: [ columns: [
{ key: "id", title: this.l("id"), hide: true, align: "left" }, { key: "id", title: this.l("id"), hide: true, align: "left" },
{
title: "序号",
type: "index",
width: 40,
align: "center"
},
{ {
key: "status", key: "status",
title: this.l("status"), title: this.l("status"),
...@@ -329,14 +335,12 @@ export default { ...@@ -329,14 +335,12 @@ export default {
{ {
key: "remark", key: "remark",
title: this.l("remark"), title: this.l("remark"),
align: "left", align: "center"
easy: true,
high: true
}, },
{ {
title: "暂停记录", title: "暂停记录",
key: "id", key: "zanting",
width: 140, width: 100,
align: "center", align: "center",
render: (h, params) => { render: (h, params) => {
return h("div", { class: "action" }, [ return h("div", { class: "action" }, [
...@@ -353,7 +357,7 @@ export default { ...@@ -353,7 +357,7 @@ export default {
}, },
{ {
title: "操作", title: "操作",
key: "id", key: "caozuo",
width: 100, width: 100,
align: "center", align: "center",
render: (h, params) => { render: (h, params) => {
......
pages/order/monitoring/record.vue
View file @ 8930155a
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
</div> </div>
</template> </template>
<script> <script>
import Api from './api' import Api from "./api";
import Detail from './detail' import Detail from "./detail";
export default { export default {
name: 'record', name: "record",
components: { components: {
Detail Detail
}, },
...@@ -19,24 +19,30 @@ export default { ...@@ -19,24 +19,30 @@ export default {
detailModal: false, detailModal: false,
action: Api.record, action: Api.record,
condition: { condition: {
orderId: { op: 'Equal', value: this.eid }, orderId: { op: "Equal", value: this.eid },
keys: { op: 'pauseCause,', value: null } keys: { op: "pauseCause,", value: null }
}, },
data: [], data: [],
curId: 0, curId: 0,
columns: [ columns: [
{ key: 'id', title: this.l('id'), hide: true, align: 'left' }, { key: "id", title: this.l("id"), hide: true, align: "left" },
{ {
key: 'mesCode', title: "序号",
title: this.l('mesCode'), type: "index",
align: 'left', width: 60,
align: "center"
},
{
key: "mesCode",
title: this.l("mesCode"),
align: "left",
render: (h, params) => render: (h, params) =>
h( h(
'a', "a",
{ {
attrs: { attrs: {
oprate: 'detail' oprate: "detail"
}, },
on: { click: () => this.detail(params.row.id) } on: { click: () => this.detail(params.row.id) }
}, },
...@@ -44,9 +50,9 @@ export default { ...@@ -44,9 +50,9 @@ export default {
) )
}, },
{ {
key: 'productName', key: "productName",
title: this.l('productName'), title: this.l("productName"),
align: 'left' align: "left"
}, },
// { // {
// key: 'orderId', // key: 'orderId',
...@@ -55,92 +61,86 @@ export default { ...@@ -55,92 +61,86 @@ export default {
// hide: false // hide: false
// }, // },
{ {
key: 'pauseCause', key: "pauseCause",
title: this.l('pauseCause'), title: this.l("pauseCause"),
align: 'left', align: "left",
code: 'mes_xingchi_plan.order_material.pauseCause' code: "mes_xingchi_plan.order_material.pauseCause"
}, },
{ {
key: 'creationTime', key: "creationTime",
title: this.l('creationTime'), title: this.l("creationTime"),
easy: true, easy: true,
high: true, high: true,
align: 'left' align: "left"
}, },
{ {
key: 'creator', key: "creator",
title: this.l('creator'), title: this.l("creator"),
easy: true, easy: true,
high: true, high: true,
align: 'left' align: "left"
}, },
{ {
key: 'laster', key: "laster",
title: this.l('laster'), title: this.l("laster"),
easy: true, easy: true,
high: true, high: true,
align: 'left' align: "left"
}, },
{ {
key: 'lastModificationTime', key: "lastModificationTime",
title: this.l('lastModificationTime'), title: this.l("lastModificationTime"),
easy: true, easy: true,
high: true, high: true,
align: 'left', align: "left",
render: (h, params) => { render: (h, params) => {
return h( return h(
'span', "span",
params.row.lastModificationTime == '0001-01-01 00:00:00' params.row.lastModificationTime == "0001-01-01 00:00:00"
? '' ? ""
: params.row.lastModificationTime : params.row.lastModificationTime
) );
} }
}, },
// {
// key: 'path',
// title: this.l('path'),
// easy: true,
// high: true,
// align: 'left'
// },
{ {
key: 'relatedPerson', key: "relatedPerson",
type: 'user', type: "user",
title: this.l('relatedPerson'), title: this.l("relatedPerson"),
align: 'left', align: "left",
high: true high: true
} }
] ]
} };
}, },
props: { props: {
eid: Number eid: Number
}, },
created() {}, created() {},
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
methods: { methods: {
search() { search() {
this.$refs.grid.reload(this.easySearch) this.$refs.grid.reload(this.easySearch);
}, },
l(key) { l(key) {
let vkey = 'order_pause' + '.' + key let vkey = "order_pause" + "." + key;
return this.$t(vkey) || key return this.$t(vkey) || key;
}, },
detail(id) { detail(id) {
this.detailModal = true this.detailModal = true;
this.curId = id this.curId = id;
} }
}, },
watch: { watch: {
eid(v) { eid(v) {
this.condition.orderId.value = v this.condition.orderId.value = v;
this.$refs.grid.reload(this.condition) this.$refs.grid.reload(this.condition);
} }
} }
} };
</script> </script>
<style lang='less'> <style lang='less'>
</style> </style>
\ No newline at end of file
pages/processManage/Process/detailfiles.vue
View file @ 8930155a
...@@ -103,9 +103,9 @@ export default { ...@@ -103,9 +103,9 @@ export default {
service service
.post( .post(
`${url}`, `${url}`,
JSON.stringify({ {
routingFile: dataValidate routingFile: dataValidate
}) }
) )
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
......
pages/processManage/Process/index.vue
View file @ 8930155a
...@@ -226,7 +226,7 @@ export default { ...@@ -226,7 +226,7 @@ export default {
doUpload: '/api/up/file', doUpload: '/api/up/file',
tableHeight: '', tableHeight: '',
myloading: true, myloading: true,
gymodaltitle: '创建主工艺', gymodaltitle: '创建工艺',
processviewModal: false, processviewModal: false,
isview: false, isview: false,
issendAudit: false, issendAudit: false,
...@@ -672,10 +672,10 @@ export default { ...@@ -672,10 +672,10 @@ export default {
service service
.post( .post(
`${url}`, `${url}`,
JSON.stringify({ {
routingHeaderEntity: a.formValidate, routingHeaderEntity: a.formValidate,
FileList: filelist FileList: filelist
}) }
) )
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
......
pages/processManage/Process/processNew.vue
View file @ 8930155a
...@@ -544,9 +544,9 @@ export default { ...@@ -544,9 +544,9 @@ export default {
service service
.post( .post(
`${url}`, `${url}`,
JSON.stringify({ {
routingDetail: this.formprocessValidate routingDetail: this.formprocessValidate
}) }
) )
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
......
pages/processManage/Process/stepModel.vue
View file @ 8930155a
...@@ -171,9 +171,9 @@ let isvalidate = false; ...@@ -171,9 +171,9 @@ let isvalidate = false;
service service
.post( .post(
`${url}`, `${url}`,
JSON.stringify({ {
routingStep: this.newModeldata routingStep: this.newModeldata
}) }
) )
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
......
pages/processManage/Process/supporting.vue
View file @ 8930155a
...@@ -304,7 +304,7 @@ export default { ...@@ -304,7 +304,7 @@ export default {
var url = `${designUrl}/routingsupporting/createorupdate` var url = `${designUrl}/routingsupporting/createorupdate`
service service
.post(`${url}`, JSON.stringify(this.formprocessValidate)) .post(`${url}`, this.formprocessValidate)
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
this.$Message.success('保存成功') this.$Message.success('保存成功')
......
pages/processManage/Process/testingModel.vue
View file @ 8930155a
...@@ -353,9 +353,9 @@ export default { ...@@ -353,9 +353,9 @@ export default {
service service
.post( .post(
`${url}`, `${url}`,
JSON.stringify({ {
routingQcCard: this.cardModeldata routingQcCard: this.cardModeldata
}) }
) )
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
......
pages/processManage/setProcess/index.vue
View file @ 8930155a
...@@ -389,7 +389,7 @@ export default { ...@@ -389,7 +389,7 @@ export default {
list: [], list: [],
data2: [], data2: [],
tabstatus: '1', //暂存tab状态（）主工艺||专业工艺 tabstatus: '1', //暂存tab状态（）主工艺||专业工艺
gymodaltitle: '创建主工艺', gymodaltitle: '创建工艺',
selectdata: [], selectdata: [],
value1: false, value1: false,
drawerShow: false, drawerShow: false,
...@@ -1076,9 +1076,7 @@ export default { ...@@ -1076,9 +1076,7 @@ export default {
saveHeader(next) { saveHeader(next) {
var a = this.$refs.processMain var a = this.$refs.processMain
if (a.formValidate.routingType == 1) {
this.savebill()
}
var filelist = a.getfile() var filelist = a.getfile()
let isvalidate = false let isvalidate = false
...@@ -1107,10 +1105,10 @@ export default { ...@@ -1107,10 +1105,10 @@ export default {
service service
.post( .post(
`${url}`, `${url}`,
JSON.stringify({ {
routingHeaderEntity: a.formValidate, routingHeaderEntity: a.formValidate,
FileList: filelist FileList: filelist
}) }
) )
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
...@@ -1209,9 +1207,7 @@ export default { ...@@ -1209,9 +1207,7 @@ export default {
this.$refs.processNew.formprocessValidate.routing_header_id = this.headerid this.$refs.processNew.formprocessValidate.routing_header_id = this.headerid
this.$refs.processNew.loaddata() this.$refs.processNew.loaddata()
} else { } else {
if (this.addpdefm.formValidate.routingType == 1) {
this.savebill()
}
var a = this.addpdefm var a = this.addpdefm
this.headerid = this.addpdefm.formValidate.id this.headerid = this.addpdefm.formValidate.id
...@@ -1231,9 +1227,9 @@ export default { ...@@ -1231,9 +1227,9 @@ export default {
service service
.post( .post(
`${url}`, `${url}`,
JSON.stringify({ {
orderRouting: orderRoutingobj orderRouting: orderRoutingobj
}) }
) )
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
...@@ -1296,15 +1292,12 @@ export default { ...@@ -1296,15 +1292,12 @@ export default {
modalShowCancel() { modalShowCancel() {
this.modalShow = false this.modalShow = false
}, },
savebill() {
this.$refs.modelTable.$refs.quotationBox2.saveData()
this.$refs.modelTable.$refs.quotationBox3.saveData()
},
saveOK() { saveOK() {
var url = `${PlanUrl}/OrderMaterial/createorupdate` var url = `${PlanUrl}/OrderMaterial/createorupdate`
// JSON.stringify({Process:this.formValidate}) // JSON.stringify({Process:this.formValidate})
service service
.post(`${url}`, JSON.stringify({ orderMaterial: this.formValidate })) .post(`${url}`, { orderMaterial: this.formValidate })
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
this.$Message.success('保存成功') this.$Message.success('保存成功')
...@@ -1334,7 +1327,7 @@ export default { ...@@ -1334,7 +1327,7 @@ export default {
let ordercombid = 0 let ordercombid = 0
this.createtype = 1 this.createtype = 1
if (routingType == 1) { if (routingType == 1) {
this.gymodaltitle = '设置主工艺规程' this.gymodaltitle = '设置工艺规程'
for (let i = 0; i < this.data1.length; i++) { for (let i = 0; i < this.data1.length; i++) {
let obj1 = this.data1[i] let obj1 = this.data1[i]
...@@ -1346,24 +1339,14 @@ export default { ...@@ -1346,24 +1339,14 @@ export default {
} }
} }
this.$refs.modelTable.issetProcess1 = true
this.$refs.modelTable.selectFault = 'greateArt'
this.$refs.modelTable.$refs.quotationBox2.loadData(
orderids.toString(',')
)
this.$refs.modelTable.$refs.quotationBox3.loadData(
orderids.toString(',')
)
this.$refs.modelTable.$refs.quotationBox2.isview = this.isview
this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
} else { } else {
this.$refs.modelTable.issetProcess1 = false
this.gymodaltitle = '设置专业工艺规程' this.gymodaltitle = '设置专业工艺规程'
ordercombid = params.row.specialtyOrderCombID ordercombid = params.row.specialtyOrderCombID
if (ordercombid != 0) { if (ordercombid != 0) {
this.$refs.modelTable.issetProcess1 = false
this.addpdefm.formValidate.ordercombid = ordercombid this.addpdefm.formValidate.ordercombid = ordercombid
for (let i = 0; i < this.data1.length; i++) { for (let i = 0; i < this.data1.length; i++) {
let obj = this.data1[i] let obj = this.data1[i]
...@@ -1450,16 +1433,9 @@ export default { ...@@ -1450,16 +1433,9 @@ export default {
let orderids = new Array() let orderids = new Array()
let orderlist = new Array() let orderlist = new Array()
if (routingType == 1) {
// ordercombid = params.row.orderCombID
this.$refs.modelTable.issetProcess1 = true
this.$refs.modelTable.$refs.quotationBox2.isview = this.isview ordercombid = params.row.orderCombID
this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
} else {
// ordercombid = params.row.specialtyOrderCombID
this.$refs.modelTable.issetProcess1 = false
}
this.addpdefm.formValidate.ordercombid = ordercombid this.addpdefm.formValidate.ordercombid = ordercombid
if (orders == null) { if (orders == null) {
for (let i = 0; i < this.data1.length; i++) { for (let i = 0; i < this.data1.length; i++) {
...@@ -1493,13 +1469,8 @@ export default { ...@@ -1493,13 +1469,8 @@ export default {
this.addpdefm.dataTop = orderlist this.addpdefm.dataTop = orderlist
if (routingType == 1) { if (routingType == 1) {
this.$refs.modelTable.$refs.quotationBox2.loadData(
orderids.toString(',')
)
this.$refs.modelTable.$refs.quotationBox3.loadData(
orderids.toString(',')
)
this.$refs.modelTable.selectFault = 'greateArt'
} }
if (routingType == 1) { if (routingType == 1) {
this.gymodaltitle = '设置工艺规程' this.gymodaltitle = '设置工艺规程'
...@@ -1539,13 +1510,9 @@ export default { ...@@ -1539,13 +1510,9 @@ export default {
let orderids = new Array() let orderids = new Array()
let orderlist = new Array() let orderlist = new Array()
let ordercombid = 0 let ordercombid = 0
if (routingType == 1) {
ordercombid = params.row.orderCombID ordercombid = params.row.orderCombID
this.$refs.modelTable.issetProcess1 = true
} else {
ordercombid = params.row.specialtyOrderCombID
this.$refs.modelTable.issetProcess1 = false
}
this.addpdefm.formValidate.ordercombid = ordercombid this.addpdefm.formValidate.ordercombid = ordercombid
for (let i = 0; i < this.data1.length; i++) { for (let i = 0; i < this.data1.length; i++) {
let obj = this.data1[i] let obj = this.data1[i]
...@@ -1568,22 +1535,10 @@ export default { ...@@ -1568,22 +1535,10 @@ export default {
} }
this.addpdefm.dataTop = orderlist this.addpdefm.dataTop = orderlist
if (routingType == 1) {
this.$refs.modelTable.$refs.quotationBox2.loadData(
orderids.toString(',')
)
this.$refs.modelTable.$refs.quotationBox3.loadData(
orderids.toString(',')
)
this.$refs.modelTable.selectFault = 'greateArt'
this.$refs.modelTable.$refs.quotationBox2.isview = this.isview
this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
}
if (routingType == 1) {
this.gymodaltitle = '查看工艺规程'
} else {
this.gymodaltitle = '查看工艺规程' this.gymodaltitle = '查看工艺规程'
}
var url = `${designUrl}/routingheader/getbyid?id=` + RoutingID var url = `${designUrl}/routingheader/getbyid?id=` + RoutingID
service.get(`${url}`).then((response) => { service.get(`${url}`).then((response) => {
this.addpdefm.formValidate = response.result this.addpdefm.formValidate = response.result
...@@ -1613,8 +1568,6 @@ export default { ...@@ -1613,8 +1568,6 @@ export default {
this.addpdefm.formValidate = this.headerInfo this.addpdefm.formValidate = this.headerInfo
this.addpdefm.isview = this.isview this.addpdefm.isview = this.isview
this.$refs.modelTable.$refs.quotationBox2.isview = this.isview
this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
this.addpdefm.ProductName = this.headerInfo.productName this.addpdefm.ProductName = this.headerInfo.productName
this.addpdefm.ProductCode = this.headerInfo.productCode this.addpdefm.ProductCode = this.headerInfo.productCode
......
pages/processManage/setProcess/processMain.vue
View file @ 8930155a
...@@ -445,36 +445,7 @@ export default { ...@@ -445,36 +445,7 @@ export default {
this.$refs.refFile.routing_header_id = 0; this.$refs.refFile.routing_header_id = 0;
this.$refs.refFile.intFiles(); this.$refs.refFile.intFiles();
}, },
LoadprocessList() {
this.processList = [];
let url = `${designUrl}/routingheader/getlistbyids?` + this.Mianids,
that = this;
service.get(`${url}`).then(res => {
let selectdata = res.result;
selectdata.forEach(item => {
this.processList.push({
value: item.id,
name: item.code,
ver: item.version
});
});
this.formValidate.up_id = this.processList[0].value;
this.MianVer = this.processList[0].ver;
this.MianCode = this.processList[0].name;
});
},
MainProcess_selected(val) {
//这里的val默认拿到的是：value绑定的那个
this.formValidate.up_id = val;
this.processList.forEach(item => {
if (val == item.value) {
this.MianVer = item.ver;
}
});
},
quotationBox() { quotationBox() {
this.$refs.generateQuotation.modalShow = true; this.$refs.generateQuotation.modalShow = true;
}, },
...@@ -559,8 +530,9 @@ export default { ...@@ -559,8 +530,9 @@ export default {
}, },
setparentcreatetype(type, headerid) { setparentcreatetype(type, headerid) {
this.$parent.$parent.$parent.createtype = type; this.$parent.$parent.createtype = type
this.$parent.$parent.$parent.headerid = headerid; this.$parent.$parent.headerid = headerid
}, },
...@@ -575,11 +547,9 @@ export default { ...@@ -575,11 +547,9 @@ export default {
}); });
}, },
setshow() { setshow() {
if (this.formValidate.routingType == 2) {
this.isshow = true;
} else {
this.isshow = false; this.isshow = false;
}
if (this.formValidate.id != 0) { if (this.formValidate.id != 0) {
this.isedit = true; this.isedit = true;
...@@ -590,14 +560,11 @@ export default { ...@@ -590,14 +560,11 @@ export default {
this.Loadfile(0); this.Loadfile(0);
} }
if (this.Mianids != "") {
this.LoadprocessList();
}
this.createtype = "1"; this.createtype = "1";
this.selectpdefmid = 0; this.selectpdefmid = 0;
this.RoutingList = []; this.RoutingList = [];
this.calcplatesnum(); // this.calcplatesnum();
} }
} }
}; };
......
pages/produce/components/expend.vue
View file @ 8930155a
...@@ -145,7 +145,7 @@ export default { ...@@ -145,7 +145,7 @@ export default {
<style lang='less' scoped> <style lang='less' scoped>
.material_row{ .material_row{
.material_label{ .material_label{
color: #249E91 color: #2d8cf0
} }
.material_line { .material_line {
display: inline-block; display: inline-block;
......
pages/produce/ordermaterial.vue
View file @ 8930155a
...@@ -360,7 +360,6 @@ export default { ...@@ -360,7 +360,6 @@ export default {
}, },
// 分页查询数据列表 // 分页查询数据列表
laoedPage() { laoedPage() {
let params = this.orderSearchForm let params = this.orderSearchForm
params.SkipCount = params.SkipCount || 0 params.SkipCount = params.SkipCount || 0
params.MaxResultCount = params.MaxResultCount || 10 params.MaxResultCount = params.MaxResultCount || 10
......
pages/qc/taskList/index.vue
View file @ 8930155a
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
v-model="searchIterms" placeholder="请输入查询条件" v-model="searchIterms" placeholder="请输入查询条件"
@on-search="tableSearch" ></Input> @on-search="tableSearch" ></Input>
</div> </div>
<Button type="primary" class="title_btn" @click='searchModel'>高级查询</Button> <Button type="primary" class="title_btn" v-show="false" @click='searchModel'>高级查询</Button>
</div> </div>
<div class="table"> <div class="table">
<Table <Table
...@@ -333,6 +333,7 @@ export default { ...@@ -333,6 +333,7 @@ export default {
searchlaode(parmes){ searchlaode(parmes){
let url = `${PlanUrl}/ordercheck/waitexecuteorderlist`; let url = `${PlanUrl}/ordercheck/waitexecuteorderlist`;
service.post(`${url}`,parmes).then(res => { service.post(`${url}`,parmes).then(res => {
console.warn(res)
this.mDatas = res.result.items this.mDatas = res.result.items
this.search.total = res.result.totalCount this.search.total = res.result.totalCount
}); });
...@@ -415,7 +416,7 @@ export default { ...@@ -415,7 +416,7 @@ export default {
<style scoped> <style scoped>
.table_title{ .table_title{
width: 320px; width: 320px;
float: left; /* float: left; */
} }
.table{ .table{
margin: 10px 0 0 0; margin: 10px 0 0 0;
......
pages/qcimplement/index.vue
View file @ 8930155a
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</div> </div>
<div class="transmit_content"> <div class="transmit_content">
<div class="wuliao_left"> <div class="wuliao_left">
<div class="card_title" style="height:32px"> <div class="card_title" style="height:46px">
<a href="#" class="state" @click="showList"> <a href="#" class="state" @click="showList">
状态： 状态：
<Icon type="ios-arrow-down" v-if="iconModel" /> <Icon type="ios-arrow-down" v-if="iconModel" />
......
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