Browse Source

Merge branch 'master' of http://36.137.93.232:3000/hf/byte-sailing-new

lxf 1 year ago
parent
commit
1216f519b4

+ 3 - 3
src/views/purchaseManage/purchaseManage/purchase/index.vue

@@ -196,10 +196,10 @@ const config = computed(() => {
     {
       attrs: {
         label: "物品类型",
-        prop: "productType",
+        prop: "productDefinition",
       },
-      render(productType) {
-        return productType == 1 ? "产品" : "物料";
+      render(productDefinition) {
+        return productDefinition == 1 ? "产品" : "物料";
       },
     },
 

File diff suppressed because it is too large
+ 601 - 114
src/views/salesMange/shipmentMange/document/index.vue


Some files were not shown because too many files changed in this diff