提交商品信息

src/api/basicData/commodityType.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params, deptId) => {
     return request({
-        url: '/api/blade-user/page',
+        url: '/api/blade-client/goodsdesc/list',
         method: 'get',
         params: {
             ...params,
@@ -13,19 +13,19 @@ export const getList = (current, size, params, deptId) => {
     })
 }
 
-export const remove = (ids) => {
+export const remove = (id) => {
     return request({
-        url: '/api/blade-user/remove',
+        url: '/api/blade-client/goodsdesc/update',
         method: 'post',
-        params: {
-            ids,
+        data: {
+            id:id
         }
     })
 }
 
 export const add = (row) => {
     return request({
-        url: '/api/blade-user/submit',
+        url: '/api/blade-client/goodsdesc/submit',
         method: 'post',
         data: row
     })
@@ -33,7 +33,7 @@ export const add = (row) => {
 
 export const update = (row) => {
     return request({
-        url: '/api/blade-user/update',
+        url: '/api/blade-client/goodsdesc/update',
         method: 'post',
         data: row
     })
@@ -53,7 +53,7 @@ export const updatePlatform = (userId, userType, userExt) => {
 
 export const getUser = (id) => {
     return request({
-        url: '/api/blade-user/detail',
+        url: '/api/blade-client/goodsdesc/detail',
         method: 'get',
         params: {
             id,

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

@@ -12,266 +12,101 @@
   "dialogClickModal": false,
   "column": [
     {
-      "label": "登录账号",
-      "prop": "account",
+      "label": "商品编码",
+      "prop": "code",
       "search": true,
-      "display": false
+      "width": 100,
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
     },
     {
-      "label": "所属租户",
-      "prop": "tenantName",
+      "label": "商品名称",
+      "prop": "cname",
       "slot": true,
-      "display": false
+      "width": 100,
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
     },
     {
-      "label": "用户姓名",
-      "prop": "realName",
-      "search": true,
-      "display": false
+      "label": "商品类别",
+      "prop": "goodsTypeId",
+      "dicData": [],
+      "type": "tree",
+      "hide": true,
+      "addDisabled": false,
+      "props": {
+        "label": "title"
+      },
+      "rules": [{
+        "required": true,
+        "message": " ",
+        "trigger": "click"
+      }]
     },
     {
-      "label": "所属角色",
-      "prop": "roleName",
-      "slot": true,
-      "display": false
+      "label": "规格编码",
+      "prop": "typeno",
+      "search": true
     },
     {
-      "label": "所属部门",
-      "prop": "deptName",
-      "slot": true,
-      "display": false
+      "label": "品牌",
+      "prop": "brand",
+      "slot": true
     },
     {
-      "label": "用户平台",
-      "prop": "userTypeName",
-      "slot": true,
-      "display": false
+      "label": "花纹",
+      "prop": "brandItem",
+      "slot": true
     },
     {
-      "label": "用户平台",
-      "type": "select",
-      "dicUrl": "/api/blade-system/dict/dictionary?code=user_type",
-      "props": {
-        "label": "dictValue",
-        "value": "dictKey"
-      },
-      "dataType": "number",
-      "search": true,
-      "hide": true,
-      "display": false,
-      "prop": "userType",
-      "rules": [{
-        "required": true,
-        "message": "请选择用户平台",
-        "trigger": "blur"
-      }]
-    }
-  ],
-  "group": [
+      "label": "规格尺寸",
+      "prop": "specs",
+      "slot": true
+    },
     {
-      "label": "基础信息",
-      "prop": "baseInfo",
-      "icon": "el-icon-user-solid",
-      "column": [
-        {
-          "label": "所属租户",
-          "prop": "tenantId",
-          "type": "tree",
-          "dicUrl": "/api/blade-system/tenant/select",
-          "props": {
-            "label": "tenantName",
-            "value": "tenantId"
-          },
-          "hide": "!website.tenantMode",
-          "addDisplay": "website.tenantMode",
-          "editDisplay": "website.tenantMode",
-          "viewDisplay": "website.tenantMode",
-          "rules": [{
-            "required": true,
-            "message": "请输入所属租户",
-            "trigger": "click"
-          }],
-          "span": 24
-        },
-        {
-          "label": "登录账号",
-          "prop": "account",
-          "rules": [{
-            "required": true,
-            "message": "请输入登录账号",
-            "trigger": "blur"
-          }]
-        },
-        {
-          "label": "用户平台",
-          "type": "select",
-          "dicUrl": "/api/blade-system/dict/dictionary?code=user_type",
-          "props": {
-            "label": "dictValue",
-            "value": "dictKey"
-          },
-          "dataType": "number",
-          "slot": true,
-          "prop": "userType",
-          "rules": [{
-            "required": true,
-            "message": "请选择用户平台",
-            "trigger": "blur"
-          }]
-        },
-        {
-          "label": "密码",
-          "prop": "password",
-          "hide": true,
-          "editDisplay": false,
-          "viewDisplay": false,
-          "rules": [{"required": true, "validator": "validatePass", "trigger": "blur"}]
-        },
-        {
-          "label": "确认密码",
-          "prop": "password2",
-          "hide": true,
-          "editDisplay": false,
-          "viewDisplay": false,
-          "rules": [{"required": true, "validator": "validatePass2", "trigger": "blur"}]
-        }
-      ]
+      "label": "产品类别",
+      "prop": "category",
+      "slot": true
     },
     {
-      "label": "详细信息",
-      "prop": "detailInfo",
-      "icon": "el-icon-s-order",
-      "column": [
-        {
-          "label": "用户昵称",
-          "prop": "name",
-          "hide": true,
-          "rules": [{
-            "required": true,
-            "message": "请输入用户昵称",
-            "trigger": "blur"
-          }]
-        },
-        {
-          "label": "用户姓名",
-          "prop": "realName",
-          "rules": [{
-            "required": true,
-            "message": "请输入用户姓名",
-            "trigger": "blur"
-          }, {
-            "min": 2,
-            "max": 5,
-            "message": "姓名长度在2到5个字符"
-          }]
-        },
-        {
-          "label": "手机号码",
-          "prop": "phone",
-          "overHidden": true
-        },
-        {
-          "label": "电子邮箱",
-          "prop": "email",
-          "hide": true,
-          "overHidden": true
-        },
-        {
-          "label": "用户性别",
-          "prop": "sex",
-          "type": "select",
-          "dicData": [
-            {
-              "label": "男",
-              "value": 1
-            },
-            {
-              "label": "女",
-              "value": 2
-            },
-            {
-              "label": "未知",
-              "value": 3
-            }
-          ],
-          "hide": true
-        },
-        {
-          "label": "用户生日",
-          "type": "date",
-          "prop": "birthday",
-          "format": "yyyy-MM-dd hh:mm:ss",
-          "valueFormat": "yyyy-MM-dd hh:mm:ss",
-          "hide": true
-        },
-        {
-          "label": "账号状态",
-          "prop": "statusName",
-          "hide": true,
-          "display": false
-        }
-      ]
+      "label": "产品分类",
+      "prop": "categoryitem",
+      "slot": true
     },
     {
-      "label": "职责信息",
-      "prop": "dutyInfo",
-      "icon": "el-icon-s-custom",
-      "column": [
-        {
-          "label": "用户编号",
-          "prop": "code"
-        },
-        {
-          "label": "所属角色",
-          "prop": "roleId",
-          "multiple": true,
-          "type": "tree",
-          "dicData": [],
-          "props": {
-            "label": "title"
-          },
-          "checkStrictly": true,
-          "slot": true,
-          "rules": [{
-            "required": true,
-            "message": "请选择所属角色",
-            "trigger": "click"
-          }]
-        },
-        {
-          "label": "所属部门",
-          "prop": "deptId",
-          "type": "tree",
-          "multiple": true,
-          "dicData": [],
-          "props": {
-            "label": "title"
-          },
-          "checkStrictly": true,
-          "slot": true,
-          "rules": [{
-            "required": true,
-            "message": "请选择所属部门",
-            "trigger": "click"
-          }]
-        },
-        {
-          "label": "所属岗位",
-          "prop": "postId",
-          "type": "tree",
-          "multiple": true,
-          "dicData": [],
-          "props": {
-            "label": "postName",
-            "value": "id"
-          },
-          "rules": [{
-            "required": true,
-            "message": "请选择所属岗位",
-            "trigger": "click"
-          }]
-        }
-      ]
+      "label": "供应商",
+      "prop": "providers",
+      "slot": true
+    },
+    {
+      "label": "计量单位",
+      "prop": "unit",
+      "slot": true
+    },
+    {
+      "label": "包装单位",
+      "prop": "packgeunit",
+      "slot": true
+    },
+    {
+      "label": "图片",
+      "prop": "url",
+      "slot": true
+    },
+    {
+      "label": "备注",
+      "prop": "remarks",
+      "slot": true
     }
   ]
 }

src/views/basicData/commodityType/index.vue

@@ -382,7 +382,8 @@ export default {
   watch: {
     'form.tenantId'() {
       if (this.form.tenantId !== '' && this.initFlag) {
-        this.initData(this.form.tenantId);
+        console.log(this.form)
+        this.initData(0);
       }
     },
     'excelForm.isCovered'() {
@@ -431,18 +432,18 @@ export default {
       this.onLoad(this.page);
     },
     initData(tenantId) {
-      getRoleTree(tenantId).then(res => {
-        const column = this.findObject(this.option.group, "roleId");
-        column.dicData = res.data.data;
-      });
-      getDeptTree(tenantId).then(res => {
-        const column = this.findObject(this.option.group, "deptId");
-        column.dicData = res.data.data;
-      });
-      getPostList(tenantId).then(res => {
-        const column = this.findObject(this.option.group, "postId");
+      // getRoleTree(tenantId).then(res => {
+      //   const column = this.findObject(this.option.group, "roleId");
+      //   column.dicData = res.data.data;
+      // });
+      getDeptLazyTree(0).then(res => {
+        const column = this.findObject(this.option.column, "goodsTypeId");
         column.dicData = res.data.data;
       });
+      // getPostList(tenantId).then(res => {
+      //   const column = this.findObject(this.option.group, "postId");
+      //   column.dicData = res.data.data;
+      // });
     },
     submitRole() {
       const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
@@ -456,9 +457,9 @@ export default {
       });
     },
     rowSave(row, done, loading) {
-      row.deptId = row.deptId.join(",");
-      row.roleId = row.roleId.join(",");
-      row.postId = row.postId.join(",");
+      // row.deptId = row.deptId.join(",");
+      // row.roleId = row.roleId.join(",");
+      // row.postId = row.postId.join(",");
       add(row).then(() => {
         this.initFlag = false;
         this.onLoad(this.page);
@@ -473,9 +474,9 @@ export default {
       });
     },
     rowUpdate(row, index, done, loading) {
-      row.deptId = row.deptId.join(",");
-      row.roleId = row.roleId.join(",");
-      row.postId = row.postId.join(",");
+      // row.deptId = row.deptId.join(",");
+      // row.roleId = row.roleId.join(",");
+      // row.postId = row.postId.join(",");
       update(row).then(() => {
         this.initFlag = false;
         this.onLoad(this.page);
@@ -609,14 +610,11 @@ export default {
       if (["edit", "view"].includes(type)) {
         getUser(this.form.id).then(res => {
           this.form = res.data.data;
-          if(this.form.hasOwnProperty("deptId")){
-            this.form.deptId = this.form.deptId.split(",");
-          }
-          if(this.form.hasOwnProperty("roleId")){
-            this.form.roleId = this.form.roleId.split(",");
-          }
-          if(this.form.hasOwnProperty("postId")){
-            this.form.postId = this.form.postId.split(",");
+          // 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(",");
+            console.log(this.form.goodsTypeId)
           }
         });
       }

src/views/basicData/customerInformation/index.vue

@@ -99,9 +99,10 @@ export default {
     },
     //新增修改时保存触发
     rowSave(row, done, loading) {
-      // typeSave(row).then(res => {
-      //   console.log(res)
-      // })
+      typeSave(row).then(res => {
+        console.log(res)
+        done()
+      })
     },
     //查询全部
     initData(){