bug修复提交

src/views/material/productLinkMaterial/components/link-material-dialog.vue

@@ -169,9 +169,9 @@
           <template v-slot:angle="{ row }">
             <DictSelection dictName="角度" clearable v-model="row.angle">
             </DictSelection>
-          </template> 
-          </ele-pro-table>
-        </el-col>
+          </template>
+        </ele-pro-table>
+      </el-col>
     </el-row>
 
     <div slot="footer" class="footer">
@@ -228,7 +228,7 @@
           },
           {
             label: `${this.catogaryName}分类`,
-            prop: 'categoryLevelGroupName'
+            prop: 'categoryLevelPath'
           },
           {
             label: `${this.catogaryName}编码`,
@@ -252,7 +252,7 @@
           },
           {
             label: `${this.catogaryName}分类`,
-            prop: 'categoryLevelGroupName',
+            prop: 'categoryLevelPath',
             width: 110
           },
           {
@@ -274,7 +274,7 @@
                 {
                   label: '槽数',
                   prop: 'slotNum',
-                  formatter:(_row, _column, cellValue) => {
+                  formatter: (_row, _column, cellValue) => {
                     return _row.extendInfo.slotNum;
                   }
                 },
@@ -367,9 +367,7 @@
         this.datasourceShow = this.datasource.filter((item) => {
           return (
             (!this.where.categoryId ||
-              item.parentId.includes(
-                this.where.categoryId
-              )) &&
+              item.parentId.includes(this.where.categoryId)) &&
             (!this.where.code || item.code.includes(this.where.code)) &&
             (!this.where.name || item.name.includes(this.where.name)) &&
             (!this.where.modelType ||
@@ -381,9 +379,7 @@
         this.datasourceRightShow = this.datasourceRight.filter((item) => {
           return (
             (!this.whereRight.categoryId ||
-              item.parentId.includes(
-                this.whereRight.categoryId
-              )) &&
+              item.parentId.includes(this.whereRight.categoryId)) &&
             (!this.whereRight.code ||
               item.code.includes(this.whereRight.code)) &&
             (!this.whereRight.name ||

vue.config.js

@@ -33,11 +33,8 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.3.51:18086', // 测试
         target: 'http://192.168.3.35:8080', // kang杨威
-        // target: 'http://192.168.3.25:8080', // 黄峥嵘
-        // target: 'http://192.168.3.41:8080', // 何江鹏
         // target: 'http://192.168.3.33:8080', // 谢一平
-        // target: 'http://192.168.3.64:8080', // 粟勋
-        // target: 'http://192.168.3.34:8080', // 刘毅
+        // target: 'http://192.168.3.38:8080', // 陈潇
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''