Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

src/views/purchase/apply/add/index.vue

@@ -27,6 +27,7 @@
     components: {
       ElSuperForm: () => import("@/components/super-form/index.vue"),
       ElSuperTable: () => import("@/components/super-table/index.vue"),
+      ElSuperUxTable: () => import("@/components/super-ux-table/index.vue"),
       ElPopoverSelectV2: () => import("@/components/popover-select-v2/index.vue"),
     },
     data() {
@@ -273,10 +274,11 @@
           lazy
         >
           <div v-loading="loading" style="height: 250px; display: flex">
-            <el-super-table
+            <el-super-ux-table
               v-model="params[item.key]"
               :dict="dict"
               :ref="tabName"
+              height="250"
               :columns="columns"
               :size="$attrs.size"
             >
@@ -300,7 +302,7 @@
                 >
                 </component>
               </template>
-              <el-table-column fixed="right" label="操作" width="100">
+              <ux-table-column fixed="right" label="操作" width="100">
                 <template slot="header" slot-scope="scope">
                   <el-button
                     type="text"
@@ -319,8 +321,8 @@
                     删除
                   </el-button>
                 </template>
-              </el-table-column>
-            </el-super-table>
+              </ux-table-column>
+            </el-super-ux-table>
           </div>
         </el-tab-pane>
       </el-tabs>

src/views/purchase/apply/columns.js

@@ -116,12 +116,12 @@ export default function useColumns() {
       },
     },
     {
-      item: { width: 100, key: "manufacturer", title: "生产厂家" },
+      item: { width: 100, key: "manufacturerName", title: "生产厂家" },
       attr: {
         is: "el-popover-select-v2",
         clearable: true,
         referName: "MANUFACTURER_PARAM",
-        valueKey: "id",
+        valueKey: "name",
         dataMapping: {
           manufacturer: "id",
           manufacturerName: "name",

src/views/purchase/apply/copy/index.vue

@@ -31,6 +31,7 @@
     components: {
       ElSuperForm: () => import("@/components/super-form/index.vue"),
       ElSuperTable: () => import("@/components/super-table/index.vue"),
+      ElSuperUxTable: () => import("@/components/super-ux-table/index.vue"),
       ElPopoverSelectV2: () => import("@/components/popover-select-v2/index.vue"),
     },
     data() {
@@ -325,10 +326,11 @@
           lazy
         >
           <div v-loading="loading" style="height: 250px; display: flex">
-            <el-super-table
+            <el-super-ux-table
               v-model="params[item.key]"
               :dict="dict"
               :ref="tabName"
+              height="250"
               :columns="columns"
               :size="$attrs.size"
             >
@@ -352,7 +354,7 @@
                 >
                 </component>
               </template>
-              <el-table-column fixed="right" label="操作" width="100">
+              <ux-table-column fixed="right" label="操作" width="100">
                 <template slot="header" slot-scope="scope">
                   <el-button :size="$attrs.size" @click="onRowAdd(tabName)">
                     新增
@@ -366,8 +368,8 @@
                     删除
                   </el-button>
                 </template>
-              </el-table-column>
-            </el-super-table>
+              </ux-table-column>
+            </el-super-ux-table>
           </div>
         </el-tab-pane>
       </el-tabs>