diff --git a/base-ui/src/views/approvalCenter/alreadyHandledWork.vue b/base-ui/src/views/approvalCenter/alreadyHandledWork.vue index 248fe139..43a978fa 100644 --- a/base-ui/src/views/approvalCenter/alreadyHandledWork.vue +++ b/base-ui/src/views/approvalCenter/alreadyHandledWork.vue @@ -1,74 +1,168 @@ diff --git a/supervise-crm-ui/.env.development b/supervise-crm-ui/.env.development index 01c78fbe..d08634fb 100644 --- a/supervise-crm-ui/.env.development +++ b/supervise-crm-ui/.env.development @@ -5,5 +5,5 @@ ENV = 'development' VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 -VUE_APP_URL = "http://192.168.3.173:8112" +VUE_APP_URL = "http://192.168.1.193:8112" ##VUE_APP_URL = "http://8.130.39.13:8112" diff --git a/supervise-crm-ui/src/api/project/project.js b/supervise-crm-ui/src/api/project/project.js index d36daa01..ff11125b 100644 --- a/supervise-crm-ui/src/api/project/project.js +++ b/supervise-crm-ui/src/api/project/project.js @@ -90,5 +90,11 @@ export default { method: 'delete' }) }, + getStorehouseBySid: function() { + return request({ + url: '/crm/v1/projectinformation/getStorehouseBySid/1', + method: 'get' + }) + }, } diff --git a/supervise-crm-ui/src/layout/components/Sidebar/index.vue b/supervise-crm-ui/src/layout/components/Sidebar/index.vue index ed7321e6..637a9f18 100644 --- a/supervise-crm-ui/src/layout/components/Sidebar/index.vue +++ b/supervise-crm-ui/src/layout/components/Sidebar/index.vue @@ -79,12 +79,12 @@ methods: { // 获取用户信息 postHuoquyonghu() { - var token = getStorage() - loginDetails(token).then((response) => { - console.log('resss', response) - if (response.code === '200') { - this.YongHuid = response.data - this.params.userSid = this.YongHuid.sid + // var token = getStorage() + // loginDetails(token).then((response) => { + // console.log('resss', response) + // if (response.code === '200') { + // this.YongHuid = response.data + // this.params.userSid = this.YongHuid.sid getrolemenus(this.params).then((res) => { console.log('userRoles', res.data) const userRoles = this.resRouter(res.data) @@ -94,8 +94,8 @@ hidden: true }) return userRoles - }) - } + // }) + // } }) }, resRouter(menus) { diff --git a/supervise-crm-ui/src/main.js b/supervise-crm-ui/src/main.js index cac4571a..25747f85 100644 --- a/supervise-crm-ui/src/main.js +++ b/supervise-crm-ui/src/main.js @@ -43,14 +43,14 @@ VueAMap.initAMapApiLoader({ Vue.config.productionTip = false -let token = null -token = GetQueryString('token') -if (token) { - setStorage(token) - const href = window.location.href -// href = href.split(`token=${token}`)[0] -// window.location.href = href.slice(0, href.length - 1) -} +// let token = null +// token = GetQueryString('token') +// if (token) { +// setStorage(token) +// const href = window.location.href +// // href = href.split(`token=${token}`)[0] +// // window.location.href = href.slice(0, href.length - 1) +// } var one = window.location.href.indexOf('&organizationData') + 18 if (parseInt(one) > 18) { @@ -65,66 +65,13 @@ if (parseInt(one) > 18) { // 获取登录用户信息 function getUserInfo() { - return request({ - baseURL: '/api', - url: '/portal/v1/sysuser/loginDetails', - method: 'post', - headers: { - 'Content-Type': 'application/json' - } - }).then(rep => { - const data = rep.data - const user = { - roleSid: data.roleSid, - name: data.name, - userName: data.userName, - departmentName: data.departmentName, // 部门名称 - departmentSid: data.departmentSid, // 部门sid - isAdmin: data.isAdmin, - staffSid: data.staffSid, // 业务员sid - userSid: data.sid, - orgSid: data.organizationSid, // 单位sid - Orgname: data.organizationName, - dwjb: data.dwjb, - orgNamePath: data.orgNamePath, // 使用组织全路径名称 - orgSidPath: data.orgSidPath // 使用组织全路径Sid - } - // 结果存入缓存 - window.sessionStorage.setItem('staffSid', user.staffSid) - window.sessionStorage.setItem('userSid', user.userSid) - window.sessionStorage.setItem('Orgname', user.Orgname) - window.sessionStorage.setItem('orgSid', user.orgSid) - window.sessionStorage.setItem('departmentName', user.departmentName) - window.sessionStorage.setItem('name', user.name) - window.sessionStorage.setItem('user', user) - window.sessionStorage.setItem('departmentName', user.departmentName) - window.sessionStorage.setItem('departmentSid', user.departmentSid) - window.sessionStorage.setItem('orgNamePath', user.orgNamePath) - window.sessionStorage.setItem('orgSidPath', user.orgSidPath) new Vue({ el: '#app', router, store, render: h => h(App) }) - }) } getUserInfo() -function GetQueryString(name) { - var one = window.location.href.indexOf('?token=') + 7 - if (one < 7) { return null } - var two = window.location.href.lastIndexOf('&') // + 1 - var data = window.location.href.substr(one) - if (two > one) { - data = window.location.href.slice(one, two) - console.log('token', data) - } - if (data) { - return data - } - return null - // var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)') - // var r = window.location.search.substr(1).match(reg) - // if (r != null) return unescape(r[2]); return null -} + diff --git a/supervise-crm-ui/src/views/project/projectAdd.vue b/supervise-crm-ui/src/views/project/projectAdd.vue index 554fed7e..c824695c 100644 --- a/supervise-crm-ui/src/views/project/projectAdd.vue +++ b/supervise-crm-ui/src/views/project/projectAdd.vue @@ -216,7 +216,6 @@ - diff --git a/supervise-crm-ui/src/views/project/projectInfo.vue b/supervise-crm-ui/src/views/project/projectInfo.vue index eefb5d93..983026c4 100644 --- a/supervise-crm-ui/src/views/project/projectInfo.vue +++ b/supervise-crm-ui/src/views/project/projectInfo.vue @@ -181,7 +181,20 @@ - + + + + 关联仓库 + + + + +
+ +
+ + + @@ -196,10 +209,13 @@ name: 'CustomerManagementInfo', data() { return { - temp: {} // 添加和修改 + temp: {}, // 添加和修改 + temps:{}, } }, - + created() { + this.getStorehouseBySid() // 类型字典信息 + }, methods: { showAdd(sid) { req.fetchBySid(sid) @@ -216,7 +232,14 @@ // 组件返回 handleReturn() { this.$emit('doback') - } + }, + getStorehouseBySid(){ + req.getStorehouseBySid().then((res) => { + if (res.success) { + this.temps=res.data + } + }) + }, } } diff --git a/warehousing-system/project_web_ui/src/views/component/initial_value/add/locationAdd.vue b/warehousing-system/project_web_ui/src/views/component/initial_value/add/locationAdd.vue new file mode 100644 index 00000000..03f40126 --- /dev/null +++ b/warehousing-system/project_web_ui/src/views/component/initial_value/add/locationAdd.vue @@ -0,0 +1,212 @@ + + + + + \ No newline at end of file diff --git a/warehousing-system/project_web_ui/src/views/component/initial_value/add/productA.vue b/warehousing-system/project_web_ui/src/views/component/initial_value/add/productA.vue new file mode 100644 index 00000000..850ee92a --- /dev/null +++ b/warehousing-system/project_web_ui/src/views/component/initial_value/add/productA.vue @@ -0,0 +1,163 @@ + + + + + \ No newline at end of file diff --git a/warehousing-system/project_web_ui/src/views/component/initial_value/add/productAdd.vue b/warehousing-system/project_web_ui/src/views/component/initial_value/add/productAdd.vue new file mode 100644 index 00000000..17dea809 --- /dev/null +++ b/warehousing-system/project_web_ui/src/views/component/initial_value/add/productAdd.vue @@ -0,0 +1,208 @@ + + + + + \ No newline at end of file diff --git a/warehousing-system/project_web_ui/src/views/component/initial_value/location.vue b/warehousing-system/project_web_ui/src/views/component/initial_value/location.vue index 0c86c2f3..162cf965 100644 --- a/warehousing-system/project_web_ui/src/views/component/initial_value/location.vue +++ b/warehousing-system/project_web_ui/src/views/component/initial_value/location.vue @@ -1,7 +1,7 @@ @@ -117,11 +80,13 @@ import ButtonBar from '@/components/ButtonBar' import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' +import divadd from '@/views/component/initial_value/add/locationAdd.vue' export default { components: { ButtonBar, Pagination, pageye, + divadd }, data () { return { @@ -227,30 +192,9 @@ export default { var pageindex = index + 1 + pagestart; return pageindex; }, - addLocationDialog () { - this.title = '新增货位' - this.locationIdAble = false - this.locationDialogVisible = true - }, - updataLocationdialog (location) { - this.locationForm.name = location.name - this.locationForm.locationId = location.locationId - this.locationForm.type = location.type - this.locationForm.status = location.status - this.locationForm.storehouse = location.storehouse - this.title = '修改货位' - this.locationIdAble = true - this.locationDialogVisible = true - }, - addLocation () { - this.$refs.locationRuleForm.validate(async valid => { - this.locationForm.status = '空闲' - const { data: result } = await this.$http.post('/location/addLocation', this.locationForm) - if (result.status !== 200) return this.$message.error('添加货位失败') - this.$message.success('成功添加货位') - this.getLocationList() - this.locationDialogVisible = false - }) + updataLocationdialog (row) { + this.viewState = 3 + this.$refs['divadd'].showEdit(row) }, async updataLocation () { const { data: result } = await this.$http.put('/location/updataLocation', this.locationForm) @@ -290,7 +234,7 @@ export default { }, toAdd() { this.viewState = 2 - // this.$refs['divadd'].showAdd() + this.$refs['divadd'].showAdd() }, doClose() { this.$store.dispatch('tagsView/delView', this.$route) diff --git a/warehousing-system/project_web_ui/src/views/component/initial_value/product.vue b/warehousing-system/project_web_ui/src/views/component/initial_value/product.vue index 5dca62af..283a87d2 100644 --- a/warehousing-system/project_web_ui/src/views/component/initial_value/product.vue +++ b/warehousing-system/project_web_ui/src/views/component/initial_value/product.vue @@ -113,74 +113,7 @@ - - - - - - - - - - - 自动 - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 取 消 - 确 定 -
- - - - - - - - - - - - - - - - - - - - - -
- 取 消 - 确 定 -
- - + @@ -188,11 +121,13 @@ import ButtonBar from '@/components/ButtonBar' import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' +import divadd from '@/views/component/initial_value/add/productAdd.vue' export default { components: { ButtonBar, Pagination, pageye, + divadd }, data () { return { @@ -221,20 +156,20 @@ export default { remarks: '' }, btnList: [ - { - type: 'primary', - size: 'small', - icon: 'plus', - btnKey: 'toAdd', - btnLabel: '新增' - }, - { - type: 'info', - size: 'small', - icon: 'cross', - btnKey: 'doClose', - btnLabel: '关闭' - } + { + type: 'primary', + size: 'small', + icon: 'plus', + btnKey: 'toAdd', + btnLabel: '新增' + }, + { + type: 'info', + size: 'small', + icon: 'cross', + btnKey: 'doClose', + btnLabel: '关闭' + } ], updataProductForm: { barCode: '', @@ -310,16 +245,6 @@ export default { this.queryInfo.total = result.data.total this.productList = result.data.rows }, - addProduct () { - this.$refs.addProductRuleForm.validate(async validate => { - if (!validate) return this.$message.error('请填写必填项') - const { data: result } = await this.$http.post('/product/addProduct', this.addProductForm) - if (result.status !== 200) return this.$message.error('添加商品失败') - this.$message.success('添加商品成功') - this.getProductList() - this.addProductDialogVisible = false - }) - }, handleSizeChange (val) { this.queryInfo.pageSize = val @@ -329,36 +254,9 @@ export default { this.queryInfo.pageNum = val this.getProductList() }, - closeAddProductDialog () { - this.$refs.addProductRuleForm.resetFields() - }, - closeUpdataProductDialog () { - this.$refs.updataProductRuleForm.resetFields() - }, - createBarCode () { - var now = new Date() - var nowstr = now.getTime() - this.addProductForm.barCode = 'P' + now.getTime() - console.log(nowstr) - }, - open (product) { - this.updataProductForm.barCode = product.barCode - this.updataProductForm.value = product.value - this.updataProductForm.netWeight = product.netWeight - this.updataProductForm.roughWeight = product.roughWeight - this.updataProductForm.effectiveDays = product.effectiveDays - // this.updataProductForm.warehouse = product.warehouse - this.updataProductForm.remarks = product.remarks - this.updataProductDialogVisible = true - }, - updataProduct () { - this.$refs.updataProductRuleForm.validate(async valid => { - const { data: result } = await this.$http.put('/product/updataProduct', this.updataProductForm) - if (result.status !== 200) return this.$message.error('更新数据失败') - this.$message.success('更新成功') - this.updataProductDialogVisible = false - this.getProductList() - }) + open (row) { + this.viewState = 3 + this.$refs['divadd'].showEdit(row) }, async deleteProduct (product) { const result = await this.$confirm('此操作将永久删除' + product.name + ', 是否继续?', '提示', { @@ -372,14 +270,9 @@ export default { this.getProductList() this.$message.success('商品删除成功') }, - async getStorehouse () { - const { data: result } = await this.$http.get('/product/getStorehouse') - if (result.status !== 200) return this.$message.error('获取仓库列表失败') - this.storehouseList = result.data - }, toAdd() { this.viewState = 2 - // this.$refs['divadd'].showAdd() + this.$refs['divadd'].showAdd() }, doClose() { this.$store.dispatch('tagsView/delView', this.$route) @@ -389,7 +282,6 @@ export default { mounted () { this.$refs['btnbar'].setButtonList(this.btnList) this.getProductList() - this.getStorehouse() } } diff --git a/warehousing-system/project_web_ui/src/views/component/initial_value/supplier.vue b/warehousing-system/project_web_ui/src/views/component/initial_value/supplier.vue index 6221cd1a..5e0213b3 100644 --- a/warehousing-system/project_web_ui/src/views/component/initial_value/supplier.vue +++ b/warehousing-system/project_web_ui/src/views/component/initial_value/supplier.vue @@ -1,7 +1,7 @@