Skip to content

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

项目升级成功

parent d956cdf5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 10882 additions and 998 deletions
pages/aps/aps/components/excute.vue
View file @ b6d3f0bc
......@@ -58,7 +58,7 @@ export default {
curId: 0,
columns: [
{ key: 'id', title: this.l('id'), hide: true, align: 'left' },
{ title: ' ', width: 110 },
{ title: ' ', width: 130 },
{
key: 'insert_flag',
title: this.l('insert_flag'),
......@@ -298,30 +298,34 @@ export default {
align: 'center',
render: (h, params) => {
return h('div', { class: 'action' }, [
h(
'op',
{
attrs: { oprate: 'detail' },
on: { click: () => this.openParms(params.row.id) }
h('op', {
attrs: {
icon: 'md-options',
type: 'icon',
title: '工序参数设置'
},
'参数'
),
h(
'op',
{
attrs: { oprate: 'edit' },
on: { click: () => this.edit(params.row.id) }
on: { click: () => this.openParms(params.row.id) }
}),
h('op', {
attrs: {
icon: 'ios-create',
type: 'icon',
title: '編輯工序',
oprate: 'edit',
msg: '确认要移出排产吗？'
},
'编辑'
),
h(
'op',
{
attrs: { oprate: 'remove' },
on: { click: () => this.remove(params.row.id, params.index) }
on: { click: () => this.edit(params.row.id) }
}),
h('op', {
attrs: {
icon: 'ios-trash',
type: 'icon',
title: '删除工序',
oprate: 'delete',
msg: '确认要刪除工序吗？'
},
'删除'
)
on: { click: () => this.remove(params.row.id, params.index) }
})
])
}
}
......
pages/aps/aps/index.vue
View file @ b6d3f0bc
......@@ -59,7 +59,7 @@ export default {
editModal: false,
detailModal: false,
deletelModal: false,
apsModal:false,
apsModal: false,
list: [
{
id: 1,
......@@ -124,7 +124,7 @@ export default {
},
{
type: 'expand',
width: 30,
width: 50,
render: (h, params) => {
return h(Expand, {
props: {
......@@ -236,39 +236,34 @@ export default {
// fixed:"right",
render: (h, params) => {
return h('div', { class: 'action' }, [
h(
'op',
{
attrs: { title: '计划参数设置', oprate: 'detail' },
on: { click: () => this.openParms(params.row.id) }
h('op', {
attrs: {
icon: 'md-options',
type: 'icon',
title: '工序参数设置'
},
'参数'
),
h(
'op',
{
attrs: {
title: '移出排产池',
oprate: 'delete',
msg: '确认要移出排产吗？'
},
on: { click: () => this.remove(params.row.id) }
on: { click: () => this.openParms(params.row.id) }
}),
h('op', {
attrs: {
icon: 'md-return-left',
type: 'icon',
title: '移出排产池',
oprate: 'delete',
msg: '确认要移出排产吗？'
},
'移出'
),
h(
'op',
{
attrs: {
title: '恢复工序',
oprate: 'delete',
msg: '确认要恢复工序吗？'
},
on: { click: () => this.remove(params.row.id) }
on: { click: () => this.remove(params.row.id) }
}),
h('op', {
attrs: {
icon: 'md-refresh',
type: 'icon',
title: '恢复工序',
oprate: 'delete',
msg: '确认要恢复工序吗？'
},
'恢复'
)
on: { click: () => this.remove(params.row.id) }
})
])
}
}
......@@ -324,7 +319,7 @@ export default {
this.detailModal = false
this.editModal = false
this.deletedlModal = false
this.apsModal=false
this.apsModal = false
},
onDragDrop(a, b) {
this.list.splice(b, 1, ...this.list.splice(a, 1, this.list[b]))
......
pages/aps/dispatch/dispatch.less
View file @ b6d3f0bc
......@@ -5,7 +5,7 @@
background: #4c5968;
opacity: 0.9;
position: absolute;
bottom: -9px;
bottom: 0;
box-shadow: 0px -5px 6px rgba(0,0,0,0.3);
width: 98%;
z-index: 99;
......@@ -22,7 +22,9 @@
padding: 0 0 0 12px;
background: #F5F6FA;
.check{
margin: 0 0 0 71%;
position: absolute;
top: 0;
right: 24px;
}
}
.dispatch_part_body{
......@@ -31,6 +33,11 @@
.dispatch_card{
margin: 10px 0;
.card{
.card_top{
.label{
cursor: pointer;
}
}
.ivu-card-head{
background: #62b8af!important;
}
......@@ -38,6 +45,11 @@
.g_title{
color: #249e91;
}
}
.dispatch_card02{
margin: 10px 0;
padding-left: 0!important;
padding-right: 0!important;
.man_body{
max-width: 187px;
label{
......@@ -66,6 +78,7 @@
}
}
}
}
}
}
......
pages/aps/dispatch/index.vue
View file @ b6d3f0bc
This diff is collapsed.
pages/aps/plan/dispatch.vue
View file @ b6d3f0bc
......@@ -10,7 +10,7 @@
<FormItem label="完成时间" style="width:100%" prop="MainRoutingFinishDate">
<DatePicker
v-model="entity.MainRoutingFinishDate"
type="date"
type="datetime"
placeholder="请选择日期"
style="width:240px"
@on-change="getTimeMainRFD"
......@@ -70,6 +70,7 @@ export default {
} else {
this.$Message.error('工艺派发失败')
}
this.$emit('on-ok')
})
.catch((err) => {
this.$Message.error('工艺派发失败')
......
pages/aps/results/api.js
View file @ b6d3f0bc
import Api from '@/plugins/request'
export default {
// getmesorder(params) {
// return Api.get(`http://47.92.102.113:10091/api/services/app/aps/getmesorder`, params); //待排产订单数据
// },
// gettaskseqinfo(params) {
// return Api.get(`http://47.92.102.113:10091/api/services/app/aps/gettaskseqinfo`, params); //根据订单获取全部工序数据
// },
// getlist(params) {
// return Api.get(`http://47.92.102.113:10091/api/services/app/mes_sys_shop_info/getlist`, params); //手工排产:查询所在车间下的所有班组信息
// },
// getbyshopid(params) {
// return Api.get(`http://47.92.102.113:10091//api/services/app/mes_sys_user_info/getuserbyshopid`, params); //手工排产:根据班组ID,加载人员信息
// },
// getlistEquip(params) {
// return Api.get(`http://47.92.102.113:10091/api/services/app/mes_equip_info/getlist`, params); //手工排产：获取所在车间的设备
// },
// getbyequippk(params) {
// return Api.get(`http://47.92.102.113:10091/api/services/app/mes_sys_user_info/getuserbyequippk`, params); //手工排产:根据设备ID,加载人员信息
// },
}
\ No newline at end of file
// index: `${apsResult}/scheduletotal/getall`,
paged(params) {
return Api.get(`${apsResult}/scheduletotal/getall`, params);
},
getall(params) {
return Api.get(`${apsResult}/schema/getall`, params);
},
clearall(params) {
return Api.post(`${apsResult}/schema/clearall`, params);
},
getdetail(params) {
return Api.get(`${apsResult}/scheduletotal/getdetail`, params);
},
}
pages/aps/results/index.vue
View file @ b6d3f0bc
......@@ -13,14 +13,12 @@
class="left-body"
v-for="(li,index) in list"
:key="index"
@click="listData(index)"
@click="listData(li.schedule_Id,index)"
:class="isactive == index ? 'addclass' : '' "
>
<div class="title-t">
<span class="fang">{{li.sCHEDULEID}}</span>
<time>{{li.time}}</time>
</div>
<div class="gong-shi">
<div class="title-t">排产方案：{{li.schedule_Id}}</div>
<div class="fa">排产时间：{{li.plan_Date}}</div>
<div class="fa">
<span>{{li.iNSERTFLAG}} /</span>
<span>参数级别：{{li.routing_schema}} /</span>
<span>参数应用：{{li.routing_version}}</span>
......@@ -31,107 +29,159 @@
<h4>排产结果</h4>
<div class="btn">
<Button type="primary" @click="parameter">下发</Button>
<Button type="primary">导出</Button>
<!-- <Button type="primary">导出</Button> -->
<Button type="primary" icon="ios-redo" @click="comeBlck">返回</Button>
</div>
<div>
<DataGrid
:columns="columns"
ref="grid"
:action="action"
:tool="false"
:conditions="easySearch"
:page="false"
></DataGrid>
<Table :columns="columns" :data="data"></Table>
</div>
</Content>
</Layout>
<Modal v-model="addModal" title="工序参数调整" footer-hide :mask-closable="false" width="1000px">
<Parameter @on-close="cancel" @on-ok="addOk" ref="addParaneter" />
</Modal>
</div>
</template>
<script>
import Api from './api'
import expandRow from './table-expand.vue'
import Parameter from './parameter.vue'
export default {
components: { expandRow, Parameter },
components: { expandRow },
data() {
return {
isactive: 0,
action: '',
addModal: false,
list: [
data: [],
list: [],
columns: [
{
sCHEDULEID: '排产方案编号',
iNSERTFLAG: '插单标记',
order_id: 'hh',
routing_version: '工序',
routing_schema: '5',
time: '2019-12-23 09:54:33'
type: 'expand',
width: 50,
render: (h, params) => {
return h(expandRow, {
props: {
row: params.row
}
})
}
},
{
sCHEDULEID: '排产方案编号',
order_id: 'hh',
routing_version: '工序',
routing_schema: '5',
time: '2019-12-23 09:54:33'
}
],
columns: [
{ key: 'id', title: this.l('id'), hide: true, align: 'left' },
title: '超期预警',
key: 'id',
align: 'center',
render: (h, params) => {
return h('div', [
h('Icon', {
props: {
type:
params.row.id == 1
? 'ios-information-circle-outline'
: 'ios-remove-circle-outline'
},
style: {
marginRight: '5px',
fontSize: '18px',
fontWeight: 'bold',
color: params.row.id == 1 ? '#FE7777' : '#0DD78D'
}
})
])
}
},
{
title: '零件图号',
key: 'part_id',
align: 'center'
},
{
title: '零件名称',
key: 'part_name',
align: 'center'
},
{
key: 'mesCode',
title: this.l('mesCode'),
align: 'left',
easy: true,
high: true
title: '计划开始时间',
key: 'plan_start',
width: 220,
align: 'center'
},
{
key: 'productName',
title: this.l('productName'),
align: 'left',
easy: true,
high: true
title: '计划结束时间',
key: 'plan_start',
width: 220,
align: 'center'
},
{
key: 'drawnNumber',
title: this.l('drawnNumber'),
align: 'left',
easy: true,
high: true
title: '投料时间',
key: 'demand_start',
width: 220,
align: 'center'
},
{
key: 'quantity',
title: this.l('quantity'),
align: 'left',
easy: true,
high: true
title: '节点时间',
key: 'demand_finish',
width: 220,
align: 'center'
},
{
title: '计划数量',
key: 'plan_qty',
align: 'center'
}
],
easySearch: {
keys: { op: 'mesCode', value: null, default: true },
type: { op: 'Equal', value: 1 }
}
]
}
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
created() {
this.orderlist()
},
methods: {
listData(index) {
this.isactive = index
orderlist() {
Api.getall()
.then((r) => {
if (r.success) {
this.list = r.result
if (r.result) {
this.listData(r.result[0].schedule_Id, 0)
} else {
this.listData(0, null)
}
}
})
.catch((error) => {
this.$$Message.error('请求失败')
})
},
clear() {},
l(key) {
let vkey = 'waitOpened' + '.' + key
return this.$t(vkey) || key
listData(id, index) {
this.isactive = index
Api.paged({ scheduleId: id })
.then((r) => {
if (r.success) {
this.data = r.result
}
})
.catch((error) => {
this.$$Message.error('请求失败')
})
},
parameter() {
this.addModal = true
clear() {
this.$Modal.confirm({
title: '清空列表',
content: '您确定要清空列表吗',
onOk: () => {
Api.clearall().then((r) => {
if (r.success) {
this.$Message.success('清空列表成功')
this.orderlist()
}
})
},
onCancel: () => {
this.$Message.info('已取消')
}
})
},
parameter() {},
addOk() {},
cancel() {},
comeBlck() {
......@@ -172,21 +222,17 @@ export default {
margin: 10px 15px 0 0;
border: 1px solid rgba(228, 230, 237, 1);
border-radius: 4px;
padding: 5px 8px;
.title-t {
padding: 8px 8px 2px 8px;
.fang {
color: #2680eb;
font-size: 15px;
font-weight: bold;
}
time {
margin-left: 20px;
}
height: 30px;
line-height: 30px;
color: #2680eb;
font-size: 15px;
font-weight: bold;
}
.gong-shi {
padding: 8px;
color: #515a6e;
.fa {
height: 30px;
line-height: 30px;
}
}
.ivu-layout-content {
......
pages/aps/results/table-expand.vue
View file @ b6d3f0bc
<template>
<div>
<div class="result-aps">
<Row class="expand-row">
<Col span="3">
<Col span="4">
<span class="expand-key">工序序号</span>
</Col>
<Col span="3">
......@@ -19,44 +19,73 @@
<Col span="4">
<span class="expand-key">计划结束时间</span>
</Col>
<Col span="4">
<Col span="3">
<span class="expand-key">设备编号</span>
</Col>
</Row>
<Row>
<Col span="3">
<span class="expand-value">{{ row.book }}</span>
<Row v-for="(item,index) in dataList" :key="item.id">
<Col span="4">
<span class="expand-value">{{ item.op_task_pk }}</span>
</Col>
<Col span="3">
<span class="expand-value">{{ row.movie }}</span>
<span class="expand-value">{{ item.task_name }}</span>
</Col>
<Col span="3">
<span class="expand-value">{{ row.book }}</span>
<span class="expand-value">{{ item.put_into_qty }}</span>
</Col>
<Col span="3">
<span class="expand-value">{{ row.movie }}</span>
<span class="expand-value">{{ item.dispatch_qty }}</span>
</Col>
<Col span="4">
<span class="expand-value">{{ row.music }}</span>
<span class="expand-value">{{ item.plan_start }}</span>
</Col>
<Col span="4">
<span class="expand-value">{{ row.music }}</span>
<span class="expand-value">{{ item.plan_finish }}</span>
</Col>
<Col span="4">
<span class="expand-value">{{ row.music }}</span>
<Col span="3">
<span class="expand-value">{{ row.equip_id }}</span>
</Col>
</Row>
</div>
</template>
<script>
import Api from './api'
export default {
props: {
row: Object
},
data() {
return {
dataList: []
}
},
mounted() {
this.getList(this.row)
},
methods: {
getList(row) {
Api.getdetail({
part_task_pk: row.id,
scheduleId: row.schedule_id
}).then((r) => {
if (r.success) {
this.dataList = r.result
}
})
}
}
}
</script>
<style scoped>
.expand-row {
margin-bottom: 16px;
<style lang='less'>
.result-aps {
.expand-row {
text-align: center;
}
// .ivu-row {
// font-weight: bold !important;
// }
}
td.ivu-table-expanded-cell {
padding: 0 !important;
}
</style>
\ No newline at end of file
pages/basicData/dataDictionary/index.vue
View file @ b6d3f0bc
......@@ -34,7 +34,7 @@
import tb from '../roleManagent/components/tb'
import addDictionary from './components/add'
import myconfirm from '../../processDesign/productTree/components/myconfirm'
import service from '../../../plugins/request'
import service from '@/plugins/request'
export default {
components:{tb,addDictionary,myconfirm},
data(){
......@@ -154,8 +154,8 @@ export default {
created(){
var url=`${systemUrl}/DictionaryType/GetPaged`
service.get(`${url}`).then(response=>{
//console.log(response.result.items)
this.selectdata=response.result.items
//console.log(response.data.result.items)
this.selectdata=response.data.result.items
this.model1=this.selectdata[0].value
this.loaddata(this.model1)
});
......@@ -177,7 +177,7 @@ export default {
loaddata(id){
var url=`${systemUrl}/Dictionary/GetPaged`
service.get(`${url}`,{params:{TypeId:id}}).then(response=>{
this.tbPro.data=response.result.items
this.tbPro.data=response.data.result.items
})
},
change(data){
......
pages/basicData/dic/api.js
View file @ b6d3f0bc
import api from '@/plugins/request'
const u=(path)=>`${systemUrl}/Dictionary/${path}`
export default {
getChildren(id) {
return api.get(u("GetChildren"), { id:id })
return api.get(u("GetChildren"), { id })
},
getTree(){
return api.get(u('GetTree'))
......
pages/basicData/menu/index.vue
View file @ b6d3f0bc
......@@ -25,7 +25,7 @@
<Option v-for="(li,i) in systemList" :value="li.id" :key="li.id">{{li.name}}</Option>
</Select>
<div class="h400">
<!-- <json-viewer :value="systemRouters" :expand-depth="5"></json-viewer> -->
<json-viewer :value="systemRouters" :expand-depth="5"></json-viewer>
</div>
</div>
</Modal>
......@@ -71,7 +71,7 @@ export default {
systemId: 0,
systemList: [],
list: [],
// systemRouters: appRouter,
systemRouters: appRouter,
curId: 0,
columns: [
{
......
pages/basicData/organizational/index.vue
View file @ b6d3f0bc
......@@ -384,14 +384,14 @@ export default {
deleteRow(params) {
this.seleId = params.row.id
this.$http.organization.dele(this.seleId).then((res) => {
if (res.result == 1) {
if (res.data.result == 1) {
//刷新列表：
this.initTable()
this.$refs.organ.initData()
this.$Message.info('删除成功!')
} else if (res.result == 2) {
} else if (res.data.result == 2) {
this.$Message.info('删除失败,找不到数据!')
} else if (res.result == 3) {
} else if (res.data.result == 3) {
this.$Message.info('删除失败,该组织下有子节点!')
} else {
this.$Message.info('删除失败!')
......@@ -436,7 +436,7 @@ export default {
if (this.isAdd) {
this.$http.organization.insert(this.openModel).then((res) => {
if (res.result) {
if (res.data.result) {
//刷新列表：
this.initTable()
this.$refs.organ.initData()
......@@ -447,7 +447,7 @@ export default {
})
} else {
this.$http.organization.update(this.openModel).then((res) => {
if (res.result) {
if (res.data.result) {
//刷新列表：
this.initTable()
this.$refs.organ.initData()
......@@ -464,14 +464,14 @@ export default {
},
deleOk() {
this.$http.organization.dele(this.seleId).then((res) => {
if (res.result == 1) {
if (res.data.result == 1) {
//刷新列表：
this.initTable()
this.$refs.organ.initData()
this.$Message.info('删除成功!')
} else if (res.result == 2) {
} else if (res.data.result == 2) {
this.$Message.info('删除失败,找不到数据!')
} else if (res.result == 3) {
} else if (res.data.result == 3) {
this.$Message.info('删除失败,该组织下有子节点!')
} else {
this.$Message.info('删除失败!')
......
pages/basicData/privilegeManagent/components/add.vue
View file @ b6d3f0bc
......@@ -53,7 +53,7 @@
</Form>
</template>
<script>
import service from '../../../../plugins/request'
import service from '@/plugins/request'
export default {
name:'addPrivilege',
tit:'',
......
pages/basicData/privilegeManagent/index.vue
View file @ b6d3f0bc
......@@ -69,7 +69,7 @@
import treeGrid from './components/treeGrid'
import addPrivilege from './components/add'
import myconfirm from '../../processDesign/productTree/components/myconfirm'
import service from '../../../plugins/request'
import service from '@/plugins/request'
export default {
components: {
treeGrid,
......@@ -214,7 +214,7 @@ export default {
var that = this
service.get(`${url}`, { params: this.searchdata }).then((response) => {
// console.log(response)
that.data = response.result
that.data = response.data.result
})
},
lodataByid: function(data1) {
......@@ -223,7 +223,7 @@ export default {
.get(`${url}`, { params: { id: this.clickindex } })
.then((response) => {
//console.log(response)
data1 = response.result
data1 = response.data.result
//console.log(data1)
this.gettree(data1.from_system, data1)
})
......@@ -234,7 +234,7 @@ export default {
params: { from_system: sid,id:this.clickindex}
})
.then((response) => {
this.seldata = response.result
this.seldata = response.data.result
this.$refs.addpri.list = []
if (this.clickindex >= 0) {
if (data1) {
......
pages/basicData/roleManagent/index.vue
View file @ b6d3f0bc
......@@ -70,7 +70,7 @@ import sel from './components/sel'
import tb from './components/tb'
import addRole from './addRole'
import RoleMenu from './roleMenu'
import service from '../../../plugins/request'
import service from '@/plugins/request'
import qs from 'qs'
export default {
......@@ -374,16 +374,18 @@ export default {
this.tbPro.loading = true
service
.get(`${url}`, searchdata
.get(`${url}`, {
params: searchdata
? searchdata
: {
role_type: this.tabIndex,
pageSize: this.pageSize,
page: this.current
})
}
})
.then((response) => {
this.tbPro.data = response.result.items
this.total = response.result.total
this.tbPro.data = response.data.result.items
this.total = response.data.result.total
this.tbPro.loading = false
//console.log(this.tbPro.data)
})
......
pages/basicData/systemlog/index.vue
View file @ b6d3f0bc
......@@ -19,7 +19,7 @@
<Button type="success" @click="search">查询</Button>
</div>
<div style="float:right" class="paddingbtn">
<!-- <Button type="success" @click="export2Excel" style="margin-left:6px">导出</Button> -->
<Button type="success" @click="export2Excel" style="margin-left:6px">导出</Button>
</div>
</div>
<div class="mt10">
......@@ -45,7 +45,7 @@
<script>
import tb from '../roleManagent/components/tb'
import detail from './components/detail'
import service from '../../../plugins/request'
import service from '@/plugins/request'
export default {
components: { tb, detail },
data() {
......@@ -183,8 +183,8 @@ export default {
})
.then((response) => {
//console.log(response)
this.total = response.result.totalCount
this.tbPro.data = response.result.items
this.total = response.data.result.totalCount
this.tbPro.data = response.data.result.items
this.tbPro.loading=false
})
},
......@@ -230,7 +230,7 @@ export default {
// }
// })
// .then((response) => {
// this.tb = response.result.items
// this.tb = response.data.result.items
// const list = this.tb
// list.forEach((item, i) => {
// var info = item.browserInfo
......
pages/basicData/user/add.vue
View file @ b6d3f0bc
......@@ -24,11 +24,7 @@
</Col>
<Col :span="12">
<FormItem :label="l('birthday')" prop="birthday">
<DatePicker
type="date"
v-model="entity.birthday"
placeholder="请选择"
></DatePicker>
<DatePicker type="date" v-model="entity.birthday" placeholder="请选择"></DatePicker>
</FormItem>
</Col>
<Col :span="12">
......@@ -38,18 +34,18 @@
</Col>
<Col :span="12">
<FormItem :label="l('departmentTitle')" prop="departmentTitle">
<DepartmentSelect v-model="entity.departmentId" @on-change="setDepartmentTitle"/>
<DepartmentSelect v-model="entity.departmentId" @on-change="setDepartmentTitle" />
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('phone')" prop="phone">
<Input v-model="entity.phone" />
<Input v-model="entity.phone" />
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('email')">
<Input v-model="entity.email" />
<Input v-model="entity.email" />
</FormItem>
</Col>
<!-- <Col :span="12">
......@@ -99,8 +95,7 @@ const valideTel = (rule, value, callback) => {
}
export default {
name: 'Add',
components: {
},
components: {},
data() {
const validateCarNo = (rule, value, callback) => {
if (!value) {
......@@ -127,11 +122,13 @@ export default {
{ required: true, message: '必填', trigger: 'blur' },
{ validator: validateCarNo, trigger: 'blur' }
],
departmentTitle: [{ required: true, message: '必选', trigger: 'change' }],
departmentTitle: [
{ required: true, message: '必选', trigger: 'change' }
],
// email: [
// { required: true, message: '必填', trigger: 'blur', type: 'email' }
// ],
phone: [{ validator: valideTel,required: true, trigger: 'blur'}],
phone: [{ validator: valideTel, required: true, trigger: 'blur' }]
// degreeId: [
// { required: true, message: '必填', trigger: 'blur', type: 'number' }
// ],
......@@ -153,10 +150,34 @@ export default {
if (r.success) {
this.$Message.success('保存成功')
//账户同步操作start
let tanantCode=this.$store.state.userInfo.tanantCode //商户号
//账户同步操作end
this.$emit('on-ok')
let parms = {
userId: r.result.id,
loginName: this.entity.phone, //用户电话
status:this.entity.status,//状态
tanantCode: this.$store.state.userInfo.tanantCode //商户号
}
Api.authAccount(parms).then((res) => {
if (res.success) {
this.$Message.success('账户同步成功')
//修改用户表的accountId start
let parms1 = {
userId: parms.userId,
accountId: res.result
}
Api.updateAccount(parms1).then((res1) => {
if (res1.success) {
this.$Message.success('操作成功')
this.$emit('on-ok')
}
else{
this.$Message.error('同步失败')
}
})
//修改用户表的accountId end
}
})
//账户同步操作end
} else {
this.$Message.error(r.error.message)
}
......@@ -177,8 +198,8 @@ export default {
key = 'user' + '.' + key
return this.$t(key)
},
setDepartmentTitle(v,item){
this.entity.departmentTitle=item.name;
setDepartmentTitle(v, item) {
this.entity.departmentTitle = item.name
},
selectDepart() {
this.showDeptTree = true
......
pages/basicData/user/api.js
View file @ b6d3f0bc
......@@ -26,6 +26,22 @@ export default {
update(params) {
return Api.post(`${systemUrl}/user/update`, params);
},
//在10010上更新用户信息//新增、修改、删除、修改密码
authAccount(params) {
return Api.post(`${authUrl}/api/services/app/useraccount/sync`, params);
},
//10010重置密码
authResetpassword(params) {
return Api.post(`${authUrl}/api/services/app/useraccount/resetpassword`, params);
},
//10010修改密码
authChangepassword(params) {
return Api.post(`${authUrl}/api/services/app/useraccount/changepassword`, params);
},
//在10020上更新用户AccountId信息
updateAccount(params) {
return Api.post(`${systemUrl}/user/updateaccountid`, params);
},
//删除：
delete(params) {
return Api.delete(`${systemUrl}/user/delete`, {
......
pages/basicData/user/edit.vue
View file @ b6d3f0bc
......@@ -39,7 +39,7 @@
</Col>
<Col :span="12">
<FormItem :label="l('phone')">
<FormItem :label="l('phone')" prop="phone">
<Input v-model="entity.phone" />
</FormItem>
</Col>
......@@ -112,7 +112,7 @@ export default {
// email: [
// { required: true, message: '必填', trigger: 'blur', type: 'email' }
// ],
// phone: [{ validator: valideTel,required: true, trigger: 'blur'}]
phone: [{ validator: valideTel, required: true, trigger: 'blur' }]
}
}
},
......@@ -135,6 +135,54 @@ export default {
this.disabled = false
if (r.success) {
this.$Message.success('保存成功')
//账户同步操作start
if (this.entity.accountId > 0) {
//账户已同步的情况下
let parms2 = {
accountId: this.entity.accountId,
userId: this.entity.id,
loginName: this.entity.phone, //用户电话
status: this.entity.status,
tanantCode: this.$store.state.userInfo.tanantCode //商户号
}
Api.authAccount(parms2).then((res) => {
//同步电话信息等
if (res.success) {
this.$Message.success('账户同步成功')
}
else
{
this.$Message.error('账户同步失败')
}
})
} else {
//账户新建后还未同步成功的情况下
let parms = {
userId: this.entity.id,
loginName: this.entity.phone, //用户电话
status: this.entity.status,
tanantCode: this.$store.state.userInfo.tanantCode //商户号
}
Api.authAccount(parms).then((res1) => {
if (res1.success) {
this.$Message.success('账户同步成功')
//修改用户表的accountId start
let parms1 = {
userId: parms.userId,
accountId: res1.result //账户同步成功后返回的accountId
}
Api.updateAccount(parms1).then((res2) => {
if (res2.success) {
this.$Message.success('操作成功')
} else {
this.$Message.error('操作失败')
}
})
//修改用户表的accountId end
}
})
}
//账户同步操作end
this.$emit('on-ok')
} else {
this.$Message.error('保存失败')
......
pages/basicData/user/index.vue
View file @ b6d3f0bc
......@@ -124,7 +124,7 @@ import Add from './add'
import Edit from './edit'
import Detail from './detail'
import Search from './search'
import service from '../../../plugins/request'
import service from '@/plugins/request'
export default {
name: 'list',
components: {
......@@ -343,7 +343,7 @@ export default {
{
title: '操作',
key: 'id',
key: 'action',
width: 180,
align: 'right',
render: (h, params) => {
......@@ -355,7 +355,7 @@ export default {
oprate: 'detail',
class: 'empower'
},
on: { click: () => this.syncAccount(params.row.id) }
on: { click: () => this.syncAccount(params.row) }
},
params.row.accountId == 0 ? '同步' : ''
),
......@@ -371,7 +371,7 @@ export default {
'op',
{
attrs: { oprate: 'remove' },
on: { click: () => this.remove(params.row.id) }
on: { click: () => this.remove(params.row) }
},
'删除'
),
......@@ -381,14 +381,15 @@ export default {
attrs: {
oprate: 'detail'
},
on: { click: () => this.openReset(params.row.id) }
on: { click: () => this.openReset(params.row) }
},
'重置密码'
)
])
}
}
]
],
selectRow: {} //删除时选中的行数据
}
},
created() {
......@@ -405,10 +406,12 @@ export default {
methods: {
addOk() {
this.$refs.grid.load()
// this.$refs.grid.reload(this.easySearch)
this.addModal = false
this.detailModal = false
this.editModal = false
this.curId = 0
//this.$refs.grid.easySearch()
},
search() {
this.$refs.grid.reload(this.easySearch)
......@@ -422,19 +425,32 @@ export default {
this.curId = id
},
remove(id) {
remove(row) {
this.deletelModal = true
this.curId = id
},
openReset(id) {
this.show7 = true
this.curId = id
this.curId = row.id
this.selectRow = row
},
removeOk() {
Api.delete({ id: this.curId }).then((r) => {
if (r.success) {
this.$refs.grid.load()
this.deletelModal = false
if (this.selectRow.accountId > 0) {
//删除成功后更新auth start
let parms = {
userId: this.curId,
accountId: this.selectRow.accountId,
tanantCode: this.$store.state.userInfo.tanantCode,
isDeleted: true
}
Api.authAccount(parms).then((res) => {
if (res.success) {
this.$Message.success('账户同步成功')
}
})
}
//删除成功后更新auth end
this.$Message.success('删除成功')
}
})
......@@ -487,12 +503,21 @@ export default {
})
},
//重置密碼
openReset(row) {
this.show7 = true
this.curId = row.id
this.selectRow = row
},
reset() {
this.$http.sysUser.reset(this.curId).then((res) => {
if (res.result == 1) {
this.$Message.info('重置成功!')
let parms = {
userId: this.curId,
accountId: this.selectRow.accountId
}
Api.authResetpassword(parms).then((res) => {
if (res.success) {
this.$Message.success('重置成功!')
} else {
this.$Message.info('重置失败!')
this.$Message.error('重置失败!')
}
})
},
......@@ -503,7 +528,7 @@ export default {
service
.get(`${url}`, { params: { role_type: type } })
.then((response) => {
data = response.result.items
data = response.data.result.items
if (type == 1) {
this.authList = data
}
......@@ -520,7 +545,7 @@ export default {
this.show3 = true
var url = `${systemUrl}/MyUserRole/GetPaged`
service.get(`${url}`, { params: { userId: id } }).then((response) => {
var data = response.result.items
var data = response.data.result.items
var dt1 = data.filter(function(ite) {
return ite.role_type == 0
})
......@@ -560,13 +585,41 @@ export default {
})
},
authCancle() {},
//同步账户
syncAccount(id) {
//同步账户start
syncAccount(row) {
this.syncAccountModal = true
this.selectRow = row
},
syncAccountOk() {
let parms = {
userId: this.selectRow.id,
loginName: this.selectRow.phone,
status: this.selectRow.status,
tanantCode: this.$store.state.userInfo.tanantCode
}
if (this.selectRow.phone&&this.selectRow.phone != '') {
Api.authAccount(parms).then((res) => {
if (res.success) {
this.$Message.success('账户同步成功')
let parms1 = {
userId: parms.userId,
accountId: res.result
}
Api.updateAccount(parms1).then((res1) => {
if (res1.success) {
this.$Message.success('操作成功')
this.$refs.grid.easySearch()
} else {
this.$Message.error('同步失败')
}
})
}
})
} else {
this.$Message.error('请完善个人电话信息')
}
}
//同步账户end
},
computed: {
searchList() {
......
pages/basicData/userManagent/index.vue
View file @ b6d3f0bc
......@@ -368,7 +368,7 @@
import Department from '@/components/modalTree/department.vue'
import OrganizType from '@/components/modalTree/organizType.vue'
import service from '../../../plugins/request'
import service from '@/plugins/request'
export default {
components: { Department, OrganizType },
data() {
......@@ -641,7 +641,7 @@ export default {
service
.get(`${url}`, { params: { role_type: type } })
.then((response) => {
data = response.result.items
data = response.data.result.items
if (type == 1) {
this.authList = data
......@@ -702,7 +702,7 @@ export default {
this.show3 = true
var url = `${systemUrl}/MyUserRole/GetPaged`
service.get(`${url}`, { params: { userId: id } }).then((response) => {
var data = response.result.items
var data = response.data.result.items
var dt1 = data.filter(function(ite) {
return ite.role_type == 0
})
......@@ -826,7 +826,7 @@ export default {
},
add() {
this.$http.sysUser.insert(this.openModel).then((res) => {
if (res.result) {
if (res.data.result) {
//刷新列表：
this.initTable()
......@@ -838,7 +838,7 @@ export default {
},
update() {
this.$http.sysUser.update(this.openModel).then((res) => {
if (res.result) {
if (res.data.result) {
//刷新列表：
this.initTable()
......@@ -850,11 +850,11 @@ export default {
},
del() {
this.$http.sysUser.del(this.selectedRow.id).then((res) => {
if (res.result == 1) {
if (res.data.result == 1) {
//刷新列表：
this.initTable()
this.$Message.info('删除成功!')
} else if (res.result == 2) {
} else if (res.data.result == 2) {
this.$Message.info('删除失败,找不到数据!')
} else {
this.$Message.info('删除失败!')
......@@ -863,7 +863,7 @@ export default {
},
reset() {
this.$http.sysUser.reset(this.selectedRow.id).then((res) => {
if (res.result == 1) {
if (res.data.result == 1) {
this.$Message.info('重置成功!')
} else {
this.$Message.info('重置失败!')
......
pages/basicData/userManagent/userInfo.vue
View file @ b6d3f0bc
......@@ -12,7 +12,7 @@
</div>
</Card>
<Card :style="{width:cardWidth}" style="float:left;margin-left:20px;">
<Tabs :animated="false" >
<Tabs :animated="false">
<TabPane label="基本信息">
<div class="tabContent">
<Form :label-width="140">
......@@ -27,8 +27,9 @@
<state code="User.base.degree" :value="userInfo.degreeId" type="text"></state>
</FormItem>
<FormItem label="职位名称：" class="ivu-form-itemNo">
<state code="User.base.position" :value="userInfo.positionId" type="text"></state>
{{userInfo.titleId}}</FormItem>
<state code="User.base.position" :value="userInfo.positionId" type="text"></state>
{{userInfo.titleId}}
</FormItem>
<FormItem label="角色：" class="ivu-form-itemNo">{{userInfo.roleTitles}}</FormItem>
<FormItem label="所属部门：" class="ivu-form-itemNo">{{userInfo.departmentTitle}}</FormItem>
</Form>
......@@ -91,9 +92,10 @@
</div>
</template>
<script>
import Api from '../user/api'
import avatar from '@/assets/images/avatar.png'
import inputFiles from '@/components/page/inputFile.vue'
var userId = JSON.parse(sessionStorage.getItem("userInfo")).userId
var userId = JSON.parse(sessionStorage.getItem('userInfo')).userId
export default {
components: {
inputFiles
......@@ -135,8 +137,8 @@ export default {
name: ''
},
imgName: '',
avatorPath:'',
oldImgName:''
avatorPath: '',
oldImgName: ''
}
},
created() {
......@@ -164,12 +166,20 @@ export default {
return
}
this.pwdModel.id = userId
this.$http.sysUser.changePwd(this.pwdModel).then((res) => {
if (res.result) {
let params = {
accountId: this.userInfo.accountId,
userId: this.userInfo.id,
newPassword: this.pwdModel.newPwd,
oldPassword: this.pwdModel.oldPwd
}
Api.authChangepassword(params).then((res) => {
if (res.success) {
this.$Message.success('修改成功!')
this.pwdModelReset()
} else {
this.$Message.error('修改失败!')
}
else
{
this.$Message.error('修改失败!')
}
})
},
......@@ -204,8 +214,8 @@ export default {
res.result.avatarUrl != null
) {
this.userInfo.avatarUrl = res.result.avatarUrl
this.avatorPath=fileUrlDown +res.result.avatarUrl
this.oldImgName=fileUrlDown +res.result.avatarUrl
this.avatorPath = fileUrlDown + res.result.avatarUrl
this.oldImgName = fileUrlDown + res.result.avatarUrl
} else {
this.userInfo.avatarUrl = avatar
}
......@@ -216,15 +226,18 @@ export default {
},
cancelAvatar() {
this.modalAvatar = false
this.avatorPath=this.oldImgName
this.avatorPath = this.oldImgName
},
upAvatar() {
if (this.imageModel.avatar_Url != '') {
this.$http.sysUser.changeavatar(this.imageModel).then((res) => {
if (res.result) {
if (res.data.result) {
this.$Message.success('修改成功!')
this.modalAvatar = false
this.$store.commit('setUserAvatar',fileUrlDown+this.imageModel.avatar_Url);
this.$store.commit(
'setUserAvatar',
fileUrlDown + this.imageModel.avatar_Url
)
} else {
this.$Message.error('修改失败!')
}
......@@ -240,8 +253,7 @@ export default {
})
}
},
computed: {
},
computed: {},
mounted() {
this.initUserInfo()
},
......@@ -250,7 +262,7 @@ export default {
const imgPathsArr = JSON.parse(newName)
this.userInfo.avatarUrl = imgPathsArr[0].filePath
this.imageModel.avatar_Url = imgPathsArr[0].filePath
this.avatorPath=fileUrlDown +imgPathsArr[0].filePath
this.avatorPath = fileUrlDown + imgPathsArr[0].filePath
}
}
}
......
pages/crm/project/index.vue
View file @ b6d3f0bc
<template>
<div class="steps">
<div class="project-steps">
<div class="aps-l">
<h4 class="title mr10">企业列表</h4>
<Input v-model="keys" search placeholder="请输入客户名称" clearable />
......@@ -127,11 +127,11 @@ export default {
name: 'jjk'
}
],
isactive: 0,
isactive: null,
keys: '',
easySearch: {
keys: { op: 'name', value: null },
customerId: { op: 'Equal', value: '-1' }
customerId: { op: 'Equal', value: null }
},
addModal: false,
editModal: false,
......@@ -161,7 +161,6 @@ export default {
}
},
mounted() {
console.log(this)
this.getList()
},
async fetch({ store, params }) {
......@@ -183,7 +182,7 @@ export default {
Api.list(this.getlists).then((r) => {
if (r.success) {
this.list = r.result
this.easySearch.customerId.value = r.result[0].id
// this.easySearch.customerId.value = r.result[0].id
this.search()
}
})
......@@ -197,8 +196,11 @@ export default {
this.curId = 0
},
add() {
this.addModal = true
// this.$refs.add.entity = {}
if (this.isactive !== null) {
this.addModal = true
} else {
this.$Message.info('请选择企业')
}
},
search() {
this.$refs.grid.reload(this.easySearch)
......@@ -249,10 +251,10 @@ export default {
background: #249e91 !important;
}
}
.steps {
.project-steps {
display: flex;
display: -webkit-flex;
height: 90%;
height: 100%;
border-top: 1px solid #e4e6ed;
h4 {
margin-bottom: 5px;
......@@ -308,6 +310,8 @@ export default {
}
.aps-r {
width: 80%;
height: 100%;
overflow: auto;
padding: 15px 0 15px 15px;
.body {
border: 1px solid #e4e6ed;
......
pages/crm/sales/index.vue
View file @ b6d3f0bc
......@@ -44,7 +44,7 @@ export default {
</script>
<style lang='less' scoped>
.sales {
height: 100%;
height: 90%;
.steps-k {
margin: 10px 30px;
.title-c {
......
pages/crm/sales/projectList.vue
View file @ b6d3f0bc
......@@ -146,7 +146,7 @@ export default {
status: '', //为空是全部排产，0为未排产；13为已排查；
partTaskPk: '', //车间
result: [],
isactive: 0,
isactive: null,
selectName: 'all',
rowResult: {},
addId: {
......@@ -172,8 +172,8 @@ export default {
listOperation: [],
easySearch: {
keys: { op: 'deliverable', value: null },
stage: { op: 'Equal', value: '-1' },
projectId: { op: 'Equal', value: '-1' }
stage: { op: 'Equal', value: null },
projectId: { op: 'Equal', value: null }
},
addModal: false,
editModal: false,
......@@ -220,14 +220,7 @@ export default {
Api.pagedList(this.getSearch).then((r) => {
if (r.success) {
this.list = r.result
if (r.result.length > 0) {
this.easySearch.projectId.value = r.result[0].id
this.easySearch.stage.value = r.result[0].stage
this.easySearch.customerId.value = r.result[0].customerId
this.easySearch.principal.value = r.result[0].principal
} else {
this.easySearch.projectId.value = -1
}
this.search()
}
})
},
......@@ -252,8 +245,11 @@ export default {
this.curId = 0
},
add() {
this.addModal = true
// this.$refs.add.entity = {}
if (this.isactive !== null) {
this.addModal = true
} else {
this.$Message.info('请选择项目')
}
},
detail(id) {
this.detailModal = true
......@@ -314,7 +310,7 @@ export default {
.steps {
display: flex;
display: -webkit-flex;
height: 90%;
height: 100%;
border-top: 1px solid #e4e6ed;
h4 {
margin-bottom: 5px;
......@@ -360,14 +356,16 @@ export default {
background: rgba(167, 184, 204, 0.2);
padding: 5px 8px;
.fa {
height: 28px;
line-height: 28px;
height: 26px;
line-height: 26px;
}
}
}
}
.aps-r {
width: 80%;
height: 100%;
overflow: auto;
padding: 15px 0 15px 15px;
.right-body {
.body {
......@@ -397,8 +395,8 @@ export default {
padding: 5px 8px;
.fa {
color: #515a6e;
height: 30px;
line-height: 30px;
height: 26px;
line-height: 26px;
}
}
}
......
pages/crm/statistical/card.less
View file @ b6d3f0bc
......@@ -23,12 +23,12 @@
.row_card{
// background: #e9a4a4;
.row_head {
background: #ccc;
background: #dadada;
height: 50px;
line-height: 50px;
padding: 0 20px 0;
border-top-left-radius: 8px;
border-top-right-radius: 8px;
border-top-left-radius: 5px;
border-top-right-radius: 5px;
#msg_tip{
.ivu-badge-count{
background: #000;
......@@ -45,16 +45,17 @@
.row_card_body{
padding: 10px 20px;
background: #efefef;
border-bottom-left-radius: 4pt;
border-bottom-right-radius: 4pt;
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
height: 252px;
width: 100%;
overflow: hidden;
.main_card{
// width: 247px;
// height: 90px;
margin: 10px 0;
width: 32%;
cursor: pointer;
float: left;
// display: inline-block;
margin: 10px 5px;
.leftIcon {
width: 40px;
height: 40px;
......
pages/crm/statistical/costomer/approval.vue
View file @ b6d3f0bc
......@@ -6,7 +6,8 @@
<div class="todolist">
<div class="row_card">
<p class="row_head">
<Icon type="md-checkbox-outline" class="f20" />
<!-- <Icon type="md-open" class="f20"/> -->
<Icon type="ios-create" class="f20"/>
<span class="ml10">待审批</span>
<a class="row_more fr" @click="toivew">更多</a>
</p>
......
pages/crm/statistical/costomer/todolist.vue
View file @ b6d3f0bc
......@@ -3,59 +3,74 @@
@import '../card.less';
</style>
<template>
<div class="todolist">
<div class="row_card">
<p class="row_head">
<Icon type="md-checkbox-outline" class="f20"/>
<span class="ml10">我的待办</span>
<a @click="topage" class="row_more fr">更多</a>
</p>
<div class="row_card_body">
<Row :gutter="16">
<Col span="8" class="main_card"
v-for="(item,index) in listTask"
:key="index">
<Card>
<div class="leftIcon">
<div class="Icon_bg">
<img class="Icon_icon" :src="imgUrl + item.image" alt="">
</div>
</div>
<div class="h60">
<p>{{item.name}}</p>
<p style="color:#249E91;font-weight:bold">{{item.totalUrl}}</p>
</div>
</Card>
</Col>
</Row>
<!-- @click.native="goPage(item)" -->
<div class="todolist">
<div class="row_card">
<p class="row_head">
<Icon type="md-checkbox-outline" class="f20" />
<span class="ml10">我的待办</span>
<a @click="topage" class="row_more fr">更多</a>
</p>
<div class="row_card_body">
<Card
class="main_card"
v-for="(item,index) in listTask"
@click.native="goPage(item)"
:key="index"
>
<div class="leftIcon">
<div class="Icon_bg">
<img class="Icon_icon" :src="imgUrl + item.image" alt />
</div>
</div>
</div>
<div class="h60">
<p>{{item.name}}</p>
<p style="color:#249E91;font-weight:bold">{{item.totalUrl}}</p>
</div>
</Card>
</div>
</div>
</div>
</template>
<script>
export default {
name:'todolist',
data(){
return{
imgUrl: iconImg,
listTask:[
{ name:'订单送审', image:'u1640.png', totalUrl:'64'},
{ name:'物料复验', image:'u1650.png', totalUrl:'46'},
{ name:'产品合格证', image:'u1660.png', totalUrl:'12'},
{ name:'任务排产', image:'u1656.png', totalUrl:'6'},
{ name:'生产执行', image:'u1658.png', totalUrl:'2'},
{ name:'订单派发', image:'u1638.png', totalUrl:'16'},
],
}
name: 'todolist',
data() {
return {
imgUrl: iconImg,
listTask: []
}
},
created() {
this.get()
},
methods: {
topage() {
var info = { id: '123', message: '成功' }
this.$router.push({ name: 'handle', params: info })
// tab(1)
},
get() {
let list = []
let url = `${systemUrl}/backlog/get`
this.$api.get(url).then((r) => {
// console.log(r.result)
list = r.result
list.forEach((data) => {
// console.log(data.totalUrl)
let ulrt = `http://${address}:` + data.totalUrl
data.totalUrl = ''
this.$api.get(ulrt).then((r) => {
return (data.totalUrl = r.result)
})
})
let arr = list.slice(0, 6)
this.listTask = arr
})
},
methods: {
topage(){
var info = {id:"123",message:"成功"}
this.$router.push({name:'handle',params:info})
// tab(1)
},
goPage(u) {
this.$router.push(u.menuUrl)
}
}
}
</script>
\ No newline at end of file
pages/dispatched/index.vue
View file @ b6d3f0bc
......@@ -126,7 +126,7 @@
</template>
<script>
import tableRow from './components/table_row.vue'
import service from '../../plugins/request'
import service from '@/plugins/request'
export default {
name: 'dispatched',
components: { tableRow },
......@@ -189,9 +189,9 @@ export default {
let urlget = `${PlanUrl}/dispatch/getschemes?RoutingId=` + usId +
'&IsMain=0' + order_ids
service.get(`${urlget}`).then((res) => {
if (res.result) {
if (res.data.result) {
var savedUl = []
res.result.map((u) => {
res.data.result.map((u) => {
let detailnew = {
detailId: u.routingDetailId, //工序id--后端接收
detailNumber: u.routingDetailNumber, //工序序号
......@@ -223,7 +223,7 @@ export default {
let urlList = `${designUrl}/routingdetail/getlistbyheaderid?headerID=` + usId
service.get(`${urlList}`).then((res) => {
var ul = []
res.result.map((u) => {
res.data.result.map((u) => {
let detail = {
detailId: u.id, //工序id--后端接收
detailNumber: u.task_seq,//工序序号
......
pages/handle/task.vue
View file @ b6d3f0bc
......@@ -74,7 +74,7 @@ export default {
this.$api.get(url).then((r) => {
list = r.result
list.forEach((data) => {
console.log(data.totalUrl)
// console.log(data.totalUrl)
let ulrt = `http://${address}:` + data.totalUrl
data.totalUrl = ''
......
pages/implement/components/entryMovie.vue
View file @ b6d3f0bc
......@@ -30,7 +30,7 @@
</div>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
import QS from 'querystring'
import cameraPreview from '../components/cameraPreview.vue'
......@@ -188,8 +188,8 @@ export default {
var url =
`${PlanUrl}/orderexecutemovie/getpaged?` + QS.stringify(this.datasearch)
service.get(`${url}`).then((response) => {
this.moviedata = response.result.items
this.datatotal = response.result.totalCount
this.moviedata = response.data.result.items
this.datatotal = response.data.result.totalCount
})
},
onPageChanged(page_index) {
......
pages/implement/components/entryPause.vue
View file @ b6d3f0bc
......@@ -103,7 +103,7 @@
</div>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
import QS from 'querystring'
export default {
name: 'entryPause',
......@@ -171,8 +171,8 @@ export default {
QS.stringify(this.datasearch)
service.get(`${url}`).then((response) => {
this.data1 = response.result.items
this.datatotal = response.result.totalCount
this.data1 = response.data.result.items
this.datatotal = response.data.result.totalCount
})
},
onPageChanged(page_index) {
......
pages/implement/components/entryrecordMovie.vue
View file @ b6d3f0bc
......@@ -17,7 +17,7 @@
</div>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
import QS from 'querystring'
export default {
name: 'entryrecordMovie',
......@@ -167,8 +167,8 @@ export default {
QS.stringify(this.datasearch)
service.get(`${url}`).then((response) => {
if (response.result != null) {
this.moviedata = response.result
if (response.data.result != null) {
this.moviedata = response.data.result
}
})
},
......@@ -193,8 +193,8 @@ export default {
if (response.data.success) {
this.$Message.success('保存成功')
this.ids.push(response.result.id)
this.moviedata.push(response.result)
this.ids.push(response.data.result.id)
this.moviedata.push(response.data.result)
this.cleardata()
this.$emit(
......
pages/implement/components/entryrecorddata.vue
View file @ b6d3f0bc
......@@ -36,7 +36,7 @@
</div>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
import QS from 'querystring'
export default {
name: 'entryrecorddata',
......@@ -166,8 +166,8 @@ export default {
QS.stringify(this.datasearch)
service.get(`${url}`).then((response) => {
if (response.result != null) {
this.moviedata = response.result
if (response.data.result != null) {
this.moviedata = response.data.result
}
})
},
......@@ -248,9 +248,9 @@ export default {
if (response.data.success) {
this.$Message.success('保存成功')
this.ids.push(response.result.id)
this.ids.push(response.data.result.id)
this.moviedata.splice(index, 1)
this.moviedata.push(response.result)
this.moviedata.push(response.data.result)
this.cleardata()
this.$emit(
......
pages/implement/components/entryrecordfiles.vue
View file @ b6d3f0bc
......@@ -17,7 +17,7 @@
</div>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
import QS from 'querystring'
export default {
name: 'entryrecordfiles',
......@@ -184,8 +184,8 @@ export default {
QS.stringify(this.datasearch)
service.get(`${url}`).then((response) => {
if (response.result != null) {
this.moviedata = response.result
if (response.data.result != null) {
this.moviedata = response.data.result
}
})
},
......@@ -210,8 +210,8 @@ export default {
if (response.data.success) {
this.$Message.success('保存成功')
this.ids.push(response.result.id)
this.moviedata.push(response.result)
this.ids.push(response.data.result.id)
this.moviedata.push(response.data.result)
this.cleardata()
this.$emit(
......
pages/implement/components/entryrecordlist.vue
View file @ b6d3f0bc
......@@ -203,7 +203,7 @@
</div>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
import entryrecordfiles from './entryrecordfiles.vue'
import entryrecordMovie from './entryrecordMovie.vue'
import entryrecorddata from './entryrecorddata.vue'
......@@ -420,8 +420,8 @@ export default {
this.datasearch.entryID
service.get(`${url}`).then((response) => {
this.product_List = response.result
this.board_List = response.result
this.product_List = response.data.result
this.board_List = response.data.result
for (let i = 0; i < this.product_List.length; i++) {
let obj = this.product_List[i]
......@@ -477,7 +477,7 @@ export default {
`${PlanUrl}/orderexecutequalityrecord/getentryqcrecordlist?` +
QS.stringify(this.datasearch)
service.get(`${url}`).then((response) => {
this.recorddata = response.result
this.recorddata = response.data.result
})
},
handleselfCheckAll() {
......
pages/implement/components/processRecord.vue
View file @ b6d3f0bc
......@@ -80,7 +80,7 @@
</div>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
import QS from 'querystring'
export default {
name: 'processRecord',
......@@ -143,7 +143,7 @@ export default {
`${PlanUrl}/orderexecutefiles/getbyentryid?entryId=` + this.dispatch_id
service.get(`${url}`).then((response) => {
this.cardModeldata = response.result[0]
this.cardModeldata = response.data.result[0]
;(this.cardModeldata.dispatch_id = this.dispatch_id),
(this.cardModeldata.execute_id = this.execute_id),
(this.cardModeldata.order_id = this.order_id)
......@@ -165,7 +165,7 @@ export default {
`${systemUrl}/equipinfo/getbyid?Id=` + this.cardModeldata.equip_id
service.get(`${url}`).then((response) => {
let obj = response.result
let obj = response.data.result
this.equipCode = obj.equip_id
this.equipName = obj.equip_name
this.equipTypeName = obj.equip_winname
......@@ -177,7 +177,7 @@ export default {
this.cardModeldata.equip_id
service.get(`${url}`).then((response) => {
let obj = response.result
let obj = response.data.result
this.fileTempUrlPath = fileUrlDown + obj.file
})
},
......
pages/implement/components/productReport.vue
View file @ b6d3f0bc
......@@ -92,7 +92,7 @@
</div>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
import QS from 'querystring'
export default {
name: 'productReport',
......@@ -376,9 +376,9 @@ export default {
QS.stringify(this.datasearch)
service.get(`${url}`).then((response) => {
if (response.result != null) {
this.data1 = response.result.items
this.datatotal = response.result.totalCount
if (response.data.result != null) {
this.data1 = response.data.result.items
this.datatotal = response.data.result.totalCount
}
})
},
......@@ -388,8 +388,8 @@ export default {
this.datasearch.entryID
service.get(`${url}`).then((response) => {
this.product_List = response.result
this.board_List = response.result
this.product_List = response.data.result
this.board_List = response.data.result
if (this.datasearch.isMain == 1) {
this.product_List = []
......
pages/implement/components/sendCheck.vue
View file @ b6d3f0bc
......@@ -46,7 +46,7 @@
</Form>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
import QS from 'querystring'
export default {
name: 'sendCheck',
......@@ -152,8 +152,8 @@ export default {
this.user.dispatch_id
service.post(`${url}`).then((response) => {
this.product_List = response.result
this.board_List = response.result
this.product_List = response.data.result
this.board_List = response.data.result
})
},
loaduser() {
......@@ -167,7 +167,7 @@ export default {
var url = systemUrl + '/MyRole/GetRolesAsync?' + QS.stringify(params)
service.get(`${url}`).then((response) => {
let roles = response.result.items
let roles = response.data.result.items
let roleids = []
for (let i = 0; i < roles.length; i++) {
roleids.push(roles[i].id)
......@@ -182,8 +182,8 @@ export default {
`${systemUrl}/myuserrole/GetUsersByRole?ids=` + roleids.join(',')
service.get(`${url}`).then((response) => {
for (let j = 0; j < response.result.length; j++) {
let user = response.result[j]
for (let j = 0; j < response.data.result.length; j++) {
let user = response.data.result[j]
var index = this.checkerlist.filter(function(item) {
return item.id === user.id
})
......
pages/implement/components/sendCheckRecord.vue
View file @ b6d3f0bc
......@@ -16,7 +16,7 @@
</div>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
import QS from 'querystring'
export default {
name: 'sendCheckRecord',
......@@ -108,9 +108,9 @@ export default {
var url =
`${PlanUrl}/ordercheckresult/getpaged?` + QS.stringify(this.datasearch)
service.get(`${url}`).then((response) => {
if (response.result != null) {
this.moviedata = response.result.items
this.datatotal = response.result.totalCount
if (response.data.result != null) {
this.moviedata = response.data.result.items
this.datatotal = response.data.result.totalCount
}
})
},
......
pages/implement/components/usercard.vue
View file @ b6d3f0bc
......@@ -49,7 +49,7 @@
</Form>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
export default {
name: 'usercard',
components: {},
......@@ -73,9 +73,9 @@ export default {
service
.post(`${systemUrl}/user/list`, JSON.stringify(params))
.then((response) => {
if (response.result.length > 0) {
this.user.user_name = response.result[0].userName
this.user.user_id = response.result[0].id
if (response.data.result.length > 0) {
this.user.user_name = response.data.result[0].userName
this.user.user_id = response.data.result[0].id
callback()
} else {
this.user.cardno = ''
......
pages/implement/index.vue
View file @ b6d3f0bc
......@@ -169,7 +169,7 @@
</template>
<script>
import service from '../../plugins/request'
import service from '@/plugins/request'
import entryMovie from './components/entryMovie.vue'
import entryrecordlist from './components/entryrecordlist.vue'
import processview from '../processDesign/Process/processview.vue'
......@@ -369,11 +369,11 @@ export default {
this.currententry = null
var url = `${PlanUrl}/orderexecute/getentrylist?ExecuteId=` + ExecuteId
service.get(`${url}`).then((response) => {
this.entryData = response.result.entryList
this.entryData = response.data.result.entryList
this.entryHistoryData = this.entryData
let data = []
for (var i = 0; i < this.entryData.length; i++) {
if (this.entryData[i].id == response.result.currentID) {
if (this.entryData[i].id == response.data.result.currentID) {
data = this.entryData[i]
this.currententry = data
this.currentID = this.entryData[i].id
......@@ -431,8 +431,8 @@ export default {
'&headerID=' +
this.data.routing_header_id
service.get(`${url}`).then((response) => {
if (response.result != null) {
let ordata = response.result
if (response.data.result != null) {
let ordata = response.data.result
for (let j = 0; j < this.data.row.length; j++) {
let obj = this.data.row[j]
var gh = ordata.filter(function(number) {
......@@ -456,9 +456,9 @@ export default {
`${designUrl}/orderbillrel/getorderbilllistbyorders?orderids=` +
this.data.orderIDs
service.get(`${url}`).then((response) => {
if (response.result != null) {
if (response.result.length > 0) {
this.loadMaterial(response.result)
if (response.data.result != null) {
if (response.data.result.length > 0) {
this.loadMaterial(response.data.result)
}
}
})
......@@ -468,9 +468,9 @@ export default {
var url =
`${designUrl}/ordermaterial/getbyid?Id=` + Bill[0].material_bill_id
service.get(`${url}`).then((response) => {
if (response.result != null) {
if (response.data.result != null) {
this.material_bill_id = Bill[0].material_bill_id
this.material_bill = response.result.orderMaterial
this.material_bill = response.data.result.orderMaterial
}
})
},
......
pages/mainProcess/index.vue
View file @ b6d3f0bc
......@@ -141,7 +141,7 @@
</template>
<script>
import consume from './components/table_row_zhu.vue'
import service from '../../plugins/request'
import service from '@/plugins/request'
export default {
name: 'dispatched',
components: { consume },
......@@ -195,9 +195,9 @@ export default {
let urlget = `${PlanUrl}/dispatch/getschemes?RoutingId=` + usId +
'&IsMain=1&' + 'OrderId=' + order_id
service.get(`${urlget}`).then((res) => {
if (res.result) {
if (res.data.result) {
var savedUl = []
res.result.map((u) => {
res.data.result.map((u) => {
let detailnew = {
detailId: u.routingDetailId, //工序id--后端接收
detailNumber: u.routingDetailNumber, //工序序号
......@@ -229,7 +229,7 @@ export default {
usId
service.get(`${urlList}`).then((res) => {
var ul = []
res.result.map((u) => {
res.data.result.map((u) => {
var detail = {
detailId: u.id, //工序id--后端接收
detailNumber: u.task_seq, //工序序号
......
pages/mordent/dispose/index.vue
View file @ b6d3f0bc
......@@ -348,7 +348,7 @@ export default {
`${designUrl}/routingqccard/getlistbydetailid?detailID=` +
this.cardModeldata.routing_detail_id
service.get(`${url}`).then((response) => {
this.data1 = response.result
this.data1 = response.data.result
})
},
openNew() {
......
pages/order/monitoring/index.vue
View file @ b6d3f0bc
......@@ -9,6 +9,9 @@
v-model="easySearch.productingpreparationpeople.value"
/>
</FormItem>
<FormItem prop="keys">
<Input placeholder="请输入订单编号" v-model="easySearch.keys.value" />
</FormItem>
<FormItem>
<Button type="primary" @click="search">查询</Button>
</FormItem>
......@@ -52,6 +55,7 @@ export default {
recordId: 0,
action: Api.index,
easySearch: {
keys: { op: 'mesCode', value: null },
productingpreparationpeople: { op: 'Equal', value: null }
},
suspendModal: false,
......
pages/order/monitoring/record.vue
View file @ b6d3f0bc
......@@ -87,7 +87,15 @@ export default {
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'
? ''
: params.row.lastModificationTime
)
}
},
// {
// key: 'path',
......@@ -135,5 +143,4 @@ export default {
}
</script>
<style lang='less'>
</style>
\ No newline at end of file
pages/order/monitoring/speed.vue
View file @ b6d3f0bc
<template>
<div class="record">
<Table height="200" :columns="columns" :data="result" border></Table>
<Table :columns="columns" :data="result" border></Table>
</div>
</template>
<script>
......
pages/order/quotation/index.vue
View file @ b6d3f0bc
......@@ -143,8 +143,7 @@ import PhotosensitiveDetails from './components/photosensitiveDetails.vue' //报
import MetalQuotationGeneration from './components/metalQuotationGeneration.vue' //生成报价单弹框
import PhotosensitiveGeneration from './components/photosensitiveGeneration.vue' //生成报价单弹框
var userId = 1;
// var userId = JSON.parse(sessionStorage.getItem('userInfo')).userId
var userId = JSON.parse(sessionStorage.getItem('userInfo')).userId
export default {
components: {
DrawerSet,
......
pages/processDesign/ChangeSingle/processchangesingle/index.vue
View file @ b6d3f0bc
......@@ -78,7 +78,7 @@
<script>
import routingchangeorder from '@/pages/processDesign/Process/routingchangeorder.vue'
import Preview from '@/pages/processDesign/Process/tan.vue'
import service from '../../../../plugins/request'
import service from '@/plugins/request'
import Department from '@/components/modalTree/department.vue'
export default {
components: {
......@@ -360,8 +360,8 @@ export default {
service
.get(`${url}`, { params: {changeorder_code: this.value1, pageindex:this.page,pageSize:this.pageSize } })
.then((res) => {
this.data2 = res.result.items
this.total=res.result.totalCount
this.data2 = res.data.result.items
this.total=res.data.result.totalCount
})
},
......@@ -479,32 +479,32 @@ export default {
.then((response) => {
console.log(response)
this.$refs.routingchangeorder.changeorder_code =
response.result.changeorder_code
response.data.result.changeorder_code
this.$refs.routingchangeorder.routing_header_Id =
response.result.routing_header_Id
response.data.result.routing_header_Id
this.$refs.routingchangeorder.formValidate = {
id: response.result.id,
changeorder_code: response.result.changeorder_code,
routing_header_Id: response.result.routing_header_Id,
propose_user_id: response.result.propose_user_id,
propose_user_name: response.result.propose_user_name,
department_id: response.result.department_id,
department_name: response.result.department_name,
technical_name: response.result.technical_name,
technical_code: response.result.technical_code,
changed_version: response.result.changed_version_id,
quantity: response.result.quantity,
print_data: response.result.print_data,
executive_branch: response.result.executive_branch,
executive_branch_id: response.result.executive_branch_id,
handling_opinions_id: response.result.handling_opinions_id,
handling_opinions: response.result.handling_opinions_id,
before_change_content: response.result.before_change_content,
after_change_content: response.result.after_change_content,
change_reason: response.result.change_reason,
effective_date: response.result.effective_date,
status:response.result.status,
note:response.result.note,
id: response.data.result.id,
changeorder_code: response.data.result.changeorder_code,
routing_header_Id: response.data.result.routing_header_Id,
propose_user_id: response.data.result.propose_user_id,
propose_user_name: response.data.result.propose_user_name,
department_id: response.data.result.department_id,
department_name: response.data.result.department_name,
technical_name: response.data.result.technical_name,
technical_code: response.data.result.technical_code,
changed_version: response.data.result.changed_version_id,
quantity: response.data.result.quantity,
print_data: response.data.result.print_data,
executive_branch: response.data.result.executive_branch,
executive_branch_id: response.data.result.executive_branch_id,
handling_opinions_id: response.data.result.handling_opinions_id,
handling_opinions: response.data.result.handling_opinions_id,
before_change_content: response.data.result.before_change_content,
after_change_content: response.data.result.after_change_content,
change_reason: response.data.result.change_reason,
effective_date: response.data.result.effective_date,
status:response.data.result.status,
note:response.data.result.note,
}
})
this.$refs.routingchangeorder.modelChange = true
......@@ -519,28 +519,28 @@ export default {
.then((response) => {
console.log(response)
this.$refs.Preview.changeorder_code =
response.result.changeorder_code
response.data.result.changeorder_code
this.$refs.Preview.formValidate = {
id: response.result.id,
changeorder_code: response.result.changeorder_code,
routing_header_Id: response.result.routing_header_Id,
propose_user_id: response.result.propose_user_id,
propose_user_name: response.result.propose_user_name,
department_id: response.result.department_id,
department_name: response.result.department_name,
technical_name: response.result.technical_name,
technical_code: response.result.technical_code,
changed_version: response.result.changed_version_name,
quantity: response.result.quantity,
print_data: response.result.print_data,
executive_branch: response.result.executive_branch,
executive_branch_id: response.result.executive_branch_id,
handling_opinions_id: response.result.handling_opinions_id,
handling_opinions: response.result.handling_opinions_name,
before_change_content: response.result.before_change_content,
after_change_content: response.result.after_change_content,
change_reason: response.result.change_reason,
effective_date: response.result.effective_date
id: response.data.result.id,
changeorder_code: response.data.result.changeorder_code,
routing_header_Id: response.data.result.routing_header_Id,
propose_user_id: response.data.result.propose_user_id,
propose_user_name: response.data.result.propose_user_name,
department_id: response.data.result.department_id,
department_name: response.data.result.department_name,
technical_name: response.data.result.technical_name,
technical_code: response.data.result.technical_code,
changed_version: response.data.result.changed_version_name,
quantity: response.data.result.quantity,
print_data: response.data.result.print_data,
executive_branch: response.data.result.executive_branch,
executive_branch_id: response.data.result.executive_branch_id,
handling_opinions_id: response.data.result.handling_opinions_id,
handling_opinions: response.data.result.handling_opinions_name,
before_change_content: response.data.result.before_change_content,
after_change_content: response.data.result.after_change_content,
change_reason: response.data.result.change_reason,
effective_date: response.data.result.effective_date
}
})
var url3 = `${workflowUrl}/instance/getdetailbycode`
......@@ -548,36 +548,36 @@ export default {
.get(`${url3}`, { params: { code: params.row.changeorder_code } })
.then((response) => {
console.log(response)
for (var i = 0; i < response.result.nodes.length; i++) {
var id= response.result.nodes[i].id
var status= response.result.nodes[i].status
for (var i = 0; i < response.data.result.nodes.length; i++) {
var id= response.data.result.nodes[i].id
var status= response.data.result.nodes[i].status
if(id==152&&status==2)
{
var nameid=response.result.nodes[i].defaultUsers.immutable[0]
var nameid=response.data.result.nodes[i].defaultUsers.immutable[0]
var url5 = `${systemUrl}/user/getuser`
service
.get(`${url5}`, { params: { id: nameid} })
.then((response) => {
var name=response.result.name
var name=response.data.result.name
console.log(name)
this.$refs.Preview.name1=name
})
}
if(id==153&&status==2)
{
var nameid=response.result.nodes[i].defaultUsers.immutable[0]
var nameid=response.data.result.nodes[i].defaultUsers.immutable[0]
var url5 = `${systemUrl}/user/getuser`
service
.get(`${url5}`, { params: { id: nameid} })
.then((response) => {
var name=response.result.name
var name=response.data.result.name
console.log(name)
this.$refs.Preview.name2=name
})
// console.log(this.$refs.coordinate.hqauditedTime)
}
}
//this.$refs.coordinate.formdata = response.result
//this.$refs.coordinate.formdata = response.data.result
})
this.$refs.Preview.modelChange1 = true
},
......
pages/processDesign/ChangeSingle/technicalcoordination/index.vue
View file @ b6d3f0bc
......@@ -135,7 +135,7 @@
</div>
</template>
<script>
import service from '../../../../plugins/request'
import service from '@/plugins/request'
import Department from '@/components/modalTree/department.vue'
import Process from '@/components/orderOperator/process'
import techSendReview from './techSendReview.vue'
......@@ -423,8 +423,8 @@ export default {
}
})
.then((res) => {
this.data2 = res.result.items
this.total = res.result.totalCount
this.data2 = res.data.result.items
this.total = res.data.result.totalCount
})
},
......@@ -458,7 +458,7 @@ if(this.formdata.dispatch_id==0)
var url1 = `${designUrl}/routingheader/GetCodeByType?code=JJXTD`
service.get(`${url1}`).then((response) => {
this.formdata.technical_coordination_code = response.result
this.formdata.technical_coordination_code = response.data.result
})
},
handleChange1(date) {
......@@ -482,7 +482,7 @@ if(this.formdata.dispatch_id==0)
.get(`${url}`, { params: {technical_coordination_code: this.formdata.technical_coordination_code, pageindex:1,pageSize:10 } })
.then((res) => {
console.log(res)
this.$refs.techSendReview.info.changeInfo = res.result.items[0];
this.$refs.techSendReview.info.changeInfo = res.data.result.items[0];
this.$refs.techSendReview.technical_coordination_code = this.formdata.technical_coordination_code;
})
this.$refs.techSendReview.modalInfo = true
......@@ -502,7 +502,7 @@ if(this.formdata.dispatch_id==0)
service
.get(`${url2}`, { params: { Id: params.row.id } })
.then((response) => {
this.formdata = response.result.technicalCoordination
this.formdata = response.data.result.technicalCoordination
})
this.show = true
},
......@@ -519,30 +519,30 @@ if(this.formdata.dispatch_id==0)
service
.get(`${url2}`, { params: { Id: params.row.id } })
.then((response) => {
this.$refs.coordinate.formdata = response.result
this.$refs.coordinate.formdata = response.data.result
})
var url3 = `${workflowUrl}/instance/getdetailbycode`
service
.get(`${url3}`, { params: { code: params.row.technical_coordination_code } })
.then((response) => {
console.log(response)
for (var i = 0; i < response.result.nodes.length; i++) {
var id= response.result.nodes[i].id
var status= response.result.nodes[i].status
for (var i = 0; i < response.data.result.nodes.length; i++) {
var id= response.data.result.nodes[i].id
var status= response.data.result.nodes[i].status
if(id==163&&status==2)
{
var context=response.result.nodes[i].contextData
var context=response.data.result.nodes[i].contextData
this.$refs.coordinate.formcontextdata=JSON.parse(context);
}
if(id==164&&status==2)
{
this.$refs.coordinate.hqauditedTime=response.result.nodes[i].auditedTime
var nameid=response.result.nodes[i].defaultUsers.immutable[0]
this.$refs.coordinate.hqauditedTime=response.data.result.nodes[i].auditedTime
var nameid=response.data.result.nodes[i].defaultUsers.immutable[0]
var url5 = `${systemUrl}/user/getuser`
service
.get(`${url5}`, { params: { id: nameid} })
.then((response) => {
var name=response.result.name
var name=response.data.result.name
console.log(name)
this.$refs.coordinate.name1=name
})
......@@ -550,21 +550,21 @@ if(this.formdata.dispatch_id==0)
}
if(id==165&&status==2)
{
var context=response.result.nodes[i].contextData
var nameid=response.result.nodes[i].defaultUsers.immutable[0]
var context=response.data.result.nodes[i].contextData
var nameid=response.data.result.nodes[i].defaultUsers.immutable[0]
this.$refs.coordinate.formcontextclosedata=JSON.parse(context);
this.$refs.coordinate.auditedTime=response.result.nodes[i].auditedTime
this.$refs.coordinate.auditedTime=response.data.result.nodes[i].auditedTime
var url4 = `${systemUrl}/user/getuser`
service
.get(`${url4}`, { params: { id: nameid} })
.then((response) => {
var name=response.result.name
var name=response.data.result.name
console.log(name)
this.$refs.coordinate.name=name
})
}
}
//this.$refs.coordinate.formdata = response.result
//this.$refs.coordinate.formdata = response.data.result
})
this.$refs.coordinate.modelChange1 = true
},
......
pages/processDesign/ChangeSingle/technicalcoordination/techSendReview.vue
View file @ b6d3f0bc
......@@ -35,7 +35,7 @@
<script>
import techInfos from './techInfos.vue'
import Process from '@/components/orderOperator/process'
import service from '../../../../plugins/request'
import service from '@/plugins/request'
export default {
name: 'techSendReview',
components: {
......@@ -75,7 +75,7 @@ export default {
// )
// .then((res) => {
// console.log(res);
// this.userlist = res.result.firstNode.operatorList
// this.userlist = res.data.result.firstNode.operatorList
// console.log(this.userlist);
// })
},
......@@ -99,7 +99,7 @@ export default {
.get(`${url}`, { params: {technical_coordination_code: this.technical_coordination_code, pageindex:1,pageSize:10 } })
.then((res) => {
console.log(res)
this.data3 = res.result.items
this.data3 = res.data.result.items
let operatorIdList = this.returnDataList()
let itemCode = this.technical_coordination_code;
this.dataListRetrunNew.idList=[];
......@@ -125,7 +125,7 @@ export default {
// .get(`${url}`, { params: {technical_coordination_code: this.technical_coordination_code, pageindex:1,pageSize:10 } })
// .then((res) => {
// console.log(res)
// this.data3 = res.result.items
// this.data3 = res.data.result.items
// console.log(this.data3[0].id)
// let url = `${workflowUrl}/instance/start`
// service
......
pages/processDesign/ChangeSingle/unqualifiedorder/index.vue
View file @ b6d3f0bc
......@@ -122,7 +122,7 @@
</div>
</template>
<script>
import service from '../../../../plugins/request'
import service from '@/plugins/request'
import Department from '@/components/modalTree/department.vue'
import Process from '@/components/orderOperator/process'
import OrderSendReview from '../components/orderSendReview'//送审页面
......@@ -374,8 +374,8 @@ export default {
}
})
.then((res) => {
this.data2 = res.result.items
this.total = res.result.totalCount
this.data2 = res.data.result.items
this.total = res.data.result.totalCount
})
},
handleChange1(date) {
......@@ -420,7 +420,7 @@ export default {
var url1 = `${designUrl}/routingheader/GetCodeByType?code=BHGSLD`
service.get(`${url1}`).then((response) => {
this.formdata.unqualified_order_code = response.result
this.formdata.unqualified_order_code = response.data.result
})
},
// 添加/编辑 弹框的保存
......@@ -430,7 +430,7 @@ export default {
.then((res) => {
console.log(res)
if (res.data.success) {
let itemId = res.result.id
let itemId = res.data.result.id
this.dataListRetrunNew.idList.push(itemId);
this.loadchangelist()
this.$Message.success('保存成功')
......@@ -481,7 +481,7 @@ export default {
service
.get(`${url2}`, { params: { Id: params.row.id } })
.then((response) => {
this.formdata = response.result
this.formdata = response.data.result
})
this.show = true
},
......@@ -500,62 +500,62 @@ export default {
service
.get(`${url2}`, { params: { Id: params.row.id } })
.then((response) => {
this.$refs.trialOrder.formdata = response.result
this.$refs.trialOrder.formdata = response.data.result
})
var url3 = `${workflowUrl}/instance/getdetailbycode`
service
.get(`${url3}`, { params: { code: params.row.unqualified_order_code } })
.then((response) => {
console.log(response)
for (var i = 0; i < response.result.nodes.length; i++) {
var id= response.result.nodes[i].id
var status= response.result.nodes[i].status
for (var i = 0; i < response.data.result.nodes.length; i++) {
var id= response.data.result.nodes[i].id
var status= response.data.result.nodes[i].status
if(id==157&&status==2)
{
var context=response.result.nodes[i].contextData
var context=response.data.result.nodes[i].contextData
this.$refs.trialOrder.formcontextdata=JSON.parse(context);
this.$refs.trialOrder.gyauditedTime=response.result.nodes[i].auditedTime
var nameid=response.result.nodes[i].defaultUsers.immutable[0]
this.$refs.trialOrder.gyauditedTime=response.data.result.nodes[i].auditedTime
var nameid=response.data.result.nodes[i].defaultUsers.immutable[0]
console.log(nameid)
var url5 = `${systemUrl}/user/getuser`
service
.get(`${url5}`, { params: { id: nameid} })
.then((response) => {
var name=response.result.name
var name=response.data.result.name
console.log(nameid)
this.$refs.trialOrder.name3=name
})
}
if(id==158&&status==2)
{
this.$refs.trialOrder.hqauditedTime=response.result.nodes[i].auditedTime
var nameid=response.result.nodes[i].defaultUsers.immutable[0]
this.$refs.trialOrder.hqauditedTime=response.data.result.nodes[i].auditedTime
var nameid=response.data.result.nodes[i].defaultUsers.immutable[0]
var url5 = `${systemUrl}/user/getuser`
service
.get(`${url5}`, { params: { id: nameid} })
.then((response) => {
var name=response.result.name
var name=response.data.result.name
//console.log(name)
this.$refs.trialOrder.name2=name
})
}
if(id==159&&status==2)
{
var context=response.result.nodes[i].contextData
var context=response.data.result.nodes[i].contextData
this.$refs.trialOrder.formcontextclosedata=JSON.parse(context);
this.$refs.trialOrder.jyauditedTime=response.result.nodes[i].auditedTime
var nameid=response.result.nodes[i].defaultUsers.immutable[0]
this.$refs.trialOrder.jyauditedTime=response.data.result.nodes[i].auditedTime
var nameid=response.data.result.nodes[i].defaultUsers.immutable[0]
var url5 = `${systemUrl}/user/getuser`
service
.get(`${url5}`, { params: { id: nameid} })
.then((response) => {
var name=response.result.name
var name=response.data.result.name
//console.log(name)
this.$refs.trialOrder.name1=name
})
}
}
//this.$refs.trialOrder.formdata = response.result
//this.$refs.trialOrder.formdata = response.data.result
})
this.$refs.trialOrder.modelChange1 = true
},
......
pages/processDesign/Process/changeSendReview.vue
View file @ b6d3f0bc
......@@ -35,7 +35,7 @@
<script>
import changeInfos from '@/pages/processDesign/Process/changeInfos.vue'
import Process from '@/components/orderOperator/process'
import service from '../../../plugins/request'
import service from '@/plugins/request'
export default {
name: 'changeSendReview',
components: {
......@@ -75,7 +75,7 @@ export default {
// )
// .then((res) => {
// console.log(res);
// this.userlist = res.result.firstNode.operatorList
// this.userlist = res.data.result.firstNode.operatorList
// console.log(this.userlist);
// })
},
......@@ -99,7 +99,7 @@ export default {
.get(`${url}`, { params: {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10 } })
.then((res) => {
console.log(res)
this.data3 = res.result.items
this.data3 = res.data.result.items
let operatorIdList = this.returnDataList()
let itemCode = this.changeorder_code;
this.dataListRetrunNew.idList=[];
......@@ -125,7 +125,7 @@ export default {
// .get(`${url}`, { params: {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10 } })
// .then((res) => {
// console.log(res)
// this.data3 = res.result.items
// this.data3 = res.data.result.items
// console.log(this.data3[0].id)
// let url = `${workflowUrl}/instance/start`
// service
......
pages/processDesign/Process/changelist.vue
View file @ b6d3f0bc
......@@ -30,7 +30,7 @@
<script>
import routingchangeorder from './routingchangeorder.vue'
import Preview from './tan'
import service from '../../../plugins/request'
import service from '@/plugins/request'
export default {
components: {
routingchangeorder,
......@@ -230,32 +230,32 @@ export default {
.then((response) => {
console.log(response)
this.$refs.routingchangeorder.changeorder_code =
response.result.changeorder_code
response.data.result.changeorder_code
this.$refs.routingchangeorder.routing_header_Id =
response.result.routing_header_Id
response.data.result.routing_header_Id
this.$refs.routingchangeorder.formValidate = {
id: response.result.id,
changeorder_code: response.result.changeorder_code,
routing_header_Id: response.result.routing_header_Id,
propose_user_id: response.result.propose_user_id,
propose_user_name: response.result.propose_user_name,
department_id: response.result.department_id,
department_name: response.result.department_name,
technical_name: response.result.technical_name,
technical_code: response.result.technical_code,
changed_version: response.result.changed_version_id,
quantity: response.result.quantity,
print_data: response.result.print_data,
executive_branch: response.result.executive_branch,
executive_branch_id: response.result.executive_branch_id,
handling_opinions_id: response.result.handling_opinions_id,
handling_opinions: response.result.handling_opinions_id,
before_change_content: response.result.before_change_content,
after_change_content: response.result.after_change_content,
change_reason: response.result.change_reason,
effective_date: response.result.effective_date,
status:response.result.status,
note:response.result.note,
id: response.data.result.id,
changeorder_code: response.data.result.changeorder_code,
routing_header_Id: response.data.result.routing_header_Id,
propose_user_id: response.data.result.propose_user_id,
propose_user_name: response.data.result.propose_user_name,
department_id: response.data.result.department_id,
department_name: response.data.result.department_name,
technical_name: response.data.result.technical_name,
technical_code: response.data.result.technical_code,
changed_version: response.data.result.changed_version_id,
quantity: response.data.result.quantity,
print_data: response.data.result.print_data,
executive_branch: response.data.result.executive_branch,
executive_branch_id: response.data.result.executive_branch_id,
handling_opinions_id: response.data.result.handling_opinions_id,
handling_opinions: response.data.result.handling_opinions_id,
before_change_content: response.data.result.before_change_content,
after_change_content: response.data.result.after_change_content,
change_reason: response.data.result.change_reason,
effective_date: response.data.result.effective_date,
status:response.data.result.status,
note:response.data.result.note,
}
})
this.$refs.routingchangeorder.modelChange = true
......@@ -270,28 +270,28 @@ export default {
.then((response) => {
console.log(response)
this.$refs.Preview.changeorder_code =
response.result.changeorder_code
response.data.result.changeorder_code
this.$refs.Preview.formValidate = {
id: response.result.id,
changeorder_code: response.result.changeorder_code,
routing_header_Id: response.result.routing_header_Id,
propose_user_id: response.result.propose_user_id,
propose_user_name: response.result.propose_user_name,
department_id: response.result.department_id,
department_name: response.result.department_name,
technical_name: response.result.technical_name,
technical_code: response.result.technical_code,
changed_version: response.result.changed_version_name,
quantity: response.result.quantity,
print_data: response.result.print_data,
executive_branch: response.result.executive_branch,
executive_branch_id: response.result.executive_branch_id,
handling_opinions_id: response.result.handling_opinions_id,
handling_opinions: response.result.handling_opinions_name,
before_change_content: response.result.before_change_content,
after_change_content: response.result.after_change_content,
change_reason: response.result.change_reason,
effective_date: response.result.effective_date
id: response.data.result.id,
changeorder_code: response.data.result.changeorder_code,
routing_header_Id: response.data.result.routing_header_Id,
propose_user_id: response.data.result.propose_user_id,
propose_user_name: response.data.result.propose_user_name,
department_id: response.data.result.department_id,
department_name: response.data.result.department_name,
technical_name: response.data.result.technical_name,
technical_code: response.data.result.technical_code,
changed_version: response.data.result.changed_version_name,
quantity: response.data.result.quantity,
print_data: response.data.result.print_data,
executive_branch: response.data.result.executive_branch,
executive_branch_id: response.data.result.executive_branch_id,
handling_opinions_id: response.data.result.handling_opinions_id,
handling_opinions: response.data.result.handling_opinions_name,
before_change_content: response.data.result.before_change_content,
after_change_content: response.data.result.after_change_content,
change_reason: response.data.result.change_reason,
effective_date: response.data.result.effective_date
}
})
var url3 = `${workflowUrl}/instance/getdetailbycode`
......@@ -299,36 +299,36 @@ export default {
.get(`${url3}`, { params: { code: params.row.changeorder_code } })
.then((response) => {
console.log(response)
for (var i = 0; i < response.result.nodes.length; i++) {
var id= response.result.nodes[i].id
var status= response.result.nodes[i].status
for (var i = 0; i < response.data.result.nodes.length; i++) {
var id= response.data.result.nodes[i].id
var status= response.data.result.nodes[i].status
if(id==152&&status==2)
{
var nameid=response.result.nodes[i].defaultUsers.immutable[0]
var nameid=response.data.result.nodes[i].defaultUsers.immutable[0]
var url5 = `${systemUrl}/user/getuser`
service
.get(`${url5}`, { params: { id: nameid} })
.then((response) => {
var name=response.result.name
var name=response.data.result.name
console.log(name)
this.$refs.Preview.name1=name
})
}
if(id==153&&status==2)
{
var nameid=response.result.nodes[i].defaultUsers.immutable[0]
var nameid=response.data.result.nodes[i].defaultUsers.immutable[0]
var url5 = `${systemUrl}/user/getuser`
service
.get(`${url5}`, { params: { id: nameid} })
.then((response) => {
var name=response.result.name
var name=response.data.result.name
console.log(name)
this.$refs.Preview.name2=name
})
// console.log(this.$refs.coordinate.hqauditedTime)
}
}
//this.$refs.coordinate.formdata = response.result
//this.$refs.coordinate.formdata = response.data.result
})
this.$refs.Preview.modelChange1 = true
},
......@@ -337,7 +337,7 @@ export default {
service
.get(`${url}`, { params: { routing_header_id: this.seleId } })
.then((res) => {
this.data2 = res.result.items
this.data2 = res.data.result.items
})
}
}
......
pages/processDesign/Process/detailfiles.vue
View file @ b6d3f0bc
......@@ -31,7 +31,7 @@
</div>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
export default {
name: 'detailfiles',
data() {
......@@ -183,7 +183,7 @@ export default {
`${designUrl}/routingfile/getlistbydetailid?detailID=` +
this.routing_detail_id
service.get(`${url}`).then((response) => {
response.result.forEach((data) => {
response.data.result.forEach((data) => {
let objImag = {}
objImag.fileName = data.name
objImag.filePath = data.url
......
pages/processDesign/Process/index.vue
View file @ b6d3f0bc
......@@ -220,7 +220,7 @@ import changelist from './changelist.vue'
import processview from './processview.vue'
import sendAudit from './sendAudit.vue'
import myechart from './myechart.vue'
import service from '../../../plugins/request'
import service from '@/plugins/request'
import QS from 'querystring'
export default {
components: {
......@@ -479,8 +479,8 @@ export default {
var url = `${designUrl}/routingheader/getpaged?` + QS.stringify(model)
service.get(`${url}`).then((response) => {
this.datatotal = response.result.totalCount
this.data1 = response.result.items
this.datatotal = response.data.result.totalCount
this.data1 = response.data.result.items
})
},
......@@ -489,7 +489,7 @@ export default {
service.get(`${url}`).then((response) => {
let arry = []
response.result.forEach((data) => {
response.data.result.forEach((data) => {
var that = this
let arryObj = {}
arryObj['label'] = data.name
......@@ -609,15 +609,15 @@ export default {
let that = this
var url = `${designUrl}/routingheader/GetCodeByType?code=ZGY`
service.get(`${url}`).then((response) => {
that.addpdefm.formValidate.code = response.result
that.addpdefm.gycode = response.result
that.addpdefm.formValidate.code = response.data.result
that.addpdefm.gycode = response.data.result
}) //编号
var url =
`${designUrl}/productinfo/getbyid?id=` + this.ProductSelected[0].id
service.get(`${url}`).then((response) => {
this.addpdefm.ProductName = response.result.name
this.addpdefm.ProductCode = response.result.drawingNo
this.addpdefm.ProductName = response.data.result.name
this.addpdefm.ProductCode = response.data.result.drawingNo
}) //产品名称
this.addpdefm.Loadfile(0)
this.addpdefm.setshow()
......@@ -710,19 +710,19 @@ export default {
let print_data_versioncode = this.headerInfo
.print_data_versioncode
a.formValidate = response.result
a.formValidate = response.data.result
a.formValidate.versioncode = versioncode
a.formValidate.task_type = task_type
a.formValidate.development_mode = development_mode
a.formValidate.print_data_versioncode = print_data_versioncode
this.headerInfo.id = response.result.id
this.headerInfo.id = response.data.result.id
a.updateEid(response.result.id)
a.updateEid(response.data.result.id)
this.modal1 = false
this.headerid = response.result.id
this.headerid = response.data.result.id
if (this.headeroldid != 0) {
var url =
......@@ -782,14 +782,14 @@ export default {
var url =
`${designUrl}/routingheader/getbyid?id=` + this.headerSelected.id
service.get(`${url}`).then((response) => {
that.addpdefm.formValidate = response.result
that.addpdefm.formValidate = response.data.result
that.addpdefm.isview = this.isview
that.addpdefm.ProductName = response.result.productName
that.addpdefm.ProductCode = response.result.productCode
this.headerInfo = response.result
this.headerid = response.result.id
that.addpdefm.MianVer = response.result.mianVer
that.addpdefm.MianCode = response.result.mianCode
that.addpdefm.ProductName = response.data.result.productName
that.addpdefm.ProductCode = response.data.result.productCode
this.headerInfo = response.data.result
this.headerid = response.data.result.id
that.addpdefm.MianVer = response.data.result.mianVer
that.addpdefm.MianCode = response.data.result.mianCode
that.addpdefm.setshow()
})
......@@ -804,14 +804,14 @@ export default {
this.headeroldid = 0
var url = `${designUrl}/routingheader/getbyid?id=` + id
service.get(`${url}`).then((response) => {
that.addpdefm.formValidate = response.result
that.addpdefm.formValidate = response.data.result
that.addpdefm.isview = this.isview
that.addpdefm.ProductName = response.result.productName
that.addpdefm.ProductCode = response.result.productCode
this.headerInfo = response.result
this.headerid = response.result.id
that.addpdefm.MianVer = response.result.mianVer
that.addpdefm.MianCode = response.result.mianCode
that.addpdefm.ProductName = response.data.result.productName
that.addpdefm.ProductCode = response.data.result.productCode
this.headerInfo = response.data.result
this.headerid = response.data.result.id
that.addpdefm.MianVer = response.data.result.mianVer
that.addpdefm.MianCode = response.data.result.mianCode
that.addpdefm.setshow()
})
......@@ -827,14 +827,14 @@ export default {
this.headeroldid = 0
var url = `${designUrl}/routingheader/getbyid?id=` + params.row.id
service.get(`${url}`).then((response) => {
that.addpdefm.formValidate = response.result
that.addpdefm.formValidate = response.data.result
that.addpdefm.isview = this.isview
that.addpdefm.ProductName = response.result.productName
that.addpdefm.ProductCode = response.result.productCode
this.headerInfo = response.result
this.headerid = response.result.id
that.addpdefm.MianVer = response.result.mianVer
that.addpdefm.MianCode = response.result.mianCode
that.addpdefm.ProductName = response.data.result.productName
that.addpdefm.ProductCode = response.data.result.productCode
this.headerInfo = response.data.result
this.headerid = response.data.result.id
that.addpdefm.MianVer = response.data.result.mianVer
that.addpdefm.MianCode = response.data.result.mianCode
that.addpdefm.setshow()
})
......@@ -949,8 +949,8 @@ export default {
let that = this
var url = `${designUrl}/routingheader/GetCodeByType?code=ZY`
service.get(`${url}`).then((response) => {
that.addpdefm.formValidate.code = response.result
that.addpdefm.gycode = response.result
that.addpdefm.formValidate.code = response.data.result
that.addpdefm.gycode = response.data.result
})
this.addpdefm.setshow()
......@@ -991,7 +991,7 @@ export default {
})
var url1 = `${designUrl}/routingheader/GetCodeByType?code=JSWJGGD`
service.get(`${url1}`).then((response) => {
this.$refs.routingchangeorder.changeorder_code = response.result
this.$refs.routingchangeorder.changeorder_code = response.data.result
})
this.$refs.routingchangeorder.modelChange = true
},
......@@ -1005,7 +1005,7 @@ export default {
.get(`${url}`, { params: { routing_header_id: this.seleId } })
.then((res) => {
//console.log(res)
this.$refs.changelist.data2 = res.result.items
this.$refs.changelist.data2 = res.data.result.items
this.$refs.changelist.myloading = false
if (this.$refs.changelist.data2.length == 0) {
this.$Message.error('该工艺规程没有更改单！')
......
pages/processDesign/Process/processNew.vue
View file @ b6d3f0bc
......@@ -123,7 +123,7 @@ import makeModel from './makeModel.vue'
import stepModel from './stepModel.vue'
import detailfiles from './detailfiles.vue'
import service from '../../../plugins/request'
import service from '@/plugins/request'
export default {
name: 'processNew',
components: { testingModel, makeModel, stepModel, detailfiles },
......@@ -336,7 +336,7 @@ export default {
`${designUrl}/routingdetail/getlistbyheaderid?headerID=` +
this.formprocessValidate.routing_header_id
service.get(`${url}`).then((response) => {
this.data2 = response.result
this.data2 = response.data.result
})
},
LoadEquipTypeList() {
......@@ -344,7 +344,7 @@ export default {
let url = `${systemUrl}/equiptype/getlistall`,
that = this
service.get(`${url}`).then((res) => {
let selectdata = res.result
let selectdata = res.data.result
selectdata.forEach((item) => {
that.EquipTypeList.push({
value: item.id,
......@@ -360,7 +360,7 @@ export default {
service
.get(`${url}`, { params: { shopid: '', eqtypeid: 0 } })
.then((res) => {
let selectdata = res.result
let selectdata = res.data.result
selectdata.forEach((item) => {
that.EquipList.push({
value: item.id,
......
pages/processDesign/Process/processfile.vue
View file @ b6d3f0bc
......@@ -32,7 +32,7 @@
</div>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
export default {
name: 'processfile',
data() {
......@@ -160,7 +160,7 @@ if(this.routing_header_id==0)
`${designUrl}/routingfile/getlistbyheaderid?isAll=0&headerID=` +
this.routing_header_id
service.get(`${url}`).then((response) => {
response.result.forEach((data) => {
response.data.result.forEach((data) => {
let objImag = {}
objImag.fileName = data.name
objImag.filePath = data.url
......
pages/processDesign/Process/processview.vue
View file @ b6d3f0bc
......@@ -353,7 +353,7 @@
</div>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
export default {
name: 'processview',
data() {
......@@ -479,7 +479,7 @@ export default {
loaddata(headerID) {
var url = `${designUrl}/routingheader/getprocessinfo?headerid=` + headerID
service.get(`${url}`).then((response) => {
this.formValidate = response.result
this.formValidate = response.data.result
if (this.formValidate.change_order_code == '') {
this.formValidate.change_order_date = ''
......
pages/processDesign/Process/quotationBox1.vue
View file @ b6d3f0bc
......@@ -252,7 +252,7 @@
</div>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
import processfile from './processfile.vue'
export default {
name: 'quotationBox1',
......@@ -514,7 +514,7 @@ export default {
let url = `${designUrl}/routingheader/getlistbyids?` + this.Mianids,
that = this
service.get(`${url}`).then((res) => {
let selectdata = res.result
let selectdata = res.data.result
selectdata.forEach((item) => {
this.processList.push({
......@@ -592,7 +592,7 @@ export default {
service.get(`${url}`).then((response) => {
this.oldformValidate = this.formValidate
this.formValidate = response.result
this.formValidate = response.data.result
this.formValidate.up_id = this.oldformValidate.up_id
this.formValidate.productids = this.oldformValidate.productids
......@@ -611,14 +611,14 @@ export default {
//this.setshow()
if (this.createtype == 2) {
this.setparentcreatetype(2, response.result.id)
this.setparentcreatetype(2, response.data.result.id)
this.formValidate.id = 0 //克隆为新建，id设置为0
}
if (this.createtype == 3) {
//只读
this.setparentcreatetype(3, response.result.id)
this.setparentcreatetype(3, response.data.result.id)
}
})
},
......@@ -639,7 +639,7 @@ export default {
'&routingType=' +
this.formValidate.routingType
service.get(`${url}`).then((response) => {
this.RoutingList = response.result
this.RoutingList = response.data.result
})
},
setshow() {
......
pages/processDesign/Process/quotationBox2.vue
View file @ b6d3f0bc
......@@ -112,7 +112,7 @@
</div>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
export default {
name: 'quotationBox2',
data() {
......@@ -298,11 +298,11 @@ this.isadd03=false;
this.data02 = []
this.data03 = []
service.get(`${url1}`).then((res) => {
let selectdata = res.result
let selectdata = res.data.result
if (selectdata == null) {
var url = `${designUrl}/routingheader/GetCodeByType?code=SWQD`
service.get(`${url}`).then((response) => {
this.formValidate.code = response.result
this.formValidate.code = response.data.result
})
} else {
this.formValidate = selectdata.orderBill
......
pages/processDesign/Process/quotationBox3.vue
View file @ b6d3f0bc
......@@ -120,7 +120,7 @@
</div>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
export default {
name: 'quotationBox3',
data() {
......@@ -298,11 +298,11 @@ isview:false,
this.data02 = []
this.data03 = []
service.get(`${url1}`).then((res) => {
let selectdata = res.result
let selectdata = res.data.result
if (selectdata == null) {
var url = `${designUrl}/routingheader/GetCodeByType?code=CPJJD`
service.get(`${url}`).then((response) => {
this.formValidate.code = response.result
this.formValidate.code = response.data.result
})
} else {
this.formValidate = selectdata.orderBill
......
pages/processDesign/Process/routingchangeorder.vue
View file @ b6d3f0bc
......@@ -180,7 +180,7 @@
</template>
<script>
import Department from '@/components/modalTree/department.vue'
import service from '../../../plugins/request'
import service from '@/plugins/request'
import VueUeditorWrap from 'vue-ueditor-wrap'
import iQuill from "@/components/quill";
import Process from '@/components/orderOperator/process'
......@@ -283,7 +283,7 @@ export default {
// )
// .then((res) => {
// console.log(res);
// this.userlist = res.result.firstNode.operatorList
// this.userlist = res.data.result.firstNode.operatorList
// console.log(this.userlist);
// })
},
......@@ -341,7 +341,7 @@ export default {
// .get(`${url}`, { params: {changeorder_code: "JSWJGGD_20200219_15", pageindex:1,pageSize:10 } })
// .then((res) => {
// console.log(res)
// this.$refs.changeSendReview.info.changeInfo = res.result.items[0];
// this.$refs.changeSendReview.info.changeInfo = res.data.result.items[0];
// this.$refs.changeSendReview.changeorder_code = "JSWJGGD_20200219_15";
// })
// this.$refs.changeSendReview.modalInfo = true;
......@@ -382,7 +382,7 @@ export default {
.get(`${url}`, { params: {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10 } })
.then((res) => {
console.log(res)
this.$refs.changeSendReview.info.changeInfo = res.result.items[0];
this.$refs.changeSendReview.info.changeInfo = res.data.result.items[0];
this.$refs.changeSendReview.changeorder_code = this.changeorder_code;
})
this.$refs.changeSendReview.modalInfo = true;
......@@ -428,7 +428,7 @@ export default {
.get(`${url}`, { params: {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10 } })
.then((res) => {
console.log(res)
this.$refs.changeSendReview.info.changeInfo = res.result.items[0];
this.$refs.changeSendReview.info.changeInfo = res.data.result.items[0];
this.$refs.changeSendReview.changeorder_code = this.changeorder_code;
})
this.$refs.changeSendReview.modalInfo = true;
......@@ -438,7 +438,7 @@ export default {
// .get(`${url}`, { params: {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10 } })
// .then((res) => {
// console.log(res)
// this.data3 = res.result.items
// this.data3 = res.data.result.items
// console.log(this.data3[0].id)
// let url = `${workflowUrl}/instance/start`
// service
......@@ -472,7 +472,7 @@ export default {
// .get(`${url}`, { params: {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10 } })
// .then((res) => {
// console.log(res)
// this.data3 = res.result.items
// this.data3 = res.data.result.items
// console.log(this.data3[0].id)
// let url = `${workflowUrl}/instance/start`
// service
......
pages/processDesign/Process/routingchangeorder1.vue
View file @ b6d3f0bc
......@@ -187,7 +187,7 @@
</template>
<script>
import Department from '@/components/modalTree/department.vue'
import service from '../../../plugins/request'
import service from '@/plugins/request'
import VueUeditorWrap from 'vue-ueditor-wrap'
import iQuill from "@/components/quill";
export default {
......
pages/processDesign/Process/stepModel.vue
View file @ b6d3f0bc
......@@ -83,7 +83,7 @@
</div>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
export default {
name: 'stepModel',
data() {
......@@ -129,7 +129,7 @@ export default {
`${designUrl}/routingstep/getlistbydetailid?detailID=` +
this.newModeldata.routing_detail_id
service.get(`${url}`).then((response) => {
this.data01 = response.result
this.data01 = response.data.result
})
},
......
pages/processDesign/Process/testingModel.vue
View file @ b6d3f0bc
......@@ -125,7 +125,7 @@
</div>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
export default {
name: 'testingModel',
......@@ -312,7 +312,7 @@ export default {
`${designUrl}/routingqccard/getlistbydetailid?detailID=` +
this.cardModeldata.routing_detail_id
service.get(`${url}`).then((response) => {
this.data1 = response.result
this.data1 = response.data.result
})
},
openNew() {
......
pages/processDesign/ProcessRecord/index.vue
View file @ b6d3f0bc
......@@ -97,7 +97,7 @@
</div>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
import Department from '@/components/modalTree/department.vue'
import inputFiles from '@/components/page/inputFile.vue'
export default {
......@@ -266,15 +266,15 @@ export default {
}
})
.then((res) => {
this.data1 = res.result.items
this.total = res.result.totalCount
this.data1 = res.data.result.items
this.total = res.data.result.totalCount
})
},
laodactiontype() {
let url = `${systemUrl}/equiptype/getpaged`,
that = this
service.get(`${url}`).then((res) => {
let selectdata = res.result.items
let selectdata = res.data.result.items
selectdata.forEach((item) => {
that.cityList.push({
value: item.equip_type_name,
......@@ -289,7 +289,7 @@ export default {
let url = `${systemUrl}/processrecord/getequipinfo`,
that = this
service.get(`${url}`, { params: { eqtypeid: id } }).then((res) => {
let selectdata = res.result.items
let selectdata = res.data.result.items
selectdata.forEach((item) => {
that.cityList1.push({
value: item.equip_id,
......
pages/processDesign/productTree/addproduct.vue
View file @ b6d3f0bc
......@@ -35,7 +35,7 @@
</Form>
</template>
<script>
import service from '../../../plugins/request'
import service from '@/plugins/request'
export default {
name:'addProduct',
props:[
......@@ -83,7 +83,7 @@ export default {
created(){
var url=`${designUrl}/productlevel/getdepartmentstree`
service.get(`${url}`).then(response=>{
this.data2= response.result
this.data2= response.data.result
})
},
......
pages/processDesign/productTree/index.vue
View file @ b6d3f0bc
......@@ -63,7 +63,7 @@ import tb from '../../basicData/roleManagent/components/tb'
import add from './addclass'
import addProduct from './addproduct'
import myconfirm from './components/myconfirm'
import service from '../../../plugins/request'
import service from '@/plugins/request'
export default {
components: { treeGrid,tb,add ,addProduct,myconfirm},
data() {
......@@ -270,7 +270,7 @@ export default {
var url=`${designUrl}/productlevel/getallselecttreenew`
service.get(`${url}`).then(response=>{
that.$refs.addproduct.data1=(response.result)
that.$refs.addproduct.data1=(response.data.result)
})
......@@ -335,7 +335,7 @@ export default {
loadProduct(seoName){
var url=`${designUrl}/productlevel/getproducttreenew`
service.get(`${url}`,{params:{seoName: seoName}}).then(response=>{
this.data=response.result
this.data=response.data.result
})
},
//保存产品
......@@ -443,13 +443,13 @@ export default {
url=`${designUrl}/productlevel/delete?id=${this.lid}`
}
service.delete(`${url}`).then(response=>{
if (response.result.status) {
if (response.data.result.status) {
this.$Message.success('删除成功')
this.loadProduct()
this.loadlevel()
}
else{
this.$Message.error(response.result.message)
this.$Message.error(response.data.result.message)
}
}).catch((error) => {
this.$Message.error()
......@@ -470,7 +470,7 @@ export default {
loadlevel(){
var url=`${designUrl}/productlevel/gettree`
service.get(`${url}`).then(response=>{
this.leveldata=response.result
this.leveldata=response.data.result
})
},
cancelClick(){
......@@ -532,7 +532,7 @@ export default {
this.$refs.addclass.list.push({label: `${name}`, value: this.clickindexLevel})
var url=`${designUrl}/productlevel/getselecttree`
service.get(`${url}`, {params:{id:this.clickindexLevel} }).then(response=>{
this.$refs.addclass.data=response.result
this.$refs.addclass.data=response.data.result
})
}else {
this.$refs.addclass.formValidate.upid=0
......@@ -581,14 +581,14 @@ export default {
}
this.formValidate1 = this.$refs.addclass.formValidate
service.post(`${url}`,JSON.stringify({ProductLevel:this.formValidate1})).then(response=>{
if(response.result.status){
if(response.data.result.status){
this.$Message.success('保存成功')
this.loadlevel()
this.loadProduct()
this.modal2 = false
}
else{
this.$Message.error(response.result.message)
this.$Message.error(response.data.result.message)
}
}).catch(error=>{
this.$Message.error('保存失败')
......
pages/processDesign/setProcess/components/dataDissemination.vue
View file @ b6d3f0bc
......@@ -58,7 +58,7 @@
</template>
<script>
import service from '../../../../plugins/request'
import service from '@/plugins/request'
import Process from '@/components/orderOperator/process'
export default {
components: {
......@@ -106,7 +106,7 @@ export default {
dataDetail(v) {
var url = `${designUrl}/orderdatareview/getbyid?id=` + v
service.get(`${url}`).then((r) => {
this.formValidate = r.result
this.formValidate = r.data.result
})
},
dataInstal(v) {},
......
pages/processDesign/setProcess/components/orderData.vue
View file @ b6d3f0bc
......@@ -85,7 +85,7 @@
</div>
</template>
<script>
import service from '../../../../plugins/request'
import service from '@/plugins/request'
import DataDissemination from './dataDissemination'
export default {
name: 'orderData',
......@@ -145,7 +145,7 @@ export default {
var url =
`${designUrl}/orderdatareview/getbyid?id=` + this.formValidate.id
service.get(`${url}`).then((response) => {
this.formValidate = response.result
this.formValidate = response.data.result
this.repairimgName = this.formValidate.repair_file_name
this.supportingimgName = this.formValidate.supporting_file_name
......@@ -234,13 +234,13 @@ export default {
.then((response) => {
console.log(response)
if (response.data.success) {
this.formValidate = response.result
this.formValidate = response.data.result
this.$Message.success('保存成功')
this.cleardata()
this.$parent.$parent.loaddata(this.$parent.$parent.orderSearchForm)
this.$parent.$parent.orderDatadia = false
this.code = response.result.code
// alert(response.result.id)
this.code = response.data.result.code
// alert(response.data.result.id)
if (this.isSendAudit == true) {
if (this.formValidate.currentstep == 0) {
this.schemaIds = '00875796-7675-4c68-bd4f-47e70764dd9e'
......
pages/processDesign/setProcess/components/orderMaterial.vue
View file @ b6d3f0bc
......@@ -286,7 +286,7 @@
</div>
</template>
<script>
import service from '../../../../plugins/request'
import service from '@/plugins/request'
import materialDic from '../components/materialDic'
export default {
......@@ -507,7 +507,7 @@ export default {
var url =
`${designUrl}/ordermaterial/getbyid?id=` + this.formValidate.id
service.get(`${url}`).then((response) => {
this.formValidate = response.result.orderMaterial
this.formValidate = response.data.result.orderMaterial
if (this.formValidate.approvalStatus == 1||this.formValidate.approvalStatus == 2||this.formValidate.approvalStatus == 3) {
this.isview = true
}else{
......@@ -515,13 +515,13 @@ export default {
this.isview = false
}
this.formValidate1 = response.result.orderMaterialList
this.formValidate1 = response.data.result.orderMaterialList
})
} else {
this.cleardata()
var url = `${designUrl}/ordermaterial/getordermateriacode`
service.get(`${url}`).then((response) => {
this.formValidate.code = response.result
this.formValidate.code = response.data.result
})
this.isview = false
this.calcplatesnum();
......@@ -550,7 +550,7 @@ export default {
let url = `${designUrl}/ordermateriallist/getmaterialplacodedic`,
that = this
service.get(`${url}`).then((res) => {
let selectdata = res.result
let selectdata = res.data.result
selectdata.forEach((item) => {
if (item.dictype == 1) {
......@@ -575,7 +575,7 @@ export default {
let url = `${designUrl}/ordermateriallist/getmaterialpowderdic`,
that = this
service.get(`${url}`).then((res) => {
let selectdata = res.result
let selectdata = res.data.result
selectdata.forEach((item) => {
if (item.dictype == 1) {
......@@ -602,7 +602,7 @@ export default {
let url = `${designUrl}/ordermateriallist/getmaterialscraperdic`,
that = this
service.get(`${url}`).then((res) => {
let selectdata = res.result
let selectdata = res.data.result
selectdata.forEach((item) => {
if (item.dictype == 1) {
......@@ -655,7 +655,7 @@ this.formValidate.productingPreparationPeople=this.productingPreparationPeople;
})
)
.then((response) => {
let itemId = response.result.orderMaterial.id
let itemId = response.data.result.orderMaterial.id
// let idIteme = this.$parent.$parent.dataListRetrunNew.idList
// if(idIteme == []){
// idIteme.push(itemId)
......
pages/processDesign/setProcess/index.vue
View file @ b6d3f0bc
......@@ -212,7 +212,7 @@
</Form>
<div slot="footer">
<Button @click="close" style="margin-left:20px;">取消</Button>
<Button @click="easySearch" type="success" style="margin-left:10px;">查询</Button>
<Button @click="search" type="success" style="margin-left:10px;">查询</Button>
</div>
</Modal>
......@@ -376,7 +376,7 @@ import orderMaterial from './components/orderMaterial.vue' //料单
import orderData from './components/orderData.vue' //数据审查
import modelTable from '../Process/model.vue'
import processNew from '../Process/processNew.vue'
import service from '../../../plugins/request'
import service from '@/plugins/request'
import OrderSendReview from './components/orderSendReview' //送审页面
import processview from '../Process/processview.vue'
......@@ -961,6 +961,10 @@ export default {
this.orderSearchForm.SkipCount = 0
this.loaddata({})
},
search()
{
this.easySearch(this.orderSearchForm)
},
//搜索查询
easySearch(params) {
this.page = 1
......@@ -1028,8 +1032,8 @@ export default {
service.get(`${url}`).then((response) => {
// console.log(response)
this.datatotal = response.result.totalCount
this.data1 = response.result.items
this.datatotal = response.data.result.totalCount
this.data1 = response.data.result.items
let count = 1
for (let i = 0; i < this.data1.length; i++) {
......@@ -1171,8 +1175,8 @@ export default {
let that = this
var url = `${designUrl}/routingheader/GetCodeByType?code=ZY`
service.get(`${url}`).then((response) => {
that.addpdefm.formValidate.code = response.result
that.addpdefm.gycode = response.result
that.addpdefm.formValidate.code = response.data.result
that.addpdefm.gycode = response.data.result
})
this.addpdefm.Mianids = ids.substring(0, ids.length - 1)
this.addpdefm.ProductName = productNames.toString(',')
......@@ -1327,18 +1331,18 @@ export default {
let print_data_versioncode = this.headerInfo
.print_data_versioncode
a.formValidate = response.result
a.formValidate = response.data.result
a.formValidate.versioncode = versioncode
a.formValidate.task_type = task_type
a.formValidate.development_mode = development_mode
a.formValidate.print_data_versioncode = print_data_versioncode
this.headerInfo.id = response.result.id
this.headerInfo.id = response.data.result.id
// this.modal1 = false
this.headerid = response.result.id
this.headerid = response.data.result.id
this.detailInfo = response.result
this.detailInfo = response.data.result
this.detailInfo.productName = this.headerInfo.productName
this.detailInfo.routingTypeDesc = this.headerInfo.routingTypeDesc
......@@ -1601,8 +1605,8 @@ export default {
(routingType == 1 ? 'ZGY' : 'ZY')
service.get(`${url}`).then((response) => {
that.addpdefm.formValidate.code = response.result
that.addpdefm.gycode = response.result
that.addpdefm.formValidate.code = response.data.result
that.addpdefm.gycode = response.data.result
})
let obj = params.row
......@@ -1617,8 +1621,8 @@ export default {
service.get(`${url}`).then((response) => {
this.addpdefm.formValidate.up_id = obj.mainRoutingID
this.addpdefm.Mianids = ''
this.addpdefm.MianVer = response.result.version
this.addpdefm.MianCode = response.result.code
this.addpdefm.MianVer = response.data.result.version
this.addpdefm.MianCode = response.data.result.code
})
}
this.addpdefm.formValidate.productingPreparationPeople =
......@@ -1705,20 +1709,20 @@ export default {
var url = `${designUrl}/routingheader/getbyid?id=` + RoutingID
service.get(`${url}`).then((response) => {
this.addpdefm.formValidate = response.result
this.addpdefm.formValidate = response.data.result
this.addpdefm.ProductName = response.result.productName
this.addpdefm.ProductCode = response.result.productCode
this.addpdefm.ProductName = response.data.result.productName
this.addpdefm.ProductCode = response.data.result.productCode
this.addpdefm.MianVer = response.result.mianVer
this.addpdefm.MianCode = response.result.mianCode
this.addpdefm.MianVer = response.data.result.mianVer
this.addpdefm.MianCode = response.data.result.mianCode
this.addpdefm.formValidate.orderids = orderids.toString(',')
this.addpdefm.formValidate.ordercombid = ordercombid
this.addpdefm.formValidate.platesnum = 1
var url = `${designUrl}/orderrouting/getbycombid?id=` + ordercombid
service.get(`${url}`).then((response) => {
this.addpdefm.formValidate.platesnum = response.result.platesnum
this.addpdefm.formValidate.platesnum = response.data.result.platesnum
})
this.addpdefm.setshow()
})
......@@ -1782,17 +1786,17 @@ export default {
}
var url = `${designUrl}/routingheader/getbyid?id=` + RoutingID
service.get(`${url}`).then((response) => {
this.addpdefm.formValidate = response.result
this.headerInfo = response.result
this.headerid = response.result.id
this.addpdefm.ProductName = response.result.productName
this.addpdefm.ProductCode = response.result.productCode
this.addpdefm.MianVer = response.result.mianVer
this.addpdefm.MianCode = response.result.mianCode
this.addpdefm.formValidate = response.data.result
this.headerInfo = response.data.result
this.headerid = response.data.result.id
this.addpdefm.ProductName = response.data.result.productName
this.addpdefm.ProductCode = response.data.result.productCode
this.addpdefm.MianVer = response.data.result.mianVer
this.addpdefm.MianCode = response.data.result.mianCode
var url = `${designUrl}/orderrouting/getbycombid?id=` + ordercombid
service.get(`${url}`).then((response) => {
this.addpdefm.formValidate.platesnum = response.result.platesnum
this.addpdefm.formValidate.platesnum = response.data.result.platesnum
})
this.addpdefm.formValidate.orderids = orderids.toString(',')
......
pages/processManage/Process/detailExamine.vue 0 → 100644
View file @ b6d3f0bc
<template>
<div class="detail">
<Row>
<Filed :span="5" :name="l('productName')">{{info.productName}}</Filed>
<Filed :span="6" :name="l('name')">{{info.name}}</Filed>
<Filed :span="5" :name="l('code')">{{info.code}}</Filed>
<Filed :span="5" :name="l('routingTypeDesc')">{{info.routingTypeDesc}}</Filed>
<Filed :span="3" :name="l('version')">{{info.version}}</Filed>
</Row>
</div>
</template>
<script>
export default {
name: 'detailExamine',
props: ['info'],
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
data() {
return {}
},
methods: {
arry2Name(arryList, values) {
//预警类别转换
var codes = arryList
var name = ''
for (let i in codes) {
if (values == codes[i].value) {
name = codes[i].name
}
}
return name
},
l(key) {
key = 'processList' + '.' + key
return this.$t(key)
}
}
}
</script>
<style lang="less" scope>
.detail {
display: table;
border-collapse: collapse;
width: 100%;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing: border-box;
.label {
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
pages/processManage/Process/detailfiles.vue 0 → 100644
View file @ b6d3f0bc
<template>
<div class="new_box">
<Upload v-if="!isview"
multiple
:on-success="uploadSuccess"
:on-error="uploadError"
:on-remove="removeFile"
:format="formatList"
:max-size="maxSize"
:show-upload-list="false"
:on-exceeded-size="onExceededSize"
:on-format-error="onFormatError"
:action="postUrl"
>
<div style="padding: 20px 0;text-align:center">
<Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>
<p>将文件拖到此处，或点击上传</p>
</div>
</Upload>
<Tag
v-for="(item,index) in nameList"
:key="index"
:name="item.id"
:closable="!unClosable"
@on-close="handleClose2"
checkable
>
<a :href="fileUrlPath" @click="downFile(item.filePath)" target="_blank">{{item.fileName}}</a>
</Tag>
</div>
</template>
<script>
import service from '@/plugins/request'
export default {
name: 'detailfiles',
data() {
return {
parms: {
app: 'processdetail',
eid: '10000',
name: ''
},
isview:false,
unClosable: false,
maxSize: 10240,
routing_header_id: 0,
routing_detail_id: 0,
file: null,
downUrl: fileUrlDown,
fileUrlPath: '',
nameList: [],
hbaseFileListNew: [],
formatList: [
'pdf',
'docx',
'doc',
'xls',
'xlsx',
'txt',
'png',
'jpg',
'gif'
],
postUrl: ''
}
},
created() {},
methods: {
loaddata(id) {
this.parms.eid = id
this.intFiles()
},
uploadSuccess(response, file, fileList) {
const hbaseFileList = []
const filesList = []
if (file.response.status == 0) {
let objImag = {}
objImag.fileName = file.response.data.fileName
objImag.filePath = file.response.data.downloadPath
objImag.id = file.response.data.id
filesList.push(objImag)
this.nameList = this.nameList.concat(filesList)
var url = `${designUrl}/routingfile/createorupdate`
var dataValidate = {
id: 0,
class_Id: 0,
routing_header_id: this.routing_header_id,
routing_detail_id: this.routing_detail_id,
routing_step_id: 0,
file_id: file.response.data.id,
name: file.response.data.fileName,
url: file.response.data.downloadPath,
type: 0,
version: '',
status: 0,
remark: '',
extend: ''
}
service
.post(
`${url}`,
JSON.stringify({
routingFile: dataValidate
})
)
.then((response) => {
if (response.data.success) {
}
})
.catch((error) => {})
} else {
this.$Message.error('上传失败，请重新上传!')
}
},
//上传文件失败
uploadError(response, file, fileList) {
this.$Message.error('上传失败，请重新上传!')
},
//文件大小验证返回
onExceededSize(file, fileList) {
if (Object.keys(file).length == 0) {
this.$Message.error(
'上传文件不能大于' + this.maxSize + 'k，请重新上传!'
)
}
},
//文件格式验证
onFormatError(file, fileList) {
if (Object.keys(file).length == 0) {
this.$Message.error('上传文件格式不正确，请重新上传!')
}
},
//删除上传
removeFile(file, fileList) {},
handleClose2(event, name) {
//删除上传到文件服务器上的文件
var url =
`${designUrl}/routingfile/delete?file_id=` +
name +
'&detail_id=' +
this.routing_detail_id
service
.delete(`${url}`)
.then((response) => {
const index = this.nameList.findIndex(function(item) {
return item.id === name
})
this.nameList.splice(index, 1)
})
.catch((error) => {})
},
downFile(path) {
this.fileUrlPath = this.downUrl + path
},
//修改时使用
intFiles() {
this.postUrl =
fileUrl +
'/upload/?token=Bearer ' +
window.sessionStorage.getItem('token') +
'&' +
this.convertObj(this.parms)
//是否显示上传按钮
this.unClosable=this.isview;
if (this.unClosable) {
this.style = 'display:none;'
} else {
this.style = ''
}
this.loadfile();
},
loadfile() {
this.nameList = []
var url =
`${designUrl}/routingfile/getlistbydetailid?detailID=` +
this.routing_detail_id
service.get(`${url}`).then((response) => {
response.data.result.forEach((data) => {
let objImag = {}
objImag.fileName = data.name
objImag.filePath = data.url
objImag.id = data.file_id
this.nameList.push(objImag)
})
})
},
//obj转为url
convertObj(data) {
if (data.eid != null) {
var _result = []
for (var key in data) {
var value = data[key]
if (value.constructor == Array) {
value.forEach(function(_value) {
_result.push(key + '=' + _value)
})
} else {
_result.push(key + '=' + value)
}
}
return _result.join('&')
} else return ''
}
}
}
</script>
pages/processManage/Process/index.vue 0 → 100644
View file @ b6d3f0bc
This diff is collapsed.
pages/processManage/Process/makeModel.vue 0 → 100644
View file @ b6d3f0bc
<template>
<div class="new_box">
<!-- v-model="makeFault" -->
<Tabs class="one_model" name="tab02" :animated="false">
<TabPane label="主材" tab="tab02" key="zhucai" name="zhucai">
<Table
stripe ref="table" border
:columns="column01"
:data="data01"
class="tableCommon" >
</Table>
</TabPane>
<TabPane label="辅材" tab="tab02" key="fucai" name="fucai">
<Table
stripe ref="table" border
:columns="column02"
:data="data02"
class="tableCommon" >
</Table>
</TabPane>
<TabPane label="刮刀" tab="tab02" key="guadao" name="guadao">
<Table
stripe ref="table" border
:columns="column03"
:data="data03"
class="tableCommon" >
</Table>
</TabPane>
<TabPane label="基板" tab="tab02" key="jiban" name="jiban">
<Table
stripe ref="table" border
:columns="column04"
:data="data04"
class="tableCommon" >
</Table>
</TabPane>
<TabPane label="量具" tab="tab02" key="liangju" name="liangju">
<Table
stripe ref="table" border
:columns="column05"
:data="data05"
class="tableCommon" >
</Table>
</TabPane>
<Button type="success" slot="extra" @click="openNew">增加</Button>
</Tabs>
<Modal v-model="newModel" title="新增制造资源" :mask-closable="false" width="830px">
<Form ref="newModeldata" :model="newModeldata" :rules="ruleValidate" :label-width="120" inline>
<Row>
<Col>
<FormItem label="名称/编号" prop='name'>
<Input
size = "large"
v-model="newModeldata.name"
placeholder="请输入..."
style="width:240px"/>
</FormItem>
</Col>
</Row>
<Row>
<Col>
<FormItem label="规格">
<Input
size = "large"
v-model="newModeldata.name"
placeholder="请输入..."
style="width:240px"/>
</FormItem>
</Col>
</Row>
<Row>
<Col>
<FormItem label="生产厂家">
<Input
size = "large"
v-model="newModeldata.require"
placeholder="请输入..."
style="width:240px"/>
</FormItem>
</Col>
</Row>
<Row>
<Col>
<FormItem label="计量单位">
<Input
size = "large"
v-model="newModeldata.require"
placeholder="请输入..."
style="width:240px"/>
</FormItem>
</Col>
</Row>
<Row>
<FormItem label="数量">
<InputNumber :max="100" :min="1" ></InputNumber>
</FormItem>
</Row>
<Row>
<FormItem label="工艺定额">
<Input v-model="newModeldata.require" maxlength="100" show-word-limit type="textarea" placeholder="Enter something..." style="width: 400px" />
</FormItem>
</Row>
</Form>
</Modal>
</div>
</template>
<script>
export default {
name:'makeModel',
data(){
return{
newModel:false,
makeFault:false,
newModeldata:{
name:'',//参数名称
standard:'',//标准值标
require:'',//生产要求
mark:'zhuanjian',//检验标记
Report:'',//汇报类型
content:'',//检测内容
value1:1,
switch1:true,
},
ruleValidate: {
name:[{required: true , trigger: 'blur'}],
standard:[{required: true , trigger: 'blur'}],
require:[{required: true , trigger: 'blur'}],
mark:[{required: true , trigger: 'change' }],
content:[{required: true , trigger: 'blur'}]
},
data01:[
{
name:'HK0122531',
name02:'WS-3S-511',
name03:'四方科技',
name04:'件',
name05:'66',
name06:'主材01工艺定额',
},
],
data02:[
{
name:'HK0122522',
name02:'WS-3S-511',
name03:'四方科技',
name04:'件',
name05:'66',
name06:'辅材01工艺定额',
},
],
data03:[
{
name:'HK0122533',
name02:'WS-3S-511',
name03:'四方科技',
name04:'件',
name05:'66',
name06:'刮刀01工艺定额',
},
],
data04:[
{
name:'HK0122535',
name02:'WS-3S-511',
name03:'四方科技',
name04:'件',
name05:'66',
name06:'基板01工艺定额',
},
],
data05:[
{
name:'HK01267753',
name02:'WS-3S-511',
name03:'四方科技',
name04:'件',
name05:'66',
name06:'量具01工艺定额',
},
],
column01:[
{ title: '序号', type:'index',width:'70',align:'center' },
{ title: '名称/编号', key: 'name' },
{ title: '规格', key: 'name02' },
{ title: '生产厂家', key: 'name03' },
{ title: '计量单位', key: 'name04',width:'100' },
{ title: '数量', key: 'name05',width:'70' },
{ title: '工艺定额', key: 'name06' }
],
column02:[
{ title: '序号', type:'index',width:'70',align:'center' },
{ title: '名称/编号', key: 'name' },
{ title: '规格', key: 'name02' },
{ title: '生产厂家', key: 'name03' },
{ title: '计量单位', key: 'name04',width:'100' },
{ title: '数量', key: 'name05',width:'70' },
{ title: '工艺定额', key: 'name06' }],
column03:[
{ title: '序号', type:'index',width:'70',align:'center' },
{ title: '名称/编号', key: 'name' },
{ title: '规格', key: 'name02' },
{ title: '生产厂家', key: 'name03' },
{ title: '计量单位', key: 'name04',width:'100' },
{ title: '数量', key: 'name05',width:'70' },
{ title: '工艺定额', key: 'name06' }],
column04:[
{ title: '序号', type:'index',width:'70',align:'center' },
{ title: '名称/编号', key: 'name' },
{ title: '规格', key: 'name02' },
{ title: '生产厂家', key: 'name03' },
{ title: '计量单位', key: 'name04',width:'100' },
{ title: '数量', key: 'name05',width:'70' },
{ title: '工艺定额', key: 'name06' }],
column05:[
{ title: '序号', type:'index',width:'70',align:'center' },
{ title: '名称/编号', key: 'name' },
{ title: '规格', key: 'name02' },
{ title: '生产厂家', key: 'name03' },
{ title: '计量单位', key: 'name04',width:'100' },
{ title: '数量', key: 'name05',width:'70' },
{ title: '工艺定额', key: 'name06' }],
}
},
methods:{
openNew(){
// this.$nextTick(()=>{
// this.$refs['formItem'].resetFields()
// }
this.newModel = true;
},
change (status) {
if(status){
this.$Message.info('拍照：是');
}else{
this.$Message.warning('拍照：否');
}
}
},
}
</script>
pages/processManage/Process/menu.less 0 → 100644
View file @ b6d3f0bc
This diff is collapsed.
pages/processManage/Process/processMain.vue 0 → 100644
View file @ b6d3f0bc
This diff is collapsed.
pages/processManage/Process/processNew.vue 0 → 100644
View file @ b6d3f0bc
This diff is collapsed.
pages/processManage/Process/processfile.vue 0 → 100644
View file @ b6d3f0bc
<template>
<div class="new_box">
<Upload
multiple v-if="!unClosable"
:on-success="uploadSuccess"
:on-error="uploadError"
:on-remove="removeFile"
:format="formatList"
:max-size="maxSize"
:show-upload-list="false"
:on-exceeded-size="onExceededSize"
:on-format-error="onFormatError"
:action="postUrl"
>
<div style="padding: 20px 0;text-align:center">
<Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>
<p>将文件拖到此处，或点击上传</p>
</div>
</Upload>
<Tag
v-for="(item,index) in nameList"
:key="index"
:name="item.id"
:closable="!unClosable"
@on-close="handleClose2"
checkable
>
<a :href="fileUrlPath" @click="downFile(item.filePath)" target="_blank">{{item.fileName}}</a>
</Tag>
</div>
</template>
<script>
import service from '@/plugins/request'
export default {
name: 'processfile',
data() {
return {
unClosable: false,
maxSize: 10240,
routing_header_id: 0,
routing_detail_id: 0,
file: null,
downUrl: fileUrlDown,
fileUrlPath: '',
nameList: [],
hbaseFileListNew: [],
formatList: [
'png',
'jpg',
'gif'
],
postUrl: ''
}
},
created() {},
props: {
parms: {
type: [String, Object],
default: ''
}
},
methods: {
uploadSuccess(response, file, fileList) {
const hbaseFileList = []
const filesList = []
if (file.response.status == 0) {
let objImag = {}
objImag.fileName = file.response.data.fileName
objImag.filePath = file.response.data.downloadPath
objImag.id = file.response.data.id
filesList.push(objImag)
this.nameList = this.nameList.concat(filesList)
} else {
this.$Message.error('上传失败，请重新上传!')
}
},
//上传文件失败
uploadError(response, file, fileList) {
this.$Message.error('上传失败，请重新上传!')
},
//文件大小验证返回
onExceededSize(file, fileList) {
if (Object.keys(file).length == 0) {
this.$Message.error(
'上传文件不能大于' + this.maxSize + 'k，请重新上传!'
)
}
},
//文件格式验证
onFormatError(file, fileList) {
if (Object.keys(file).length == 0) {
this.$Message.error('上传文件格式不正确，请重新上传!')
}
},
//删除上传
removeFile(file, fileList) {},
handleClose2(event, name) {
//删除上传到文件服务器上的文件
if(this.routing_header_id==0)
{
const index = this.nameList.findIndex(function(item) {
return item.id === name
})
this.nameList.splice(index, 1)
}else
{
var url =
`${designUrl}/routingfile/deleteheaderfile?file_id=` +
name +
'&header_id=' +
this.routing_header_id
service
.delete(`${url}`)
.then((response) => {
const index = this.nameList.findIndex(function(item) {
return item.id === name
})
this.nameList.splice(index, 1)
})
.catch((error) => {})
}
},
downFile(path) {
this.fileUrlPath = this.downUrl + path
},
//修改时使用
intFiles() {
this.postUrl =
fileUrl +
'/upload/?token=Bearer ' +
window.sessionStorage.getItem('token') +
'&' +
this.convertObj(this.parms)
//是否显示上传按钮
if (this.unClosable) {
this.style = 'display:none;'
} else {
this.style = ''
}
this.loadfile();
},
loadfile() {
this.nameList = []
if(this.routing_header_id!=0)
{
var url =
`${designUrl}/routingfile/getlistbyheaderid?isAll=0&headerID=` +
this.routing_header_id
service.get(`${url}`).then((response) => {
response.data.result.forEach((data) => {
let objImag = {}
objImag.fileName = data.name
objImag.filePath = data.url
objImag.id = data.file_id
this.nameList.push(objImag)
})
})
}
},
//obj转为url
convertObj(data) {
if (data.eid != null) {
var _result = []
for (var key in data) {
var value = data[key]
if (value.constructor == Array) {
value.forEach(function(_value) {
_result.push(key + '=' + _value)
})
} else {
_result.push(key + '=' + value)
}
}
return _result.join('&')
} else return ''
}
}
}
</script>
pages/processManage/Process/processview.vue 0 → 100644
View file @ b6d3f0bc
This diff is collapsed.
pages/processManage/Process/sendAudit.vue 0 → 100644
View file @ b6d3f0bc
<template>
<div style="width:80%;margin:0 auto">
<DetailExamine :info="info"></DetailExamine>
<Process
ref="userProcess"
schemaIdVal="2085025d-9c38-4834-846a-8f9d2f4c8553"
/>
</div>
</template>
<script>
import Process from '@/components/orderOperator/process'
import DetailExamine from './detailExamine'
export default {
name: 'sendAudit',
components: {
Process,
DetailExamine
},
data() {
return {
info: {},
dataList: {},
dataListRetrun: [], //确定后返回数据
dataListRetrunNew: {
schemaId: '2085025d-9c38-4834-846a-8f9d2f4c8553', //订单送审的schemaId
idList: [], //订单id List
codeList: [], //订单编号List
operatorIdList: [] //操作员id
} //确定后返回数据
}
},
created: function() {},
methods: {
intData(data) {
//打开modal层时给订单list赋值
this.dataList ={}
this.dataList = data
this.info = data
},
returnDataList() {
this.dataListRetrunNew.idList = []
this.dataListRetrunNew.codeList = []
this.dataListRetrunNew.operatorIdList = []
this.dataListRetrunNew.idList.push(this.dataList.id)
this.dataListRetrunNew.codeList.push(this.dataList.code)
let ues = this.$refs.userProcess
this.dataListRetrunNew.operatorIdList = ues.immutData
// alert(JSON.stringify( this.dataListRetrunNew))
//返回审批数据
return this.dataListRetrunNew
}
}
}
</script>
pages/processManage/Process/stepModel.vue 0 → 100644
View file @ b6d3f0bc
This diff is collapsed.
pages/processManage/Process/supporting.vue 0 → 100644
View file @ b6d3f0bc
This diff is collapsed.
pages/processManage/Process/tan.vue 0 → 100644
View file @ b6d3f0bc
This diff is collapsed.
pages/processManage/Process/testingModel.vue 0 → 100644
View file @ b6d3f0bc
This diff is collapsed.
pages/processManage/setProcess/components/drawerSet.vue 0 → 100644
View file @ b6d3f0bc
This diff is collapsed.
pages/processManage/setProcess/components/materialDic.vue 0 → 100644
View file @ b6d3f0bc
This diff is collapsed.
pages/processManage/setProcess/components/orderData.vue 0 → 100644
View file @ b6d3f0bc
This diff is collapsed.
pages/processManage/setProcess/components/orderInfos.vue 0 → 100644
View file @ b6d3f0bc
This diff is collapsed.
pages/processManage/setProcess/components/orderMaterial.vue 0 → 100644
View file @ b6d3f0bc
This diff is collapsed.
pages/processManage/setProcess/components/orderSendReview.vue 0 → 100644
View file @ b6d3f0bc
This diff is collapsed.
pages/processManage/setProcess/components/quotationBox.vue 0 → 100644
View file @ b6d3f0bc
This diff is collapsed.
pages/processManage/setProcess/components/searchBox.vue 0 → 100644
View file @ b6d3f0bc
This diff is collapsed.
pages/processManage/setProcess/components/treeType.vue 0 → 100644
View file @ b6d3f0bc
This diff is collapsed.
pages/processManage/setProcess/index.vue 0 → 100644
View file @ b6d3f0bc
This diff is collapsed.
pages/processManage/setProcess/processMain.vue 0 → 100644
View file @ b6d3f0bc
This diff is collapsed.
pages/produce/ordermaterial.vue
View file @ b6d3f0bc
This diff is collapsed.
pages/produce/orderscheduling.vue
View file @ b6d3f0bc
This diff is collapsed.
pages/produce/taskList.vue
View file @ b6d3f0bc
This diff is collapsed.
pages/qc/certificate/endIssued/index.vue
View file @ b6d3f0bc
This diff is collapsed.
pages/qc/certificate/waitOpened/index.vue
View file @ b6d3f0bc
This diff is collapsed.
pages/qc/check/waitReview/index.vue
View file @ b6d3f0bc
This diff is collapsed.
pages/qc/dataTrace/components/mainView.vue
View file @ b6d3f0bc
This diff is collapsed.
pages/qc/dataTrace/index.vue
View file @ b6d3f0bc
This diff is collapsed.
pages/qc/implement/index.vue
View file @ b6d3f0bc
This diff is collapsed.
pages/qc/taskList/index.vue
View file @ b6d3f0bc
This diff is collapsed.
pages/qcimplement/components/backCheck.vue
View file @ b6d3f0bc
This diff is collapsed.
pages/qcimplement/index.vue
View file @ b6d3f0bc
This diff is collapsed.
pages/resource/order/orders.vue
View file @ b6d3f0bc
This diff is collapsed.
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