diff --git a/yxt-as-ui/src/api/basicinformation/secondaryCooperativeStation.js b/yxt-as-ui/src/api/basicinformation/secondaryCooperativeStation.js new file mode 100644 index 0000000000..8a60b78450 --- /dev/null +++ b/yxt-as-ui/src/api/basicinformation/secondaryCooperativeStation.js @@ -0,0 +1,140 @@ +import request from '@/utils/request' +// 合作二级站备案申请 接口文档 +export default { + // 查询分页列表 + listPage: function(params) { + return request({ + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + url: '/as/v1/secondaryCooperativeStation/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // // 初始化 + // init: function(data) { + // return request({ + // url: '/as/v1/secondaryCooperativeStation/init', + // method: 'post', + // data: data, + // headers: { + // 'Content-Type': 'application/json' + // } + // }) + // }, + // 回显 + fetchDetailsBySid: function(data) { + return request({ + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + url: '/as/v1/secondaryCooperativeStation/fetchDetailsBySid/' + data, + method: 'get' + }) + }, + saveOrUpdate: function(data) { + return request({ + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + url: '/as/v1/secondaryCooperativeStation/save', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + deleteBySids: function(data) { + return request({ + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + url: '/as/v1/secondaryCooperativeStation/delBySids', + method: 'DELETE', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 提交流程 + submit: function(params) { + return request({ + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + url: '/as/v1/secondaryCooperativeStation/submit', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 流程审批(同意) + complete: function(params) { + return request({ + url: '/as/v1/secondaryCooperativeStation/complete', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 流程审批(加签) + delegate: function(params) { + return request({ + url: '/as/v1/secondaryCooperativeStation/delegate', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 流程审批(驳回) + reject: function(params) { + return request({ + url: '/as/v1/secondaryCooperativeStation/reject', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 流程审批(终止) + breakProcess: function(params) { + return request({ + url: '/as/v1/secondaryCooperativeStation/breakProcess', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 流程审批(撤回) + revokeProcess: function(params) { + return request({ + url: '/as/v1/secondaryCooperativeStation/revokeProcess', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 审批流程(同意)获取下一环节 + getNextNodesForSubmit: function(data) { + return request({ + url: '/as/v1/secondaryCooperativeStation/getNextNodesForSubmit', + method: 'get', + params: data + }) + }, + // 审批流程(驳回)获取上一环节 + getPreviousNodesForReject: function(data) { + return request({ + url: '/as/v1/secondaryCooperativeStation/getPreviousNodesForReject', + method: 'get', + params: data + }) + } +} diff --git a/yxt-as-ui/src/api/storage/otherOutbound.js b/yxt-as-ui/src/api/storage/otherOutbound.js new file mode 100644 index 0000000000..5b685906ad --- /dev/null +++ b/yxt-as-ui/src/api/storage/otherOutbound.js @@ -0,0 +1,169 @@ +import request from '@/utils/request' +// 其他出库 +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default", + url: '/wms/v1/wmsotheroutapply/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + + deleteBySids: function(data) { + return request({ + // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default", + url: '/wms/v1/wmsotheroutapply/delBySids', + method: 'DELETE', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 详情 + fetchDetailsBySid: function(params) { + return request({ + // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default", + url: '/wms/v1/wmsotheroutapply/fetchDetailsBySid/' + params, + method: 'get', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 获取商品 + sourceBillBySid: function(params) { + return request({ + // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default", + url: '/wms/apiadmin/inventory/wmsinventory/otherOutGoodsListPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 保存 + save: function(data) { + return request({ + // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default", + url: '/wms/v1/wmsotheroutapply/save', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }); + }, + + // 提交 + submit: function(data) { + return request({ + // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default", + url: '/wms/v1/wmsotheroutapply/submitApply', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }); + }, + + + // 流程审批(同意) + complete: function(params) { + return request({ + url: '/wms/v1/wmsotheroutapply/complete', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 流程审批(加签) + delegate: function(params) { + return request({ + url: '/wms/v1/wmsotheroutapply/reject', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 流程审批(转办) + assignTask: function(params) { + return request({ + url: '/wms/v1/wmsotheroutapply/assignTask', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 流程审批(驳回) + reject: function(params) { + return request({ + url: '/wms/v1/wmsotheroutapply/reject', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 流程审批(终止) + breakProcess: function(params) { + return request({ + url: '/wms/v1/wmsotheroutapply/breakProcess', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 流程审批(撤回) + revokeProcess: function(params) { + return request({ + url: '/wms/v1/wmsotheroutapply/revokeProcess', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 审批流程(同意)获取下一环节 + getNextNodesForSubmit: function(data) { + return request({ + url: '/wms/v1/wmsotheroutapply/getPreviousNodesForReject', + method: 'get', + params: data + }) + }, + // 审批流程(驳回)获取上一环节 + getPreviousNodesForReject: function(data) { + return request({ + url: '/wms/v1/wmsotheroutapply/getNextNodesForSubmit', + method: 'get', + params: data + }) + }, + + + + +} diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js index b9f5d58741..fc03366b2a 100644 --- a/yxt-as-ui/src/router/index.js +++ b/yxt-as-ui/src/router/index.js @@ -416,12 +416,20 @@ export const constantRoutes = [{ }, children: [{ path: '/outStorage/index', - component: () => import('@/views/storage/outStorage/index'), + component: () => import('@/views/storage/outStorage/outStorage/index'), name: 'OutStorage', meta: { title: '出库管理', noCache: true } + }, { + path: '/otherOutbound/otherOutbound', + component: () => import('@/views/storage/outStorage/otherOutbound/otherOutbound'), + name: 'OtherOutbound', + meta: { + title: '其他出库', + noCache: true + } }, { path: '/inventory/inventory', @@ -963,6 +971,16 @@ export const constantRoutes = [{ noCache: true } }, + { + path: '/secondaryCooperativeStation/secondaryCooperativeStation', + component: () => import( + '@/views/basicinformation/secondaryCooperativeStation/secondaryCooperativeStation.vue'), + name: 'SecondaryCooperativeStation', + meta: { + title: '合作二级备案申请管理', + noCache: true + } + }, { path: '/claimantManufacturer/claimantManufacturer', component: () => import('@/views/basicinformation/claimantManufacturer/claimantManufacturer.vue'), diff --git a/yxt-as-ui/src/views/basicinformation/secondaryCooperativeStation/secondaryCooperativeStation.vue b/yxt-as-ui/src/views/basicinformation/secondaryCooperativeStation/secondaryCooperativeStation.vue new file mode 100644 index 0000000000..c5a8cc7f8f --- /dev/null +++ b/yxt-as-ui/src/views/basicinformation/secondaryCooperativeStation/secondaryCooperativeStation.vue @@ -0,0 +1,415 @@ + + + + diff --git a/yxt-as-ui/src/views/basicinformation/secondaryCooperativeStation/secondaryCooperativeStationAdd.vue b/yxt-as-ui/src/views/basicinformation/secondaryCooperativeStation/secondaryCooperativeStationAdd.vue new file mode 100644 index 0000000000..41fed83cf7 --- /dev/null +++ b/yxt-as-ui/src/views/basicinformation/secondaryCooperativeStation/secondaryCooperativeStationAdd.vue @@ -0,0 +1,407 @@ + + + + + diff --git a/yxt-as-ui/src/views/basicinformation/secondaryCooperativeStation/secondaryCooperativeStationInfo.vue b/yxt-as-ui/src/views/basicinformation/secondaryCooperativeStation/secondaryCooperativeStationInfo.vue new file mode 100644 index 0000000000..c3c79197da --- /dev/null +++ b/yxt-as-ui/src/views/basicinformation/secondaryCooperativeStation/secondaryCooperativeStationInfo.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/yxt-as-ui/src/views/goods/brands/brandsAdd.vue b/yxt-as-ui/src/views/goods/brands/brandsAdd.vue index a8870b3bf1..a52427b173 100644 --- a/yxt-as-ui/src/views/goods/brands/brandsAdd.vue +++ b/yxt-as-ui/src/views/goods/brands/brandsAdd.vue @@ -250,6 +250,7 @@ this.$refs['form_obj'].clearValidate() }) + req.initBrands(row.sid) .then(resp => { if (resp.success) { diff --git a/yxt-as-ui/src/views/storage/outStorage/otherOutbound/otherOutbound.vue b/yxt-as-ui/src/views/storage/outStorage/otherOutbound/otherOutbound.vue new file mode 100644 index 0000000000..a087e9a650 --- /dev/null +++ b/yxt-as-ui/src/views/storage/outStorage/otherOutbound/otherOutbound.vue @@ -0,0 +1,398 @@ + + + + diff --git a/yxt-as-ui/src/views/storage/outStorage/otherOutbound/otherOutboundAdd.vue b/yxt-as-ui/src/views/storage/outStorage/otherOutbound/otherOutboundAdd.vue new file mode 100644 index 0000000000..11bb2c75e3 --- /dev/null +++ b/yxt-as-ui/src/views/storage/outStorage/otherOutbound/otherOutboundAdd.vue @@ -0,0 +1,440 @@ + + + + diff --git a/yxt-as-ui/src/views/storage/outStorage/otherOutbound/otherOutboundInfo.vue b/yxt-as-ui/src/views/storage/outStorage/otherOutbound/otherOutboundInfo.vue new file mode 100644 index 0000000000..2fa70e6c78 --- /dev/null +++ b/yxt-as-ui/src/views/storage/outStorage/otherOutbound/otherOutboundInfo.vue @@ -0,0 +1,144 @@ + + + + diff --git a/yxt-as-ui/src/views/storage/outStorage/otherOutbound/relation/chooseproducts.vue b/yxt-as-ui/src/views/storage/outStorage/otherOutbound/relation/chooseproducts.vue new file mode 100644 index 0000000000..e40ef09ed6 --- /dev/null +++ b/yxt-as-ui/src/views/storage/outStorage/otherOutbound/relation/chooseproducts.vue @@ -0,0 +1,168 @@ + + + + diff --git a/yxt-as-ui/src/views/storage/outStorage/distributionAdd.vue b/yxt-as-ui/src/views/storage/outStorage/outStorage/distributionAdd.vue similarity index 100% rename from yxt-as-ui/src/views/storage/outStorage/distributionAdd.vue rename to yxt-as-ui/src/views/storage/outStorage/outStorage/distributionAdd.vue diff --git a/yxt-as-ui/src/views/storage/outStorage/index.vue b/yxt-as-ui/src/views/storage/outStorage/outStorage/index.vue similarity index 100% rename from yxt-as-ui/src/views/storage/outStorage/index.vue rename to yxt-as-ui/src/views/storage/outStorage/outStorage/index.vue diff --git a/yxt-as-ui/src/views/storage/outStorage/outStorageAdd.vue b/yxt-as-ui/src/views/storage/outStorage/outStorage/outStorageAdd.vue similarity index 100% rename from yxt-as-ui/src/views/storage/outStorage/outStorageAdd.vue rename to yxt-as-ui/src/views/storage/outStorage/outStorage/outStorageAdd.vue diff --git a/yxt-as-ui/src/views/storage/outStorage/outStorageInfo.vue b/yxt-as-ui/src/views/storage/outStorage/outStorage/outStorageInfo.vue similarity index 100% rename from yxt-as-ui/src/views/storage/outStorage/outStorageInfo.vue rename to yxt-as-ui/src/views/storage/outStorage/outStorage/outStorageInfo.vue diff --git a/yxt-as-ui/src/views/storage/outStorage/relation/chooseproducts.vue b/yxt-as-ui/src/views/storage/outStorage/outStorage/relation/chooseproducts.vue similarity index 100% rename from yxt-as-ui/src/views/storage/outStorage/relation/chooseproducts.vue rename to yxt-as-ui/src/views/storage/outStorage/outStorage/relation/chooseproducts.vue