|
@@ -1160,13 +1160,19 @@ const rules = ref({
|
|
rate: [{ required: true, message: "请输入汇率", trigger: "blur" }],
|
|
rate: [{ required: true, message: "请输入汇率", trigger: "blur" }],
|
|
});
|
|
});
|
|
const getDict = () => {
|
|
const getDict = () => {
|
|
- proxy.post("/customer/selPage", { pageNum: 1, pageSize: 50 }).then((res) => {
|
|
|
|
- customerList.value = res.rows.map((x) => ({
|
|
|
|
- ...x,
|
|
|
|
- label: x.name,
|
|
|
|
- value: x.id,
|
|
|
|
- }));
|
|
|
|
- });
|
|
|
|
|
|
+ proxy
|
|
|
|
+ .post("/customer/selPage", {
|
|
|
|
+ pageNum: 1,
|
|
|
|
+ pageSize: 50,
|
|
|
|
+ userId: userInfo.user.userId,
|
|
|
|
+ })
|
|
|
|
+ .then((res) => {
|
|
|
|
+ customerList.value = res.rows.map((x) => ({
|
|
|
|
+ ...x,
|
|
|
|
+ label: x.name,
|
|
|
|
+ value: x.id,
|
|
|
|
+ }));
|
|
|
|
+ });
|
|
proxy
|
|
proxy
|
|
.getDictOne([
|
|
.getDictOne([
|
|
"inner_packaging_method_ehsd",
|
|
"inner_packaging_method_ehsd",
|
|
@@ -1604,6 +1610,10 @@ const handleRemove = async (index, row) => {
|
|
formData.data.contractShipmentList.filter(
|
|
formData.data.contractShipmentList.filter(
|
|
(item) => item.productId !== row.productId
|
|
(item) => item.productId !== row.productId
|
|
);
|
|
);
|
|
|
|
+ formData.data.contractWaitShipmentList =
|
|
|
|
+ formData.data.contractWaitShipmentList.filter(
|
|
|
|
+ (item) => item.productId !== row.productId
|
|
|
|
+ );
|
|
await formData.data.contractProductList.splice(index, 1);
|
|
await formData.data.contractProductList.splice(index, 1);
|
|
totalAmount();
|
|
totalAmount();
|
|
};
|
|
};
|
|
@@ -1781,14 +1791,16 @@ const loadingSearch = ref(false);
|
|
const remoteMethod = (keyword) => {
|
|
const remoteMethod = (keyword) => {
|
|
if (keyword && typeof keyword === "string") {
|
|
if (keyword && typeof keyword === "string") {
|
|
loadingSearch.value = true;
|
|
loadingSearch.value = true;
|
|
- proxy.post("/customer/selPage", { keyword }).then((res) => {
|
|
|
|
- customerList.value = res.rows.map((x) => ({
|
|
|
|
- ...x,
|
|
|
|
- label: x.name,
|
|
|
|
- value: x.id,
|
|
|
|
- }));
|
|
|
|
- loadingSearch.value = false;
|
|
|
|
- });
|
|
|
|
|
|
+ proxy
|
|
|
|
+ .post("/customer/selPage", { keyword, userId: userInfo.user.userId })
|
|
|
|
+ .then((res) => {
|
|
|
|
+ customerList.value = res.rows.map((x) => ({
|
|
|
|
+ ...x,
|
|
|
|
+ label: x.name,
|
|
|
|
+ value: x.id,
|
|
|
|
+ }));
|
|
|
|
+ loadingSearch.value = false;
|
|
|
|
+ });
|
|
}
|
|
}
|
|
return;
|
|
return;
|
|
};
|
|
};
|
|
@@ -1989,7 +2001,10 @@ watch(
|
|
res.cityId = res.buyCityId;
|
|
res.cityId = res.buyCityId;
|
|
if (res && res.buyCorporationName) {
|
|
if (res && res.buyCorporationName) {
|
|
proxy
|
|
proxy
|
|
- .post("/customer/selPage", { keyword: res.buyCorporationName })
|
|
|
|
|
|
+ .post("/customer/selPage", {
|
|
|
|
+ keyword: res.buyCorporationName,
|
|
|
|
+ userId: userInfo.user.userId,
|
|
|
|
+ })
|
|
.then((res) => {
|
|
.then((res) => {
|
|
customerList.value = res.rows.map((x) => ({
|
|
customerList.value = res.rows.map((x) => ({
|
|
...x,
|
|
...x,
|
|
@@ -2076,7 +2091,10 @@ const selectContract = (businessId) => {
|
|
proxy.post("/contract/detail", { id: businessId }).then((res) => {
|
|
proxy.post("/contract/detail", { id: businessId }).then((res) => {
|
|
if (res && res.buyCorporationName) {
|
|
if (res && res.buyCorporationName) {
|
|
proxy
|
|
proxy
|
|
- .post("/customer/selPage", { keyword: res.buyCorporationName })
|
|
|
|
|
|
+ .post("/customer/selPage", {
|
|
|
|
+ keyword: res.buyCorporationName,
|
|
|
|
+ userId: userInfo.user.userId,
|
|
|
|
+ })
|
|
.then((res) => {
|
|
.then((res) => {
|
|
customerList.value = res.rows.map((x) => ({
|
|
customerList.value = res.rows.map((x) => ({
|
|
...x,
|
|
...x,
|
|
@@ -2197,7 +2215,10 @@ const selectContract = (businessId) => {
|
|
}
|
|
}
|
|
if (res && res.buyCorporationName) {
|
|
if (res && res.buyCorporationName) {
|
|
proxy
|
|
proxy
|
|
- .post("/customer/selPage", { keyword: res.buyCorporationName })
|
|
|
|
|
|
+ .post("/customer/selPage", {
|
|
|
|
+ keyword: res.buyCorporationName,
|
|
|
|
+ userId: userInfo.user.userId,
|
|
|
|
+ })
|
|
.then((res) => {
|
|
.then((res) => {
|
|
customerList.value = res.rows.map((x) => ({
|
|
customerList.value = res.rows.map((x) => ({
|
|
...x,
|
|
...x,
|