diff --git a/supervise-organizational-ui/src/views/brank/brankAdd.vue b/supervise-organizational-ui/src/views/brank/brankAdd.vue index 5da879de..76d9b778 100644 --- a/supervise-organizational-ui/src/views/brank/brankAdd.vue +++ b/supervise-organizational-ui/src/views/brank/brankAdd.vue @@ -23,7 +23,6 @@ -
省-市-县：
diff --git a/warehousing-system/project_web/src/components/ButtonBar/index.vue b/warehousing-system/project_web/src/components/ButtonBar/index.vue new file mode 100644 index 00000000..2024ee73 --- /dev/null +++ b/warehousing-system/project_web/src/components/ButtonBar/index.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/warehousing-system/project_web/src/components/initial_value/storehouse.vue b/warehousing-system/project_web/src/components/initial_value/storehouse.vue index bbecae4c..1b7ce66d 100644 --- a/warehousing-system/project_web/src/components/initial_value/storehouse.vue +++ b/warehousing-system/project_web/src/components/initial_value/storehouse.vue @@ -58,21 +58,121 @@ - - - - - - - - - - - - - - - + + + + + + *仓库名称： + + + + + + + *仓库简称： + + + + + + + *仓库编码： + + + + + + + + + + *所属地：    + + + + + + + + + + + + + + + + + + + + + + *库房面积： + + + + + + + *库房高度： + + + + + + + *月租金： + + + + + + + + + *库房性质编码： + + + + + + + + + + + + *房源： + + + + + + + + + *联系人姓名： + + + + + + + *联系人电话： + + + + + + + *附件： + + + + +
@@ -113,7 +213,24 @@ export default { addr: [ { required: true, message: '请输入仓库地址', trigger: 'blur' } ] - } + }, + tableData:[], + totalPrice:0, + form:{ + name:"", + region1:'', + region2:'', + region3:'', + xxarrive:'', + tel:'', + provinceList:[], + cityList:[], + countyList:[] + }, + CITY:[], + XIAN:[], + mapApiKey: 'map', + shouhuoArrive:{} } }, methods: { @@ -132,9 +249,6 @@ export default { this.total = result.data.total this.storehouseList = result.data.rows }, - closeStorehouseDialog () { - this.$refs.storehouseRuleForm.resetFields() - }, addStorehouseDialog () { this.title = '新增仓库' this.storehouseDialogVisible = true @@ -180,13 +294,95 @@ export default { if (resultDB.status !== 200) return this.$message.error('删除出库失败') this.getStorehouseList() this.$message.success('仓库删除成功') - } + }, + getMap(){ + this.$http({ + method:"get", + url:"https://restapi.amap.com/v3/config/district?parameters", // apii请求地址 + params:{ // 携带的参数 + key:"3a708a4ef5e3af28694b1c861985a5ce", // 在高德开放平台申请的个人key密钥 + keyWords:"中国", + subdistrict:3 // 要获取的行政区划的级别：省、市、县三级 + } + }).then((res)=>{ + this.form.provinceList = res.data.districts[0].districts /* 省*/ + /* 进行遍历赋值*/ + /* 市区和县区*/ + let newProvince = this.form.provinceList + for(let i = 0; i < newProvince.length; i++){ /* 省级*/ + for(let j = 0; j < newProvince[i].districts.length; j++){ /* 市级*/ + let city = newProvince[i].districts[j].name + this.CITY.push({id:j+1,name:city,code:i+1}) + for(let k = 0;k{ + if(item.name == that){ + cityCode = item.code + } + }) + // console.log(cityCode) + if(cityCode){ + this.form.cityList = [] + this.CITY.forEach((item,index)=>{ + if(item.code == cityCode){ + this.form.cityList.push(item) + } + }) /* 市匹配成功*/ + } + }, + cityChange(that){ + this.form.region3='' + let countyCode = 0 + let cityname = '' + let newCountyArry = [] + this.form.cityList.forEach((item,index)=>{ + if(item.name == that){ + countyCode = item.id + cityname = item.name + } + }) + if(countyCode){ + this.form.countyList = [] + this.XIAN.forEach((item,index)=>{ + if(item.code == countyCode && item.cityCountyName == cityname){ + this.form.countyList.push(item) + } + }) + } + }, }, mounted () { this.getStorehouseList() - } + this.getMap() + }, } diff --git a/warehousing-system/project_web/src/plugins/element.js b/warehousing-system/project_web/src/plugins/element.js index a02206dc..c4be6047 100644 --- a/warehousing-system/project_web/src/plugins/element.js +++ b/warehousing-system/project_web/src/plugins/element.js @@ -39,8 +39,8 @@ import { Checkbox, Upload, Divider, - InputNumber - + InputNumber, + footer } from 'element-ui' Vue.use(Button) @@ -81,6 +81,7 @@ Vue.use(Checkbox) Vue.use(Upload) Vue.use(Divider) Vue.use(InputNumber) +Vue.use(footer) // 将弹框组件挂载到Vue对象中 用户可以使用this关键字调用 Vue.prototype.$message = Message diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchmodletemplate.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchmodletemplate.js index 95a9b07f..e60b1821 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchmodletemplate.js +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchmodletemplate.js @@ -55,5 +55,13 @@ export default { method: 'post', data: params }) + }, + // 关联 + save: function(params) { + return request({ + url: '/yxtdispatchcenter/v1/dispatchmodletemplate/save', + method: 'post', + data: params + }) } } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js index 92298596..2d491fa6 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js @@ -71,5 +71,21 @@ export default { method: 'post', data: params }) + }, + // 查询任务项列表信息 + listPageA: function(params) { + return request({ + url: '/yxtdispatchcenter/v1/dispatchorderstandards/listPage', + method: 'post', + data: params, + }) + }, + // 查询运维人员信息 + listPageB: function(params) { + return request({ + url: '/yxtdispatchcenter/v1/dispatchworker/listPage', + method: 'post', + data: params, + }) }, } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/components/AreaPicker/index.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/components/AreaPicker/index.vue index 105c6475..5124d962 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/components/AreaPicker/index.vue +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/components/AreaPicker/index.vue @@ -1,151 +1,154 @@ diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplate.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplate.vue index 72bad52a..55132c5e 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplate.vue +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplate.vue @@ -160,7 +160,6 @@ export default { taskid: '' // 任务项标准库id } }, - multipleSelection: [], btnList: [ { type: 'primary', @@ -190,7 +189,10 @@ export default { tasktypeparent: '' // 任务项父级分类+ } }, - multipleSelection:[] + UseList:{ + templateid:'', + taskid:[] + } } }, mounted() { @@ -324,7 +326,7 @@ export default { }) }, handleSelectionChange(val) { - this.multipleSelection = val + this.UseList.taskid = val }, // 序号 indexMethod(index) { @@ -343,6 +345,7 @@ export default { toMaintain(row){ this.loadLists() this.dialogVisible=true + this.UseList.templateid=row.templateid }, formatPrivilegeType: function( row, column) { if(row.taskreturn === '1'){ @@ -356,10 +359,25 @@ export default { } }, confirm(){ - if (this.multipleSelection.length === 0) { - this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' }) + if (this.UseList.taskid.length === 0) { + this.$message({ showClose: true, type: 'error', message: '请至少选择一条记录进行关联' }) return } + let arrList=[] + this.UseList.taskid.forEach(item=>{ + arrList.push(item.sid) + }) + console.log(arrList); + this.UseList.taskid=arrList + req.save(this.UseList).then((res)=>{ + if (res.success) { + this.$message({ type: 'success', message: res.msg, showClose: true }) + this.dialogVisible=false + } else { + // 根据resp.code进行异常情况处理 + } + }) + } } } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue index a826d7f7..869773fb 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue @@ -20,7 +20,7 @@
巡视工单信息
-
+
*客户名称： @@ -60,7 +60,7 @@ v-for="(item, i) in dataList" :key="i" :label="item.templateid" - :value="item.taskid" + :value="item.templateid" /> @@ -161,9 +161,9 @@
- - - + + +
@@ -227,6 +227,14 @@ export default { taskid: '' } }, + queryParamsA: { + current: 1, + size: 10, + total: 0, + params: { + orderId:'' + } + }, } }, mounted(){ @@ -234,7 +242,6 @@ export default { if (resp.success) { const data = resp.data this.dataList = data.records - this.list = data.records } }) }, @@ -258,7 +265,7 @@ export default { this.formobj.operationcontent = '' // 处理情况 this.formobj.receiveperson = '' // 现场联系人 this.formobj.receivetel = '' // 现场联系人电话 - + this.queryParamsA.params.orderId='' this.$refs['form_obj'].resetFields() this.$emit('doback') }, @@ -276,6 +283,7 @@ export default { this.$refs['form_obj'].clearValidate() }) this.viewTitle = '【新增】工单数据' + this.ShowList() }, showEdit(row) { this.$nextTick(() => { @@ -310,6 +318,9 @@ export default { .catch(e => { this.formobj = row }) + this.queryParamsA.params.orderId=row.sid + this.ShowList() + this.ShowYunwei() }, saveOrUpdate() { if (this.formobj.workers.length === 0) { @@ -327,6 +338,7 @@ export default { if (resp.success) { _this.$message({ showClose: true, type: 'success', message: resp.msg }) _this.handleReturn('true') + _this.queryParamsA.params.orderId='' } else { // 根据resp.code进行异常情况处理 } @@ -362,9 +374,21 @@ export default { }).then(() => { this.TabList.splice(index, 1); }) - }, - } - } + }, + // 查询运维人员信息 + ShowYunwei(){ + req.listPageB(this.queryParamsA).then((res)=>{ + console.log(res); + }) + }, + // 查询任务项列表信息 + ShowList(){ + req.listPageA(this.queryParamsA).then((res)=>{ + this.list = res.data.records + }) + }, + } +} diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanAdds.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanAdds.vue index 6d090484..8afda781 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanAdds.vue +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanAdds.vue @@ -130,17 +130,40 @@
巡视人员
+ 新增
- + > - - - - + + + + + + + + + + + + + + +
@@ -149,9 +172,9 @@
- - - + + +
@@ -162,6 +185,7 @@ diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworker.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworker.vue index 2404eca3..63df65b6 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworker.vue +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworker.vue @@ -52,7 +52,7 @@ - + @@ -437,6 +437,7 @@ export default { }, purchase(row){ this.drawer=true + this.formobj = Object.assign({}, row); }, } }