diff --git a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js index 5667e84914..9f71b8ce73 100644 --- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js +++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js @@ -485,6 +485,38 @@ const codemenu = [ meta: { title: '存放地点变更申请管理', noCache: true } }] }, + // 调车开票申请管理 + { + path: '/diaochekaipiaoshenqingguanli', + component: Layout, + redirect: '/diaochekaipiaoshenqingguanli/diaocheshenqing', + meta: { + title: '调车开票申请管理' + }, + children: [{ + path: '/diaochekaipiaoshenqingguanli/diaocheshenqing', + component: () => import('@/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqing.vue'), + name: 'diaocheshenqing', + meta: { title: '调车开票申请管理', noCache: true } + }] + }, + // 调账申请管理 + { + path: '/tiaozhangshenqingguanli', + component: Layout, + redirect: '/tiaozhangshenqingguanli/tiaozhangshenqing', + meta: { + title: '调账申请管理' + }, + children: [{ + path: '/tiaozhangshenqingguanli/tiaozhangshenqing', + component: () => import('@/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanli.vue'), + name: 'tiaozhangshenqingguanli', + meta: { title: '调账申请管理', noCache: true } + }] + }, + + // 流程审批 // 入账管理编辑 { diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue index 9690b4ebec..adffba9e54 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue @@ -4,7 +4,7 @@
{{ viewTitle }}
保存 - 提交 + 提交 返回
@@ -86,10 +86,9 @@ - - {{ item.value }} - + + + @@ -139,6 +138,7 @@ export default { stateId: 0, FormLoading: false, listLoading: false, + disableSubmit: false, location_list: [], targetLocation_list: [], imgList: [], // 附件上传 @@ -242,6 +242,11 @@ export default { InsuranceStateChange(val) { const choosetItem = this.InsuranceState_list.filter((item) => item.key == val) this.temp.InsuranceState = choosetItem[0].value + if (this.temp.InsuranceStateKey == '0') { + this.imgList = [] + this.temp.policyImage = [] + } + this.$forceUpdate() console.log('name:', this.temp.InsuranceState, 'key:', this.temp.InsuranceStateKey) }, showAdd() { @@ -272,6 +277,7 @@ export default { userSid: window.sessionStorage.getItem('userSid'), sid: sid } + this.disableSubmit = true getCarTransferInfo(data).then((res) => { if (res.success) { this.temp = res.data @@ -286,9 +292,19 @@ export default { }) } } + if (this.temp.nodeState == '待提交' || this.temp.nodeState == '移库申请'){ + this.disableSubmit = false + } } }) this.getType() + this.InsuranceState_list = [{ + key: '0', + value: '否' + }, { + key: '1', + value: '是' + }] }, getUrl() { if (this.temp.InsuranceStateKey == '1') { @@ -334,6 +350,7 @@ export default { temporaryCard: '', policyImage: [] } + this.disableSubmit = false this.imgList = [] this.vinNo_list = [] this.$emit('doback') diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqing.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqing.vue new file mode 100644 index 0000000000..58dcd351a7 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqing.vue @@ -0,0 +1,332 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue new file mode 100644 index 0000000000..c6655c710b --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue @@ -0,0 +1,359 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingInfo.vue new file mode 100644 index 0000000000..d912bdb246 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingInfo.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/relation/cheliangList.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/relation/cheliangList.vue new file mode 100644 index 0000000000..167c38b2c3 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/relation/cheliangList.vue @@ -0,0 +1,373 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanli.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanli.vue new file mode 100644 index 0000000000..717ddd5555 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanli.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue new file mode 100644 index 0000000000..0bba3a2a7d --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliInfo.vue new file mode 100644 index 0000000000..a454ded117 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliInfo.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/anrui-system-ui/src/api/system/postManage/index.js b/anrui-system-ui/src/api/system/postManage/index.js index 5ccde32ffe..a7c12ba598 100644 --- a/anrui-system-ui/src/api/system/postManage/index.js +++ b/anrui-system-ui/src/api/system/postManage/index.js @@ -66,4 +66,13 @@ export function pullDown(data){ method: 'get', params: data }) -} \ No newline at end of file +} + +// 查询岗位列表 +export function selectList(data){ + return request({ + url: '/portal/v1/syspost/selectList', + method: 'get', + params: data + }) +} diff --git a/anrui-system-ui/src/views/postManage/postManage.vue b/anrui-system-ui/src/views/postManage/postManage.vue index b5a5c47fa0..404d8b028e 100644 --- a/anrui-system-ui/src/views/postManage/postManage.vue +++ b/anrui-system-ui/src/views/postManage/postManage.vue @@ -37,15 +37,27 @@ + - + + + + +
上级岗位 + + + + +
岗位名称 @@ -98,9 +110,21 @@ + + + + + - - + + @@ -153,37 +179,30 @@
上级岗位 + + + + +
岗位名称 @@ -108,13 +132,15 @@
岗位职级 - - - - - 岗位职级 + + + + +
岗位编码