Skip to content

M
mes-ui
Commit b32e3427 authored by 周远喜's avatar 周远喜
Browse files
Options

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

parents 0adf3cc1 786d999c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1441 additions and 1537 deletions
components/customTable/customTable.vue
View file @ b32e3427
......@@ -290,6 +290,15 @@ export default {
title: '紧急程度',
key: 'urgencyLevel',
width: 100,
render: (h, params) => {
return h('state', {
props: {
code: 'plan.order.urgencyLevel',
type: 'text',
value: params.row.urgencyLevel + ''
}
})
}
},
// {
// title: '任务类型',
......
components/orderOperator/createOrder.vue
View file @ b32e3427
This diff is collapsed.
components/orderOperator/orderSend.vue
View file @ b32e3427
This diff is collapsed.
components/page/dataGrid.vue
View file @ b32e3427
......@@ -496,6 +496,15 @@ export default {
})
return cols
}
},
watch:{
"data.length"(){
this.list=this.data;
},
"height"()
{
this.tableHeight=this.height;
}
}
}
</script>
......
i18n/locale/zh-CN.js
View file @ b32e3427
......@@ -1019,9 +1019,13 @@ export default {
},
mes_op_task_plan_simulate: { //参数设置的表
id: '',
// partTaskPk: 订单ID,
// opTaskPk: 工单ID,
flog: 0,//参数应用
planMethod: "转序规则", // 平行 重叠
op_task_pk: '工单编号',
part_task_pk: '计划编号',
task_seq: '工序号',
taskSeq: '工序号',
task_name: '工序名称',
put_into_qty: '投产数量',
plan_start: '计划排产开始',
......@@ -1030,21 +1034,23 @@ export default {
run_time: '单件工时',
transport_time: '转运时间',
check_time: '检验时间',
efficiency_value: '效率系数',
efficiencyValue: '效率系数',
singleout: '单件产出',
first_equip: '设备编号',
equip_type: '设备类型',
cal_id: '连班策略',
calId: '连班策略',
machine_rule: '设备优先规则',
plan_method: '重叠转序',
over_time: '六日加班',
isdiscrete: '是否离散',
discrete_value: '离散值',
overTime: '六日加班',
isDiscrete: '是否离散',
discrete: '离散值',
multi_machine: '多台分配',
notes: '备注',
insert_flag: '插单',
outside_time: '外协时间',
discrete_percent: '离散百分比%',
multipleEquip: "是否多台安排设备",// 否 是
multipleEquipIds: "设备id", //用英文逗号分隔
taskseq_des: '',
workshopcode: '',
routing_detail_id: '',
......@@ -1052,44 +1058,44 @@ export default {
comb_param: '',
rule_qty: '',
},
routing_header:{
id:'',
creationTime:'',
creatorUserId:'',
lastModificationTime:'',
lastModifierUserId:'',
deleterUserId:'',
deletionTime:'',
classId:'类id',
unicode:'unicode',
name:'工艺名称',
code:'工艺编号',
productId:'产品id',
productName:'产品名称',
productCode:'产品图号',
version:'工艺文件版本',
author:'编制人',
departmentId:'',
isMain:'',
upId:'',
upDetailId:'',
routingType:'工艺类型',
status:'',
approvalStatus:'状态',
remark:'工艺说明',
roufile:'多媒体附件',
approvalStatusRemark:'',
auditUserId1:'审核人',
auditUserId2:'审批人',
isDeleted:'',
platesnum:'',
isEffect:'',
developmentMode:'研制方式',
changeOrderCode:'更改单编号',
changeOrderDate:'更改单日期',
changeMethod:'更改办法',
taskType:'任务类型',
},
routing_header: {
id: '',
creationTime: '',
creatorUserId: '',
lastModificationTime: '',
lastModifierUserId: '',
deleterUserId: '',
deletionTime: '',
classId: '类id',
unicode: 'unicode',
name: '工艺名称',
code: '工艺编号',
productId: '产品id',
productName: '产品名称',
productCode: '产品图号',
version: '工艺文件版本',
author: '编制人',
departmentId: '',
isMain: '',
upId: '',
upDetailId: '',
routingType: '工艺类型',
status: '',
approvalStatus: '状态',
remark: '工艺说明',
roufile: '多媒体附件',
approvalStatusRemark: '',
auditUserId1: '审核人',
auditUserId2: '审批人',
isDeleted: '',
platesnum: '',
isEffect: '',
developmentMode: '研制方式',
changeOrderCode: '更改单编号',
changeOrderDate: '更改单日期',
changeMethod: '更改办法',
taskType: '任务类型',
},
routing_detail: {
id: '',
creationTime: '创建时间',
......@@ -1174,30 +1180,30 @@ export default {
stepContent: '工步内容',
extend: '扩展字段',
},
routing_qc_card:{
id:'',
creationTime:'创建时间',
creatorUserId:'创建人',
lastModificationTime:'修改时间',
lastModifierUserId:'修改人',
isDeleted:'是否删除',
deleterUserId:'删除人',
deletionTime:'删除时间',
routingHeaderId:'工艺',
routingDetailId:'工序',
routingStepId:'工步',
checkContent:'检验内容',
checkType:'检验标记',
checkParams:'参数名称',
measurementUnit:'单位',
fillintype:'汇报类型',
qualityTemplate:'模板',
isphotograph:'是否拍照',
status:'状态',
extend:'扩展字段',
remark:'备注',
productionRequirement:'生产要求',
standard:'标准指标',
qualityTemplateName:'模板文件名称',
}
routing_qc_card: {
id: '',
creationTime: '创建时间',
creatorUserId: '创建人',
lastModificationTime: '修改时间',
lastModifierUserId: '修改人',
isDeleted: '是否删除',
deleterUserId: '删除人',
deletionTime: '删除时间',
routingHeaderId: '工艺',
routingDetailId: '工序',
routingStepId: '工步',
checkContent: '检验内容',
checkType: '检验标记',
checkParams: '参数名称',
measurementUnit: '单位',
fillintype: '汇报类型',
qualityTemplate: '模板',
isphotograph: '是否拍照',
status: '状态',
extend: '扩展字段',
remark: '备注',
productionRequirement: '生产要求',
standard: '标准指标',
qualityTemplateName: '模板文件名称',
}
}
\ No newline at end of file
pages/aps/aps/add.vue
View file @ b32e3427
......@@ -11,33 +11,36 @@
<span slot="close">Off</span>
</i-switch>
</FormItem>
<FormItem :label="l('cal_id')" prop="cal_id">
<Select v-model="entity.cal_id" style="width:150px">
<Option value="beijing">策略1</Option>
<Option value="shanghai">策略2</Option>
<Option value="shenzhen">策略3</Option>
<FormItem :label="l('calId')" prop="calId">
<Select v-model="entity.calId" style="width:150px">
<Option
v-for="(item,index) in listCal"
:key="index"
:value="item.calid"
:label="item.calname"
></Option>
</Select>
</FormItem>
<FormItem :label="l('over_time')" prop="over_time">
<i-switch v-model="entity.over_time" size="large">
<FormItem :label="l('overTime')" prop="overTime">
<i-switch v-model="entity.overTime" size="large">
<span slot="open">On</span>
<span slot="close">Off</span>
</i-switch>
</FormItem>
<FormItem :label="l('efficiency_value')" prop="efficiency_value">
<Input v-model="entity.efficiency_value" style="width:150px"></Input>
<FormItem :label="l('efficiencyValue')" prop="efficiencyValue">
<Input v-model="entity.efficiencyValue" style="width:150px"></Input>
</FormItem>
<FormItem :label="l('run_time')" prop="run_time">
<InputNumber v-model="entity.run_time"></InputNumber>
</FormItem>
<FormItem :label="l('isdiscrete')" prop="isdiscrete">
<i-switch v-model="entity.isdiscrete" size="large">
<FormItem :label="l('isDiscrete')" prop="isDiscrete">
<i-switch v-model="entity.isDiscrete" size="large">
<span slot="open">On</span>
<span slot="close">Off</span>
</i-switch>
</FormItem>
<FormItem :label="l('discrete_value')" prop="discrete_value">
<InputNumber v-model="entity.discrete_value"></InputNumber>
<FormItem :label="l('discrete')" prop="discrete">
<InputNumber v-model="entity.discrete"></InputNumber>
</FormItem>
<FormItem :label="l('discrete_percent')" prop="discrete_percent">
<InputNumber v-model="entity.discrete_percent"></InputNumber>
......@@ -150,40 +153,63 @@
</div>
</template>
<script>
import Api from "./api";
export default {
data() {
return {
entity: {
value1:100,
value2:100,
value1: 100,
value2: 100,
fruit: []
},
listCal: [],
visible: false,
rules: {
businessName: [{ required: true, message: '必填', trigger: 'blur' }],
businessCode: [{ required: true, message: '必填', trigger: 'blur' }]
businessName: [{ required: true, message: "必填", trigger: "blur" }],
businessCode: [{ required: true, message: "必填", trigger: "blur" }]
}
}
};
},
mounted() {
this.getCal();
},
methods: {
handleSubmit() {},
getCal() {
Api.getallcal().then(res => {
if (res.success) {
this.listCal = res.result;
}
});
},
handleSubmit() {
this.$refs.form.validate(valid => {
if (valid) {
Api.apsschedulupdateparameter(this.entity).then(res => {
if (res.success) {
}
});
} else {
this.$Message.error("Fail!");
}
});
},
handleClose() {
this.$emit("on-close")
this.$emit("on-close");
},
handleOpen() {
this.visible = true
this.visible = true;
},
handle() {
this.visible = false
this.visible = false;
},
handleOk() {},
l(key) {
let vkey = 'mes_op_task_plan_simulate' + '.' + key
return this.$t(vkey) || key
let vkey = "mes_op_task_plan_simulate" + "." + key;
return this.$t(vkey) || key;
}
}
}
};
</script>
<style lang="less" scoped>
.parameter {
......@@ -262,7 +288,7 @@ export default {
color: #2680eb;
}
.check-box {
height: 300px;
height: 348px;
border-top: 1px solid #e0e0e0;
padding: 15px;
padding-left: 0;
......@@ -271,7 +297,7 @@ export default {
}
}
.right-down {
height: 100px;
height: 92px;
}
.click-btn {
text-align: right;
......
pages/aps/aps/api.js
View file @ b32e3427
......@@ -21,39 +21,47 @@ export default {
},
//获取排产池数据列表
getall() {
return Api.get(`${aps}/Mes_part_task_plan_simulate/getall`);
return Api.get(`${apsUrl}/Mes_part_task_plan_simulate/getall`);
},
//点开排产池列表查看对应的工序
getbyorderid(params) {
return Api.get(`${aps}/mes_op_task_plan_simulate/getbyorderid`, params);
return Api.get(`${apsUrl}/mes_op_task_plan_simulate/getbyorderid`, params);
},
//订单优先级
orderpriority(params) {
return Api.post(`${aps}/apspoolappservices/orderpriority`, params);
return Api.post(`${apsUrl}/apspoolappservices/orderpriority`, params);
},
//删除工序
removeoptasksimluate(params) {
return Api.post(`${aps}/apspoolappservices/removeoptasksimluate`, params);
return Api.post(`${apsUrl}/apspoolappservices/removeoptasksimluate`, params);
},
//恢复工艺
recoveryoptasksimluate(params) {
return Api.post(`${aps}/apspoolappservices/recoveryoptasksimluate`, params);
return Api.post(`${apsUrl}/apspoolappservices/recoveryoptasksimluate`, params);
},
//移出排产池
shiftoutapspool(params) {
return Api.post(`${aps}/apspoolappservices/shiftoutapspool`, params);
return Api.post(`${apsUrl}/apspoolappservices/shiftoutapspool`, params);
},
//排产计算
apsprepareandcalc(params) {
return Api.post(`${aps}/apspoolappservices/apsprepareandcalc`, params);
return Api.post(`${apsUrl}/apspoolappservices/apsprepareandcalc`, params);
},
//排产方案下发
processschemedispatch(params) {
return Api.post(`${aps}/apspoolappservices/processschemedispatch`, params);
return Api.post(`${apsUrl}/apspoolappservices/processschemedispatch`, params);
},
//APS排产前数据合法性校验
recoveryoptasksimluate(params) {
return Api.post(`${aps}/apspoolappservices/apsdatachecked`, params);
apsdatachecked(params) {
return Api.post(`${apsUrl}/apspoolappservices/apsdatachecked`, params);
},
//获取连班策略
getallcal(params) {
return Api.get(`${apsUrl}/mes_daily_work_sched/getallcal`, params);
},
//工序参数调整
apsschedulupdateparameter(params) {
return Api.post(`${apsUrl}/ser/apsschedulupdateparameter`, params);
},
}
pages/aps/aps/components/excute.vue
View file @ b32e3427
......@@ -4,21 +4,18 @@
style="margin-top:-25px;margin-bottom:-25px"
:columns="columns"
ref="grid"
:action="action"
:easy="false"
:high="false"
:set="false"
:border="false"
:data="data1"
:page="false"
:height="gridHeight"
></DataGrid>
<Modal v-model="editModal" title="编辑" footer-hide width="800">
<Edit :eid="curId" @on-close="cancel" />
</Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
<p>确定删除？</p>
</Modal>
<Modal v-model="insertlModal" title="插单" @on-ok="insertOk" @on-cancel="cancel">
<p>确定进行 {{insertTItle}} 操作？</p>
</Modal>
......@@ -52,10 +49,10 @@ export default {
setParsModal: false,
editModal: false,
detailModal: false,
deletelModal: false,
insertlModal: false,
rowIndex: null,
curId: 0,
gridHeight: 45,
columns: [
{ key: "id", title: this.l("id"), hide: true, align: "left" },
{ title: " ", width: 130 },
......@@ -302,6 +299,7 @@ export default {
attrs: {
icon: "md-options",
type: "icon",
oprate: "detail",
title: "工序参数设置"
},
on: { click: () => this.openParms(params.row.id) }
......@@ -324,117 +322,15 @@ export default {
oprate: "delete",
msg: "确认要刪除工序吗？"
},
on: { click: () => this.remove(params.row.id, params.index) }
on: { click: () => this.remove(params.row, params.index) }
})
]);
}
}
],
data1: [
{
id: "1",
op_task_pk: "001",
part_task_pk: "001",
task_seq: "1",
task_name: "测试工序1",
put_into_qty: "10",
plan_start: "04/05/2020",
plan_finish: "06/05/2020",
setup_time: "5",
run_time: "1",
transport_time: "1",
check_time: "1",
efficiency_value: "0.5",
singleout: "2",
first_equip: "NTY-0012",
equip_type: "加工设备",
cal_id: "日历id",
machine_rule: "优先",
plan_method: "是",
over_time: "1",
isdiscrete: "是",
discrete_value: "1.2",
multi_machine: "5",
notes: "暂无备注信息test",
insert_flag: 1,
outside_time: "04/06/2020",
taskseq_des: "",
workshopcode: "",
routing_detail_id: "",
routing_header_id: "",
comb_param: "",
rule_qty: ""
},
{
id: "2",
op_task_pk: "002",
part_task_pk: "002",
task_seq: "2",
task_name: "测试工序2",
put_into_qty: "10",
plan_start: "04/05/2020",
plan_finish: "06/05/2020",
setup_time: "5",
run_time: "1",
transport_time: "1",
check_time: "1",
efficiency_value: "0.5",
singleout: "2",
first_equip: "NTY-0012",
equip_type: "加工设备",
cal_id: "日历id",
machine_rule: "优先",
plan_method: "是",
over_time: "1",
isdiscrete: "是",
discrete_value: "1.2",
multi_machine: "5",
notes: "暂无备注信息test",
insert_flag: 0,
outside_time: "04/06/2020",
taskseq_des: "",
workshopcode: "",
routing_detail_id: "",
routing_header_id: "",
comb_param: "",
rule_qty: ""
},
{
id: "3",
op_task_pk: "003",
part_task_pk: "003",
task_seq: "3",
task_name: "测试工序3",
put_into_qty: "10",
plan_start: "04/05/2020",
plan_finish: "06/05/2020",
setup_time: "5",
run_time: "1",
transport_time: "1",
check_time: "1",
efficiency_value: "0.5",
singleout: "2",
first_equip: "NTY-0012",
equip_type: "加工设备",
cal_id: "日历id",
machine_rule: "优先",
plan_method: "是",
over_time: "1",
isdiscrete: "是",
discrete_value: "1.2",
multi_machine: "5",
notes: "暂无备注信息test",
insert_flag: 0,
outside_time: "04/06/2020",
taskseq_des: "",
workshopcode: "",
routing_detail_id: "",
routing_header_id: "",
comb_param: "",
rule_qty: ""
}
],
insertTItle: "插单"
data1: [],
insertTItle: "插单",
selectRoutingDetail: {} //需那种工序
};
},
mounted() {
......@@ -448,51 +344,14 @@ export default {
loadData(expendId) {
let params = {
id: expendId
}
};
Api.getbyorderid(params).then(res => {
if (res.sucess) {
this.data1 = [];
if (res.success) {
this.data1 = res.result;
this.gridHeight = 45;
this.gridHeight = (res.result.length + 1) * 48;
}
});
//加载数据
//alert(id);
// let arr1 = {
// id: '1',
// op_task_pk: '001',
// part_task_pk: '001',
// task_seq: '1',
// task_name: '测试工序1',
// put_into_qty: '10',
// plan_start: '04/05/2020',
// plan_finish: '06/05/2020',
// setup_time: '5',
// run_time: '1',
// transport_time: '1',
// check_time: '1',
// efficiency_value: '0.5',
// singleout: '2',
// first_equip: 'NTY-0012',
// equip_type: '加工设备',
// cal_id: '日历id',
// machine_rule: '优先',
// plan_method: '是',
// over_time: '1',
// isdiscrete: '是',
// discrete_value: '1.2',
// multi_machine: '5',
// notes: '暂无备注信息test',
// insert_flag: 1,
// outside_time: '04/06/2020',
// taskseq_des: '',
// workshopcode: '',
// routing_detail_id: '',
// routing_header_id: '',
// comb_param: '',
// rule_qty: ''
// }
// this.data1.push(arr1)
},
//插单事件start----
......@@ -535,25 +394,22 @@ export default {
//编辑工序end----
//删除工序事件start-----
remove(id, index) {
this.deletelModal = true;
this.curId = Number(id);
remove(row, index) {
//this.curId = Number(id);
this.rowIndex = index;
this.selectRoutingDetail = row;
let params = {
partPk: this.selectRoutingDetail.part_task_pk,
detailIdstr: this.selectRoutingDetail.routing_detail_id
};
Api.removeoptasksimluate(params).then(r => {
if (r.success) {
this.$Message.success("删除成功");
this.data1.splice(this.rowIndex, 1);
}
});
},
removeOk() {
alert(this.rowIndex);
this.data1.splice(this.rowIndex, 1);
// Api.delete({ id: this.curId }).then((r) => {
// if (r.success) {
// this.$refs.grid.load()
// this.deletelModal = false
// this.$Message.success('删除成功')
// }
// })
},
removeCancel() {
this.deletelModal = false;
},
//删除工序时间end-----
cancel() {
this.curId = 0;
......
pages/aps/aps/index.vue
View file @ b32e3427
This diff is collapsed.
pages/aps/plan/index.vue
View file @ b32e3427
......@@ -158,7 +158,8 @@ export default {
title: this.l("urgencyLevel"),
align: "left",
easy: true,
high: true
high: true,
code: "plan.order.urgencyLevel",
},
{
......@@ -456,10 +457,6 @@ export default {
}
}
});
this.$router.push({
name: "aps-aps"
// params: { customerId: id }
});
},
addOk() {
this.$refs.grid.load();
......
pages/aps/scheduling/api.js
View file @ b32e3427
import Api from '@/plugins/request'
export default {
getmesorder(params) {
return Api.get(`${aps}/aps/getmesorder`, params); //待排产订单数据
return Api.get(`${apsManualUrl}/aps/getmesorder`, params); //待排产订单数据
},
gettaskseqinfo(params) {
return Api.get(`${aps}/aps/gettaskseqinfo`, params); //根据订单获取全部工序数据
return Api.get(`${apsManualUrl}/aps/gettaskseqinfo`, params); //根据订单获取全部工序数据
},
getlist(params) {
return Api.get(`${aps}/mes_sys_shop_info/getlist`, params); //手工排产:查询所在车间下的所有班组信息
return Api.get(`${apsManualUrl}/mes_sys_shop_info/getlist`, params); //手工排产:查询所在车间下的所有班组信息
},
getbyshopid(params) {
return Api.get(`${aps}/mes_sys_user_info/getuserbyshopid`, params); //手工排产:根据班组ID,加载人员信息
return Api.get(`${apsManualUrl}/mes_sys_user_info/getuserbyshopid`, params); //手工排产:根据班组ID,加载人员信息
},
getlistEquip(params) {
return Api.get(`${aps}/mes_equip_info/getlist`, params); //手工排产：获取所在车间的设备
return Api.get(`${apsManualUrl}/mes_equip_info/getlist`, params); //手工排产：获取所在车间的设备
},
getbyequippk(params) {
return Api.get(`${aps}/mes_sys_user_info/getuserbyequippk`, params); //手工排产:根据设备ID,加载人员信息
return Api.get(`${apsManualUrl}/mes_sys_user_info/getuserbyequippk`, params); //手工排产:根据设备ID,加载人员信息
},
}
\ No newline at end of file
pages/basicData/code/index.vue
View file @ b32e3427
......@@ -17,7 +17,7 @@
<template slot="buttons">
<Button type="primary" @click="addModal=true">新增</Button>
</template>
</DataGrid>
</DataGrid>
<Modal v-model="addModal" title="新增" width="800" footer-hide>
<Add @on-close="cancel" @on-ok="addOk" />
</Modal>
......@@ -33,14 +33,14 @@
</div>
</template>
<script>
import Api from './api'
import Add from './add'
import Edit from './edit'
import Detail from './detail'
import Search from './search'
import Set from './set'
import Api from "./api";
import Add from "./add";
import Edit from "./edit";
import Detail from "./detail";
import Search from "./search";
import Set from "./set";
export default {
name: 'list',
name: "list",
components: {
Add,
Edit,
......@@ -52,7 +52,7 @@ export default {
return {
action: Api.index,
easySearch: {
keys: { op: 'businessName', value: null }
keys: { op: "businessName", value: null }
},
addModal: false,
editModal: false,
......@@ -61,200 +61,204 @@ export default {
deletelModal: false,
curId: 0,
columns: [
{ key: 'id', title: this.l('id'), hide: true, align: 'left' },
{ key: "id", title: this.l("id"), hide: true, align: "left" },
{
key: 'businessName',
title: this.l('businessName'),
align: 'left',
title: "序号",
type: "index",
width: 65,
align: "center"
},
{
key: "businessName",
title: this.l("businessName"),
align: "left",
easy: true,
high: true
},
{
key: 'businessCode',
title: this.l('businessCode'),
align: 'left',
key: "businessCode",
title: this.l("businessCode"),
align: "left",
easy: true,
high: true
},
{
key: 'prefix',
title: this.l('prefix'),
align: 'left',
key: "prefix",
title: this.l("prefix"),
align: "left",
easy: true,
high: true
},
{
key: 'maxSerial',
title: this.l('maxSerial'),
align: 'left',
key: "maxSerial",
title: this.l("maxSerial"),
align: "left",
high: true
},
{
key: 'day',
title: this.l('day'),
align: 'left',
key: "day",
title: this.l("day"),
align: "left",
high: true,
code: 'mes_xingchi_system.business_code_config.day'
code: "mes_xingchi_system.business_code_config.day"
},
{
key: 'remark',
title: this.l('remark'),
align: 'left',
key: "remark",
title: this.l("remark"),
align: "left",
easy: true,
high: true
},
{
key: 'creationTime',
title: this.l('creationTime'),
key: "creationTime",
title: this.l("creationTime"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'creatorUserId',
title: this.l('creatorUserId'),
key: "creatorUserId",
title: this.l("creatorUserId"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'lastModificationTime',
title: this.l('lastModificationTime'),
key: "lastModificationTime",
title: this.l("lastModificationTime"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'lastModifierUserId',
title: this.l('lastModifierUserId'),
key: "lastModifierUserId",
title: this.l("lastModifierUserId"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'isDeleted',
title: this.l('isDeleted'),
key: "isDeleted",
title: this.l("isDeleted"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'deletionTime',
title: this.l('deletionTime'),
key: "deletionTime",
title: this.l("deletionTime"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'deleterUserId',
title: this.l('deleterUserId'),
key: "deleterUserId",
title: this.l("deleterUserId"),
hide: true,
align: 'left'
align: "left"
},
{
title: '操作',
key: 'id',
title: "操作",
key: "id",
width: 220,
align: 'center',
align: "center",
render: (h, params) => {
return h('div', { class: 'action' }, [
return h("div", { class: "action" }, [
h(
'op',
"op",
{
attrs: {
oprate: 'set'
oprate: "set"
},
on: { click: () => this.set(params.row.id) }
},
'设置'
"设置"
),
h(
'op',
"op",
{
attrs: {
oprate: 'detail'
oprate: "detail"
},
on: { click: () => this.detail(params.row.id) }
},
'查看'
"查看"
),
h(
'op',
"op",
{
attrs: {
oprate: 'detail',
class: 'edit'
oprate: "detail",
class: "edit"
},
on: { click: () => this.edit(params.row.id) }
},
'编辑'
"编辑"
),
h(
'op',
"op",
{
attrs: {
oprate: 'delete',
class: 'remove'
oprate: "delete",
class: "remove"
},
on: { click: () => this.remove(params.row.id) }
},
'删除'
"删除"
)
])
]);
}
}
]
}
},
mounted() {
};
},
mounted() {},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
addOk() {
this.$refs.grid.load()
this.addModal = false
this.detailModal = false
this.editModal = false
this.setModal = false
this.curId = 0
this.$refs.grid.load();
this.addModal = false;
this.detailModal = false;
this.editModal = false;
this.setModal = false;
this.curId = 0;
},
search() {
this.$refs.grid.reload(this.easySearch)
this.$refs.grid.reload(this.easySearch);
},
detail(id) {
this.detailModal = true
this.curId = id
this.detailModal = true;
this.curId = id;
},
edit(id) {
this.editModal = true
this.curId = id
this.editModal = true;
this.curId = id;
},
set(id) {
this.setModal = true
this.curId = id
this.setModal = true;
this.curId = id;
},
remove(id) {
this.deletelModal = true
this.curId = id
this.deletelModal = true;
this.curId = id;
},
removeOk() {
Api.delete({ id: this.curId }).then((r) => {
Api.delete({ id: this.curId }).then(r => {
if (r.success) {
this.$refs.grid.load()
this.deletelModal = false
this.$Message.success('删除成功')
this.$refs.grid.load();
this.deletelModal = false;
this.$Message.success("删除成功");
}
})
});
},
removeCancel() {
this.deletelModal = false
this.deletelModal = false;
},
cancel() {
this.curId = 0
this.addModal = false
this.detailModal = false
this.editModal = false
this.deletedlModal = false
this.setModal = false
this.curId = 0;
this.addModal = false;
this.detailModal = false;
this.editModal = false;
this.deletedlModal = false;
this.setModal = false;
},
l(key) {
/*
......@@ -278,11 +282,11 @@ export default {
deleterUserId:'',
}
*/
let vkey = 'business_code_config' + '.' + key
return this.$t(vkey) || key
let vkey = "business_code_config" + "." + key;
return this.$t(vkey) || key;
}
}
}
};
</script>
<style lang="less">
</style>
\ No newline at end of file
pages/basicData/user/index.vue
View file @ b32e3427
......@@ -451,7 +451,7 @@ export default {
let parms = {
userId: this.curId,
accountId: this.selectRow.accountId,
tanantCode: this.$store.state.userInfo.tanantCode,
tanantCode: util.cookies.get('tanantCode'),
isDeleted: true
};
Api.authAccount(parms).then(res => {
......@@ -604,7 +604,8 @@ export default {
userId: this.selectRow.id,
loginName: this.selectRow.phone,
status: this.selectRow.status,
tanantCode: this.$store.state.userInfo.tanantCode
tanantCode:util.cookies.get('tanantCode'),
//tanantCode: this.$store.state.userInfo.tanantCode
};
if (this.selectRow.phone && this.selectRow.phone != "") {
Api.authAccount(parms).then(res => {
......
pages/crm/contract/detail.vue
View file @ b32e3427
......@@ -5,7 +5,7 @@
<Filed :span="12" :name="l('name')">{{entity.name}} </Filed>
<Filed :span="12" :name="l('userId')"><User :value="entity.userId" /></Filed>
<Filed :span="12" :name="l('proceeds')">{{entity.proceeds}}</Filed>
<Filed :span="12" :name="l('status')"><state code="crm.contract.status" :value="entity.status" type="text"></state></Filed>
<Filed :span="24" :name="l('status')"><state code="crm.contract.status" :value="entity.status" type="text"></state></Filed>
<Filed :span="24" :name="l('accessory')"><files ref="refFile" :parms="parms" unClosable style="display:inline" /></Filed>
<Filed :span="24" :name="l('notes')">{{entity.notes}}</Filed>
</Row>
......
pages/crm/project/detail.vue
View file @ b32e3427
......@@ -14,7 +14,7 @@
<Filed :span="12" :name="l('status')">
<state code="crm.project.status" :value="entity.status" />
</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>
</Row>
</div>
......
pages/crm/project/index.vue
View file @ b32e3427
......@@ -98,7 +98,7 @@
<Modal v-model="editModal" title="编辑" footer-hide>
<Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
</Modal>
<Modal v-model="detailModal" title="详情">
<Modal v-model="detailModal" title="详情" footer-hide>
<Detail :eid="curId" />
</Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
......
pages/crm/sales/add.vue
View file @ b32e3427
......@@ -79,9 +79,9 @@
</Form>
</template>
<script>
import Api from './api'
import Api from "./api";
export default {
name: 'Add',
name: "Add",
data() {
return {
disabled: false,
......@@ -94,15 +94,15 @@ export default {
stage: 1
},
rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }]
name: [{ required: true, message: "必填", trigger: "blur" }]
},
parms: {
app: 'Follow',
app: "Follow",
eid: null,
name: '',
field: ''
name: "",
field: ""
}
}
};
},
props: {
v: Object,
......@@ -113,67 +113,67 @@ export default {
}
},
mounted() {
this.parms.eid = this.$u.guid()
this.$refs.refFile.intFiles()
this.parms.eid = this.$u.guid();
this.$refs.refFile.intFiles();
},
methods: {
handleSubmit() {
this.$refs.form.validate((v) => {
this.$refs.form.validate(v => {
if (v) {
this.entity.accessory = ''
this.entity.accessory = "";
if (this.$refs.refFile.nameList.length > 0) {
let nameList = this.$refs.refFile.nameList
let names = []
nameList.forEach((e) => {
names.push(e.fileName)
})
let nameList = this.$refs.refFile.nameList;
let names = [];
nameList.forEach(e => {
names.push(e.fileName);
});
this.entity.accessory = JSON.stringify(names)
.replace('[', '')
.replace(']', '')
.replace(/\"/g, '') //附件本地库暂存文件名称
.replace("[", "")
.replace("]", "")
.replace(/\"/g, ""); //附件本地库暂存文件名称
}
this.disabled = true
this.disabled = true;
Api.create(this.entity)
.then((r) => {
this.disabled = false
.then(r => {
this.disabled = false;
if (r.success) {
this.$Message.success('保存成功')
this.$emit('on-ok')
this.$Message.success("保存成功");
this.$emit("on-ok");
} else {
this.$Message.error('保存失败')
this.$Message.error("保存失败");
}
this.$refs.refFile.intFiles()
})
.catch((err) => {
this.disabled = false
this.$Message.error('保存失败')
console.warn(err)
this.$refs.refFile.intFiles();
})
.catch(err => {
this.disabled = false;
this.$Message.error("保存失败");
console.warn(err);
});
}
})
});
},
handleClose() {
this.$emit('on-close')
this.$emit("on-close");
},
l(key) {
key = 'Follow' + '.' + key
return this.$t(key)
key = "Follow" + "." + key;
return this.$t(key);
}
},
watch: {
'addId.projectId'(v) {
"addId.projectId"(v) {
if (v > 0) {
this.entity.projectId = v
this.entity.projectId = v;
}
},
'addId.customerId'(v) {
"addId.customerId"(v) {
if (v > 0) {
this.entity.customerId = v
this.entity.customerId = v;
}
},
'addId.principal'(v) {
this.entity.principal = v
"addId.principal"(v) {
this.entity.principal = v;
}
}
}
};
</script>
\ No newline at end of file
pages/crm/sales/projectList.vue
View file @ b32e3427
......@@ -108,7 +108,7 @@
<Modal v-model="editModal" title="编辑" footer-hide>
<Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
</Modal>
<Modal v-model="detailModal" title="详情">
<Modal v-model="detailModal" title="详情" footer-hide>
<Detail :eid="curId" />
</Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
......@@ -290,6 +290,7 @@ export default {
},
watch: {
stage(v) {
this.isactive = null;
this.getList(v);
},
"easySearch.projectId.value"(v) {
......
pages/implement/components/entryMovie.vue
View file @ b32e3427
......@@ -212,9 +212,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
orderExecuteMovie: this.datafrom
})
}
)
.then((response) => {
if (response.success) {
......
pages/implement/components/entryPause.vue
View file @ b32e3427
......@@ -193,9 +193,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
orderExecutePausecause: this.cardModeldata
})
}
)
.then((response) => {
if (response.success) {
......
pages/implement/components/entryrecordMovie.vue
View file @ b32e3427
......@@ -185,9 +185,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
orderExecuteQualityMovie: this.datafrom
})
}
)
.then((response) => {
if (response.success) {
......
pages/implement/components/entryrecorddata.vue
View file @ b32e3427
......@@ -240,9 +240,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
OrderExecuteQualityData: this.datafrom
})
}
)
.then((response) => {
if (response.success) {
......
pages/implement/components/entryrecordfiles.vue
View file @ b32e3427
......@@ -202,9 +202,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
OrderExecuteQualityData: this.datafrom
})
}
)
.then((response) => {
if (response.success) {
......
pages/implement/components/processRecord.vue
View file @ b32e3427
......@@ -202,9 +202,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
orderExecuteFiles: this.cardModeldata
})
}
)
.then((response) => {
if (response.success) {
......
pages/implement/components/productReport.vue
View file @ b32e3427
......@@ -499,11 +499,11 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
dispatch_id: this.datasearch.entryID,
order_id: this.datasearch.order_id,
list: datalist
})
}
)
.then((response) => {
if (response.success) {
......
pages/implement/components/sendCheck.vue
View file @ b32e3427
......@@ -115,7 +115,7 @@ export default {
if (state) {
var url = `${PlanUrl}/ordercheckresult/sendcheck`
service
.post(`${url}`, JSON.stringify(this.user))
.post(`${url}`, this.user)
.then((response) => {
if (response.success) {
this.$Message.success('保存成功')
......
pages/implement/components/usercard.vue
View file @ b32e3427
......@@ -71,7 +71,7 @@ export default {
}
service
.post(`${systemUrl}/user/list`, JSON.stringify(params))
.post(`${systemUrl}/user/list`, params)
.then((response) => {
if (response.result.length > 0) {
this.user.user_name = response.result[0].userName
......@@ -139,10 +139,10 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
user: this.user,
card: this.recordList
})
}
)
.then((response) => {
if (response.success) {
......@@ -185,7 +185,7 @@ export default {
}
this.product_ID.push(fillModel.product_ID)
console.log(fillModel.board_ID);
this.board_ID.push(fillModel.board_ID)
if (
fillModel.fill_in_user_type == 1 ||
......@@ -238,9 +238,10 @@ export default {
},
getCurrentUser(e) {
if (e) {
let userInfo = this.$store.admin.user.info;
let userInfo = this.$store.state.userInfo;
console.log(userInfo);
this.user.cardno = userInfo.login_id
this.user.user_name = localStorage.getItem('userName')
this.user.user_name = userInfo.name
this.user.user_id = userInfo.userId
} else {
this.user.cardno = ''
......
pages/implement/index.vue
View file @ b32e3427
......@@ -541,11 +541,11 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
id: row.id,
orderid: this.data.orderIDs,
time: null
})
}
)
.then((response) => {
if (response.success) {
......@@ -566,11 +566,11 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
id: row.id,
orderid: this.data.orderIDs,
time: null
})
}
)
.then((response) => {
if (response.success) {
......
pages/order/monitoring/index.vue
View file @ b32e3427
......@@ -65,6 +65,12 @@ export default {
curId: 0,
columns: [
{ key: "id", title: this.l("id"), hide: true, align: "left" },
{
title: "序号",
type: "index",
width: 40,
align: "center"
},
{
key: "status",
title: this.l("status"),
......@@ -329,14 +335,12 @@ export default {
{
key: "remark",
title: this.l("remark"),
align: "left",
easy: true,
high: true
align: "center"
},
{
title: "暂停记录",
key: "id",
width: 140,
key: "zanting",
width: 100,
align: "center",
render: (h, params) => {
return h("div", { class: "action" }, [
......@@ -353,7 +357,7 @@ export default {
},
{
title: "操作",
key: "id",
key: "caozuo",
width: 100,
align: "center",
render: (h, params) => {
......@@ -385,7 +389,7 @@ export default {
params.row.status == 6 ? "Button" : "", //订单状态执行中，暂停
{
props: {
type: "default",
type: "success",
size: "small",
icon: "ios-pause",
ghost: true
......
pages/order/monitoring/record.vue
View file @ b32e3427
......@@ -7,10 +7,10 @@
</div>
</template>
<script>
import Api from './api'
import Detail from './detail'
import Api from "./api";
import Detail from "./detail";
export default {
name: 'record',
name: "record",
components: {
Detail
},
......@@ -19,24 +19,30 @@ export default {
detailModal: false,
action: Api.record,
condition: {
orderId: { op: 'Equal', value: this.eid },
keys: { op: 'pauseCause,', value: null }
orderId: { op: "Equal", value: this.eid },
keys: { op: "pauseCause,", value: null }
},
data: [],
curId: 0,
columns: [
{ key: 'id', title: this.l('id'), hide: true, align: 'left' },
{ key: "id", title: this.l("id"), hide: true, align: "left" },
{
key: 'mesCode',
title: this.l('mesCode'),
align: 'left',
title: "序号",
type: "index",
width: 60,
align: "center"
},
{
key: "mesCode",
title: this.l("mesCode"),
align: "left",
render: (h, params) =>
h(
'a',
"a",
{
attrs: {
oprate: 'detail'
oprate: "detail"
},
on: { click: () => this.detail(params.row.id) }
},
......@@ -44,9 +50,9 @@ export default {
)
},
{
key: 'productName',
title: this.l('productName'),
align: 'left'
key: "productName",
title: this.l("productName"),
align: "left"
},
// {
// key: 'orderId',
......@@ -55,92 +61,86 @@ export default {
// hide: false
// },
{
key: 'pauseCause',
title: this.l('pauseCause'),
align: 'left',
code: 'mes_xingchi_plan.order_material.pauseCause'
key: "pauseCause",
title: this.l("pauseCause"),
align: "left",
code: "mes_xingchi_plan.order_material.pauseCause"
},
{
key: 'creationTime',
title: this.l('creationTime'),
key: "creationTime",
title: this.l("creationTime"),
easy: true,
high: true,
align: 'left'
align: "left"
},
{
key: 'creator',
title: this.l('creator'),
key: "creator",
title: this.l("creator"),
easy: true,
high: true,
align: 'left'
align: "left"
},
{
key: 'laster',
title: this.l('laster'),
key: "laster",
title: this.l("laster"),
easy: true,
high: true,
align: 'left'
align: "left"
},
{
key: 'lastModificationTime',
title: this.l('lastModificationTime'),
key: "lastModificationTime",
title: this.l("lastModificationTime"),
easy: true,
high: true,
align: 'left',
align: "left",
render: (h, params) => {
return h(
'span',
params.row.lastModificationTime == '0001-01-01 00:00:00'
? ''
"span",
params.row.lastModificationTime == "0001-01-01 00:00:00"
? ""
: params.row.lastModificationTime
)
);
}
},
// {
// key: 'path',
// title: this.l('path'),
// easy: true,
// high: true,
// align: 'left'
// },
{
key: 'relatedPerson',
type: 'user',
title: this.l('relatedPerson'),
align: 'left',
key: "relatedPerson",
type: "user",
title: this.l("relatedPerson"),
align: "left",
high: true
}
]
}
};
},
props: {
eid: Number
},
created() {},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
search() {
this.$refs.grid.reload(this.easySearch)
this.$refs.grid.reload(this.easySearch);
},
l(key) {
let vkey = 'order_pause' + '.' + key
return this.$t(vkey) || key
let vkey = "order_pause" + "." + key;
return this.$t(vkey) || key;
},
detail(id) {
this.detailModal = true
this.curId = id
this.detailModal = true;
this.curId = id;
}
},
watch: {
eid(v) {
this.condition.orderId.value = v
this.$refs.grid.reload(this.condition)
this.condition.orderId.value = v;
this.$refs.grid.reload(this.condition);
}
}
}
};
</script>
<style lang='less'>
</style>
\ No newline at end of file
pages/order/monitoring/speed.vue
View file @ b32e3427
......@@ -4,125 +4,125 @@
</div>
</template>
<script>
import Api from './api'
import Api from "./api";
export default {
name: '',
name: "",
data() {
return {
columns: [
{
key: 'detailId',
title: this.l('detailId'),
align: 'left'
key: "detailId",
title: this.l("detailId"),
align: "center"
},
{
key: 'taskSeq',
title: this.l('taskSeq'),
align: 'left'
key: "taskSeq",
title: this.l("taskSeq"),
align: "center"
},
{
key: 'detailName',
title: this.l('detailName'),
align: 'left'
key: "detailName",
title: this.l("detailName"),
align: "left"
},
{
key: 'routingCode',
title: this.l('routingCode'),
align: 'left'
key: "routingCode",
title: this.l("routingCode"),
align: "center"
},
{
key: 'userNames',
title: this.l('userNames'),
key: "userNames",
title: this.l("userNames"),
align: 'left'
align: "center"
},
{
key: 'demandStartDate',
title: this.l('demandStartDate'),
align: 'center',
key: "demandStartDate",
title: this.l("demandStartDate"),
align: "center",
render: (h, params) => {
return h(
'span',
this.sliceStr(params.row.demandStartDate + ' ', 0, 10),
"span",
this.sliceStr(params.row.demandStartDate + " ", 0, 10),
params.row.demandStartDate
)
);
}
},
{
key: 'demandFinishDate',
title: this.l('demandFinishDate'),
align: 'center',
key: "demandFinishDate",
title: this.l("demandFinishDate"),
align: "center",
render: (h, params) => {
return h(
'span',
this.sliceStr(params.row.demandFinishDate + ' ', 0, 10),
"span",
this.sliceStr(params.row.demandFinishDate + " ", 0, 10),
params.row.demandFinishDate
)
);
}
},
{
key: 'actualStartDate',
title: this.l('actualStartDate'),
align: 'center',
key: "actualStartDate",
title: this.l("actualStartDate"),
align: "center",
render: (h, params) => {
return h(
'span',
"span",
// this.sliceStr(params.row.actualStartDate + ' ', 0, 10),
params.row.actualStartDate == '0001-01-01 00:00:00'
? ''
params.row.actualStartDate == "0001-01-01 00:00:00"
? ""
: params.row.actualStartDate
)
);
}
},
{
key: 'actualFinishDate',
title: this.l('actualFinishDate'),
align: 'center',
key: "actualFinishDate",
title: this.l("actualFinishDate"),
align: "center",
render: (h, params) => {
return h(
'span',
"span",
// this.sliceStr(params.row.actualFinishDate + ' ', 0, 10),
params.row.actualFinishDate == '0001-01-01 00:00:00'
? ''
params.row.actualFinishDate == "0001-01-01 00:00:00"
? ""
: params.row.actualFinishDate
)
);
}
},
{
key: 'status',
type: 'user',
title: this.l('status'),
code: 'plan.order.status',
align: 'left'
key: "status",
type: "user",
title: this.l("status"),
code: "plan.order.status",
align: "center"
}
]
}
};
},
props: {
result: Array
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
await store.dispatch("loadDictionary"); // 加载数据字典
},
created() {},
methods: {
//截取字符串
sliceStr(str, lenS, lenE) {
return str.slice(lenS, lenE)
return str.slice(lenS, lenE);
},
l(key) {
let vkey = 'mes_order_watch' + '.' + key
return this.$t(vkey) || key
let vkey = "mes_order_watch" + "." + key;
return this.$t(vkey) || key;
}
}
}
};
</script>
<style lang='less'>
</style>
\ No newline at end of file
pages/order/quotation/components/quotationBox.vue
View file @ b32e3427
......@@ -402,7 +402,7 @@ th.conciseContent .ivu-table-cell {
padding: 0px !important;
}
.ivu-table-cell {
padding: 0px !important;
/* padding: 0px !important; */
}
</style>>
pages/order/quotation/index.vue
View file @ b32e3427
......@@ -458,7 +458,7 @@ export default {
this.recordColumn = [
{
type: "index",
width: 60,
width: 65,
title: "序号",
align: "center"
},
......
pages/processDesign/productTree/index.vue
View file @ b32e3427
This diff is collapsed.
pages/processManage/Process/detailfiles.vue
View file @ b32e3427
......@@ -103,9 +103,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
routingFile: dataValidate
})
}
)
.then((response) => {
if (response.success) {
......
pages/processManage/Process/index.vue
View file @ b32e3427
......@@ -226,7 +226,7 @@ export default {
doUpload: '/api/up/file',
tableHeight: '',
myloading: true,
gymodaltitle: '创建主工艺',
gymodaltitle: '创建工艺',
processviewModal: false,
isview: false,
issendAudit: false,
......@@ -672,10 +672,10 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
routingHeaderEntity: a.formValidate,
FileList: filelist
})
}
)
.then((response) => {
if (response.success) {
......
pages/processManage/Process/processNew.vue
View file @ b32e3427
......@@ -544,9 +544,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
routingDetail: this.formprocessValidate
})
}
)
.then((response) => {
if (response.success) {
......
pages/processManage/Process/stepModel.vue
View file @ b32e3427
......@@ -171,9 +171,9 @@ let isvalidate = false;
service
.post(
`${url}`,
JSON.stringify({
{
routingStep: this.newModeldata
})
}
)
.then((response) => {
if (response.success) {
......
pages/processManage/Process/supporting.vue
View file @ b32e3427
......@@ -304,7 +304,7 @@ export default {
var url = `${designUrl}/routingsupporting/createorupdate`
service
.post(`${url}`, JSON.stringify(this.formprocessValidate))
.post(`${url}`, this.formprocessValidate)
.then((response) => {
if (response.success) {
this.$Message.success('保存成功')
......
pages/processManage/Process/testingModel.vue
View file @ b32e3427
......@@ -353,9 +353,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
routingQcCard: this.cardModeldata
})
}
)
.then((response) => {
if (response.success) {
......
pages/processManage/setProcess/index.vue
View file @ b32e3427
......@@ -389,7 +389,7 @@ export default {
list: [],
data2: [],
tabstatus: '1', //暂存tab状态（）主工艺||专业工艺
gymodaltitle: '创建主工艺',
gymodaltitle: '创建工艺',
selectdata: [],
value1: false,
drawerShow: false,
......@@ -557,7 +557,7 @@ export default {
content = gh[0].name
editColor = gh[0].color
}
if (this.tabstatus == '1') {
return h('div', [
h(
'span',
......@@ -601,24 +601,7 @@ export default {
content
)
])
} else {
return h('div', [
h(
'span',
{
props: {
type: 'text',
ghost: true
},
style: {
color: editColor,
cursor: 'pointer'
}
},
content
)
])
}
}
},
......@@ -1076,9 +1059,7 @@ export default {
saveHeader(next) {
var a = this.$refs.processMain
if (a.formValidate.routingType == 1) {
this.savebill()
}
var filelist = a.getfile()
let isvalidate = false
......@@ -1107,10 +1088,10 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
routingHeaderEntity: a.formValidate,
FileList: filelist
})
}
)
.then((response) => {
if (response.success) {
......@@ -1209,9 +1190,7 @@ export default {
this.$refs.processNew.formprocessValidate.routing_header_id = this.headerid
this.$refs.processNew.loaddata()
} else {
if (this.addpdefm.formValidate.routingType == 1) {
this.savebill()
}
var a = this.addpdefm
this.headerid = this.addpdefm.formValidate.id
......@@ -1231,9 +1210,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
orderRouting: orderRoutingobj
})
}
)
.then((response) => {
if (response.success) {
......@@ -1296,15 +1275,12 @@ export default {
modalShowCancel() {
this.modalShow = false
},
savebill() {
this.$refs.modelTable.$refs.quotationBox2.saveData()
this.$refs.modelTable.$refs.quotationBox3.saveData()
},
saveOK() {
var url = `${PlanUrl}/OrderMaterial/createorupdate`
// JSON.stringify({Process:this.formValidate})
service
.post(`${url}`, JSON.stringify({ orderMaterial: this.formValidate }))
.post(`${url}`, { orderMaterial: this.formValidate })
.then((response) => {
if (response.success) {
this.$Message.success('保存成功')
......@@ -1334,7 +1310,7 @@ export default {
let ordercombid = 0
this.createtype = 1
if (routingType == 1) {
this.gymodaltitle = '设置主工艺规程'
this.gymodaltitle = '设置工艺规程'
for (let i = 0; i < this.data1.length; i++) {
let obj1 = this.data1[i]
......@@ -1346,24 +1322,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 {
this.$refs.modelTable.issetProcess1 = false
this.gymodaltitle = '设置专业工艺规程'
ordercombid = params.row.specialtyOrderCombID
if (ordercombid != 0) {
this.$refs.modelTable.issetProcess1 = false
this.addpdefm.formValidate.ordercombid = ordercombid
for (let i = 0; i < this.data1.length; i++) {
let obj = this.data1[i]
......@@ -1431,12 +1397,11 @@ export default {
this.addpdefm.setshow()
},
editProcessRow(params, RoutingID, routingType) {
let ordercombid = 0
if (routingType == 1) {
ordercombid = params.row.orderCombID
} else {
ordercombid = params.row.specialtyOrderCombID
}
this.editProcess(ordercombid, RoutingID, routingType, null)
},
editProcess(ordercombid, RoutingID, routingType, orders) {
......@@ -1450,16 +1415,9 @@ export default {
let orderids = 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
this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
} else {
// ordercombid = params.row.specialtyOrderCombID
this.$refs.modelTable.issetProcess1 = false
}
this.addpdefm.formValidate.ordercombid = ordercombid
if (orders == null) {
for (let i = 0; i < this.data1.length; i++) {
......@@ -1492,15 +1450,7 @@ export default {
}
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'
}
if (routingType == 1) {
this.gymodaltitle = '设置工艺规程'
} else {
......@@ -1539,13 +1489,9 @@ export default {
let orderids = new Array()
let orderlist = new Array()
let ordercombid = 0
if (routingType == 1) {
ordercombid = params.row.orderCombID
this.$refs.modelTable.issetProcess1 = true
} else {
ordercombid = params.row.specialtyOrderCombID
this.$refs.modelTable.issetProcess1 = false
}
this.addpdefm.formValidate.ordercombid = ordercombid
for (let i = 0; i < this.data1.length; i++) {
let obj = this.data1[i]
......@@ -1568,22 +1514,10 @@ export default {
}
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 = '查看工艺规程'
}
var url = `${designUrl}/routingheader/getbyid?id=` + RoutingID
service.get(`${url}`).then((response) => {
this.addpdefm.formValidate = response.result
......@@ -1613,9 +1547,7 @@ export default {
this.addpdefm.formValidate = this.headerInfo
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.ProductCode = this.headerInfo.productCode
......
pages/processManage/setProcess/processMain.vue
View file @ b32e3427
......@@ -445,36 +445,7 @@ export default {
this.$refs.refFile.routing_header_id = 0;
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() {
this.$refs.generateQuotation.modalShow = true;
},
......@@ -558,9 +529,10 @@ export default {
});
},
setparentcreatetype(type, headerid) {
this.$parent.$parent.createtype = type
this.$parent.$parent.headerid = headerid
this.$parent.$parent.$parent.createtype = type;
this.$parent.$parent.$parent.headerid = headerid;
},
......@@ -575,11 +547,9 @@ export default {
});
},
setshow() {
if (this.formValidate.routingType == 2) {
this.isshow = true;
} else {
this.isshow = false;
}
if (this.formValidate.id != 0) {
this.isedit = true;
......@@ -590,14 +560,11 @@ export default {
this.Loadfile(0);
}
if (this.Mianids != "") {
this.LoadprocessList();
}
this.createtype = "1";
this.selectpdefmid = 0;
this.RoutingList = [];
this.calcplatesnum();
// this.calcplatesnum();
}
}
};
......
pages/produce/components/expend.vue
View file @ b32e3427
......@@ -145,7 +145,7 @@ export default {
<style lang='less' scoped>
.material_row{
.material_label{
color: #249E91
color: #2d8cf0
}
.material_line {
display: inline-block;
......
pages/produce/ordermaterial.vue
View file @ b32e3427
......@@ -360,8 +360,7 @@ export default {
},
// 分页查询数据列表
laoedPage() {
let params = this.orderSearchForm
let params = this.orderSearchForm
params.SkipCount = params.SkipCount || 0
params.MaxResultCount = params.MaxResultCount || 10
......
pages/qc/taskList/index.vue
View file @ b32e3427
......@@ -8,7 +8,7 @@
v-model="searchIterms" placeholder="请输入查询条件"
@on-search="tableSearch" ></Input>
</div>
<Button type="primary" class="title_btn" @click='searchModel'>高级查询</Button>
<Button type="primary" class="title_btn" v-show="false" @click='searchModel'>高级查询</Button>
</div>
<div class="table">
<Table
......@@ -319,6 +319,24 @@ export default {
},
// 搜索
tableSearch() {
console.warn("查询数据")
let val = this.searchIterms;
console.log(val)
let parmes = {
"status": 0,
"simpleSearch": val,
"skipCount":0,
"maxResultCount": 10
}
this.searchlaode(parmes)
},
searchlaode(parmes){
let url = `${PlanUrl}/ordercheck/waitexecuteorderlist`;
service.post(`${url}`,parmes).then(res => {
console.warn(res)
this.mDatas = res.result.items
this.search.total = res.result.totalCount
});
},
searchModel(){
this.showModel = true;
......@@ -398,7 +416,7 @@ export default {
<style scoped>
.table_title{
width: 320px;
float: left;
/* float: left; */
}
.table{
margin: 10px 0 0 0;
......
pages/qcimplement/components/backCheck.vue
View file @ b32e3427
......@@ -92,7 +92,7 @@ export default {
if (state) {
var url = `${PlanUrl}/ordercheckresult/savecheckresult`
service
.post(`${url}`, JSON.stringify(this.mod))
.post(`${url}`, this.mod)
.then((response) => {
if (response.success) {
this.$Message.success('操作成功')
......
pages/qcimplement/index.vue
View file @ b32e3427
......@@ -30,7 +30,7 @@
</div>
<div class="transmit_content">
<div class="wuliao_left">
<div class="card_title" style="height:32px">
<div class="card_title" style="height:46px">
<a href="#" class="state" @click="showList">
状态：
<Icon type="ios-arrow-down" v-if="iconModel" />
......@@ -388,11 +388,11 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
id: row.id,
orderid: this.data.orderIDs,
time: null
})
}
)
.then((response) => {
if (response.success) {
......@@ -413,11 +413,11 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
id: row.id,
orderid: this.data.orderIDs,
time: null
})
}
)
.then((response) => {
if (response.success) {
......
static/config.js
View file @ b32e3427
......@@ -30,7 +30,7 @@ const systemApi = {
let hostAddress = "localhost"; //192.168.0.159
let filePath = '39.100.148.168'; //文件上传ip
let filePathDown = '39.100.148.168'; //文件上传ip
let apsUrl = '47.92.102.113'
let apsAdress = '47.92.102.113'
let address = systemApi.cloudServer;
//占位符自动替换：
window.systemUrl = `http://${address}:10020/api/services/app`; //System-api 系统管理（基础数据）
......@@ -47,13 +47,14 @@ const systemApi = {
window.certificateUrl = `http://${address}:10090/api/services/app`; //Process-api
window.crmUrl = `http://${address}:10100/api/services/app`; //crm客户、合同、项目管理
window.iconImg = `http://${hostAddress}:3000/imgicon/`; //待办任务图标路径
window.aps = `http://${apsUrl}:10110/api/services/app`;//aps手工排产
window.apsManualUrl = `http://${apsAdress}:10091/api/services/app`;//aps手工排产
window.apsUrl = `http://${apsAdress}:10110/api/services/app`;//aps排产
//oidc配置：
window.authConfig = {
authority: `http://${address}:10010`,
client_id: 'js',
redirect_uri: `http://${hostAddress}:3006/callback`,
response_type: 'code',
scope: 'openid profile system process plan resource qms bug workflow crm',
scope: 'openid profile system process plan resource qms bug workflow crm aps',
post_logout_redirect_uri: `http://${hostAddress}:3006/`
};
\ No newline at end of file
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