diff --git a/src/mycomponents/package/packageCard.vue b/src/mycomponents/package/packageCard.vue
new file mode 100644
index 00000000..2a19d5b0
--- /dev/null
+++ b/src/mycomponents/package/packageCard.vue
@@ -0,0 +1,158 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 复制采购
+ |制品
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/mycomponents/package/packageList.vue b/src/mycomponents/package/packageList.vue
new file mode 100644
index 00000000..f27035ae
--- /dev/null
+++ b/src/mycomponents/package/packageList.vue
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue b/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
index 4a096893..35263f95 100644
--- a/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
+++ b/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
@@ -6,7 +6,7 @@
-
+
@@ -28,6 +28,7 @@
import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
import pack from '@/mycomponents/balance/pack.vue'
import detailList from '@/mycomponents/detail/detailList.vue'
+ import packageList from '@/mycomponents/package/packageList.vue'
import {
getDetailOption,
@@ -42,7 +43,8 @@
jobDetailPopup,
receiptDetailInfoPopup,
winScanLocation,
- detailList
+ detailList,
+ packageList
},
props: {
dataContent: {
@@ -86,11 +88,30 @@
this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, this.settingParam
.allowModifyLocation)
}
- this.resizeCollapse();
+
+
+ },
+
+ updated() {
+ console.log('updated')
},
- methods: {
+ methods: {
+ collapseChange(){
+ setTimeout(() => {
+ this.resizeCollapse();
+ }, 500)
+ },
+
resizeCollapse() {
+ this.$nextTick(r => {
+ this.$refs.collapse.resize()
+ });
+ this.$forceUpdate();
+ },
+
+
+ refreshCollapse() {
this.$nextTick(r => {
this.$refs.collapse.forEach(r => {
r.childrens.forEach(i => {
@@ -99,6 +120,7 @@
r.resize();
})
});
+ this.$forceUpdate();
},
swipeClick(e, item) {
diff --git a/src/static/config.js b/src/static/config.js
index 612c4d5d..76734df7 100644
--- a/src/static/config.js
+++ b/src/static/config.js
@@ -1,5 +1,5 @@
-let request_url = "http://dev.ccwin-in.com:25300/api/admin-api"
-// let request_url = "http://192.168.0.211:12080/admin-api"
+// let request_url = "http://dev.ccwin-in.com:25300/api/admin-api"
+let request_url = "http://192.168.0.211:12080/admin-api"
let isDevelopment = false