Browse Source

Merge branch 'sit' of http://120.46.155.214:3000/xiaodai2022/order-ui-pc into sit

wugg 2 years ago
parent
commit
28137e904f

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-libs.js


+ 2 - 2
src/views/purchaseIn/purchaseOrder/columns.js

@@ -139,9 +139,9 @@ const columns = [
     width: "120px",
   },
   {
-    prop: "order_type",
+    prop: "order_id",
     label: "采购单来源",
-    _slot_: "order_type",
+    _slot_: "order_id",
     width: "110px",
   },
   

+ 2 - 2
src/views/purchaseIn/purchaseOrder/index.vue

@@ -221,13 +221,13 @@
             "
           ></el-tag>
         </template>
-        <template #order_type="{ scope }">
+        <template #order_id="{ scope }">
           <el-tag
             :size="tablebtnSize"
             v-text="
               (
                 cg_order_type_options.find(
-                  (item) => item.value == scope.row.order_type
+                  (item) => item.value == scope.row.order_id
                 ) || {}
               ).label || '--'
             "

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