Merge branch 'master' of git.echepei.com:caojunjie/Smart_platform_ui

src/views/basicData/commodityType/configuration/mainList.json

@@ -44,6 +44,7 @@
       "type": "tree",
       "hide": true,
       "addDisabled": false,
+      "multiple": true,
       "props": {
         "label": "title"
       },

src/views/basicData/commodityType/index.vue

@@ -474,6 +474,7 @@ export default {
       });
     },
     rowUpdate(row, index, done, loading) {
+      row.goodsTypeId = row.goodsTypeId.join(",");
       // row.deptId = row.deptId.join(",");
       // row.roleId = row.roleId.join(",");
       // row.postId = row.postId.join(",");
@@ -607,12 +608,11 @@ export default {
     handleTemplate() {
       window.open(`/api/blade-user/export-template?${this.website.tokenHeader}=${getToken()}`);
     },
-    beforeOpen(done, type) {
+    async beforeOpen(done, type) {
       if (["edit", "view"].includes(type)) {
-        getUser(this.form.id).then(res => {
+        await getUser(this.form.id).then(res => {
           this.form = res.data.data;
           // this.form.goodsTypeId = [this.form.goodsTypeId.replace(/\"/g,"")]
-          console.log(this.form.goodsTypeId)
           if(this.form.hasOwnProperty("goodsTypeId")){
             this.form.goodsTypeId = this.form.goodsTypeId.split(",");
           }