diff --git a/src/api/system/dept.js b/src/api/system/dept.js index c723fa1..1cd3dcf 100644 --- a/src/api/system/dept.js +++ b/src/api/system/dept.js @@ -62,5 +62,5 @@ export function apiGetPartTree() { // 新增公司 export const addCompanyApi = (data) => { - return request.post('/system/dept/addCompany', data) + return request.post('/system/dept/addFirm', data) } diff --git a/src/views/claimAndreturn/picking/outbound-nw/index.vue b/src/views/claimAndreturn/picking/outbound-nw/index.vue index 62ea88c..3996058 100644 --- a/src/views/claimAndreturn/picking/outbound-nw/index.vue +++ b/src/views/claimAndreturn/picking/outbound-nw/index.vue @@ -93,7 +93,7 @@ >导出 - 推送到智慧工地 + > --> - - + --> +
+ + + + + + + 搜索 + 绑定新设备 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 取 消 + 确 定 +
+ +
+ + + + + diff --git a/src/views/claimAndreturn/picking/pushAndLocation/component/MapDIalog.vue b/src/views/claimAndreturn/picking/pushAndLocation/component/MapDIalog.vue new file mode 100644 index 0000000..89e21c4 --- /dev/null +++ b/src/views/claimAndreturn/picking/pushAndLocation/component/MapDIalog.vue @@ -0,0 +1,661 @@ + + + + + diff --git a/src/views/claimAndreturn/picking/pushAndLocation/index.vue b/src/views/claimAndreturn/picking/pushAndLocation/index.vue new file mode 100644 index 0000000..a126368 --- /dev/null +++ b/src/views/claimAndreturn/picking/pushAndLocation/index.vue @@ -0,0 +1,473 @@ + + + + diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index f3339ee..8c76e22 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -149,7 +149,6 @@ >新增 - + @@ -199,11 +203,48 @@ + + + + + + + + + + + + + + + @@ -259,11 +300,43 @@ - + + + + + + + + + + + + + + +
确 定 { - if (!e.deptName) { - this.$message.error('请输入公司名称！') - this.$refs[`deptName_${v}`][0].focus() - isNull = true - throw new Error() + this.$refs['addCompanyRef'].validate(async (valid) => { + if (valid) { + const res = await addCompanyApi(this.addCompanyForm) + if (res.code === 200) { + this.$message.success('新增成功！') + this.addCompanyVisible = false + this.$refs.addCompanyRef.resetFields() + this.getList() } - if (!e.socialCreditCode) { - this.$message.error('请输入统一社会信用代码！') - this.$refs[`socialCreditCode_${v}`][0].focus() - isNull = true - throw new Error() - } - if (!e.enterpriseOwnershipCode) { - this.$message.error('请输入企业代号！') - this.$refs[`enterpriseOwnershipCode_${v}`][0].focus() - isNull = true - throw new Error() - } - }) - } catch (error) {} - if (isNull) return - // 判断已有的公司名称是否重复 - const seen = {} - const uniqueCompanyList = this.companyList.reduce((acc, item) => { - const name = item.deptName - if (!seen[name]) { - seen[name] = true - acc.push(item) } - return acc - }, []) + }) + // 判断公司名称是否为空 + // let isNull = false + // try { + // this.companyList.map((e, v) => { + // if (!e.deptName) { + // this.$message.error('请输入公司名称！') + // this.$refs[`deptName_${v}`][0].focus() + // isNull = true + // throw new Error() + // } + // if (!e.socialCreditCode) { + // this.$message.error('请输入统一社会信用代码！') + // this.$refs[`socialCreditCode_${v}`][0].focus() + // isNull = true + // throw new Error() + // } + // if (!e.enterpriseOwnershipCode) { + // this.$message.error('请输入企业代号！') + // this.$refs[`enterpriseOwnershipCode_${v}`][0].focus() + // isNull = true + // throw new Error() + // } + // }) + // } catch (error) {} + // if (isNull) return + // // 判断已有的公司名称是否重复 + // const seen = {} + // const uniqueCompanyList = this.companyList.reduce((acc, item) => { + // const name = item.deptName + // if (!seen[name]) { + // seen[name] = true + // acc.push(item) + // } + // return acc + // }, []) - if (uniqueCompanyList.length < this.companyList.length) { - this.$message.error('公司名称不可重复添加！') - return - } - let list = [...this.companyList] - const res = await addCompanyApi(list) - if (res.code == 200) { - this.$message.success('新增成功！') - this.getList() - this.companyList = [ - { - deptName: '', - socialCreditCode: '', - enterpriseOwnershipCode: '', - }, - ] - this.addCompanyVisible = false - } + // if (uniqueCompanyList.length < this.companyList.length) { + // this.$message.error('公司名称不可重复添加！') + // return + // } + // let list = [...this.companyList] + // const res = await addCompanyApi(list) + // if (res.code == 200) { + // this.$message.success('新增成功！') + // this.getList() + // this.companyList = [ + // { + // deptName: '', + // socialCreditCode: '', + // enterpriseOwnershipCode: '', + // }, + // ] + // this.addCompanyVisible = false + // } }, /** 关闭新增公司弹框 */ closeAddCompanyDialog() { this.addCompanyVisible = false - this.companyList = [ - { - deptName: '', - socialCreditCode: '', - enterpriseOwnershipCode: '', - }, - ] + this.$refs.addCompanyRef.resetFields() }, }, } diff --git a/vue.config.js b/vue.config.js index c183240..8f7ce8c 100644 --- a/vue.config.js +++ b/vue.config.js @@ -44,12 +44,12 @@ module.exports = { // target: `http://192.168.2.152:39080`, //超 // target: `http://10.40.92.81:8080`, //韩/ - target: `http://192.168.10.105:49080`, //旭/ + // target: `http://192.168.10.105:49080`, //旭/ // target: `http://192.168.10.236:49080`, //旭/ // target: `http://192.168.43.200:49080`, //旭/ - // target: `http://10.40.92.138:28080`, //帅 - // target: `http://192.168.2.218:39080`, //福 - // target: `http://192.168.2.120:39080`, //跃 + // target: `http://192.168.2.17:39080`, //帅 + // target: `http://192.168.2.234:49080`, //福 + target: `http://192.168.2.116:49080`, //跃 //******** 注意事项 ********* */ //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;