diff --git a/.env.production b/.env.production
index 75f161be..1c85c14e 100644
--- a/.env.production
+++ b/.env.production
@@ -65,8 +65,8 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://192.168.0.67:9150/UDI_WMS_MC/'
# 东山
-VUE_APP_BASE_API = 'http://https://mudi.dsxyy.org/UDI_WMS_MC/'
-
+# VUE_APP_BASE_API = 'http://https://mudi.dsxyy.org/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://192.168.10.225:9150/UDI_WMS_MC/'
# 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'
diff --git a/src/views/purchase/purApply/purApply.vue b/src/views/purchase/purApply/purApply.vue
index 34a7bafa..2e6ad729 100644
--- a/src/views/purchase/purApply/purApply.vue
+++ b/src/views/purchase/purApply/purApply.vue
@@ -120,7 +120,7 @@
-
+
编辑
@@ -299,7 +299,7 @@ export default {
},
getId(id) {
if (this.formName == 'add' && id != null) {
- var data = {
+ let data = {
id: id
}
this.pId = id
@@ -312,7 +312,6 @@ export default {
} else {
this.newSpDistributionVisible = false
}
-
},
onSubmitFind() {
this.filterQuery.page = 1;
diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index 491f4517..4485f5b8 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -106,12 +106,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
编辑
@@ -212,6 +212,10 @@ export default {
type: Function,
required: true,
},
+ isRepeat: {
+ type: Boolean,
+ required: true,
+ },
},
data() {
return {
@@ -514,6 +518,29 @@ export default {
});
},
+ getDetailByRepeat(value) {
+ this.query = {
+ orderIdFk: value
+ }
+ listApplyDetail(this.query) //查找该单号下的所有条码
+ .then((response) => {
+ this.codeArray = response.data.list || [];
+ this.total = response.data.total || 0;
+ this.loading = false;
+ this.codeArray.forEach(item => {
+ item.orderIdFk = value
+ })
+
+ })
+ .catch(() => {
+ this.loading = false;
+ this.list = [];
+ this.total = 0;
+ });
+
+ }
+
+
},
filters: {},
mounted() {
@@ -523,21 +550,7 @@ export default {
};
},
created() {
- this.$nextTick(res => {
- //当父id为空的时候生成id
- if (this.pId == null) {
- addApplyId().then(response => {
- if (response.code === 20000) {
- this.pId = response.data
- console.log("最初生成id:")
- console.log(this.pId)
- }
- }).catch(() => {
- this.loading = false;
- })
- }
- })
-
+ debugger
if (this.$isNotBlank(this.idQuery.id)) {
this.query.limit = 100;
this.pId = this.idQuery.id;
@@ -547,25 +560,64 @@ export default {
this.sValue = this.formData.corpName;
this.getStockOrderDetailList();
} else {
- var date = new Date();
- this.formData = {
- id: null,
- billNo: null,
- remark: "",
- deptCode: null,
- locStorageCode: null,
- invWarehouseCode: null,
- createTime: parseTime(
+ let date = new Date();
+ if (this.isRepeat) {
+ this.formData = this.idQuery.formData
+ let orderId = this.idQuery.formData.id;
+ this.createTime = parseTime(
date,
"{y}-{m}-{d} {h}:{i}:{s}"
- ),
- };
- this.orderEditor = false;
+ )
+ this.formData.billNo = null
+ addApplyId().then(response => {
+ if (response.code === 20000) {
+ this.pId = response.data
+ this.formData.id = this.pId
+ this.$nextTick(res => {
+ this.getDetailByRepeat(orderId)
+ });
+
+ }
+ }).catch(() => {
+ this.loading = false;
+ })
+ } else {
+ this.formData = {
+ id: null,
+ billNo: null,
+ remark: "",
+ deptCode: null,
+ locStorageCode: null,
+ invWarehouseCode: null,
+ createTime: parseTime(
+ date,
+ "{y}-{m}-{d} {h}:{i}:{s}"
+ ),
+ };
+ this.orderEditor = false;
+ this.$nextTick(res => {
+ //当父id为空的时候生成id
+ if (this.pId == null) {
+ addApplyId().then(response => {
+ if (response.code === 20000) {
+ this.pId = response.data
+ this.formData.id = this.pId
+ }
+ }).catch(() => {
+ this.loading = false;
+ })
+ }
+ })
+ }
+
+
}
this.findSubInvs();
this.codeArray = [];
- },
-};
+ }
+ ,
+}
+;