|
@@ -45,11 +45,11 @@
|
|
|
<el-input v-model="tableScreenForm.goodsCode" placeholder="辅材代码" size="small" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :xs="24" :sm="8" :lg="8">
|
|
|
+ <!-- <el-col :xs="24" :sm="8" :lg="8">
|
|
|
<el-form-item label="规格型号" prop="goodsSpecification">
|
|
|
<el-input v-model="tableScreenForm.goodsSpecification" placeholder="规格型号" size="small" />
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
+ </el-col> -->
|
|
|
<el-col :xs="24" :sm="8" :lg="8" class="tr">
|
|
|
<el-form-item label="">
|
|
|
<el-button size="small" @click="chongzhi">重置</el-button>
|
|
@@ -115,8 +115,8 @@ export default {
|
|
|
goodsId: '',
|
|
|
goodsName: '',
|
|
|
goodsCode: '',
|
|
|
- categoryId: '',
|
|
|
- goodsSpecification: ''
|
|
|
+ categoryId: ''
|
|
|
+ // goodsSpecification: ''
|
|
|
},
|
|
|
goodsList: [],
|
|
|
table_currentPage: 1,
|
|
@@ -165,15 +165,15 @@ export default {
|
|
|
return []
|
|
|
}
|
|
|
})(),
|
|
|
- ...(() => {
|
|
|
- if (this.tableScreenForm.goodsSpecification) {
|
|
|
- return [
|
|
|
- { param: 'a.goods_specification', compare: 'like', value: this.tableScreenForm.goodsSpecification }
|
|
|
- ]
|
|
|
- } else {
|
|
|
- return []
|
|
|
- }
|
|
|
- })(),
|
|
|
+ // ...(() => {
|
|
|
+ // if (this.tableScreenForm.goodsSpecification) {
|
|
|
+ // return [
|
|
|
+ // { param: 'a.goods_specification', compare: 'like', value: this.tableScreenForm.goodsSpecification }
|
|
|
+ // ]
|
|
|
+ // } else {
|
|
|
+ // return []
|
|
|
+ // }
|
|
|
+ // })(),
|
|
|
...(() => {
|
|
|
if (this.tableScreenForm.categoryId) {
|
|
|
return [{ param: 'b.category_id', compare: '=', value: this.tableScreenForm.categoryId }]
|