diff --git a/src/api/thrsys/smp.js b/src/api/thrsys/smp.js
index 40857aa..7bb0690 100644
--- a/src/api/thrsys/smp.js
+++ b/src/api/thrsys/smp.js
@@ -7,3 +7,41 @@ export function postOrder(query) {
data: query
});
}
+
+
+//往来单位上传
+export function corpUpload(query) {
+ return axios({
+ url: "/udiwms/corps/importLog/uploadSmp",
+ method: "post",
+ data: query
+ });
+}
+
+//产品信息上传
+export function udiUpload(query) {
+ return axios({
+ url: "/udiwms/products/importLog/uploadSmp",
+ method: "post",
+ data: query
+ });
+}
+
+
+//第三方业务单据上传
+export function orderUpload(query) {
+ return axios({
+ url: "/udiwms/thrOrder/importLog/uploadSmp",
+ method: "post",
+ data: query
+ });
+}
+
+export function thrProductUpload(query) {
+ return axios({
+ url: "/udiwms/thrProducts/importLog/uploadSmp",
+ method: "post",
+ data: query
+ });
+}
+
diff --git a/src/views/basic/CorpExport.vue b/src/views/basic/CorpExport.vue
index 3aaeb31..1e1b53f 100644
--- a/src/views/basic/CorpExport.vue
+++ b/src/views/basic/CorpExport.vue
@@ -106,6 +106,7 @@
fromType: null,
page: 1,
limit: 20,
+ type:1,
thirdSysFk: null,
},
selectType: 0,
@@ -144,6 +145,7 @@
genKey: null,
status: null,
page: 1,
+ type:1,
limit: 20,
thirdSysFk: null,
};
diff --git a/src/views/basic/CorpExportSmp.vue b/src/views/basic/CorpExportSmp.vue
index 75a69bd..fb075a3 100644
--- a/src/views/basic/CorpExportSmp.vue
+++ b/src/views/basic/CorpExportSmp.vue
@@ -49,20 +49,13 @@
-
-
-
-
-
-
-
{
+ this.query.ids.push(obj.id);
+ });
+ this.allUploadSMP();
+ },
+
+ allUploadSMP(){
+ corpUpload(this.query)
+ .then((response) => {
+ if (response.code == 20000) {
+ this.$message.success("提交成功，后台正在上传！")
+ } else {
+ this.$message.error(response.message)
+ }
+ this.$emit("cancelDialog", true);
+ })
+ .catch(() => {
+ this.$message.error("上传失败！");
+ });
+ },
+
handleModifyClick(row) {
this.editDialogVisible = true;
this.editQuery = row;
diff --git a/src/views/basic/UdIInfoSelect.vue b/src/views/basic/UdIInfoSelect.vue
index 90ddc77..aef02b9 100644
--- a/src/views/basic/UdIInfoSelect.vue
+++ b/src/views/basic/UdIInfoSelect.vue
@@ -32,7 +32,7 @@
v-if="selectType==1"
>选中上传
- 一键上传
@@ -486,10 +486,9 @@
import {
getUdiInfos,
updateErpProduct,
- uploadSmp,
thirdSysDetail,
} from "../../api/basic/udiRelevance";
-
+import {udiUpload} from "../../api/thrsys/smp"
import {exportExcel} from "../../api/basic/udiInfoExport"
import {selectSysParamByKey} from "../../api/param/systemParamConfig";
import {filterByUuid} from "../../api/basic/udiInfo";
@@ -643,14 +642,14 @@
},
uploadSMP() {
var selectData = this.multipleSelection;
- var keys = [];
selectData.forEach((obj) => {
- keys.push(obj.id);
+ this.filterQuery.uuids.push(obj.uuid);
});
- var tquery = {
- keys: keys,
- };
- uploadSmp(tquery)
+ this.allUploadSMP();
+ },
+
+ allUploadSMP(){
+ udiUpload(this.filterQuery)
.then((response) => {
if (response.code == 20000) {
this.$message({
@@ -663,12 +662,14 @@
message: response.message,
});
}
+ this.$emit("cancelDialog", true);
})
.catch(() => {
this.$message({
type: "error",
message: "上传失败",
});
+ this.$emit("cancelDialog", true);
});
},
handleSelectionChange(val) {
diff --git a/src/views/basic/UdiinfoExport.vue b/src/views/basic/UdiinfoExport.vue
index 197c98a..89be984 100644
--- a/src/views/basic/UdiinfoExport.vue
+++ b/src/views/basic/UdiinfoExport.vue
@@ -79,7 +79,7 @@
width="85%"
v-if="udiImportDetailVisible"
>
-
@@ -101,6 +101,7 @@
data() {
return {
filterQuery: {
+ type: 1,
genKey: null,
status: null,
fromType: null,
@@ -140,6 +141,7 @@
path: "",
});
this.filterQuery = {
+ type: 1,
fromType: null,
genKey: null,
status: null,
@@ -176,7 +178,7 @@
let href =
"http://127.0.0.1:9991" +
"/udiwms/products/exportLog/download" +
- "?genKey=" +row.genKey;
+ "?genKey=" + row.genKey;
let a = document.createElement("a");
fetch(href)
.then((res) => res.blob())
diff --git a/src/views/basic/UdiinfoExportSmp.vue b/src/views/basic/UdiinfoExportSmp.vue
index 888d09b..d6b8100 100644
--- a/src/views/basic/UdiinfoExportSmp.vue
+++ b/src/views/basic/UdiinfoExportSmp.vue
@@ -49,20 +49,13 @@
-
-
-
-
-
-
-
diff --git a/src/views/thrsys/ThrOrderExport.vue b/src/views/thrsys/ThrOrderExport.vue
index 08aae5a..3490838 100644
--- a/src/views/thrsys/ThrOrderExport.vue
+++ b/src/views/thrsys/ThrOrderExport.vue
@@ -100,6 +100,7 @@
data() {
return {
filterQuery: {
+ type: 1,
genKey: null,
status: null,
fromType: null,
@@ -143,6 +144,7 @@
genKey: null,
status: null,
page: 1,
+ type: 1,
limit: 20,
thirdSysFk: null,
};
@@ -155,7 +157,7 @@
if (response.code == 20000) {
this.list = response.data.list || [];
this.total = response.data.total || 0;
- }else {
+ } else {
this.$message.error(response.message);
}
this.loading = false;
@@ -179,7 +181,7 @@
let href =
"http://127.0.0.1:9991" +
"/udiwms/thrOrder/exportLog/download" +
- "?genKey=" +row.genKey;
+ "?genKey=" + row.genKey;
let a = document.createElement("a");
fetch(href)
.then((res) => res.blob())
diff --git a/src/views/thrsys/ThrOrderExportSmp.vue b/src/views/thrsys/ThrOrderExportSmp.vue
index c9b82dd..04427b0 100644
--- a/src/views/thrsys/ThrOrderExportSmp.vue
+++ b/src/views/thrsys/ThrOrderExportSmp.vue
@@ -106,6 +106,7 @@
fromType: null,
page: 1,
limit: 20,
+ type:2,
thirdSysFk: null,
},
selectType: 0,
@@ -144,6 +145,7 @@
genKey: null,
status: null,
page: 1,
+ type:2,
limit: 20,
thirdSysFk: null,
};
diff --git a/src/views/thrsys/ThrOrderImport.vue b/src/views/thrsys/ThrOrderImport.vue
index f315dd9..5107762 100644
--- a/src/views/thrsys/ThrOrderImport.vue
+++ b/src/views/thrsys/ThrOrderImport.vue
@@ -352,6 +352,15 @@
.catch(() => {
});
},
+ formatter(row, index) {
+ if (row.isE == true) {
+ row.Registrationstate = "已注册"
+ }
+ if(row.Registrationstate == false) {
+ row.Registrationstate = "未注册"
+ }
+ return row.Registrationstate
+ }
},
mounted() {
diff --git a/src/views/thrsys/ThrOrderSelect.vue b/src/views/thrsys/ThrOrderSelect.vue
index 28de7ac..23c1ef0 100644
--- a/src/views/thrsys/ThrOrderSelect.vue
+++ b/src/views/thrsys/ThrOrderSelect.vue
@@ -48,7 +48,7 @@
v-if="selectType==1"
>选中上传
- 一键上传
@@ -106,6 +106,7 @@
import {selectIp} from "../../api/param/systemParamConfig";
import {getCloudErp} from "../../api/inout/erpOrder";
import {exportExcel} from "../../api/thrsys/thrOrderExport"
+ import {orderUpload} from "../../api/thrsys/smp"
export default {
name: "ThrOrderSelect",
@@ -212,6 +213,30 @@
});
});
},
+
+ uploadSMP(){
+ var selectData = this.multipleSelection;
+ selectData.forEach((obj) => {
+ this.filterQuery.erpOrderResponses.push(obj);
+ });
+ this.allUploadSMP();
+ },
+
+ allUploadSMP(){
+ orderUpload(this.filterQuery)
+ .then((response) => {
+ if (response.code == 20000) {
+ this.$message.success("提交成功，后台正在上传！")
+ } else {
+ this.$message.error(response.message)
+ }
+ this.$emit("cancelDialog", true);
+ })
+ .catch(() => {
+ this.$message.error("上传失败！");
+ });
+ },
+
deleteDialog(row) {
this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
confirmButtonText: "确定",
diff --git a/src/views/thrsys/ThrProductsExportSmp.vue b/src/views/thrsys/ThrProductsExportSmp.vue
index 7a498fb..fc58a3c 100644
--- a/src/views/thrsys/ThrProductsExportSmp.vue
+++ b/src/views/thrsys/ThrProductsExportSmp.vue
@@ -101,6 +101,7 @@
data() {
return {
filterQuery: {
+ type:2,
genKey: null,
status: null,
fromType: null,
@@ -140,6 +141,7 @@
path: "",
});
this.filterQuery = {
+ type:2,
fromType: null,
genKey: null,
status: null,
diff --git a/src/views/thrsys/ThrProductsSelect.vue b/src/views/thrsys/ThrProductsSelect.vue
index 196a519..8292140 100644
--- a/src/views/thrsys/ThrProductsSelect.vue
+++ b/src/views/thrsys/ThrProductsSelect.vue
@@ -37,11 +37,11 @@
一键导出
- 选中上传
- 一键上传
@@ -97,6 +97,7 @@
import {selectIp} from "../../api/param/systemParamConfig";
import thrProductsDetail from "./ThrProductsDetail";
import {exportExcel} from "../../api/thrsys/thrProductsExport"
+ import {thrProductUpload} from "../../api/thrsys/smp"
export default {
name: "thrProductsSelect",
@@ -299,6 +300,33 @@
});
},
+ uploadSmp() {
+ var selectData = this.multipleSelection;
+ selectData.forEach((obj) => {
+ this.filterQuery.thrProductsEntities.push(obj);
+ });
+ this.allUploadSmp();
+ },
+ allUploadSmp() {
+ thrProductUpload(this.filterQuery)
+ .then((response) => {
+ if (response.code == 20000) {
+ this.$message.success(response.data);
+ this.$emit("cancelDialog", true);
+ } else {
+ this.$message.error(response.message);
+ this.$emit("cancelDialog", true);
+ }
+ })
+ .catch(() => {
+ this.$message({
+ type: "error",
+ message: "上传失败",
+ });
+ });
+ },
+
+
selectExport() {
var selectData = this.multipleSelection;
selectData.forEach((obj) => {