完善左侧菜单及功能

src/api/Common/Upload.js

@@ -0,0 +1,4 @@
+import request from '@/utils/request'
+// 上传图片
+
+export const uploadFile = '/api/portal/file/upload'

src/api/Common/areaPicker.js

@@ -0,0 +1,49 @@
+import request from '@/utils/request'
+
+//区域获取省
+// export function getProvince(data) {
+//   return request({
+//     url: '/system/region/getProvince',
+//     method: 'get'
+//   })
+// }
+// //根据省sid获取该省的所有市
+// export function getCity(data) {
+//   return request({
+//     url: '/system/region/getCity',
+//     method: 'get',
+//     params: data
+//   })
+// }
+// //根据市sid获取该市的所有县区
+// export function getCounty(data) {
+//   return request({
+//     url: '/system/region/getCounty',
+//     method: 'get',
+//     params: data
+//   })
+// }
+// 获取省/portal/v1/regions/getProvince
+export function getProvince(data) {
+  return request({
+    url: '/portal/v1/regions/getProvince',data,
+    method: 'get',
+    params:data,
+  })
+}
+// 根据省sid获取该省的所有市
+export function getCity(data) {
+  return request({
+    url: '/portal/v1/regions/getCity',
+    params:data,
+    method: 'get',
+  })
+}
+// 根据市sid获取该市的所有县区
+export function getCounty(data) {
+  return request({
+    url: '/portal/v1/regions/getCounty',
+    method: 'get',
+    params:data,
+  })
+}

src/api/Common/dictcommons.js

@@ -0,0 +1,144 @@
+import request from '@/utils/request'
+
+export function typeValues(data) {
+  return request({
+    url: '/wms/apiadmin/dictcommons/typeValues',
+    method: 'get',
+    params: data
+  })
+}
+
+// 根据当前登录人orgSidPath(全路径sid)查询分公司
+export function getOrgSidByPath(data) {
+  return request({
+    url: '/portal/v1/sysstafforg/getOrgSidByPath',
+    method: 'get',
+    params: data
+  })
+}
+
+// 根据分公司sid查询分公司名称
+export function fetchBySid(sid) {
+  return request({
+    url: '/portal/v1/sysorganization/fetchBySid/' + sid,
+    method: 'get'
+  })
+}
+
+// 根据当前登录用户sid获取本分公司下的销售部门和销售专员
+export function selectOrgList(data) {
+  return request({
+    url: '/portal/v1/sysorganization/selectOrgList',
+    method: 'get',
+    params: data
+  })
+}
+
+// 当前用户创建申请时判断该用户是否有该菜单的操作权限
+export function selectHaveMessage(data) {
+  return request({
+    url: '/portal/v1/sysuser/selectHaveMessage ',
+    method: 'post',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+// 根据当前登录用户的角色获取菜单分页列表页面右上角按钮的隐藏
+export function getButtonPermissions(data) {
+  return request({
+    url: '/portal/v1/sysfunction/getButtonPermissions',
+    method: 'post',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+// 根据当前登录用户的全路径查询相应部门下的所有人
+export function selAllByOrgSidPath(data) {
+  return request({
+    url: '/portal/v1/sysstafforg/selAllByOrgSidPath',
+    method: 'post',
+    params: data
+  })
+}
+
+// 分公司全路径sid获取工种
+export function getServiceType(data) {
+  return request({
+    url: '/as/v1/AsServiceItem/getServiceType',
+    method: 'get',
+    params: data
+  })
+}
+
+// 分公司全路径sid获取科目
+export function selSubjectInfo(data) {
+  return request({
+    url: '/as/v1/asservicepackage/selSubjectInfo',
+    method: 'get',
+    params: data
+  })
+}
+
+// 分公司全路径sid获取班组
+export function getGroupList(data) {
+  return request({
+    url: '/as/v1/asservicegroup/getGroupList',
+    method: 'post',
+    params: data
+  })
+}
+
+// 查询分页列表 -- 客户列表
+export function customerListPage(params) {
+  return request({
+    url: '/yxtcrm/apiadmin/v1/crmcustomer/customerListPage',
+    method: 'post',
+    data: params,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+// 获取省
+export function getProvince() {
+  return request({
+    url: '/portal/v1/regions/getProvince',
+    method: 'get'
+  })
+}
+// 根据省sid获取该省的所有市
+export function getCity(data) {
+  return request({
+    url: '/portal/v1/regions/getCity',
+    method: 'get',
+    params: data
+  })
+}
+// 根据市sid获取该市的所有县区
+export function getCounty(data) {
+  return request({
+    url: '/portal/v1/regions/getCounty',
+    method: 'get',
+    params: data
+  })
+}
+
+// 获取售后服务--基础信息--供应商信息
+export function choiceSupplierInfo(data) {
+  return request({
+    url: '/pms/v1/pmssupplierinfo/choiceSupplierInfo',
+    method: 'post',
+    params: data
+  })
+}
+
+// 查询分页列表 -- 商品列表
+export function chooseproducts(params) {
+  return request({
+    url: '/yxtbase/apiadmin/base/basegoodssku/getGoodsListPage',
+    method: 'post',
+    data: params,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}

src/api/Common/permission.js

@@ -0,0 +1,13 @@
+import request from '@/utils/request'
+// 请求按钮权限
+export default {
+
+  // 查询分页列表，输入当前路径和userSid，返回
+  buttonPermission: function(params) {
+    return request({
+      url: '/demopackage/v1/demo/buttonPermission',
+      method: 'post',
+      data: params
+    })
+  }
+}

src/api/goods/brand.js

@@ -0,0 +1,74 @@
+import request from '@/utils/request'
+
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodsbrand/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  // 品牌查询
+  getAllBrand: function(params) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodsbrand/listAll',
+     method: 'post',
+     data: params,
+     headers: {
+       'Content-Type': 'application/json'
+     }
+    })
+  },
+
+
+  // 修改是否可用状态
+  updateIsEnable: function(sid,isEnable) {
+  	return request({
+  		url: '/wms/apiadmin/base/basegoodsbrand/updateIsEnable/'+sid+"/"+isEnable
+  	});
+  },
+
+
+  // 新增、保存
+  saveBrands: function(data) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodsbrand/saveOrUpdate',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+  // 初始化
+  initBrands: function(data) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodsbrand/initialization/' + data,
+      method: 'get'
+    });
+  },
+
+
+
+  // 品牌-- 删除
+  deleteBySids: function(data) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodsbrand/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+
+
+}

src/api/goods/category.js

@@ -0,0 +1,78 @@
+import request from '@/utils/request'
+
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodstype/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  // 类别查询
+  getAllType: function(params) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodstype/listAll',
+     method: 'post',
+     data: params,
+     headers: {
+       'Content-Type': 'application/json'
+     }
+    })
+  },
+
+
+  // 修改是否可用状态
+  updateIsEnable: function(sid, isEnable) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodstype/updateIsEnable/' + sid + "/" + isEnable
+    });
+  },
+
+  // 修改是否一品一码
+  updateIsGoodsID: function(sid, isGoodsID) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodstype/updateIsGoodsID/' + sid + "/" + isGoodsID
+    });
+  },
+
+  // 新增、保存
+  saveTypes: function(data) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodstype/saveOrUpdate',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+  // 初始化
+  initTypes: function(data) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodstype/initialization/' + data,
+      method: 'get'
+    });
+  },
+
+
+
+  // 类别-- 删除
+  deleteBySids: function(data) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodstype/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+}

src/api/goods/factory.js

@@ -0,0 +1,70 @@
+import request from '@/utils/request'
+
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/wms/apiadmin/base/basemanufacturer/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+ // 厂家查询
+  getAllFacturer: function(params) {
+    return request({
+      url: '/wms/apiadmin/base/basemanufacturer/listAll',
+     method: 'post',
+     data: params,
+     headers: {
+       'Content-Type': 'application/json'
+     }
+    })
+  },
+
+  // 修改是否可用状态
+  updateIsEnable: function(sid,isEnable) {
+  	return request({
+  		url: '/wms/apiadmin/base/basemanufacturer/updateIsEnable/'+sid+"/"+isEnable
+  	});
+  },
+
+
+  // 新增、保存
+  saveFacturer: function(data) {
+    return request({
+      url: '/wms/apiadmin/base/basemanufacturer/saveOrUpdate',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+  // 初始化
+  initFacturer: function(data) {
+    return request({
+      url: '/wms/apiadmin/base/basemanufacturer/initialization/' + data,
+      method: 'get'
+    });
+  },
+
+ // 厂家-- 删除
+  deleteBySids: function(data) {
+    return request({
+      url: '/wms/apiadmin/base/basemanufacturer/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+
+}

src/api/goods/goods.js

@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      // url: '/wms/apiadmin/base/basegoodsspu/listPage',
+      url: '/wms/apiadmin/base/basegoodsspu/goodsListPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  // 修改是否可用状态
+  updateIsEnable: function(sid, isEnable) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodsspu/updateIsEnable/' + sid + "/" + isEnable
+    });
+  },
+
+  // 新增、保存
+  saveGoods: function(data) {
+    return request({
+      // url: '/wms/apiadmin/base/basegoodsspu/saveOrUpdate',
+      url: '/wms/apiadmin/base/basegoodsspu/saveOrUpdateGoods',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+  // 初始化
+  initGoods: function(data) {
+    return request({
+      // url: '/wms/apiadmin/base/basegoodsspu/initialization/' + data,
+      url: '/wms/apiadmin/base/basegoodsspu//goodsDetails/' + data,
+      method: 'get'
+    });
+  },
+
+
+ // 商品-- 删除
+  deleteBySids: function(data) {
+    return request({
+      // url: '/wms/apiadmin/base/basegoodsspu/delBySids',
+      url: '/wms/apiadmin/base/basegoodsspu/delGoodsBySids',
+      method: 'DELETE',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+}

src/api/goods/unit.js

@@ -0,0 +1,70 @@
+import request from '@/utils/request'
+
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodsunit/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  // 单位查询
+  getAllUnit: function(params) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodsunit/listAll',
+    method: 'post',
+    data: params,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+    })
+  },
+
+
+  // 修改是否可用状态
+  updateIsEnable: function(sid,isEnable) {
+  	return request({
+  		url: '/wms/apiadmin/base/basegoodsunit/updateIsEnable/'+sid+"/"+isEnable
+  	});
+  },
+
+
+  // 新增、保存
+  saveUnits: function(data) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodsunit/saveOrUpdate',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+  // 初始化
+  initUnits: function(data) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodsunit/initialization/' + data,
+      method: 'get'
+    });
+  },
+
+ // 单位-- 删除
+  deleteBySids: function(data) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodsunit/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+}

src/components/uploadFile/uploadImg.vue

@@ -160,6 +160,7 @@
           imgFiles.push(o.url)
         })
         this.$emit('fileChange', this.files)
+          this.$emit('change', this.files)
       },
       handleRemove(file, fileList) {
         console.log('file:' + JSON.stringify(file))

src/layout/components/Sidebar/index.vue

@@ -97,7 +97,7 @@
           if (menus[i].component == '') {
             menus[i] = {
               path: menus[i].path,
-              component: Layout,
+              component: '',
               redirect: menus[i].path,
               children: [menus[i]]
             }

src/router/index.js

@@ -57,8 +57,8 @@ export const constantRoutes = [
       title: '基础信息'
     },
     children: [{
-        path: 'warehouses/warehouse',
-        name: 'warehouse',
+        path: '/warehouses/warehouse',
+        name: 'Warehouse',
         component: () => import('@/views/baseInfo/warehouses/warehouse/index'),
         meta: {
           title: '仓库管理',
@@ -67,8 +67,8 @@ export const constantRoutes = [
         hidden: true
       },
       {
-        path: 'warehouses/warehouseArea',
-        name: 'warehouseArea',
+        path: '/warehouses/warehouseArea',
+        name: 'WarehouseArea',
         component: () => import('@/views/baseInfo/warehouses/warehouseArea/index'),
         meta: {
           title: '库区管理',
@@ -77,8 +77,8 @@ export const constantRoutes = [
         hidden: true
       },
       {
-        path: 'warehouses/warehouseAreaType',
-        name: 'warehouseAreaType',
+        path: '/warehouses/warehouseAreaType',
+        name: 'WarehouseAreaType',
         component: () => import('@/views/baseInfo/warehouses/warehouseAreaType/index'),
         meta: {
           title: '库区类型管理',
@@ -87,8 +87,8 @@ export const constantRoutes = [
         hidden: true
       },
       {
-        path: 'warehouses/goodsShelves',
-        name: 'goodsShelves',
+        path: '/warehouses/goodsShelves',
+        name: 'GoodsShelves',
         component: () => import('@/views/baseInfo/warehouses/goodsShelves/index'),
         meta: {
           title: '库位管理',
@@ -97,7 +97,7 @@ export const constantRoutes = [
         hidden: true
       },
       {
-        path: 'supplier/supplier',
+        path: '/supplier/supplier',
         name: 'Supplier',
         component: () => import('@/views/baseInfo/supplier/supplier/supplier'),
         meta: {
@@ -107,7 +107,7 @@ export const constantRoutes = [
         hidden: true
       },
       {
-        path: 'supplier/suppliertype',
+        path: '/supplier/suppliertype',
         name: 'Suppliertype',
         component: () => import('@/views/baseInfo/supplier/suppliertype/suppliertype'),
         meta: {
@@ -119,6 +119,66 @@ export const constantRoutes = [
 
     ]
   },
+  {
+    path: '/goods',
+    component: Layout,
+    redirect: null,
+    meta: {
+      title: '商品管理'
+    },
+    children: [{
+        path: '/brands/index',
+        name: 'Brands',
+        component: () => import('@/views/goods/brands/index'),
+        meta: {
+          title: '品牌管理',
+          icon: 'product-add'
+        },
+        hidden: true
+      },
+      {
+        path: '/category/index',
+        name: 'Category',
+        component: () => import('@/views/goods/category/index'),
+        meta: {
+          title: '商品类别',
+          icon: 'product-add'
+        },
+        hidden: true
+      },
+      {
+        path: '/factory/index',
+        name: 'Factory',
+        component: () => import('@/views/goods/factory/index'),
+        meta: {
+          title: '厂家管理',
+          icon: 'product-add'
+        },
+        hidden: true
+      },
+      {
+        path: '/unit/index',
+        name: 'Unit',
+        component: () => import('@/views/goods/unit/index'),
+        meta: {
+          title: '计量单位',
+          icon: 'product-add'
+        },
+        hidden: true
+      },
+      {
+        path: '/goods/index',
+        name: 'Goods',
+        component: () => import('@/views/goods/goods/index'),
+        meta: {
+          title: '商品管理',
+          icon: 'product-add'
+        },
+        hidden: true
+      },
+
+    ]
+  },
   {
     path: '/system',
     component: Layout,
@@ -164,7 +224,7 @@ export const constantRoutes = [
           title: '角色管理'
         }
       }, {
-        path: 'menuManage/menuManage',
+        path: '/menuManage/menuManage',
         component: () => import('@/views/system/menuManage/menuManage.vue'),
         name: 'MenuManage',
         meta: {

src/views/goods/brands/brandsAdd.vue

@@ -0,0 +1,301 @@
+<template>
+  <div>
+
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>品牌信息</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div class="listconadd">
+
+
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+
+        <el-row class="first_row">
+          <el-col :span="8">
+
+            <div class="span-sty"><span class="must">*</span> 品牌名称</div>
+            <el-form-item prop="brandName">
+              <el-input v-model="formobj.brandName" placeholder="" class="addinputw addinputInfo" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <div class="span-sty"><span class="must">*</span> 品牌代码</div>
+            <el-form-item prop="brandCode">
+              <el-input v-model="formobj.brandCode" placeholder="" class="addinputw addinputInf" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <div class="span-sty"><span class="must">*</span> 首字母大写</div>
+            <el-form-item prop="letter">
+              <el-input v-model="formobj.letter" placeholder="" class="addinputw addinputInf" clearable
+                oninput="value=value.replace(/[^A-Z]/g,'');" @input="letter" />
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+
+            <div class="span-sty"> 品牌备注</div>
+            <el-form-item>
+              <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" clearable />
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="24">
+            <div class="span-sty">品牌Logo</div>
+            <el-form-item>
+              <upload-img ref="uploadImg" class="addinputw addinputInfo" v-model="imgList" :limit="1" bucket="map"
+                :upload-data="{ type: '0001' }" :class="{ hide: hideUploadBtn }" @change="backData" />
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+      </el-form>
+
+      <!--
+      <el-card class="box-card">
+        <div class="item">
+          <span class="item_text"><span class="must">*</span> 品牌名称：</span>
+          <el-input v-model="formobj.brandName" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text"><span class="must">*</span> 品牌代码：</span>
+          <el-input v-model="formobj.brandCode" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text"><span class="must">*</span> 首字母大写：</span>
+          <el-input v-model="formobj.letter" placeholder="" class="item_input" clearable
+            oninput="value=value.replace(/[^A-Z]/g,'');" @input="letter" />
+        </div>
+        <div class="item">
+          <span class="item_text">品牌备注：</span>
+          <el-input v-model="formobj.remarks" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item" style="margin-bottom: 100px;margin-top: 100px;">
+          <span class="item_text">品牌Logo：</span>
+          <upload-img ref="uploadImg" class="item_input" v-model="imgList" :limit="1" bucket="map"
+            :upload-data="{ type: '0001' }" :class="{ hide: hideUploadBtn }" @change="backData" />
+
+        </div>
+
+      </el-card> -->
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/goods/brand.js'
+  import uploadImg from '@/components/uploadFile/uploadImg'
+  export default {
+    components: {
+      uploadImg
+    },
+    data() {
+      return {
+        imgList: [],
+        imgList2: [],
+        submitdisabled: false,
+        formobj: {
+          sid: '',
+          brandName: '',
+          brandCode: '',
+          remarks: '',
+          letter: '',
+          image: "",
+          useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+          createOrgSid: window.sessionStorage.getItem('orgSid'),
+          userSid: window.sessionStorage.getItem('userSid'),
+
+        },
+        hideUploadBtn: false,
+        hideUploadBtn2: false,
+        rules: {
+          brandName: [{
+            required: true,
+            message: '品牌名称不能为空',
+            trigger: 'blur'
+          }],
+          brandCode: [{
+            required: true,
+            message: '品牌代码不能为空',
+            trigger: 'blur'
+          }],
+          letter: [{
+            required: true,
+            message: '首字母大写不能为空',
+            trigger: 'blur'
+          }],
+        }
+      }
+    },
+    created() {
+      // this.initData()
+    },
+    methods: {
+      letter(val) {
+        console.log('letter', val)
+        this.formobj.letter = val
+      },
+      backData(value) {
+        console.log('imgList', this.imgList)
+
+        if (this.imgList.length > 0) {
+          this.formobj.image = this.imgList[0].url
+        } else {
+          this.formobj.image = ''
+        }
+        this.hideUploadBtn = this.imgList.length != 0
+        console.log('this.hideUploadBtn', this.hideUploadBtn)
+      },
+
+      saveOrUpdate() {
+        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
+        // if (this.formobj.brandName == '') {
+        //   this.$message({
+        //     showClose: true,
+        //     type: 'warning',
+        //     message: "品牌名称不能为空"
+        //   })
+        //   return
+        // }
+
+        // if (this.formobj.brandCode == '') {
+        //   this.$message({
+        //     showClose: true,
+        //     type: 'warning',
+        //     message: "品牌代码不能为空"
+        //   })
+        //   return
+        // }
+
+        // if (this.formobj.letter == '') {
+        //   this.$message({
+        //     showClose: true,
+        //     type: 'warning',
+        //     message: "首字母大写不能为空"
+        //   })
+        //   return
+        // }
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+            req.saveBrands(this.formobj)
+              .then(resp => {
+                if (resp.success) {
+                  this.$message({
+                    showClose: true,
+                    type: 'success',
+                    message: resp.msg
+                  })
+                  this.handleReturn('true')
+                } else {
+                  // 根据resp.code进行异常情况处理
+                }
+              })
+              .catch(() => {})
+          }
+        })
+
+
+
+      },
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.imgList = []
+        this.hideUploadBtn = true
+        this.formobj = {
+          sid: '',
+          brandName: '',
+          brandCode: '',
+          remarks: '',
+          letter: '',
+          image: "",
+          useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+          createOrgSid: window.sessionStorage.getItem('orgSid'),
+          userSid: window.sessionStorage.getItem('userSid'),
+        }
+        this.$emit('doback')
+      },
+      showAdd() {
+        console.log("this.imgList", this.imgList)
+        this.hideUploadBtn = this.imgList.length != 0
+      },
+      showEdit(row) {
+        req.initBrands(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+              this.imgList = []
+              if (resp.data.image != '') {
+                this.imgList.push({
+                  url: resp.data.image
+                })
+              }
+
+              this.hideUploadBtn = this.imgList.length != 0
+            }
+          })
+          .catch(e => {
+            this.formobj = row
+            this.imgList = []
+          })
+      },
+
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+</style>

src/views/goods/brands/index.vue

@@ -0,0 +1,313 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <button-bar ref="btnbar" view-title="品牌列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">
+            {{ searchxianshitit }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" class="tab-header">
+              <el-form-item label="品牌名称">
+                <el-input v-model="queryParams.params.name" placeholder="" clearable />
+              </el-form-item>
+
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!-- Start 项目列表头部 -->
+        <div class="listtop">
+          <div class="tit">品牌列表</div>
+        </div>
+        <!-- End 项目列表头部 -->
+        <!-- Start 项目列表 -->
+        <div class="">
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
+            @selection-change="selectionLineChangeHandle">
+            <el-table-column fixed width="50" type="selection" align="center" />
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+            <!--  <el-table-column label="操作" align="center" width="100">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button>
+              </template>
+            </el-table-column> -->
+            <el-table-column label="是否可用" align="center" width="140">
+              <template slot-scope="scope">
+                <el-switch v-model="scope.row.isEnable" active-text="是" inactive-text="否" active-value="1"
+                  inactive-value="2" @change="enableChange(scope.row.sid,scope.row.isEnable)" />
+              </template>
+            </el-table-column>
+            <el-table-column label="品牌Logo" align="center">
+              <template slot-scope="scope">
+                <el-popover placement="left" trigger="click" width="300">
+                  <img :src="scope.row.image" width="100%">
+                  <img slot="reference" :src="scope.row.image" :alt="scope.row.image"
+                    style="max-height: 70px;max-width: 70px; padding: 5px">
+                </el-popover>
+              </template>
+            </el-table-column>
+            <el-table-column prop="brandName" label="品牌名称" align="center" />
+            <el-table-column prop="brandCode" label="品牌代码" align="center" />
+            <el-table-column prop="letter" label="首字母大写" align="center" />
+            <el-table-column prop="remarks" label="品牌备注" align="center" />
+
+          </el-table>
+        </div>
+        <!-- End 项目列表 -->
+        <div class="pages">
+          <div class="tit" />
+          <!--  翻页  -->
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
+            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+        </div>
+      </div>
+    </div>
+    <!-- End 查询和其列表部分 -->
+    <!-- 新增修改部分组件 -->
+    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+  </div>
+</template>
+
+<script>
+  import req from '@/api/goods/brand.js'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import divAdd from './brandsAdd.vue'
+  export default {
+    components: {
+      ButtonBar,
+      Pagination,
+      pageye,
+      divAdd
+    },
+    data() {
+      return {
+        btndisabled: false,
+        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        tableLoading: false,
+        dataList: [],
+        btnList: [{
+            type: 'primary',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'toAdd',
+            btnLabel: '新增'
+          },
+          {
+            type: 'primary',
+            size: 'small',
+            icon: 'edit',
+            btnKey: 'toEdit',
+            btnLabel: '编辑'
+          },
+          {
+            type: 'danger',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'doDel',
+            btnLabel: '删除'
+          },
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            name: ''
+          }
+        },
+        sids: [],
+        selectionList: []
+      }
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+      this.loadList()
+    },
+    methods: {
+      selectionLineChangeHandle(val) {
+        console.log("val", val);
+
+        this.selectionList = val
+
+        const aa = []
+        val.forEach(element => {
+          aa.push(element.sid)
+        })
+        this.sids = aa
+      },
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'toAdd':
+            this.toAdd()
+            break
+          case 'toEdit':
+            this.toEdit()
+            break
+          case 'doDel':
+            this.doDel()
+            break
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      loadList() {
+        this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
+        req.listPage(this.queryParams).then((resp) => {
+          this.tableLoading = false
+          if (resp.success) {
+            const data = resp.data
+            this.queryParams.total = data.total
+            this.dataList = data.records
+          } else {
+            // 根据resp.code进行异常情况处理
+            this.dataList = []
+            this.queryParams.total = 0
+          }
+        }).catch(() => {
+          this.tableLoading = false
+        })
+      },
+
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      dosearch() {
+        this.queryParams.current = 1
+        this.loadList()
+      },
+      resetQuery() {
+        this.queryParams = {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            name: ''
+          }
+        }
+        this.loadList()
+      },
+      toAdd() {
+        this.viewState = 2
+        this.$refs['divadd'].showAdd()
+      },
+      toEdit() {
+
+        if (this.selectionList.length != 1) {
+          this.$message({
+            type: 'warning',
+            message: "请选择一条数据。",
+            showClose: true
+          })
+          return
+        }
+
+        this.viewState = 3
+        this.$refs['divadd'].showEdit(this.selectionList[0])
+      },
+
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      },
+      toRelevancy(row) {
+        this.viewState = 3
+        this.$refs['divadd'].showEdit(row)
+      },
+      doDel() {
+
+        if (this.sids.length > 0) {
+          const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+          this.$confirm(tip, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
+            req.deleteBySids(this.sids).then((resp) => {
+              loading.close()
+              if (resp.success) {
+                this.$message({
+                  type: 'success',
+                  message: resp.msg,
+                  showClose: true
+                })
+                this.loadList()
+              } else {
+                // 根据resp.code进行异常情况处理
+              }
+            }).catch(e => {
+              loading.close()
+            })
+          }).catch(() => {})
+        } else {
+          this.$message({
+            showClose: true,
+            message: '请至少选择一条记录进行删除操作'
+          })
+        }
+      },
+      resetState() {
+        this.viewState = 1
+      },
+      enableChange(sid, state) {
+        console.log('sid', sid)
+        console.log('state', state)
+        req.updateIsEnable(sid, state).then((resp) => {
+          if (resp.success) {
+            this.$message({
+              type: 'success',
+              message: '状态已更新',
+              showClose: true
+            })
+          } else { // 根据resp.code进行异常情况处理
+          }
+        }).catch(e => {
+          console.log(e)
+        })
+      }
+    }
+  }
+</script>
+<style scoped>
+</style>

src/views/goods/category/categoryAdd.vue

@@ -0,0 +1,376 @@
+<template>
+  <div>
+
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>商品类别</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div class="listconadd">
+
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+
+        <el-row class="first_row">
+          <el-col :span="8">
+            <div class="span-sty">选择父级类别</div>
+            <el-form-item>
+              <el-select v-model="formobj.pname" placeholder="请选择父级类别" class="addinputw addinputInfo"
+                @change="selectGoodsTypeChange">
+                <el-option v-for="item in goodsTypeList" :key="item.sid" :label="item.goodsTypeName"
+                  :value="item.sid" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+
+            <div class="span-sty"><span class="must">*</span> 类别名称</div>
+            <el-form-item prop="goodsTypeName">
+              <el-input v-model="formobj.goodsTypeName" placeholder="" class="addinputw addinputInfo" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <div class="span-sty"><span class="must">*</span> 类别编码</div>
+            <el-form-item prop="goodsTypeCode">
+              <el-input v-model="formobj.goodsTypeCode" placeholder="" class="addinputw addinputInfo" clearable
+                oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+
+            <div class="span-sty">提成比例</div>
+            <el-form-item>
+              <el-input v-model="formobj.percentageRate" placeholder="" class="addinputw addinputInfo" clearable
+                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <div class="span-sty">提成金额</div>
+            <el-form-item>
+              <el-input v-model="formobj.percentageAmount" placeholder="" class="addinputw addinputInfo" clearable
+                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <div class="span-sty"><span class="must">*</span> 出库规则</div>
+            <el-form-item prop="outStockRuleValue">
+              <el-select v-model="formobj.outStockRuleValue" placeholder="请选择出库规则" class="addinputw addinputInfo"
+                @change="selectOutStockRuleChange">
+                <el-option v-for="item in outStockRuleList" :key="item.dictKey" :label="item.dictValue"
+                  :value="item.dictKey" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+
+            <div class="span-sty"><span class="must">*</span>排序</div>
+            <el-form-item>
+              <el-input v-model="formobj.sortNo" placeholder="" class="addinputw addinputInfo" clearable
+                oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="16">
+
+            <div class="span-sty">备注</div>
+            <el-form-item>
+              <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" clearable />
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+      </el-form>
+
+
+      <!--  <el-card class="box-card">
+        <div class="item">
+          <span class="item_text">选择父级类别：</span>
+          <el-select v-model="formobj.pname" placeholder="请选择父级类别" class="item_input" @change="selectGoodsTypeChange">
+            <el-option v-for="item in goodsTypeList" :key="item.sid" :label="item.goodsTypeName" :value="item.sid" />
+          </el-select>
+        </div>
+        <div class="item">
+          <span class="item_text"><span class="must">*</span> 类别名称：</span>
+          <el-input v-model="formobj.goodsTypeName" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text"><span class="must">*</span> 类别编码：</span>
+          <el-input v-model="formobj.goodsTypeCode" placeholder="" class="item_input" clearable
+            oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
+        </div>
+        <div class="item">
+          <span class="item_text">提成比例：</span>
+          <el-input v-model="formobj.percentageRate" placeholder="" class="item_input" clearable
+            oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+        </div>
+        <div class="item">
+          <span class="item_text">提成金额：</span>
+          <el-input v-model="formobj.percentageAmount" placeholder="" class="item_input" clearable
+            oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+        </div>
+        <div class="item">
+          <span class="item_text"><span class="must">*</span> 出库规则：</span>
+          <el-select v-model="formobj.outStockRuleValue" placeholder="请选择出库规则" class="item_input"
+            @change="selectOutStockRuleChange">
+            <el-option v-for="item in outStockRuleList" :key="item.dictKey" :label="item.dictValue"
+              :value="item.dictKey" />
+          </el-select>
+        </div>
+        <div class="item">
+          <span class="item_text"><span class="must">*</span> 类别排序：</span>
+          <el-input v-model="formobj.sortNo" placeholder="" class="item_input" clearable
+            oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+        </div>
+        <div class="item">
+          <span class="item_text">类别备注：</span>
+          <el-input v-model="formobj.remarks" placeholder="" class="item_input" clearable />
+        </div>
+
+      </el-card> -->
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/goods/category.js'
+  import {
+    typeValues
+  } from '@/api/Common/dictcommons.js'
+  export default {
+    components: {},
+    data() {
+      return {
+        submitdisabled: false,
+        formobj: {
+          sid: '',
+          goodsTypeName: '',
+          goodsTypeCode: '',
+          percentageRate: '',
+          percentageAmount: '',
+          outStockRule: '',
+          outStockRuleValue: '',
+          sids: '',
+          pname: '',
+          sortNo: '',
+          remarks: '',
+          useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+          createOrgSid: window.sessionStorage.getItem('orgSid'),
+          userSid: window.sessionStorage.getItem('userSid'),
+
+        },
+        goodsTypeList: [],
+        outStockRuleList: [],
+        rules: {
+          goodsTypeName: [{
+            required: true,
+            message: '类别名称不能为空',
+            trigger: 'blur'
+          }],
+          goodsTypeCode: [{
+            required: true,
+            message: '类别编码不能为空',
+            trigger: 'blur'
+          }],
+          outStockRuleValue: [{
+            required: true,
+            message: '请选择出库规则',
+            trigger: 'change'
+          }],
+          sortNo: [{
+            required: true,
+            message: '排序不能为空',
+            trigger: 'blur'
+          }],
+        }
+      }
+    },
+    created() {
+      this.initData()
+    },
+    methods: {
+      initData() {
+        console.log('>>>>>>>>>initData')
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
+
+        req.getAllType(parpams).then(resp => {
+          this.goodsTypeList = resp.data
+        })
+
+        var params = {
+          type: "goodsOutRule",
+          psid: '0'
+        }
+
+        typeValues(params).then(resp => {
+          console.log('>>>>>>>>>typeValues', resp)
+          this.outStockRuleList = resp.data
+        }).catch(() => {})
+
+      },
+      saveOrUpdate() {
+        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
+        // if (this.formobj.goodsTypeName == '') {
+        //   this.$message({
+        //     showClose: true,
+        //     type: 'warning',
+        //     message: "类别名称不能为空"
+        //   })
+        //   return
+        // }
+
+        // if (this.formobj.goodsTypeCode == '') {
+        //   this.$message({
+        //     showClose: true,
+        //     type: 'warning',
+        //     message: "类别编码不能为空"
+        //   })
+        //   return
+        // }
+
+        // if (this.formobj.outStockRule == '' || this.formobj.outStockRuleValue == '') {
+        //   this.$message({
+        //     showClose: true,
+        //     type: 'warning',
+        //     message: "请选择出库规则"
+        //   })
+        //   return
+        // }
+
+        // if (this.formobj.sortNo == '') {
+        //   this.$message({
+        //     showClose: true,
+        //     type: 'warning',
+        //     message: "类别排序不能为空"
+        //   })
+        //   return
+        // }
+
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+            req.saveTypes(this.formobj)
+              .then(resp => {
+                if (resp.success) {
+                  this.$message({
+                    showClose: true,
+                    type: 'success',
+                    message: resp.msg
+                  })
+                  this.handleReturn('true')
+                } else {
+                  // 根据resp.code进行异常情况处理
+                }
+              })
+              .catch(() => {})
+          }
+        })
+
+      },
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+          sid: '',
+          goodsTypeName: '',
+          goodsTypeCode: '',
+          percentageRate: '',
+          percentageAmount: '',
+          outStockRule: '',
+          outStockRuleValue: '',
+          sids: '',
+          pname: '',
+          sortNo: '',
+          remarks: '',
+          useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+          createOrgSid: window.sessionStorage.getItem('orgSid'),
+          userSid: window.sessionStorage.getItem('userSid'),
+        }
+        this.$emit('doback')
+      },
+      showAdd() {},
+      showEdit(row) {
+        req.initTypes(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+            }
+          })
+          .catch(e => {
+            this.formobj = row
+          })
+      },
+      selectGoodsTypeChange(val) {
+
+        const choose = this.goodsTypeList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectGoodsTypeChange', choose)
+        this.formobj.sids = choose[0].sid
+        this.formobj.pName = choose[0].goodsTypeName
+      },
+
+      selectOutStockRuleChange(val) {
+        console.log('>>>>>>>>>selectOutStockRuleChange', val)
+        const choose = this.outStockRuleList.filter((item) => item.dictKey == val)
+        console.log('>>>>>>>>>selectOutStockRuleChange', choose)
+        this.formobj.outStockRule = choose[0].dictKey
+        this.formobj.outStockRuleValue = choose[0].dictValue
+      },
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+</style>

src/views/goods/category/index.vue

@@ -0,0 +1,381 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <button-bar ref="btnbar" view-title="商品类别" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">
+            {{ searchxianshitit }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" class="tab-header">
+              <el-form-item label="类别名称">
+                <el-input v-model="queryParams.params.name" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="类别编码">
+                <el-input v-model="queryParams.params.code" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="是否一物一码">
+                <el-select v-model="queryParams.params.goodID" placeholder="请选择" class="addinputw addinputInfo"
+                  @change="selectIsGoodIDChange">
+                  <el-option v-for="item in isGoodIDList" :key="item.sid" :label="item.name" :value="item.sid" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="出库规则">
+                <el-select v-model="queryParams.params.outStockRule" placeholder="请选择" class="addinputw addinputInfo"
+                  @change="selectOutStockRuleChange">
+                  <el-option v-for="item in outStockRuleList" :key="item.dictKey" :label="item.dictValue"
+                    :value="item.dictKey" />
+                </el-select>
+              </el-form-item>
+
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!-- Start 项目列表头部 -->
+        <div class="listtop">
+          <div class="tit">类别列表</div>
+        </div>
+        <!-- End 项目列表头部 -->
+        <!-- Start 项目列表 -->
+        <div class="">
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
+            @selection-change="selectionLineChangeHandle">
+            <el-table-column fixed width="50" type="selection" align="center" />
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+           <!-- <el-table-column label="操作" align="center" width="100">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button>
+              </template>
+            </el-table-column> -->
+            <el-table-column label="是否可用" align="center" width="140">
+              <template slot-scope="scope">
+                <el-switch v-model="scope.row.isEnable" active-text="是" inactive-text="否" active-value="1"
+                  inactive-value="2" @change="enableChange(scope.row.sid,scope.row.isEnable)" />
+              </template>
+            </el-table-column>
+            <el-table-column label="是否一物一码" align="center" width="140">
+              <template slot-scope="scope">
+                <el-switch v-model="scope.row.isGoodsID" active-text="是" inactive-text="否" active-value="1"
+                  inactive-value="0" @change="enableChange2(scope.row.sid,scope.row.isGoodsID)" />
+              </template>
+            </el-table-column>
+            <el-table-column prop="goodsTypeName" label="类别名称" align="center" />
+            <el-table-column prop="goodsTypeCode" label="类别编码" align="center" />
+            <el-table-column prop="pname" label="上级类别" align="center" />
+            <el-table-column prop="percentageRate" label="提成比例" align="center" />
+            <el-table-column prop="percentageAmount" label="提成金额" align="center" />
+            <el-table-column prop="outstockRulevalue" label="出库规则" align="center" />
+          </el-table>
+        </div>
+        <!-- End 项目列表 -->
+        <div class="pages">
+          <div class="tit" />
+          <!--  翻页  -->
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
+            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+        </div>
+      </div>
+    </div>
+    <!-- End 查询和其列表部分 -->
+    <!-- 新增修改部分组件 -->
+    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+  </div>
+</template>
+
+<script>
+  import req from '@/api/goods/category.js'
+  import {
+    typeValues
+  } from '@/api/Common/dictcommons.js'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import divAdd from './categoryAdd.vue'
+  export default {
+    components: {
+      ButtonBar,
+      Pagination,
+      pageye,
+      divAdd
+    },
+    data() {
+      return {
+        btndisabled: false,
+        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        tableLoading: false,
+        dataList: [],
+        btnList: [{
+            type: 'primary',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'toAdd',
+            btnLabel: '新增'
+          },
+          {
+            type: 'primary',
+            size: 'small',
+            icon: 'edit',
+            btnKey: 'toEdit',
+            btnLabel: '编辑'
+          },
+          {
+            type: 'danger',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'doDel',
+            btnLabel: '删除'
+          },
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            name: '',
+            code: '',
+            goodID: '',
+            outStockRule: '',
+          }
+        },
+        isGoodIDList: [{
+            sid: "0",
+            name: '否'
+          },
+          {
+            sid: "1",
+            name: '是'
+          }
+        ],
+        outStockRuleList: [],
+        sids: [],
+        selectionList: []
+      }
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+      this.loadList()
+      this.getDictValue()
+    },
+    methods: {
+      getDictValue() {
+
+        var params = {
+          type: "goodsOutRule",
+          psid: '0'
+        }
+
+        typeValues(params).then(resp => {
+          console.log('>>>>>>>>>typeValues', resp)
+          this.outStockRuleList = resp.data
+        }).catch(() => {})
+      },
+      selectIsGoodIDChange(val) {
+
+      },
+      selectOutStockRuleChange(val) {
+
+      },
+      selectionLineChangeHandle(val) {
+        console.log("val", val);
+
+        this.selectionList = val
+
+        const aa = []
+        val.forEach(element => {
+          aa.push(element.sid)
+        })
+        this.sids = aa
+      },
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'toAdd':
+            this.toAdd()
+            break
+          case 'doDel':
+            this.doDel()
+            break
+            case 'toEdit':
+              this.toEdit()
+              break
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      loadList() {
+        this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
+        req.listPage(this.queryParams).then((resp) => {
+          this.tableLoading = false
+          if (resp.success) {
+            const data = resp.data
+            this.queryParams.total = data.total
+            this.dataList = data.records
+          } else {
+            // 根据resp.code进行异常情况处理
+            this.dataList = []
+            this.queryParams.total = 0
+          }
+        }).catch(() => {
+          this.tableLoading = false
+        })
+      },
+
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      dosearch() {
+        this.queryParams.current = 1
+        this.loadList()
+      },
+      resetQuery() {
+        this.queryParams = {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+           name: '',
+           code: '',
+           goodID: '',
+           outStockRule: '',
+          }
+        }
+        this.loadList()
+      },
+      toAdd() {
+        this.viewState = 2
+        this.$refs['divadd'].showAdd()
+      },
+      toEdit() {
+
+        if (this.selectionList.length != 1) {
+          this.$message({
+            type: 'warning',
+            message: "请选择一条数据。",
+            showClose: true
+          })
+          return
+        }
+
+        this.viewState = 3
+        this.$refs['divadd'].showEdit(this.selectionList[0])
+      },
+
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      },
+      toRelevancy(row) {
+        this.viewState = 3
+        this.$refs['divadd'].showEdit(row)
+      },
+      doDel() {
+
+        if (this.sids.length > 0) {
+          const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+          this.$confirm(tip, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
+            req.deleteBySids(this.sids).then((resp) => {
+              loading.close()
+              if (resp.success) {
+                this.$message({
+                  type: 'success',
+                  message: resp.msg,
+                  showClose: true
+                })
+                this.loadList()
+              } else {
+                // 根据resp.code进行异常情况处理
+              }
+            }).catch(e => {
+              loading.close()
+            })
+          }).catch(() => {})
+        } else {
+          this.$message({
+            showClose: true,
+            message: '请至少选择一条记录进行删除操作'
+          })
+        }
+      },
+      resetState() {
+        this.viewState = 1
+      },
+      enableChange(sid, state) {
+        console.log('sid', sid)
+        console.log('state', state)
+        req.updateIsEnable(sid, state).then((resp) => {
+          if (resp.success) {
+            this.$message({
+              type: 'success',
+              message: '状态已更新',
+              showClose: true
+            })
+          } else { // 根据resp.code进行异常情况处理
+          }
+        }).catch(e => {
+          console.log(e)
+        })
+      },
+      enableChange2(sid, state) {
+        console.log('sid', sid)
+        console.log('state', state)
+        req.updateIsGoodsID(sid, state).then((resp) => {
+          if (resp.success) {
+            this.$message({
+              type: 'success',
+              message: '状态已更新',
+              showClose: true
+            })
+          } else { // 根据resp.code进行异常情况处理
+          }
+        }).catch(e => {
+          console.log(e)
+        })
+      }
+    }
+  }
+</script>
+<style scoped>
+</style>

src/views/goods/factory/factoryAdd.vue

@@ -0,0 +1,239 @@
+<template>
+  <div>
+
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>厂家信息</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div class="listconadd">
+
+
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+
+        <el-row class="first_row">
+          <el-col :span="8">
+
+            <div class="span-sty"><span class="must">*</span> 厂家名称</div>
+            <el-form-item prop="manufacturerName">
+             <el-input v-model="formobj.manufacturerName" placeholder="" class="addinputw addinputInfo" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="16">
+            <div class="span-sty"><span class="must">*</span> 厂家编码</div>
+            <el-form-item prop="manufacturerCode">
+              <el-input v-model="formobj.manufacturerCode" placeholder="" class="addinputw addinputInfo" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row class="first_row">
+          <el-col :span="8">
+
+            <div class="span-sty"><span class="must">*</span> 排序</div>
+            <el-form-item prop="sortNo">
+           <el-input v-model="formobj.sortNo" placeholder="" class="addinputw addinputInfo" clearable
+             oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="16">
+            <div class="span-sty">备注</div>
+            <el-form-item >
+              <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+
+
+    <!--  <el-card class="box-card">
+        <div class="item">
+          <span class="item_text"><span class="must">*</span> 厂家名称：</span>
+          <el-input v-model="formobj.manufacturerName" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text"><span class="must">*</span> 厂家编码：</span>
+          <el-input v-model="formobj.manufacturerCode" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text"><span class="must">*</span> 厂家排序：</span>
+          <el-input v-model="formobj.sortNo" placeholder="" class="item_input" clearable
+            oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+        </div>
+        <div class="item">
+          <span class="item_text">厂家备注：</span>
+          <el-input v-model="formobj.remarks" placeholder="" class="item_input" clearable />
+        </div>
+      </el-card> -->
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/goods/factory.js'
+  export default {
+    components: {},
+    data() {
+      return {
+        submitdisabled: false,
+        formobj: {
+          sid: '',
+          manufacturerName: '',
+          manufacturerCode: '',
+          sortNo: '',
+          remarks: "",
+          useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+          createOrgSid: window.sessionStorage.getItem('orgSid'),
+          userSid: window.sessionStorage.getItem('userSid'),
+        },
+        rules: {
+          manufacturerName: [{
+            required: true,
+            message: '厂家名称不能为空',
+            trigger: 'blur'
+          }],
+          manufacturerCode: [{
+            required: true,
+            message: '厂家编码不能为空',
+            trigger: 'blur'
+          }],
+          sortNo: [{
+            required: true,
+            message: '排序不能为空',
+            trigger: 'blur'
+          }],
+        }
+      }
+    },
+    created() {},
+    methods: {
+
+      saveOrUpdate() {
+        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
+        // if (this.formobj.manufacturerName == '') {
+        //   this.$message({
+        //     showClose: true,
+        //     type: 'warning',
+        //     message: "厂家名称不能为空"
+        //   })
+        //   return
+        // }
+
+        // if (this.formobj.manufacturerCode == '') {
+        //   this.$message({
+        //     showClose: true,
+        //     type: 'warning',
+        //     message: "厂家编码不能为空"
+        //   })
+        //   return
+        // }
+
+        // if (this.formobj.sortNo == '') {
+        //   this.$message({
+        //     showClose: true,
+        //     type: 'warning',
+        //     message: "厂家排序不能为空"
+        //   })
+        //   return
+        // }
+
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+            req.saveFacturer(this.formobj)
+              .then(resp => {
+                if (resp.success) {
+                  this.$message({
+                    showClose: true,
+                    type: 'success',
+                    message: resp.msg
+                  })
+                  this.handleReturn('true')
+                } else {
+                  // 根据resp.code进行异常情况处理
+                }
+              })
+              .catch(() => {})
+          }
+        })
+
+
+      },
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+          sid: '',
+          manufacturerName: '',
+          manufacturerCode: '',
+          sortNo: '',
+          remarks: "",
+          useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+          createOrgSid: window.sessionStorage.getItem('orgSid'),
+          userSid: window.sessionStorage.getItem('userSid'),
+        }
+        this.$emit('doback')
+      },
+      showAdd() {},
+      showEdit(row) {
+        req.initFacturer(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+            }
+          })
+          .catch(e => {
+            this.formobj = row
+          })
+      },
+
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+</style>

src/views/goods/factory/index.vue

@@ -0,0 +1,302 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <button-bar ref="btnbar" view-title="厂家列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">
+            {{ searchxianshitit }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" class="tab-header">
+              <el-form-item label="厂家名称">
+                <el-input v-model="queryParams.params.name" placeholder="" clearable />
+              </el-form-item>
+
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!-- Start 项目列表头部 -->
+        <div class="listtop">
+          <div class="tit">厂家列表</div>
+        </div>
+        <!-- End 项目列表头部 -->
+        <!-- Start 项目列表 -->
+        <div class="">
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
+            @selection-change="selectionLineChangeHandle">
+            <el-table-column fixed width="50" type="selection" align="center" />
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+            <!-- <el-table-column label="操作" align="center" width="100">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button>
+              </template>
+            </el-table-column> -->
+            <el-table-column label="是否可用" align="center" width="140">
+              <template slot-scope="scope">
+                <el-switch v-model="scope.row.isEnable" active-text="是" inactive-text="否" active-value="1"
+                  inactive-value="2" @change="enableChange(scope.row.sid,scope.row.isEnable)" />
+              </template>
+            </el-table-column>
+            <el-table-column prop="manufacturerName" label="厂家名称" align="center" />
+            <el-table-column prop="manufacturerCode" label="厂家编码" align="center" />
+            <el-table-column prop="sortNo" label="排序" align="center" />
+          </el-table>
+        </div>
+        <!-- End 项目列表 -->
+        <div class="pages">
+          <div class="tit" />
+          <!--  翻页  -->
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
+            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+        </div>
+      </div>
+    </div>
+    <!-- End 查询和其列表部分 -->
+    <!-- 新增修改部分组件 -->
+    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+  </div>
+</template>
+
+<script>
+  import req from '@/api/goods/factory.js'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import divAdd from './factoryAdd.vue'
+  export default {
+    components: {
+      ButtonBar,
+      Pagination,
+      pageye,
+      divAdd
+    },
+    data() {
+      return {
+        btndisabled: false,
+        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        tableLoading: false,
+        dataList: [],
+        btnList: [{
+            type: 'primary',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'toAdd',
+            btnLabel: '新增'
+          },
+          {
+            type: 'primary',
+            size: 'small',
+            icon: 'edit',
+            btnKey: 'toEdit',
+            btnLabel: '编辑'
+          },
+          {
+            type: 'danger',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'doDel',
+            btnLabel: '删除'
+          },
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            name: ''
+          }
+        },
+        sids: [],
+        selectionList: []
+      }
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+      this.loadList()
+    },
+    methods: {
+      selectionLineChangeHandle(val) {
+        console.log("val", val);
+
+        this.selectionList = val
+
+        const aa = []
+        val.forEach(element => {
+          aa.push(element.sid)
+        })
+        this.sids = aa
+      },
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'toAdd':
+            this.toAdd()
+            break
+          case 'toEdit':
+            this.toEdit()
+            break
+          case 'doDel':
+            this.doDel()
+            break
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      loadList() {
+        this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
+        req.listPage(this.queryParams).then((resp) => {
+          this.tableLoading = false
+          if (resp.success) {
+            const data = resp.data
+            this.queryParams.total = data.total
+            this.dataList = data.records
+          } else {
+            // 根据resp.code进行异常情况处理
+            this.dataList = []
+            this.queryParams.total = 0
+          }
+        }).catch(() => {
+          this.tableLoading = false
+        })
+      },
+
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      dosearch() {
+        this.queryParams.current = 1
+        this.loadList()
+      },
+      resetQuery() {
+        this.queryParams = {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            name: ''
+          }
+        }
+        this.loadList()
+      },
+      toAdd() {
+        this.viewState = 2
+        this.$refs['divadd'].showAdd()
+      },
+
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      },
+      toEdit() {
+
+        if (this.selectionList.length != 1) {
+          this.$message({
+            type: 'warning',
+            message: "请选择一条数据。",
+            showClose: true
+          })
+          return
+        }
+
+        this.viewState = 3
+        this.$refs['divadd'].showEdit(this.selectionList[0])
+      },
+      toRelevancy(row) {
+        this.viewState = 3
+        this.$refs['divadd'].showEdit(row)
+      },
+      doDel() {
+
+        if (this.sids.length > 0) {
+          const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+          this.$confirm(tip, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
+            req.deleteBySids(this.sids).then((resp) => {
+              loading.close()
+              if (resp.success) {
+                this.$message({
+                  type: 'success',
+                  message: resp.msg,
+                  showClose: true
+                })
+                this.loadList()
+              } else {
+                // 根据resp.code进行异常情况处理
+              }
+            }).catch(e => {
+              loading.close()
+            })
+          }).catch(() => {})
+        } else {
+          this.$message({
+            showClose: true,
+            message: '请至少选择一条记录进行删除操作'
+          })
+        }
+      },
+      resetState() {
+        this.viewState = 1
+      },
+      enableChange(sid, state) {
+        console.log('sid', sid)
+        console.log('state', state)
+        req.updateIsEnable(sid, state).then((resp) => {
+          if (resp.success) {
+            this.$message({
+              type: 'success',
+              message: '状态已更新',
+              showClose: true
+            })
+          } else { // 根据resp.code进行异常情况处理
+          }
+        }).catch(e => {
+          console.log(e)
+        })
+      },
+    }
+  }
+</script>
+<style scoped>
+</style>

src/views/goods/goods/goodsAdd2.vue

@@ -0,0 +1,509 @@
+<template>
+  <div>
+
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>商品信息</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div class="listconadd">
+
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+        <div class="title">
+          <div>基础信息</div>
+        </div>
+        <el-row class="first_row">
+
+          <el-col :span="6">
+            <div class="span-sty"><span class="must">*</span> 商品名称</div>
+            <el-form-item prop="goodsName">
+              <el-input v-model="formobj.goodsName" placeholder="商品名称" class="addinputw addinputInfo" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <div class="span-sty"><span class="must">*</span> 商品编码</div>
+            <el-form-item prop="goodsCode">
+              <el-input v-model="formobj.goodsCode" placeholder="商品编码" class="addinputw addinputInfo" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <div class="span-sty">条形码</div>
+            <el-form-item>
+              <el-input v-model="formobj.barCode" placeholder="由系统自动生成" :readonly="true" class="addinputw addinputInfo"
+                clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <div class="span-sty"> 拼音缩写</div>
+            <el-form-item>
+              <el-input v-model="formobj.goodsPY" placeholder="由系统自动生成" :readonly="true" class="addinputw addinputInfo"
+                clearable />
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="6">
+            <div class="span-sty"><span class="must">*</span> 计量单位</div>
+            <el-form-item prop="goodsUnitName">
+              <el-select v-model="formobj.goodsUnitName" placeholder="请选择计量单位" class="addinputw"
+                @change="selectunitNameChange">
+                <el-option v-for="item in unitNameList" :key="item.sid" :label="item.unitName" :value="item.sid" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <div class="span-sty"><span class="must">*</span> 商品类别</div>
+            <el-form-item prop="goodsTypeName">
+              <el-select v-model="formobj.goodsTypeName" placeholder="请选择商品类别" class="addinputw"
+                @change="selectCateChange">
+                <el-option v-for="item in cateList" :key="item.sid" :label="item.goodsTypeName" :value="item.sid" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="6">
+            <div class="span-sty">规格</div>
+            <el-form-item>
+              <el-input v-model="formobj.indexes" placeholder="规格" class="addinputw addinputInfo" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <div class="span-sty">保质期(天)</div>
+            <el-form-item>
+              <el-input v-model="formobj.shelfLife  " placeholder="保质期(天)" class="addinputw addinputInfo" clearable
+                oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="6">
+            <div class="span-sty"><span class="must">*</span> 品牌</div>
+            <el-form-item prop="brandName">
+              <el-select v-model="formobj.brandName" placeholder="请选择品牌" class="addinputw" @change="selectBrandChange">
+                <el-option v-for="item in brandList" :key="item.sid" :label="item.brandName" :value="item.sid" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <div class="span-sty"><span class="must">*</span> 厂家</div>
+            <el-form-item prop="manufacturerName">
+              <el-select v-model="formobj.manufacturerName" placeholder="请选择厂家" class="addinputw"
+                @change="selectfacturerChange">
+                <el-option v-for="item in facturerList" :key="item.sid" :label="item.manufacturerName"
+                  :value="item.sid" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <div class="span-sty">原厂标志</div>
+            <el-form-item>
+              <el-radio-group v-model="formobj.isOriginalFactory" size="small" class="addinputw"
+                @change="selectIsOriginalFactory">
+                <el-radio :label="'1'">是</el-radio>
+                <el-radio :label="'2'">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="6">
+            <div class="span-sty"><span class="must">*</span> 库存上限</div>
+            <el-form-item prop="inventoryAlertUpperLimit">
+              <el-input v-model="formobj.inventoryAlertUpperLimit" placeholder="库存上限" class="addinputw addinputInfo"
+                clearable oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="18">
+            <div class="span-sty"><span class="must">*</span> 库存下限</div>
+            <el-form-item prop="inventoryAlertLowerLimit">
+              <el-input v-model="formobj.inventoryAlertLowerLimit" placeholder="库存下限" class="addinputw addinputInfo"
+                clearable oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="6">
+            <div class="span-sty"><span class="must">*</span> 排序</div>
+            <el-form-item prop="sortNo">
+              <el-input v-model="formobj.sortNo" placeholder="排序" class="addinputw addinputInfo" clearable
+                oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="18">
+            <div class="span-sty">备注</div>
+            <el-form-item>
+              <el-input v-model="formobj.skuRemarks" placeholder="备注" class="addinputw addinputInfo" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="6">
+            <div class="span-sty">锁定销售定价</div>
+            <el-form-item>
+              <el-radio-group v-model="formobj.isLockingSalesPrice" size="small" class="addinputw"
+                @change="selectIsLockingSalesPrice">
+                <el-radio :label="'1'">是</el-radio>
+                <el-radio :label="'2'">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <div class="span-sty">销售底价</div>
+            <el-form-item>
+              <el-input v-model="formobj.minimumSalesPrice" placeholder="销售底价" class="addinputw addinputInfo" clearable
+                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <div class="span-sty">三包价格</div>
+            <el-form-item>
+              <el-input v-model="formobj.standardPurchasePrice" placeholder="三包价格" class="addinputw addinputInfo"
+                clearable
+                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <div class="span-sty">首保价格</div>
+            <el-form-item>
+              <el-input v-model="formobj.agencyPrice" placeholder="首保价格" class="addinputw addinputInfo" clearable
+                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="24">
+            <div class="span-sty">商品图片</div>
+            <el-form-item>
+              <upload-img ref="uploadImg" class="addinputw addinputInfo" v-model="imgList" :limit="50" bucket="map"
+                :upload-data="{ type: '0001' }" @change="backData" />
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+      </el-form>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/goods/goods.js'
+  import req2 from '@/api/goods/brand.js'
+  import req3 from '@/api/goods/category.js'
+  import req4 from '@/api/goods/factory.js'
+  import req5 from '@/api/goods/unit.js'
+  import uploadImg from '@/components/uploadFile/uploadImg'
+  export default {
+    components: {
+      uploadImg
+    },
+    data() {
+      return {
+        listLoading: false,
+        activeNames: ['1'],
+        imgList: [],
+        submitdisabled: false,
+        formobj: {
+          "sid": "",
+          "userSid": window.sessionStorage.getItem('userSid'),
+          "orgPath": window.sessionStorage.getItem('orgSidPath'),
+          "goodsName": "",
+          "goodsCode": "",
+          "goodsPY": "",
+          "barCode": "",
+          "goodsUnitSid": "",
+          "goodsUnitName": "",
+          "goodsTypeSid": "",
+          "goodsTypeName": "",
+          "indexes": "",
+          "shelfLife": "",
+          "brandSid": "",
+          "brandName": "",
+          "manufacturerSid": "",
+          "manufacturerName": "",
+          "isOriginalFactory": "2",
+          "isOriginalFactoryValue": "",
+          "sortNo": "",
+          "skuRemarks": "",
+          "inventoryAlertUpperLimit": "",
+          "inventoryAlertLowerLimit": "",
+          "isLockingSalesPrice": "2",
+          "isLockingSalesPriceValue": "",
+          "minimumSalesPrice": "",
+          "standardPurchasePrice": "",
+          "agencyPrice": "",
+          "picPath": []
+        },
+        brandList: [],
+        cateList: [],
+        facturerList: [],
+        unitNameList: [],
+        rules: {
+          goodsName: [{
+            required: true,
+            message: '商品名称不能为空',
+            trigger: 'blur'
+          }],
+          goodsCode: [{
+            required: true,
+            message: '商品编码不能为空',
+            trigger: 'blur'
+          }],
+          goodsUnitName: [{
+            required: true,
+            message: '请选择计量单位',
+            trigger: 'change'
+          }],
+          goodsTypeName: [{
+            required: true,
+            message: '请选择商品类别',
+            trigger: 'change'
+          }],
+          brandName: [{
+            required: true,
+            message: '请选择商品品牌',
+            trigger: 'change'
+          }],
+          manufacturerName: [{
+            required: true,
+            message: '请选择商品厂家',
+            trigger: 'change'
+          }],
+          sortNo: [{
+            required: true,
+            message: '商品排序不能为空',
+            trigger: 'blur'
+          }],
+          inventoryAlertUpperLimit: [{
+            required: true,
+            message: '商品上限不能为空',
+            trigger: 'blur'
+          }],
+          inventoryAlertLowerLimitt: [{
+            required: true,
+            message: '商品下限不能为空',
+            trigger: 'blur'
+          }],
+        }
+      }
+    },
+    created() {
+      this.initData()
+    },
+    methods: {
+
+      selectIsOriginalFactory(val) {
+        console.log('selectIsOriginalFactory》》》》', val)
+
+        this.formobj.isOriginalFactoryValue = val == '1' ? '是' : '否'
+
+      },
+      selectIsLockingSalesPrice(val) {
+        console.log('selectIsLockingSalesPrice》》》》', val)
+
+        this.formobj.isLockingSalesPriceValue = val == '1' ? '是' : '否'
+
+      },
+      initData() {
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
+        req2.getAllBrand(parpams).then(resp => {
+          this.brandList = resp.data
+        })
+        req3.getAllType(parpams).then(resp => {
+          this.cateList = resp.data
+        })
+        req4.getAllFacturer(parpams).then(resp => {
+          this.facturerList = resp.data
+        })
+        req5.getAllUnit(parpams).then(resp => {
+          this.unitNameList = resp.data
+        })
+      },
+      backData(value) {
+        console.log('backData》》》》', value)
+        console.log('imgList', this.imgList)
+
+        this.formobj.picPath = this.imgList
+
+      },
+
+      saveOrUpdate() {
+        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+
+            req.saveGoods(this.formobj)
+              .then(resp => {
+                if (resp.success) {
+                  this.$message({
+                    showClose: true,
+                    type: 'success',
+                    message: resp.msg
+                  })
+                  this.handleReturn('true')
+                } else {
+                  // 根据resp.code进行异常情况处理
+                }
+              })
+              .catch(() => {})
+
+          }
+        })
+      },
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+          "sid": "",
+          "userSid": window.sessionStorage.getItem('userSid'),
+          "orgPath": window.sessionStorage.getItem('orgSidPath'),
+          "goodsName": "",
+          "goodsCode": "",
+          "goodsPY": "",
+          "barCode": "",
+          "goodsUnitSid": "",
+          "goodsUnitName": "",
+          "goodsTypeSid": "",
+          "goodsTypeName": "",
+          "indexes": "",
+          "shelfLife": "",
+          "brandSid": "",
+          "brandName": "",
+          "manufacturerSid": "",
+          "manufacturerName": "",
+          "isOriginalFactory": "2",
+          "isOriginalFactoryValue": "",
+          "sortNo": "",
+          "skuRemarks": "",
+          "inventoryAlertUpperLimit": "",
+          "inventoryAlertLowerLimit": "",
+          "isLockingSalesPrice": "2",
+          "isLockingSalesPriceValue": "",
+          "minimumSalesPrice": "",
+          "standardPurchasePrice": "",
+          "agencyPrice": "",
+          "picPath": []
+        }
+        this.$emit('doback')
+      },
+      showAdd() {
+        // var sid = require('uuid').v1()
+        // console.log('>>>>>>>>>showAdd', sid)
+
+        // this.formobj.sid = sid
+      },
+      indexMethod(index) {
+        return index + 1
+      },
+      showEdit(row) {
+        req.initGoods(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+            }
+          })
+          .catch(e => {
+            this.formobj = row
+          })
+      },
+      selectBrandChange(val) {
+        const choose = this.brandList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectBrandChange', choose)
+        this.formobj.brandSid = choose[0].sid
+        this.formobj.brandName = choose[0].brandName
+      },
+      selectCateChange(val) {
+        const choose = this.cateList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectCateChange', choose)
+        this.formobj.goodsTypeSid = choose[0].sid
+        this.formobj.goodsTypeName = choose[0].goodsTypeName
+      },
+      selectfacturerChange(val) {
+        const choose = this.facturerList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectfacturerChange', choose)
+        this.formobj.manufacturerSid = choose[0].sid
+        this.formobj.manufacturerName = choose[0].manufacturerName
+      },
+      selectunitNameChange(val) {
+        const choose = this.unitNameList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectunitNameChange', choose)
+        this.formobj.goodsUnitSid = choose[0].sid
+        this.formobj.goodsUnitName = choose[0].unitName
+      },
+
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+</style>

src/views/goods/goods/goodsInfo.vue

@@ -0,0 +1,573 @@
+<template>
+  <div>
+
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>商品信息</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div class="listconadd">
+
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <div class="title">
+          <div>基础信息</div>
+        </div>
+        <el-row class="first_row">
+
+          <el-col :span="12">
+            <div class="span-sty">商品名称</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.goodsName}}</span>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <div class="span-sty">商品简称</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.goodsShortName}}</span>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">商品副标题</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.subTitle}}</span>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <div class="span-sty">商品拼音缩写</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.goodsPY}}</span>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">商品编码</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.goodsCode}}</span>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <div class="span-sty">商品条形码</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.barCode}}</span>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">商品品牌</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.brandName}}</span>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <div class="span-sty">商品类别</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.typeName}}</span>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">商品厂家</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.manufacturerName}}</span>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <div class="span-sty">厂家货号</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.factoryCode}}</span>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">商品单位</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.goodsUnitName}}</span>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <div class="span-sty">是否上架</div>
+            <el-form-item>
+              <el-radio-group v-model="formobj.isListed" :disabled="true" size="small" class="addinputw">
+                <el-radio :label="'1'">上架</el-radio>
+                <el-radio :label="'2'">下架</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">外部编码</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.externalCode}}</span>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <div class="span-sty">国标码</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.nationalStandardCode}}</span>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">税率</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.taxRate}}</span>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <div class="span-sty">保质期天</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.shelfLife}}</span>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">商品排序</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.sortNo}}</span>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <div class="span-sty">商品备注</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.remarks}}</span>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="24">
+            <div class="span-sty">商品详细说明</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.baseGoodsSpuDetail.goodsExplain}}</span>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="24">
+            <div class="span-sty">商品描述</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.baseGoodsSpuDetail.goodsDescription}}</span>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="24">
+            <div class="span-sty">商品通用规格参数</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.baseGoodsSpuDetail.genericSpec}}</span>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="24">
+            <div class="span-sty">商品特有规格参数</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.baseGoodsSpuDetail.specialSpec}}</span>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+
+        <div class="title titleOne">
+          <div>规格列表</div>
+        </div>
+        <el-table v-loading="listLoading" :data="formobj.baseGoodsSkus" border>
+          <!-- <el-table-column type="selection" align="center" width="50"/> -->
+          <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+          <el-table-column label="规格代码" prop="goodsSkuCode" align="center" />
+          <el-table-column label="商品标题" prop="title" align="center" />
+          <el-table-column label="外部编码" prop="externalCode" align="center" />
+          <el-table-column label="特有规格属性" prop="indexes" align="center" />
+          <el-table-column label="特有规格参数" prop="ownSpec" align="center" />
+          <el-table-column label="规格明细" wid align="center" width="250">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini"
+                @click="showGoodsSkuDttail(scope.row.baseGoodsSkuExtend)">查看</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </el-form>
+
+      <el-dialog title="查看规格明细" :visible.sync="dialogVisible" :before-close="handleClose">
+
+        <el-form ref="dataForm1" class="formaddcopy02" style="margin-top: -40px;" :model="itemInfo">
+
+          <el-row class="first_row">
+
+            <el-col :span="8">
+              <div class="span-sty">最后采购价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.finalPurchasePrice}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">安全库存天数</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.safetyStockDays}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">是否原厂</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isOriginalFactory" :disabled="true" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="8">
+              <div class="span-sty">是否库存警戒</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isInventoryAlert" :disabled="true" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">库存警戒上线</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.inventoryAlertUpperLimit}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">库存警戒下线</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.inventoryAlertLowerLimit}}</span>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="8">
+              <div class="span-sty">成本价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.costPrice}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">吊牌价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.tagPrice}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">销售单价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.salesPrice}}</span>
+              </el-form-item>
+            </el-col>
+
+
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="8">
+              <div class="span-sty">标准进价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.standardPurchasePrice}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">代理价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.agencyPrice}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">折扣</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.discount}}</span>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="8">
+              <div class="span-sty">最低零售价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.minimumSalesPrice}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">是否积分兑换</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isIntegralExchange" :disabled="true" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">积分数量</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.integralAmount}}</span>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="8">
+              <div class="span-sty">锁定销售价格</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isLockingSalesPrice" :disabled="true" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">排序</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.sortNo}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">备注</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.remarks}}</span>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">规格图片</div>
+              <el-form-item>
+                <template slot-scope="scope">
+                  <span v-for="(item,index) in itemInfo.urls" :key="index" class="addinputInfo">
+                    <el-popover placement="left" trigger="click" width="300">
+                      <img :src="item.url" width="100%" />
+                      <img slot="reference" :src="item.url" :alt="item.url"
+                        style="max-height: 70px;max-width: 70px; padding: 5px" />
+                    </el-popover>
+                  </span>
+                </template>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+
+        <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
+          <el-button type="primary" style="margin-top: 20px;" @click="handleClose">关 闭</el-button>
+        </div>
+
+      </el-dialog>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/goods/goods.js'
+  export default {
+    data() {
+      return {
+        listLoading: false,
+        activeNames: ['1'],
+        imgList: [],
+        submitdisabled: false,
+        formobj: {
+          sid: '',
+          goodsName: "",
+          goodsCode: "",
+          brandSid: "",
+          brand: "",
+          goodsTypeSid: "",
+          typeName: "",
+          manufacturersid: "",
+          manufacturer: "",
+          externalCode: '',
+          factoryCode: '',
+          taxRate: '',
+          shelfLife: '',
+          baseGoodsSpuDetail: {
+            goodsExplain: "",
+            goodsDescription: ""
+          },
+          baseGoodsSkuDtos: []
+        },
+        hideUploadBtn: false,
+        dialogVisible: false,
+        dialogVisible2: false,
+        itemInfo: {},
+        orderInfo: {}
+      }
+    },
+    created() {},
+    methods: {
+
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.imgList = []
+        this.hideUploadBtn = true
+        this.formobj = {
+          sid: '',
+          brand: "",
+          brandSid: "",
+          typeName: "",
+          goodsTypeSid: "",
+          manufacturer: "",
+          manufacturerSid: "",
+          goodsName: '',
+          goodsCode: '',
+          barcode: '',
+          producer: '',
+          unit: '',
+          specification: '',
+          remarks: '',
+          baseGoodsSpuDetail: {
+            goodsExplain: "",
+            goodsDescription: ""
+          },
+          baseGoodsSku: []
+        }
+        this.$emit('doback')
+      },
+      showAdd() {},
+      indexMethod(index) {
+        return index + 1
+      },
+      showEdit(row) {
+        req.initGoods(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+            }
+          })
+          .catch(e => {
+            this.formobj = row
+          })
+      },
+
+      showGoodsSkuDttail(goodsSkuDto) {
+        console.log('>>>>>>>>>showGoodsSkuDttail', goodsSkuDto)
+
+        this.dialogVisible = true
+        this.itemInfo = goodsSkuDto
+      },
+
+      handleClose() {
+        this.dialogVisible = false
+      },
+      handleClose2() {
+        this.dialogVisible2 = false
+      },
+
+
+    }
+  }
+</script>
+<style scoped>
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+</style>

src/views/goods/goods/goodsInfo2.vue

@@ -0,0 +1,270 @@
+<template>
+<div>
+
+  <div class="tab-header webtop">
+    <!-- 标题 -->
+    <div>商品信息</div>
+    <!-- start 添加修改按钮 -->
+    <div>
+      <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+    </div>
+    <!-- end 添加修改按钮 -->
+    <!-- end 详情按钮 -->
+  </div>
+
+  <div class="listconadd">
+
+    <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+      <div class="title">
+        <div>基础信息</div>
+      </div>
+      <el-row class="first_row">
+
+        <el-col :span="6">
+          <div class="span-sty">商品名称</div>
+          <el-form-item>
+            <span class="addinputInfo">{{formobj.goodsName}}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <div class="span-sty">商品编码</div>
+          <el-form-item>
+            <span class="addinputInfo">{{formobj.goodsCode}}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <div class="span-sty">商品条形码</div>
+          <el-form-item>
+            <span class="addinputInfo">{{formobj.barCode}}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <div class="span-sty">商品拼音缩写</div>
+          <el-form-item>
+            <span class="addinputInfo">{{formobj.goodsPY}}</span>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+
+      <el-row>
+
+        <el-col :span="6">
+          <div class="span-sty">商品单位</div>
+          <el-form-item>
+            <span class="addinputInfo">{{formobj.goodsUnitName}}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <div class="span-sty">商品类别</div>
+          <el-form-item>
+            <span class="addinputInfo">{{formobj.goodsTypeName}}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <div class="span-sty">规格</div>
+          <el-form-item>
+            <span class="addinputInfo">{{formobj.indexes}}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <div class="span-sty">保质期(天)</div>
+          <el-form-item>
+            <span class="addinputInfo">{{formobj.shelfLife}}</span>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+
+      <el-row>
+
+        <el-col :span="6">
+          <div class="span-sty">商品品牌</div>
+          <el-form-item>
+            <span class="addinputInfo">{{formobj.brandName}}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <div class="span-sty">商品厂家</div>
+          <el-form-item>
+            <span class="addinputInfo">{{formobj.manufacturerName}}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <div class="span-sty">原厂标志</div>
+          <el-form-item>
+            <el-radio-group v-model="formobj.isOriginalFactory" :disabled="true" size="small" class="addinputw">
+              <el-radio :label="'1'">是</el-radio>
+              <el-radio :label="'2'">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+
+      <el-row>
+
+        <el-col :span="6">
+          <div class="span-sty">商品排序</div>
+          <el-form-item>
+            <span class="addinputInfo">{{formobj.sortNo}}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="18">
+          <div class="span-sty">商品备注</div>
+          <el-form-item>
+            <span class="addinputInfo">{{formobj.skuRemarks}}</span>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+
+      <el-row>
+
+        <el-col :span="16">
+          <div class="span-sty">库存上限</div>
+          <el-form-item>
+            <span class="addinputInfo">{{formobj.inventoryAlertUpperLimit}}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="18">
+          <div class="span-sty">库存下限</div>
+          <el-form-item>
+            <span class="addinputInfo">{{formobj.inventoryAlertLowerLimit}}</span>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+
+      <el-row>
+
+        <el-col :span="6">
+          <div class="span-sty">锁定销售定价</div>
+          <el-form-item>
+            <el-radio-group v-model="formobj.isLockingSalesPrice" :disabled="true" size="small" class="addinputw">
+              <el-radio :label="'1'">是</el-radio>
+              <el-radio :label="'2'">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <div class="span-sty">销售底价</div>
+          <el-form-item>
+            <span class="addinputInfo">{{formobj.minimumSalesPrice}}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <div class="span-sty">三包价格</div>
+          <el-form-item>
+            <span class="addinputInfo">{{formobj.standardPurchasePrice}}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <div class="span-sty">首保价格</div>
+          <el-form-item>
+            <span class="addinputInfo">{{formobj.agencyPrice}}</span>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+
+      <el-row>
+
+        <el-col :span="24">
+          <div class="span-sty">规格图片</div>
+          <el-form-item>
+            <template slot-scope="scope">
+              <span v-for="(item,index) in formobj.picPath" :key="index" class="addinputInfo">
+                <el-popover placement="left" trigger="click" width="300">
+                  <img :src="item.url" width="100%" />
+                  <img slot="reference" :src="item.url" :alt="item.url"
+                    style="max-height: 70px;max-width: 70px; padding: 5px" />
+                </el-popover>
+              </span>
+            </template>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+
+    </el-form>
+
+  </div>
+
+</div>
+</template>
+
+<script>
+  import req from '@/api/goods/goods.js'
+  export default {
+    data() {
+      return {
+        formobj: {},
+      }
+    },
+    created() {},
+    methods: {
+
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {}
+        this.$emit('doback')
+      },
+      showAdd() {},
+      indexMethod(index) {
+        return index + 1
+      },
+      showEdit(row) {
+        req.initGoods(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+            }
+          })
+          .catch(e => {
+            this.formobj = row
+          })
+      },
+
+
+    }
+  }
+</script>
+<style scoped>
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+</style>

src/views/goods/goods/index.vue

@@ -0,0 +1,459 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <button-bar ref="btnbar" view-title="商品列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">
+            {{ searchxianshitit }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" class="tab-header">
+              <el-form-item label="分公司">
+                <el-input v-model="queryParams.params.createOrgName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="部门">
+                <el-input v-model="queryParams.params.useOrgName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="商品名称">
+                <el-input v-model="queryParams.params.goodsName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="商品编码">
+                <el-input v-model="queryParams.params.goodsCode" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="拼音缩写">
+                <el-input v-model="queryParams.params.goodsPY" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="商品类别">
+                <el-select v-model="queryParams.params.goodsTypeName" placeholder="请选择" class="addinputw addinputInfo"
+                  @change="selectCateChange">
+                  <el-option v-for="item in goodsTypeList" :key="item.sid" :label="item.goodsTypeName" :value="item.sid" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="品牌">
+                <el-select v-model="queryParams.params.brandName" placeholder="请选择" class="addinputw addinputInfo"
+                  @change="selectBrandChange">
+                  <el-option v-for="item in brandList" :key="item.sid" :label="item.brandName" :value="item.sid" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="厂家">
+                <el-select v-model="queryParams.params.manufacturerName" placeholder="请选择"
+                  class="addinputw addinputInfo" @change="selectfacturerChange">
+                  <el-option v-for="item in facturerList" :key="item.sid" :label="item.manufacturerName" :value="item.sid" />
+                </el-select>
+              </el-form-item>
+
+
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!-- Start 项目列表头部 -->
+        <div class="listtop">
+          <div class="tit" :hidden="false">商品列表</div>
+        </div>
+        <!-- End 项目列表头部 -->
+        <!-- Start 项目列表 -->
+        <div class="">
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
+            @selection-change="selectionLineChangeHandle">
+            <el-table-column fixed width="50" type="selection" align="center" />
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column fixed label="操作" align="center" width="100">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">详情</el-button>
+                <!-- <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button> -->
+              </template>
+            </el-table-column>
+            <!-- <el-table-column label="是否可用" align="center" width="140">
+              <template slot-scope="scope">
+                <el-switch v-model="scope.row.isEnable" active-text="是" inactive-text="否" active-value="1"
+                  inactive-value="2" @change="enableChange(scope.row.sid,scope.row.isEnable)" />
+              </template>
+            </el-table-column> -->
+            <el-table-column fixed prop="goodsName" label="商品名称" width="120" align="center" />
+            <el-table-column prop="goodsCode" label="商品编码" width="120" align="center" />
+            <el-table-column prop="goodsPY" label="拼音缩写" width="100" align="center" />
+            <el-table-column prop="barCode" label="商品条码" width="100" align="center" />
+            <el-table-column prop="goodsUnitName" label="计量单位" width="100" align="center" />
+            <el-table-column prop="goodsTypeName" label="商品类别" width="100" align="center" />
+            <el-table-column prop="indexes" label="规格" width="100" align="center" />
+            <el-table-column prop="shelfLife" label="保质期(天)" width="100" align="center" />
+            <el-table-column prop="brandName" label="品牌" width="100" align="center" />
+            <el-table-column prop="manufacturerName" label="厂家" width="120" align="center" />
+            <el-table-column prop="isOriginalFactoryValue" label="原厂标志" width="100" align="center" />
+            <el-table-column prop="inventoryAlertUpperLimit" label="库存上限" width="100" align="center" />
+            <el-table-column prop="inventoryAlertLowerLimit" label="库存下限" width="100" align="center" />
+            <el-table-column prop="isLockingSalesPriceValue" label="锁定销售价" width="100" align="center" />
+            <el-table-column prop="minimumSalesPrice" label="销售底价" width="100" align="center" />
+            <el-table-column prop="standardPurchasePrice" label="三包价格" width="100" align="center" />
+            <el-table-column prop="agencyPrice" label="首保价格" width="100" align="center" />
+            <el-table-column label="商品图片" align="center" width="100">
+              <template slot-scope="scope">
+                <div style="color: #1890FF; text-decoration: underline ;" @click="showImage(scope.row.picPath)">查看
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <!-- End 项目列表 -->
+        <div class="pages">
+          <div class="tit" />
+          <!--  翻页  -->
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
+            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+        </div>
+      </div>
+    </div>
+    <!-- End 查询和其列表部分 -->
+    <!-- 新增修改部分组件 -->
+    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+    <!-- 详情部分组件 -->
+    <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
+
+    <el-dialog title="商品图片" :visible.sync="dialogVisible" :before-close="handleClose">
+
+      <el-form ref="dataForm1" class="formadd" style="margin-top: -30px;">
+
+        <el-row class="first_row">
+          <el-col :span="24" class="trightb">
+            <el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;"
+              v-for="(item,index) in fileList" :src="item.url" :preview-src-list="[item.url]">
+            </el-image>
+          </el-col>
+        </el-row>
+
+      </el-form>
+
+
+    </el-dialog>
+
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/goods/goods.js'
+  import req2 from '@/api/goods/brand.js'
+  import req3 from '@/api/goods/category.js'
+  import req4 from '@/api/goods/factory.js'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import divAdd from './goodsAdd2.vue'
+  import divInfo from './goodsInfo2.vue'
+  export default {
+    components: {
+      ButtonBar,
+      Pagination,
+      pageye,
+      divAdd,
+      divInfo,
+
+    },
+    data() {
+      return {
+        dialogVisible: false,
+        btndisabled: false,
+        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        tableLoading: false,
+        dataList: [],
+        btnList: [{
+            type: 'primary',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'toAdd',
+            btnLabel: '新增'
+          },
+          {
+            type: 'primary',
+            size: 'small',
+            icon: 'edit',
+            btnKey: 'toEdit',
+            btnLabel: '编辑'
+          },
+          {
+            type: 'danger',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'doDel',
+            btnLabel: '删除'
+          },
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            orgPath: '',
+            useOrgName: '',
+            createOrgName: '',
+            goodsName: '',
+            goodsCode: '',
+            goodsPY: '',
+            goodsTypeSid: '',
+            goodsTypeName: '',
+            brandSid: '',
+            brandName: '',
+            manufacturerSid: '',
+            manufacturerName: '',
+          }
+        },
+        sids: [],
+        selectionList: [],
+        brandList: [],
+        goodsTypeList: [],
+        facturerList: [],
+        fileList: []
+      }
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+      this.loadList()
+      this.initData()
+    },
+    methods: {
+      initData() {
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
+        // 品牌
+        req2.getAllBrand(parpams).then(resp => {
+          console.log('>>>>>>>>>getAllBrand', resp)
+          this.brandList = resp.data
+        }).catch(() => {})
+
+        // 类别
+        req3.getAllType(parpams).then(resp => {
+          console.log('>>>>>>>>>getAllType', resp)
+          this.goodsTypeList = resp.data
+        }).catch(() => {})
+
+        // 厂家
+        req4.getAllFacturer(parpams).then(resp => {
+          console.log('>>>>>>>>>getAllFacturer', resp)
+          this.facturerList = resp.data
+        }).catch(() => {})
+
+      },
+
+      selectBrandChange(val) {
+        const choose = this.brandList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectBrandChange', choose)
+        this.queryParams.params.brandSid = choose[0].sid
+        this.queryParams.params.brandName = choose[0].brandName
+      },
+      selectCateChange(val) {
+        const choose = this.goodsTypeList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectCateChange', choose)
+        this.queryParams.params.goodsTypeSid = choose[0].sid
+        this.queryParams.params.goodsTypeName = choose[0].goodsTypeName
+      },
+      selectfacturerChange(val) {
+        const choose = this.facturerList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectfacturerChange', choose)
+        this.queryParams.params.manufacturerSid = choose[0].sid
+        this.queryParams.params.manufacturerName = choose[0].manufacturerName
+      },
+
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'toAdd':
+            this.toAdd()
+            break
+          case 'toEdit':
+            this.toEdit()
+            break
+          case 'doDel':
+            this.doDel()
+            break
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      selectionLineChangeHandle(val) {
+        console.log("val", val);
+
+        this.selectionList = val
+
+        const aa = []
+        val.forEach(element => {
+          aa.push(element.sid)
+        })
+        this.sids = aa
+      },
+      loadList() {
+        this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
+        req.listPage(this.queryParams).then((resp) => {
+          this.tableLoading = false
+          if (resp.success) {
+            const data = resp.data
+            this.queryParams.total = data.total
+            this.dataList = data.records
+          } else {
+            // 根据resp.code进行异常情况处理
+            this.dataList = []
+            this.queryParams.total = 0
+          }
+        }).catch(() => {
+          this.tableLoading = false
+        })
+      },
+
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      dosearch() {
+        this.queryParams.current = 1
+        this.loadList()
+      },
+      resetQuery() {
+        this.queryParams = {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            orgPath: '',
+            useOrgName: '',
+            createOrgName: '',
+            goodsName: '',
+            goodsCode: '',
+            goodsPY: '',
+            goodsTypeSid: '',
+            goodsTypeName: '',
+            brandSid: '',
+            brandName: '',
+            manufacturerSid: '',
+            manufacturerName: '',
+          }
+        }
+        this.loadList()
+      },
+      toAdd() {
+        this.viewState = 2
+        this.$refs['divadd'].showAdd()
+      },
+      toEdit() {
+
+        if (this.selectionList.length != 1) {
+          this.$message({
+            type: 'warning',
+            message: "请选择一条数据。",
+            showClose: true
+          })
+          return
+        }
+
+        this.viewState = 3
+        this.$refs['divadd'].showEdit(this.selectionList[0])
+      },
+
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      },
+      toRelevancy(row) {
+        this.viewState = 4
+        this.$refs['divinfo'].showEdit(row)
+      },
+      doDel() {
+
+        if (this.sids.length > 0) {
+          const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+          this.$confirm(tip, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
+            req.deleteBySids(this.sids).then((resp) => {
+              loading.close()
+              if (resp.success) {
+                this.$message({
+                  type: 'success',
+                  message: resp.msg,
+                  showClose: true
+                })
+                this.loadList()
+              } else {
+                // 根据resp.code进行异常情况处理
+              }
+            }).catch(e => {
+              loading.close()
+            })
+          }).catch(() => {})
+        } else {
+          this.$message({
+            showClose: true,
+            message: '请至少选择一条记录进行删除操作'
+          })
+        }
+      },
+      resetState() {
+        this.viewState = 1
+      },
+      enableChange(sid, state) {
+        console.log('sid', sid)
+        console.log('state', state)
+        req.updateIsEnable(sid, state).then((resp) => {
+          if (resp.success) {
+            this.$message({
+              type: 'success',
+              message: '状态已更新',
+              showClose: true
+            })
+          } else { // 根据resp.code进行异常情况处理
+          }
+        }).catch(e => {
+          console.log(e)
+        })
+      },
+      showImage(paths) {
+        this.fileList = paths
+        this.dialogVisible = true
+      },
+      handleClose() {
+        this.dialogVisible = false
+      },
+    }
+  }
+</script>
+<style scoped>
+</style>

src/views/goods/unit/index.vue

@@ -0,0 +1,302 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <button-bar ref="btnbar" view-title="计量单位" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">
+            {{ searchxianshitit }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" class="tab-header">
+              <el-form-item label="计量单位名称">
+                <el-input v-model="queryParams.params.name" placeholder="" clearable />
+              </el-form-item>
+
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!-- Start 项目列表头部 -->
+        <div class="listtop">
+          <div class="tit">计量单位列表</div>
+        </div>
+        <!-- End 项目列表头部 -->
+        <!-- Start 项目列表 -->
+        <div class="">
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
+            @selection-change="selectionLineChangeHandle">
+            <el-table-column fixed width="50" type="selection" align="center" />
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+            <!-- <el-table-column label="操作" align="center" width="100">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button>
+              </template>
+            </el-table-column> -->
+            <el-table-column label="是否可用" align="center" width="140">
+              <template slot-scope="scope">
+                <el-switch v-model="scope.row.isEnable" active-text="是" inactive-text="否" active-value="1"
+                  inactive-value="2" @change="enableChange(scope.row.sid,scope.row.isEnable)" />
+              </template>
+            </el-table-column>
+            <el-table-column prop="unitName" label="计量单位名称" align="center" />
+            <el-table-column prop="remarks" label="计量单位备注" align="center" />
+
+          </el-table>
+        </div>
+        <!-- End 项目列表 -->
+        <div class="pages">
+          <div class="tit" />
+          <!--  翻页  -->
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
+            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+        </div>
+      </div>
+    </div>
+    <!-- End 查询和其列表部分 -->
+    <!-- 新增修改部分组件 -->
+    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+  </div>
+</template>
+
+<script>
+  import req from '@/api/goods/unit.js'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import divAdd from './unitAdd.vue'
+  export default {
+    components: {
+      ButtonBar,
+      Pagination,
+      pageye,
+      divAdd
+    },
+    data() {
+      return {
+        btndisabled: false,
+        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        tableLoading: false,
+        dataList: [],
+        btnList: [{
+            type: 'primary',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'toAdd',
+            btnLabel: '新增'
+          },
+          {
+            type: 'primary',
+            size: 'small',
+            icon: 'edit',
+            btnKey: 'toEdit',
+            btnLabel: '编辑'
+          },
+          {
+            type: 'danger',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'doDel',
+            btnLabel: '删除'
+          },
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            name: ''
+          }
+        },
+        sids: [],
+        selectionList: []
+      }
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+      this.loadList()
+    },
+    methods: {
+      selectionLineChangeHandle(val) {
+        console.log("val", val);
+
+        this.selectionList = val
+
+        const aa = []
+        val.forEach(element => {
+          aa.push(element.sid)
+        })
+        this.sids = aa
+      },
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'toAdd':
+            this.toAdd()
+            break
+          case 'toEdit':
+            this.toEdit()
+            break
+          case 'doDel':
+            this.doDel()
+            break
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      loadList() {
+        this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
+        req.listPage(this.queryParams).then((resp) => {
+          this.tableLoading = false
+          if (resp.success) {
+            const data = resp.data
+            this.queryParams.total = data.total
+            this.dataList = data.records
+          } else {
+            // 根据resp.code进行异常情况处理
+            this.dataList = []
+            this.queryParams.total = 0
+          }
+        }).catch(() => {
+          this.tableLoading = false
+        })
+      },
+
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      dosearch() {
+        this.queryParams.current = 1
+        this.loadList()
+      },
+      resetQuery() {
+        this.queryParams = {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            name: ''
+          }
+        }
+        this.loadList()
+      },
+      toAdd() {
+        this.viewState = 2
+        this.$refs['divadd'].showAdd()
+      },
+
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      },
+      toEdit() {
+
+        if (this.selectionList.length != 1) {
+          this.$message({
+            type: 'warning',
+            message: "请选择一条数据。",
+            showClose: true
+          })
+          return
+        }
+
+        this.viewState = 3
+        this.$refs['divadd'].showEdit(this.selectionList[0])
+      },
+      toRelevancy(row) {
+        this.viewState = 3
+        this.$refs['divadd'].showEdit(row)
+      },
+      doDel() {
+
+        if (this.sids.length > 0) {
+          const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+          this.$confirm(tip, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
+            req.deleteBySids(this.sids).then((resp) => {
+              loading.close()
+              if (resp.success) {
+                this.$message({
+                  type: 'success',
+                  message: resp.msg,
+                  showClose: true
+                })
+                this.loadList()
+              } else {
+                // 根据resp.code进行异常情况处理
+              }
+            }).catch(e => {
+              loading.close()
+            })
+          }).catch(() => {})
+        } else {
+          this.$message({
+            showClose: true,
+            message: '请至少选择一条记录进行删除操作'
+          })
+        }
+      },
+      resetState() {
+        this.viewState = 1
+      },
+      enableChange(sid, state) {
+        console.log('sid', sid)
+        console.log('state', state)
+        req.updateIsEnable(sid, state).then((resp) => {
+          if (resp.success) {
+            this.$message({
+              type: 'success',
+              message: '状态已更新',
+              showClose: true
+            })
+          } else { // 根据resp.code进行异常情况处理
+          }
+        }).catch(e => {
+          console.log(e)
+        })
+      }
+    }
+  }
+</script>
+<style scoped>
+</style>

src/views/goods/unit/unitAdd.vue

@@ -0,0 +1,178 @@
+<template>
+  <div>
+
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>计量单位信息</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div class="listconadd">
+
+
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+
+        <el-row class="first_row">
+          <el-col :span="8">
+
+            <div class="span-sty"><span class="must">*</span> 计量单位名称</div>
+            <el-form-item prop="unitName">
+              <el-input v-model="formobj.unitName" placeholder="" class="addinputw addinputInfo" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="16">
+            <div class="span-sty">备注</div>
+            <el-form-item>
+              <el-input v-model="formobj.remarks" placeholder="" class="item_input" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <!--  <el-card class="box-card">
+        <div class="item">
+          <span class="item_text"><span class="must">*</span> 计量单位名称：</span>
+          <el-input v-model="formobj.unitName" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text">计量单位备注：</span>
+          <el-input v-model="formobj.remarks" placeholder="" class="item_input" clearable />
+        </div>
+      </el-card> -->
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/goods/unit.js'
+  export default {
+    components: {},
+    data() {
+      return {
+        submitdisabled: false,
+        formobj: {
+          sid: '',
+          unitName: '',
+          remarks: '',
+          useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+          createOrgSid: window.sessionStorage.getItem('orgSid'),
+          userSid: window.sessionStorage.getItem('userSid'),
+        },
+        rules: {
+          unitName: [{
+            required: true,
+            message: '计量单位名称不能为空',
+            trigger: 'blur'
+          }],
+        }
+      }
+    },
+    created() {
+      // this.initData()
+    },
+    methods: {
+
+      saveOrUpdate() {
+        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
+        // if (this.formobj.unitName == '') {
+        //   this.$message({
+        //     showClose: true,
+        //     type: 'warning',
+        //     message: "计量单位名称不能为空"
+        //   })
+        //   return
+        // }
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+            req.saveUnits(this.formobj)
+              .then(resp => {
+                if (resp.success) {
+                  this.$message({
+                    showClose: true,
+                    type: 'success',
+                    message: resp.msg
+                  })
+                  this.handleReturn('true')
+                } else {
+                  // 根据resp.code进行异常情况处理
+                }
+              })
+              .catch(() => {})
+          }
+        })
+
+
+      },
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+          sid: '',
+          unitName: '',
+          remarks: '',
+          useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+          createOrgSid: window.sessionStorage.getItem('orgSid'),
+          userSid: window.sessionStorage.getItem('userSid'),
+        }
+        this.$emit('doback')
+      },
+      showAdd() {},
+      showEdit(row) {
+        req.initUnits(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+            }
+          })
+          .catch(e => {
+            this.formobj = row
+          })
+      },
+
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+</style>

src/views/login/login.vue

@@ -509,20 +509,21 @@
 
             loading.close()
 
-            window.sessionStorage.setItem('token', response.data.token)
-            window.sessionStorage.setItem('sid', response.data.sid)
-            window.sessionStorage.setItem('staffSid', response.data.staffSid)
-            window.sessionStorage.setItem('userName', response.data.userName)
-            window.sessionStorage.setItem('orgName', response.data.orgName)
-            window.sessionStorage.setItem('mobile', response.data.mobile)
-            window.sessionStorage.setItem('orgSid', response.data.orgSid)
-            window.sessionStorage.setItem('orgSid', response.data.orgSid)
-            window.sessionStorage.setItem('departmentName', response.data.departmentName)
-            window.sessionStorage.setItem('departmentSid', response.data.departmentSid)
-            window.sessionStorage.setItem('orgNamePath', response.data.orgNamePath)
-            window.sessionStorage.setItem('orgSidPath', response.data.orgSidPath)
-            window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', response.data
-              .pNameAndDepartmentNameAndPostName)
+
+          window.sessionStorage.setItem('token', response.data.token)
+          window.sessionStorage.setItem('userSid', response.data.sid)
+          window.sessionStorage.setItem('staffSid', response.data.staffSid)
+          window.sessionStorage.setItem('userName', response.data.userName)
+          window.sessionStorage.setItem('orgName', response.data.orgName)
+          window.sessionStorage.setItem('mobile', response.data.mobile)
+          window.sessionStorage.setItem('orgSid', response.data.orgSid)
+          window.sessionStorage.setItem('departmentName', response.data.departmentName)
+          window.sessionStorage.setItem('departmentSid', response.data.departmentSid)
+          window.sessionStorage.setItem('defaultOrgPath', response.data.orgSid)
+          window.sessionStorage.setItem('orgNamePath', response.data.orgNamePath)
+          window.sessionStorage.setItem('orgSidPath', response.data.orgSidPath)
+          window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', response.data
+            .pNameAndDepartmentNameAndPostName)
           }
 
         }).catch(() => {
@@ -556,7 +557,7 @@
             loading.close()
 
             window.sessionStorage.setItem('token', response.data.token)
-            window.sessionStorage.setItem('sid', response.data.sid)
+            window.sessionStorage.setItem('userSid', response.data.sid)
             window.sessionStorage.setItem('staffSid', response.data.staffSid)
             window.sessionStorage.setItem('userName', response.data.userName)
             window.sessionStorage.setItem('orgName', response.data.orgName)
@@ -564,6 +565,7 @@
             window.sessionStorage.setItem('orgSid', response.data.orgSid)
             window.sessionStorage.setItem('departmentName', response.data.departmentName)
             window.sessionStorage.setItem('departmentSid', response.data.departmentSid)
+            window.sessionStorage.setItem('defaultOrgPath', response.data.orgSid)
             window.sessionStorage.setItem('orgNamePath', response.data.orgNamePath)
             window.sessionStorage.setItem('orgSidPath', response.data.orgSidPath)
             window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', response.data

src/views/system/menuManage/menuManage.vue

@@ -35,43 +35,47 @@
         <div class="table-describe clearfix">
           <h4 style="color:#000;">菜单列表</h4>
         </div>
-        <el-table ref="multipleTable" :data="tableData" border style="width: 100%;" row-key="sid"
-          :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-          <el-table-column prop="name" label="菜单名称" width="220" />
-          <el-table-column label="操作" width="260" align="center">
-            <template slot-scope="scope">
-              <el-button type="primary" size="mini" @click="add(scope.row)">
-                添加子菜单
-              </el-button>
-              <el-button v-if="scope.row.isSource == '0'" type="primary" size="mini" @click="editRow(scope.row)">
-                修改
-              </el-button>
-              <el-button v-if="scope.row.isSource == '0'" type="danger" size="mini"
-                @click.native.prevent="deleteRow(scope.row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-          <!--<el-table-column prop="sourceName" label="资源名称" align="center"></el-table-column>-->
-          <!-- <el-table-column prop="sortNo" sortable label="排序" align="center" width="100">
+
+        <div class="listconadd">
+
+          <el-table ref="multipleTable" :data="tableData" border style="width: 100%;margin-bottom: 100px;" row-key="sid"
+            :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+            <el-table-column prop="name" label="菜单名称" width="220" />
+            <el-table-column label="操作" width="260" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="add(scope.row)">
+                  添加子菜单
+                </el-button>
+                <el-button v-if="scope.row.isSource == '0'" type="primary" size="mini" @click="editRow(scope.row)">
+                  修改
+                </el-button>
+                <el-button v-if="scope.row.isSource == '0'" type="danger" size="mini"
+                  @click.native.prevent="deleteRow(scope.row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+            <!--<el-table-column prop="sourceName" label="资源名称" align="center"></el-table-column>-->
+            <!-- <el-table-column prop="sortNo" sortable label="排序" align="center" width="100">
             <template slot-scope="scope">
               <el-input v-model="scope.row.sortNo" size="mini"/>
             </template>
           </el-table-column>-->
-          <el-table-column prop="pageUrl" label="链接地址" align="center" />
-          <el-table-column prop="isEnable" label="可见性" align="center">
-            <template slot-scope="scope">
-              <el-switch v-model="scope.row.isEnable" active-color="#13ce66" inactive-color="#ff4949" active-value="1"
-                inactive-value="0" @change="enabledChange(scope.row.isEnable,scope.row)" />
-            </template>
-          </el-table-column>
-        </el-table>
+            <el-table-column prop="pageUrl" label="链接地址" align="center" />
+            <el-table-column prop="isEnable" label="可见性" align="center">
+              <template slot-scope="scope">
+                <el-switch v-model="scope.row.isEnable" active-color="#13ce66" inactive-color="#ff4949" active-value="1"
+                  inactive-value="0" @change="enabledChange(scope.row.isEnable,scope.row)" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
       </div>
       <!-- <pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size" @pagination="pagination"/> -->
       <!-- 编辑功能信息 -->
       <el-dialog :title="dialogTitle + '功能信息'" :visible.sync="editDialog" width="40%">
         <table class="e-table" cellspacing="0">
-         <!-- <tr>
+          <!-- <tr>
             <td>上级菜单</td>
             <td>
               <el-input v-model="form.pname" :disabled="true" style="width:300px" />
@@ -146,7 +150,7 @@
       <!-- 添加 -->
       <!--<el-dialog :title="dialogTitle + '菜单管理'" :visible.sync="editDialog" width="40%">-->
       <table class="e-table" cellspacing="0">
-       <!-- <tr>
+        <!-- <tr>
           <td>上级菜单</td>
           <td>
             <el-input v-model="form.pname" :disabled="true" style="width:300px" />