diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 675789c5..526e104e 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -111,30 +111,30 @@
-
-
-
-
-
- {{ item.name }}
- {{
- item.thirdSysName
- }}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/inout/DialogSelectThrOrder.vue b/src/views/inout/DialogSelectThrOrder.vue
index 54cc575e..1c6f9553 100644
--- a/src/views/inout/DialogSelectThrOrder.vue
+++ b/src/views/inout/DialogSelectThrOrder.vue
@@ -9,29 +9,35 @@
-
-
+
+
+
+ {{ item.thirdName }}
+
+
+
+ v-for="item in originTypes"
+ :key="item.name"
+ :label="item.name"
+ :value="item.action">
{{ item.name }}
{{
item.thirdSysName
@@ -45,14 +51,14 @@
@@ -64,9 +70,9 @@
显示/隐藏搜索栏
重置
查询
@@ -78,13 +84,13 @@
@@ -95,11 +101,11 @@
@@ -119,17 +125,17 @@
+ v-if="storageVisible"
+ title="请选择单据所属仓库信息"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ append-to-body
+ :visible.sync="storageVisible">
@@ -142,6 +148,7 @@ import store from "../../store";
import {getOriginBusType} from "@/api/basic/busOriginType";
import {filterAllByUser} from "@/api/system/invWarehouse";
import selectInvDialog from "./DialogSelectInv";
+import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
export default {
name: "closeDialog",
@@ -269,23 +276,23 @@ export default {
}
this.listQuery.customerId = store.getters.customerId;
getCloudErp(this.listQuery)
- .then((response) => {
- console.log(response)
- this.loading = false;
- if (response.code === 20000) {
- this.dataList = response.data.list || [];
- this.pageTotal = response.data.total || 0;
- } else {
- this.$message.error(response.message);
- this.dataList = [];
- this.pageTotal = 0;
- }
- })
- .catch(() => {
- this.loading = false;
+ .then((response) => {
+ console.log(response)
+ this.loading = false;
+ if (response.code === 20000) {
+ this.dataList = response.data.list || [];
+ this.pageTotal = response.data.total || 0;
+ } else {
+ this.$message.error(response.message);
this.dataList = [];
this.pageTotal = 0;
- });
+ }
+ })
+ .catch(() => {
+ this.loading = false;
+ this.dataList = [];
+ this.pageTotal = 0;
+ });
},
intentBack() {
this.closeDialog();
@@ -304,15 +311,15 @@ export default {
invWarehouseCode: this.currentRow.invWarehouseCode,
}
addStockOrder(tQuery)
- .then((response) => {
- if (response.code === 20000) {
- this.closeDialog();
- } else {
- this.$message.error(response.message);
- }
- })
- .catch(() => {
- });
+ .then((response) => {
+ if (response.code === 20000) {
+ this.closeDialog();
+ } else {
+ this.$message.error(response.message);
+ }
+ })
+ .catch(() => {
+ });
}
},
hideSearch() {
@@ -329,16 +336,16 @@ export default {
locStorageCode: this.curLocInv,
}
addStockOrder(tQuery)
- .then((response) => {
- if (response.code === 20000) {
- this.storageVisible = false;
- this.closeDialog();
- } else {
- this.$message.error(response.message);
- }
- })
- .catch(() => {
- });
+ .then((response) => {
+ if (response.code === 20000) {
+ this.storageVisible = false;
+ this.closeDialog();
+ } else {
+ this.$message.error(response.message);
+ }
+ })
+ .catch(() => {
+ });
},
handleSelectionUdiChange(val) {
@@ -348,25 +355,26 @@ export default {
getBusType() {
let query = {
enabled: true,
+ thirdSys: this.listQuery.thirdSysFk,
};
getOriginBusType(query)
- .then((response) => {
- this.originTypes = response.data.list || [];
- })
- .catch(() => {
- });
+ .then((response) => {
+ this.originTypes = response.data.list || [];
+ })
+ .catch(() => {
+ });
},
getStorage(event) {
this.storageList = [];
filterAllByUser()
- .then((response) => {
- this.storageList = response.data || [];
- if (this.storageList.length == 1) {
- this.curLocInv = this.storageList[0].code;
- }
- })
- .catch(() => {
- });
+ .then((response) => {
+ this.storageList = response.data || [];
+ if (this.storageList.length == 1) {
+ this.curLocInv = this.storageList[0].code;
+ }
+ })
+ .catch(() => {
+ });
},
@@ -374,15 +382,41 @@ export default {
this.storageVisible = false;
},
+ thirdSysChange() {
+ this.listQuery.billAction = "";
+ this.getBusType();
+ },
+
closeSubmitDialog() {
this.storageVisible = false;
this.combine();
},
+
+
+ getBasicThirdSys() {
+ let query = {
+ enabled: true,
+ };
+ getBasicThirdSys(query)
+ .then((response) => {
+ this.thirdSys = response.data.list || [];
+ this.listQuery.thirdSysFk = this.thirdSys[0].thirdId;
+ this.uploadData.thirdSys = this.listQuery.thirdSysFk;
+ this.selectSysParam();
+ this.getBusType();
+ })
+ .catch(() => {
+ this.loading = false;
+ this.list = [];
+ });
+ },
+
+
},
created() {
- this.getBusType();
+
+ this.getBasicThirdSys();
this.getStorage();
- this.getList();
},
components: {selectInvDialog}
diff --git a/src/views/thirdSys/order/thrOrder.vue b/src/views/thirdSys/order/thrOrder.vue
index 33930fdf..427fe066 100644
--- a/src/views/thirdSys/order/thrOrder.vue
+++ b/src/views/thirdSys/order/thrOrder.vue
@@ -9,12 +9,21 @@
-
-
+
+
+
+ {{ item.thirdName }}
+
+
-
+
+
+
+
+
{