Commit f051971d authored by 刘帅's avatar 刘帅

1.优化

parent 676c8c98
package com.maintain.web.controller.tool; package com.maintain.web.controller.tool;
import org.springframework.beans.factory.annotation.Autowired; import cn.dev33.satoken.annotation.SaCheckPermission;
import com.maintain.common.utils.ip.IpUtils;
import groovy.transform.AnnotationCollector;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.beans.factory.annotation.Autowired;
@RestController @RestController
...@@ -17,24 +20,24 @@ public class ReportController { ...@@ -17,24 +20,24 @@ public class ReportController {
//报表设计 //报表设计
@GetMapping(value = "/reportList") @GetMapping(value = "/reportList")
public String ReportList(){ public String ReportList(){
return "http://10.100.102.82:" + environment.getProperty("server.port") + "/jmreport/list"; return "http://" + IpUtils.getHostIp() + ":" + environment.getProperty("server.port") + "/jmreport/list";
} }
//报表查看 //报表查看
@GetMapping(value = "/reportView") @GetMapping(value = "/reportView")
public String ReportView(){ public String ReportView(){
return "http://10.100.102.82:" + environment.getProperty("server.port") + "/jmreport/view"; return "http://" + IpUtils.getHostIp() + ":" + environment.getProperty("server.port") + "/jmreport/view";
} }
//报表查看 //报表查看
@GetMapping(value = "/biList") @GetMapping(value = "/biList")
public String bi(){ public String bi(){
return "http://10.100.102.82:" + environment.getProperty("server.port") + "/drag/list"; return "http://" + IpUtils.getHostIp() + ":" + environment.getProperty("server.port") + "/drag/list";
} }
//报表查看 //报表查看
@GetMapping(value = "/biView") @GetMapping(value = "/biView")
public String biView(){ public String biView(){
return "http://10.100.102.82:" + environment.getProperty("server.port") + "/drag/share/view"; return "http://" + IpUtils.getHostIp() + ":" + environment.getProperty("server.port") + "/drag/share/view";
} }
} }
...@@ -647,7 +647,7 @@ export default { ...@@ -647,7 +647,7 @@ export default {
taskName: undefined, taskName: undefined,
taskUserId: undefined, taskUserId: undefined,
taskUserName: undefined, taskUserName: undefined,
taskStartTime: undefined, taskStartTime: formatDate(new Date().getTime()),
taskEndTime: undefined, taskEndTime: undefined,
warehouseId: undefined, warehouseId: undefined,
warehouseName: undefined, warehouseName: undefined,
......
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="报修单" prop="repairFormId"> <el-form-item label="报修单" prop="repairFormId">
<el-select v-model="form.repairFormId" placeHolder="请选择报修单" @change="repairFormChange"> <el-select v-model="form.repairFormId" placeHolder="请选择报修单" @change="repairFormChange" style="width: 100%">
<el-option v-for="item in repairFormOpt" :key="item.id" :value="item.id" :label="item.repairNumber" /> <el-option v-for="item in repairFormOpt" :key="item.id" :value="item.id" :label="item.repairNumber" />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -633,7 +633,7 @@ export default { ...@@ -633,7 +633,7 @@ export default {
receiveUserName: undefined, receiveUserName: undefined,
receiveTime: undefined, receiveTime: undefined,
state: undefined, state: undefined,
outTime: undefined, outTime: formatDate(new Date().getTime()),
createBy: this.$store.state.user.userInfo.userName, createBy: this.$store.state.user.userInfo.userName,
createTime: formatDate(new Date().getTime()), createTime: formatDate(new Date().getTime()),
pickingInfoList: [] pickingInfoList: []
......
...@@ -134,14 +134,14 @@ ...@@ -134,14 +134,14 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="报修单" prop="repairFormId"> <el-form-item label="报修单" prop="repairFormId">
<el-select v-model="form.repairFormId" placeHolder="请选择报修单" @change="repairFormChange"> <el-select v-model="form.repairFormId" placeHolder="请选择报修单" @change="repairFormChange" style="width: 100%;">
<el-option v-for="item in repairFormOpt" :key="item.id" :value="item.id" :label="item.repairNumber" /> <el-option v-for="item in repairFormOpt" :key="item.id" :value="item.id" :label="item.repairNumber" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="出库单号" prop="outNumber"> <el-form-item label="出库单号" prop="outNumber">
<el-select v-model="form.outNumber" placeHolder="请选择出库单号" @change="outNumberChange"> <el-select v-model="form.outNumber" placeHolder="请选择出库单号" @change="outNumberChange" style="width: 100%;">
<el-option v-for="item in pickingOpt" :key="item.id" :value="item.id" :label="item.outNumber" /> <el-option v-for="item in pickingOpt" :key="item.id" :value="item.id" :label="item.outNumber" />
</el-select> </el-select>
</el-form-item> </el-form-item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment