Skip to content

D
dwsproject
Commit e29a6ad2 by 夏超
Options

[fix] 大东联搜索更改

parent d1fc4c7e
Showing with 11 additions and 4 deletions
sdddl_project/__manifest__.py
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
'author': 'www.rokedata.com', 'author': 'www.rokedata.com',
'website': 'http://www.rokedata.com', 'website': 'http://www.rokedata.com',
'description': """ 'description': """
玖姿机械
""", """,
'data': [ 'data': [
'security/ir.model.access.csv', 'security/ir.model.access.csv',
......
sdddl_project/static/src/html/view/craft_design.html
...@@ -502,7 +502,7 @@ ...@@ -502,7 +502,7 @@
</el-tag> </el-tag>
</div> </div>
<div class="selMaterialsFiltrateBox"> <div class="selMaterialsFiltrateBox">
<el-input style="width: 30%" size="medium" v-model="selMaterialValue" placeholder="请输入物料名称" <el-input style="width: 30%" size="medium" v-model="selMaterialValue" placeholder="请输入:物料名称/助记码/规格"
@change="selMaterialCategoryChange"></el-input> @change="selMaterialCategoryChange"></el-input>
<el-select style="width: 30%; margin-left: 20px" size="medium" clearable <el-select style="width: 30%; margin-left: 20px" size="medium" clearable
v-model="selMaterialCategoryId" placeholder="请选择类别" @change="selMaterialCategoryChange"> v-model="selMaterialCategoryId" placeholder="请选择类别" @change="selMaterialCategoryChange">
...@@ -2150,7 +2150,11 @@ ...@@ -2150,7 +2150,11 @@
limit: this.materialPageSize, limit: this.materialPageSize,
} }
if (this.selMaterialValue) { if (this.selMaterialValue) {
config.domain.push("|")
config.domain.push(["name", "ilike", this.selMaterialValue]) config.domain.push(["name", "ilike", this.selMaterialValue])
config.domain.push("|")
config.domain.push(["mnemonic_aid_code", "ilike", this.selMaterialValue])
config.domain.push(["specification", "ilike", this.selMaterialValue])
} }
if (this.selMaterialCategoryId) { if (this.selMaterialCategoryId) {
config.domain.push(["category_id", "=", this.selMaterialCategoryId]) config.domain.push(["category_id", "=", this.selMaterialCategoryId])
......
sdddl_project/static/src/html/view/index.html
...@@ -813,7 +813,7 @@ ...@@ -813,7 +813,7 @@
</el-tag> </el-tag>
</div> </div>
<div class="selMaterialsFiltrateBox"> <div class="selMaterialsFiltrateBox">
<el-input style="width: 30%" size="medium" v-model="selMaterialValue" placeholder="请输入物料名称" <el-input style="width: 30%" size="medium" v-model="selMaterialValue" placeholder="请输入:物料名称/助记码/规格"
@change="selMaterialCategoryChange"></el-input> @change="selMaterialCategoryChange"></el-input>
<el-select style="width: 30%; margin-left: 20px" size="medium" clearable <el-select style="width: 30%; margin-left: 20px" size="medium" clearable
v-model="selMaterialCategoryId" placeholder="请选择类别" @change="selMaterialCategoryChange"> v-model="selMaterialCategoryId" placeholder="请选择类别" @change="selMaterialCategoryChange">
...@@ -3677,7 +3677,11 @@ ...@@ -3677,7 +3677,11 @@
limit: this.materialPageSize, limit: this.materialPageSize,
}; };
if (this.selMaterialValue) { if (this.selMaterialValue) {
config.domain.push(["name", "ilike", this.selMaterialValue]); config.domain.push("|")
config.domain.push(["name", "ilike", this.selMaterialValue])
config.domain.push("|")
config.domain.push(["mnemonic_aid_code", "ilike", this.selMaterialValue])
config.domain.push(["specification", "ilike", this.selMaterialValue])
} }
if (this.selMaterialCategoryId) { if (this.selMaterialCategoryId) {
config.domain.push(["category_id", "=", this.selMaterialCategoryId]); config.domain.push(["category_id", "=", this.selMaterialCategoryId]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment