diff --git a/src/views/erp/AddrManagerList.vue b/src/views/erp/AddrManagerList.vue
index 864ca41..842dd26 100644
--- a/src/views/erp/AddrManagerList.vue
+++ b/src/views/erp/AddrManagerList.vue
@@ -11,8 +11,8 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" v-has="'erp:addr_manager:add'" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('地址管理')">导出</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('仓库地址')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
@@ -68,7 +68,7 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a v-has="'erp:addr_manager:edit'" @click="handleEdit(record)">编辑</a>
+          <a @click="handleEdit(record)">编辑</a>
 
           <a-divider type="vertical" />
           <a-dropdown>
@@ -79,7 +79,7 @@
               </a-menu-item>
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a v-has="'erp:addr_manager:delete'">删除</a>
+                  <a>删除</a>
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
@@ -100,7 +100,6 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import AddrManagerModal from './modules/AddrManagerModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-  import addrManagerList from '@views/erp/const/addrManagerList'
 
   export default {
     name: 'AddrManagerList',
@@ -110,9 +109,73 @@
     },
     data () {
       return {
-        description: '地址管理管理页面',
+        description: '仓库地址管理页面',
         // 表头
-        columns: addrManagerList,
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'所属项目',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title:'省',
+            align:"center",
+            dataIndex: 'province'
+          },
+          {
+            title:'市',
+            align:"center",
+            dataIndex: 'city'
+          },
+          {
+            title:'地区',
+            align:"center",
+            dataIndex: 'county'
+          },
+          {
+            title:'地址',
+            align:"center",
+            dataIndex: 'detail'
+          },
+          {
+            title:'接收人',
+            align:"center",
+            dataIndex: 'recipient'
+          },
+          {
+            title:'手机',
+            align:"center",
+            dataIndex: 'telephone'
+          },
+          {
+            title:'是否默认',
+            align:"center",
+            dataIndex: 'isDefault_dictText'
+          },
+          {
+            title:'备注',
+            align:"center",
+            dataIndex: 'remark'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
         url: {
           list: "/erp/addrManager/list",
           delete: "/erp/addrManager/delete",
@@ -138,14 +201,14 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'userId',text:'用户id',dictCode:''})
+        fieldList.push({type:'list_multi',value:'userId',text:'所属项目',dictTable:"", dictText:'', dictCode:'project_code'})
         fieldList.push({type:'string',value:'province',text:'省',dictCode:''})
         fieldList.push({type:'string',value:'city',text:'市',dictCode:''})
         fieldList.push({type:'string',value:'county',text:'地区',dictCode:''})
         fieldList.push({type:'string',value:'detail',text:'地址',dictCode:''})
         fieldList.push({type:'string',value:'recipient',text:'接收人',dictCode:''})
         fieldList.push({type:'string',value:'telephone',text:'手机',dictCode:''})
-        fieldList.push({type:'int',value:'isDefault',text:'是否默认',dictCode:'isDefault'})
+        fieldList.push({type:'int',value:'isDefault',text:'是否默认，0：否 默认，1：是',dictCode:'isDefault'})
         fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
         this.superFieldList = fieldList
       }
diff --git a/src/views/erp/GoodsList.vue b/src/views/erp/GoodsList.vue
index 26d0d5d..1697205 100644
--- a/src/views/erp/GoodsList.vue
+++ b/src/views/erp/GoodsList.vue
@@ -11,7 +11,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" v-has="'erp:goods:add'" type="primary" icon="plus">新增</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('产品信息')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
@@ -68,18 +68,18 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a v-has="'erp:goods:edit'" @click="handleEdit(record)">编辑</a>
+          <a @click="handleEdit(record)">编辑</a>
 
           <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
               <a-menu-item>
-                <a v-has="'erp:goods:delete'" @click="handleDetail(record)">详情</a>
+                <a @click="handleDetail(record)">详情</a>
               </a-menu-item>
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a v-has="'erp:goods:delete'">删除</a>
+                  <a>删除</a>
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
@@ -100,7 +100,6 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import GoodsModal from './modules/GoodsModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-  import goodsList from '@/views/erp/const/goodsList'
 
   export default {
     name: 'GoodsList',
@@ -112,7 +111,76 @@
       return {
         description: '产品信息管理页面',
         // 表头
-        columns: goodsList,
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'价格',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'产品名称',
+            align:"center",
+            dataIndex: 'goodsName'
+          },
+          {
+            title:'分类',
+            align:"center",
+            dataIndex: 'category'
+          },
+          {
+            title:'规格',
+            align:"center",
+            dataIndex: 'specs'
+          },
+          {
+            title:'厂商',
+            align:"center",
+            dataIndex: 'factory'
+          },
+          {
+            title:'是否销售',
+            align:"center",
+            dataIndex: 'ifSale'
+          },
+          {
+            title:'所属项目',
+            align:"center",
+            dataIndex: 'orgCode_dictText'
+          },
+          {
+            title:'单位',
+            align:"center",
+            dataIndex: 'unit'
+          },
+          {
+            title:'图片地址',
+            align:"center",
+            dataIndex: 'url'
+          },
+          {
+            title:'备注',
+            align:"center",
+            dataIndex: 'remark'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
         url: {
           list: "/erp/goods/list",
           delete: "/erp/goods/delete",
@@ -143,7 +211,10 @@
         fieldList.push({type:'string',value:'category',text:'分类',dictCode:''})
         fieldList.push({type:'string',value:'specs',text:'规格',dictCode:''})
         fieldList.push({type:'string',value:'factory',text:'厂商',dictCode:''})
-        fieldList.push({type:'int',value:'ifSale',text:'是否销售',dictCode:'ifSale'})
+        fieldList.push({type:'int',value:'ifSale',text:'是否销售',dictCode:''})
+        fieldList.push({type:'list_multi',value:'orgCode',text:'所属项目',dictTable:"", dictText:'', dictCode:'project_code'})
+        fieldList.push({type:'string',value:'unit',text:'单位',dictCode:''})
+        fieldList.push({type:'string',value:'url',text:'图片地址',dictCode:''})
         fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
         this.superFieldList = fieldList
       }
diff --git a/src/views/erp/modules/AddrManagerForm.vue b/src/views/erp/modules/AddrManagerForm.vue
index 1edb5ad..976f50a 100644
--- a/src/views/erp/modules/AddrManagerForm.vue
+++ b/src/views/erp/modules/AddrManagerForm.vue
@@ -4,8 +4,8 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="用户id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <a-input v-model="model.userId" placeholder="请输入用户id"  ></a-input>
+            <a-form-model-item label="所属项目" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-multi-select-tag type="list_multi" v-model="model.userId" dictCode="project_code" placeholder="请选择所属项目" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
diff --git a/src/views/erp/modules/GoodsForm.vue b/src/views/erp/modules/GoodsForm.vue
index 76f0e6d..82b514f 100644
--- a/src/views/erp/modules/GoodsForm.vue
+++ b/src/views/erp/modules/GoodsForm.vue
@@ -30,7 +30,22 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="是否销售" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ifSale">
-              <j-dict-select-tag type="list" v-model="model.ifSale" dictCode="ifSale" placeholder="请选择是否销售，0：否，1：是 默认" />
+              <a-input-number v-model="model.ifSale" placeholder="请输入是否销售" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="所属项目" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orgCode">
+              <j-multi-select-tag type="list_multi" v-model="model.orgCode" dictCode="project_code" placeholder="请选择所属项目" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unit">
+              <a-input v-model="model.unit" placeholder="请输入单位"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="图片地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="url">
+              <a-input v-model="model.url" placeholder="请输入图片地址"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">