'123'
This commit is contained in:
parent
60793084d2
commit
483d5ffa26
|
@ -721,6 +721,12 @@ public class QuotController extends BaseController
|
||||||
@PostMapping("/commitOAQuot")
|
@PostMapping("/commitOAQuot")
|
||||||
public AjaxResult commitOAQuot(@RequestBody Quot quot)
|
public AjaxResult commitOAQuot(@RequestBody Quot quot)
|
||||||
{
|
{
|
||||||
|
//金思维协助中不允许提交OA
|
||||||
|
String quot_jsw_approval_status = quot.getQuotJswApprovalStatus();
|
||||||
|
if("1".equals(quot_jsw_approval_status)){
|
||||||
|
return error("金思维协助还未完成");
|
||||||
|
}
|
||||||
|
|
||||||
// 报价单提交OA,插入中间表 sys_oa_quot sys_oa_quot_material
|
// 报价单提交OA,插入中间表 sys_oa_quot sys_oa_quot_material
|
||||||
SysOaQuot sysOaQuot = new SysOaQuot();
|
SysOaQuot sysOaQuot = new SysOaQuot();
|
||||||
SysOaQuot oauser = quotService.selectOAUserByUserName(getUsername());// 查询OA用户
|
SysOaQuot oauser = quotService.selectOAUserByUserName(getUsername());// 查询OA用户
|
||||||
|
|
|
@ -1,10 +1,6 @@
|
||||||
package com.ruoyi.common.utils.http;
|
package com.ruoyi.common.utils.http;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import java.io.*;
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.io.InputStreamReader;
|
|
||||||
import java.io.PrintWriter;
|
|
||||||
import java.net.*;
|
import java.net.*;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.security.cert.X509Certificate;
|
import java.security.cert.X509Certificate;
|
||||||
|
@ -217,6 +213,7 @@ public class HttpUtils
|
||||||
conn.setRequestProperty("connection", "Keep-Alive");
|
conn.setRequestProperty("connection", "Keep-Alive");
|
||||||
conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
|
conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
|
||||||
conn.setRequestProperty("Accept-Charset", "utf-8");
|
conn.setRequestProperty("Accept-Charset", "utf-8");
|
||||||
|
conn.setRequestProperty("Charset", "UTF-8");
|
||||||
conn.setRequestProperty("contentType", "application/json; charset=utf-8");
|
conn.setRequestProperty("contentType", "application/json; charset=utf-8");
|
||||||
conn.setRequestProperty("Content-Type", "application/json; charset=utf-8");
|
conn.setRequestProperty("Content-Type", "application/json; charset=utf-8");
|
||||||
// 设置Cookie头部
|
// 设置Cookie头部
|
||||||
|
@ -246,7 +243,7 @@ public class HttpUtils
|
||||||
|
|
||||||
conn.setDoOutput(true);
|
conn.setDoOutput(true);
|
||||||
conn.setDoInput(true);
|
conn.setDoInput(true);
|
||||||
out = new PrintWriter(conn.getOutputStream());
|
out = new PrintWriter(new OutputStreamWriter(conn.getOutputStream(),"utf-8"));
|
||||||
out.print(param);
|
out.print(param);
|
||||||
out.flush();
|
out.flush();
|
||||||
in = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
|
in = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
|
||||||
|
|
|
@ -1500,8 +1500,8 @@ export default {
|
||||||
commitForm() {
|
commitForm() {
|
||||||
this.$refs["form"].validate(valid => {
|
this.$refs["form"].validate(valid => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
if(this.quotMaterialList.length == 0 && this.quotXjFileList == 0){
|
if(this.quotXjFileList == 0){
|
||||||
this.$message.warning("无报价产品 或 未提交询价附件!");
|
this.$message.warning("未上传询价清单附件!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue