Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-mini-web

src/components/table/dk-table/dk-table.vue

@@ -557,6 +557,7 @@ export default {
       if (n && n.length > 0) {
         //设置当前行
         this.$refs[this.name].setCurrentRow(n[0])
+
         if (!this.refreshSelect) {
           this.currentChangeEvent({row: n[0]})
         }
@@ -1440,7 +1441,6 @@ export default {
         this.$Export({tableData: columns}, {
           ok: (val) => {
             this.handleExportAll(true); // 控制不允许再次点击导出
-            console.log('eee', this.exportCondition, JSON.stringify(val))
             let params = {...this.exportCondition}
             // console.log('ttt', Object.assign({'seq': '序号'}, val))
             // 增加序号

src/mixins/index.js

@@ -493,7 +493,6 @@ export const indexMixin = {
      * @date   : 2022年12月13日10:13:23
      */
     edit(rows) {
-      // console.log('rows',rows,this.primaryKey)
       this.modalTitle = this.setTitle(this.$config.formMode.edit, this.$route.meta.title)  // 给modal标题赋值
       this.modalParams = {
         button: this.$config.formMode.edit,

src/view/mst/goods-attr/index.vue

@@ -35,7 +35,8 @@
       <div :style="'height: ' + tableHeight + 'px'" class="split-div-class">
         <DkSplit v-model="split">
           <!-- 左边部分   -->
-          <DkTable slot="left" ref="leftTable" :data="leftData" :height="tableHeight " :page-flag="false"
+          <DkTable  slot="left" ref="leftTable" :data="leftData" :height="tableHeight" :page-flag="false"
+                   primaryKey="kindCode"
                    :page-total-flag="false" :show-setting-flag="false" :freeze="false" :choose-flag="false"
                    @current-change="currentChangeEvent($event)">
             <DkTableColumn :title="$t('allType')" field="kindName" width="auto" :filter="false" :sortable="false"
@@ -428,29 +429,12 @@ export default {
       this.excute(serviceName, serviceNameWay, params, true, 'save').then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
           this.formData = []
-          this.getData();
+          this.getGoodsAttrData();
         }
       })
     },
 
     /**
-     * @desc   : 获取数据
-     * @author : 常皓宁
-     * @date   : 2024/3/9 10:55
-     */
-    getData(params) {
-      if (this.kindCode) {
-        let data = {
-          kindCode: this.kindCode,
-          code: this.searchCond._value['code'],
-          name: this.searchCond._value['name'],
-        }
-        this.currentChangeEvent({row: data})
-      }
-      this.loading = false
-    },
-
-    /**
      * @desc   : 商品属性左侧列表数据
      * @author : 常皓宁
      * @date   : 2024/3/9 13:03
@@ -465,10 +449,12 @@ export default {
       }
     },
   },
+  mounted() {
+    this.getGoodsAttrData() //商品属性左侧列表数据
+  },
   created() {
     this.primaryKey = 'goodsAttrId'  // 设置主键Id
     this.routeObjName = 'goodsAttr'  // 设置路由名称
-    this.getGoodsAttrData() //商品属性左侧列表数据
   }
 }
 </script>