Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = 宝绅系统
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = '/api'
+VUE_APP_BASE_API = 'http://192.168.3.91:8100'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.production

@@ -5,4 +5,4 @@ VUE_APP_TITLE = 宝绅系统
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'http://192.168.3.91:8100'

.env.staging

@@ -7,4 +7,4 @@ NODE_ENV = production
 ENV = 'staging'
 
 # 若依管理系统/测试环境
-VUE_APP_BASE_API = '/stage-api'
+VUE_APP_BASE_API = 'http://192.168.3.181:8100'

src/views/mes/pro/ClientItemRelation/index.vue

 <template>
     <div class="app-container">
       <el-form :model="pageReq" ref="queryForm" size="small" inline v-show="showSearch">
-        <el-form-item label="客户名称" prop="clientId">
+        <el-form-item label="客户名称" prop="clientName">
           <el-input v-model="pageReq.clientName" placeholder="请输入客户名称" clearable @keyup.enter.native="getList(1)"/>
         </el-form-item>
-        <el-form-item label="产品" prop="itemId">
-          <el-input v-model="pageReq.itemName" placeholder="请输入产品" clearable @keyup.enter.native="getList(1)"/>
-        </el-form-item>
-        <el-form-item label="物料类型编码" prop="itemType">
-          <item-type-tree v-model="pageReq.itemTypeCode" clearable/>
-        </el-form-item>
         <el-form-item label="客户产品编码" prop="clientItemCode">
           <el-input v-model="pageReq.clientItemCode" placeholder="请输入客户产品编码" clearable @keyup.enter.native="getList(1)"/>
         </el-form-item>
         <el-form-item label="客户产品名称" prop="clientItemName">
           <el-input v-model="pageReq.clientItemName" placeholder="请输入客户产品名称" clearable @keyup.enter.native="getList(1)"/>
         </el-form-item>
+        <el-form-item label="产品名称" prop="itemName">
+          <el-input v-model="pageReq.itemName" placeholder="请输入产品名称" clearable @keyup.enter.native="getList(1)"/>
+        </el-form-item>
+        <el-form-item label="产品类型编码" prop="itemTypeCode">
+            <el-input v-model="pageReq.itemTypeCode" placeholder="请输入产品类型编码" clearable @keyup.enter.native="getList(1)"/>
+        </el-form-item>
+        <el-form-item label="产品类型名称" prop="itemTypeName">
+            <el-input v-model="pageReq.itemTypeName" placeholder="请输入产品类型名称" clearable @keyup.enter.native="getList(1)"/>
+        </el-form-item>
+        <el-form-item label="品牌名称" prop="brandName">
+            <el-input v-model="pageReq.brandName" placeholder="请输入品牌名称" clearable @keyup.enter.native="getList(1)"/>
+        </el-form-item>
+        <el-form-item label="品牌编号" prop="brandCode">
+            <el-input v-model="pageReq.brandCode" placeholder="请输入品牌编号" clearable @keyup.enter.native="getList(1)"/>
+        </el-form-item>
+
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="getList(1)">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="getList(0)">重置</el-button>
@@ -28,8 +38,10 @@
         <el-table-column label="客户名称" prop="clientName" show-overflow-tooltip/>
         <el-table-column label="产品编码" prop="sapItemCode" show-overflow-tooltip/>
         <el-table-column label="产品名称" prop="itemName" show-overflow-tooltip/>
-        <el-table-column label="物料类型编码" prop="itemTypeCode" show-overflow-tooltip/>
-        <el-table-column label="品牌" prop="brandName" show-overflow-tooltip/>
+        <el-table-column label="产品类型编码" prop="itemTypeCode" show-overflow-tooltip/>
+        <el-table-column label="产品类型名称" prop="itemTypeName" show-overflow-tooltip/>
+        <el-table-column label="品牌名称" prop="brandName" show-overflow-tooltip/>
+        <el-table-column label="品牌编号" prop="brandCode" show-overflow-tooltip/>
         <el-table-column label="基本单位" prop="itemUnitOfMeasure" width="100"/>
         <el-table-column label="客户单位" prop="clientUnitOfMeasure" width="100"/>
         <el-table-column label="换算关系" prop="exchange" width="100"/>
@@ -64,12 +76,14 @@
         pageReq: {
           current: 1,
           size: 10,
-          clientId: null,
-          itemId: null,
-          itemType: null,
-          brandId: null,
+          clientName: null,
           clientItemCode: null,
-          clientItemName: null
+          clientItemName: null,
+          itemName: null,
+          itemTypeCode: null,
+          itemTypeName: null,
+          brandName: null,
+          brandCode: null
         },
         page: {total: 0, rows: []},
         showEdit: false,