Merge pull request '物料添加检索条件' (#144) from liwei into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT/pulls/144
Reviewed-by: wangxy <xinyao.wang@le-it.com.cn>

src/views/plant/material/maintainbom.vue

@@ -12,44 +12,82 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          >新增</el-button
+        >
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="dataList" border>
+      <el-table-column type="index" width="40" />
       <el-table-column
-        type="index"
-        width="40"
+        align="center"
+        :label="getColumnName('ME_BomHead-BomId')"
+        prop="ME_BomHead-BomId"
+        sortable
+        width="200px"
+        show-overflow-tooltip
       />
-      <el-table-column align="center" :label="getColumnName('ME_BomHead-BomId')" prop="ME_BomHead-BomId" sortable width="200px" show-overflow-tooltip />
-      <el-table-column align="center" :label="getColumnName('ME_BomHead-MatNr')" prop="ME_BomHead-MatNr" sortable width="200px" show-overflow-tooltip />
-      <el-table-column align="center" :label="getColumnName('ME_BomHead-Descr')" prop="ME_BomHead-Descr" sortable width="200px" show-overflow-tooltip />
-      <el-table-column v-for="(item, index) in headers" :key="index" align="center" :label="getColumnName(item)" show-overflow-tooltip>
+      <el-table-column
+        align="center"
+        :label="getColumnName('ME_BomHead-MatNr')"
+        prop="ME_BomHead-MatNr"
+        sortable
+        width="200px"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        align="center"
+        :label="getColumnName('ME_BomHead-Descr')"
+        prop="ME_BomHead-Descr"
+        sortable
+        width="200px"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        v-for="(item, index) in headers"
+        :key="index"
+        align="center"
+        :label="getColumnName(item)"
+        show-overflow-tooltip
+      >
         <template slot-scope="scope">
-          <span v-if="item === 'ME_BomHead-LastModify'"> {{ parseTime(scope.row[item]) }} </span>
-          <span v-else-if="item === 'ME_BomHead-CreateTime'"> {{ parseTime(scope.row[item]) }} </span>
-          <span v-else-if="item === 'me_bomhead-type'"> {{ getContent(scope.row[item]) }} </span>
+          <span v-if="item === 'ME_BomHead-LastModify'">
+            {{ parseTime(scope.row[item]) }}
+          </span>
+          <span v-else-if="item === 'ME_BomHead-CreateTime'">
+            {{ parseTime(scope.row[item]) }}
+          </span>
+          <span v-else-if="item === 'me_bomhead-type'">
+            {{ getContent(scope.row[item]) }}
+          </span>
           <span v-else>{{ scope.row[item] }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="120" fixed="right">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
+          <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
+            >修改</el-button
+          >
+          <el-button size="mini" type="text" @click="handleDelete(scope.row)"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNumber"
       :limit.sync="queryParams.pageSize"
@@ -57,57 +95,126 @@
     />
 
     <!-- 添加或修改配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" fullscreen>
+    <el-dialog :title="title" :visible.sync="open" v-if="open" width="1400px">
       <el-tabs type="border-card">
         <el-tab-pane label="当前字段">
-          <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+          <el-form label-width="120px">
             <el-col :span="6">
-              <el-form-item :label="getColumnName('ME_BomHead-BomId')" prop="ME_BomHead-BomId">
-                <el-input v-model="form['ME_BomHead-BomId']" placeholder="请输入" :disabled="!isAdd" />
+              <el-form-item
+                :label="getColumnName('ME_BomHead-BomId')"
+                prop="ME_BomHead-BomId"
+              >
+                <el-input
+                  v-model="form['ME_BomHead-BomId']"
+                  placeholder="请输入"
+                  :disabled="!isAdd"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item :label="getColumnName('ME_BomHead-MatNr')" prop="ME_BomHead-MatNr">
-                <el-input v-model="form['ME_BomHead-MatNr']" placeholder="请输入" :disabled="!isAdd" />
+              <el-form-item
+                :label="getColumnName('ME_BomHead-MatNr')"
+                prop="ME_BomHead-MatNr"
+              >
+                <el-input
+                  v-model="form['ME_BomHead-MatNr']"
+                  placeholder="请输入"
+                  :disabled="!isAdd"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item :label="getColumnName('ME_BomHead-Descr')">
-                <el-input v-model="form['ME_BomHead-Descr']" placeholder="请输入" />
+                <el-input
+                  v-model="form['ME_BomHead-Descr']"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
-						<el-col :span="6" style="text-align: right;">
-              <el-button type="primary" @click="submitForm" size="medium">确 定</el-button>
-							<el-button @click="cancel" size="medium">取 消</el-button>
+            <el-col :span="6" style="text-align: right">
+              <el-button type="primary" @click="submitForm" size="medium"
+                >确 定</el-button
+              >
+              <el-button @click="cancel" size="medium">取 消</el-button>
             </el-col>
-            <el-col v-show="!isAdd" :span="24">
+          </el-form>
+          <el-col :span="24" v-show="!isAdd">
+            <el-form
+              ref="form"
+              :model="form"
+              :rules="rules"
+              label-width="120px"
+            >
               <el-row :gutter="20">
                 <el-col :span="4">
-                  <el-tree :data="form['ME_BomHead-BomLstLi']" :props="defaultProps" @node-click="handleNodeClick" />
+                  <el-tree
+                    :data="form['ME_BomHead-BomLstLi']"
+                    :props="defaultProps"
+                    @node-click="handleNodeClick"
+                  />
                 </el-col>
                 <el-col :span="16">
                   <el-col :span="24">
                     <el-form-item>
-                      <el-button type="primary" icon="el-icon-plus" size="mini" @click="addBomItem">新增</el-button>
-                      <el-button type="danger" icon="el-icon-delete" size="mini" @click="deleteBomItem">删除</el-button>
-                      <el-button type="success" icon="el-icon-check" size="mini" @click="saveBomItem">保存</el-button>
-                      <div style="float:right; font-size:16px;"><strong>{{ editType }}</strong></div>
+                      <el-button
+                        type="primary"
+                        icon="el-icon-plus"
+                        size="mini"
+                        @click="addBomItem"
+                        >新增</el-button
+                      >
+                      <el-button
+                        type="danger"
+                        icon="el-icon-delete"
+                        size="mini"
+                        @click="deleteBomItem"
+                        >删除</el-button
+                      >
+                      <el-button
+                        type="success"
+                        icon="el-icon-check"
+                        size="mini"
+                        @click="saveBomItem"
+                        >保存</el-button
+                      >
+                      <div style="float: right; font-size: 16px">
+                        <strong>{{ editType }}</strong>
+                      </div>
                     </el-form-item>
                   </el-col>
+
                   <el-col :span="12">
-                    <el-form-item :label="`${getColumnName('ME_BomLst-FmatNr')}`" required>
-                      <el-input v-model="formBom['ME_BomLst-FmatNr']" placeholder="请输入" disabled />
+                    <el-form-item
+                      :label="`${getColumnName('ME_BomLst-FmatNr')}`"
+                      required
+                    >
+                      <el-input
+                        v-model="formBom['ME_BomLst-FmatNr']"
+                        placeholder="请输入"
+                        disabled
+                      />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item :label="getColumnName('ME_BomLst-FmatName')">
-                      <el-input v-model="formBom['ME_BomLst-FmatName']" placeholder="请输入" />
+                      <el-input
+                        v-model="formBom['ME_BomLst-FmatName']"
+                        placeholder="请输入"
+                      />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item :label="getColumnName('ME_BomLst-FmatQty')">
-                      <el-input v-model="formBom['ME_BomLst-FmatQty']" placeholder="请输入" style="display:inline-block; width:200px" />
-                      <el-select v-model="formBom['ME_BomLst-FmatUom']" style="width:130px" placeholder="请选择">
+                      <el-input
+                        v-model="formBom['ME_BomLst-FmatQty']"
+                        placeholder="请输入"
+                        style="display: inline-block; width: 200px"
+                      />
+                      <el-select
+                        v-model="formBom['ME_BomLst-FmatUom']"
+                        style="width: 130px"
+                        placeholder="请选择"
+                      >
                         <el-option
                           v-for="item in uomArray"
                           :key="item['Uom-UomId']"
@@ -119,7 +226,10 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item :label="getColumnName('ME_BomLst-FmatSpec')">
-                      <el-input v-model="formBom['ME_BomLst-FmatSpec']" placeholder="请输入" />
+                      <el-input
+                        v-model="formBom['ME_BomLst-FmatSpec']"
+                        placeholder="请输入"
+                      />
                     </el-form-item>
                   </el-col>
                   <el-col :span="24">
@@ -128,19 +238,37 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item :label="`${getColumnName('ME_BomLst-CmatNr')}`" required>
-                      <el-input v-model="formBom['ME_BomLst-CmatNr']" placeholder="请输入" :disabled="isBomlst" />
+                    <el-form-item
+                      :label="`${getColumnName('ME_BomLst-CmatNr')}`"
+                      required
+                    >
+                      <el-input
+                        v-model="formBom['ME_BomLst-CmatNr']"
+                        placeholder="请输入"
+                        :disabled="isBomlst"
+                      />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item :label="getColumnName('ME_BomLst-CmatName')">
-                      <el-input v-model="formBom['ME_BomLst-CmatName']" placeholder="请输入" />
+                      <el-input
+                        v-model="formBom['ME_BomLst-CmatName']"
+                        placeholder="请输入"
+                      />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item :label="getColumnName('ME_BomLst-CmatQty')">
-                      <el-input v-model="formBom['ME_BomLst-CmatQty']" placeholder="请输入" style="display:inline-block; width:200px" />
-                      <el-select v-model="formBom['ME_BomLst-CmatUom']" style="width:130px" placeholder="请选择">
+                      <el-input
+                        v-model="formBom['ME_BomLst-CmatQty']"
+                        placeholder="请输入"
+                        style="display: inline-block; width: 200px"
+                      />
+                      <el-select
+                        v-model="formBom['ME_BomLst-CmatUom']"
+                        style="width: 130px"
+                        placeholder="请选择"
+                      >
                         <el-option
                           v-for="item in uomArray"
                           :key="item['Uom-UomId']"
@@ -152,7 +280,10 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item :label="getColumnName('ME_BomLst-CmatType')">
-                      <el-select v-model="formBom['ME_BomLst-CmatType']" placeholder="请选择">
+                      <el-select
+                        v-model="formBom['ME_BomLst-CmatType']"
+                        placeholder="请选择"
+                      >
                         <el-option
                           v-for="item in childType"
                           :key="item"
@@ -164,12 +295,18 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item :label="getColumnName('ME_BomLst-TimeUom')">
-                      <el-input v-model="formBom['ME_BomLst-TimeUom']" placeholder="请输入" />
+                      <el-input
+                        v-model="formBom['ME_BomLst-TimeUom']"
+                        placeholder="请输入"
+                      />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item :label="getColumnName('ME_BomLst-LossRate')">
-                      <el-input v-model="formBom['ME_BomLst-LossRate']" placeholder="请输入" />
+                      <el-input
+                        v-model="formBom['ME_BomLst-LossRate']"
+                        placeholder="请输入"
+                      />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
@@ -194,54 +331,78 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item>
-                      <el-checkbox v-model="formBom['ME_BomLst-BackFlushItem']" :label="getColumnName('ME_BomLst-BackFlushItem')" />
+                      <el-checkbox
+                        v-model="formBom['ME_BomLst-BackFlushItem']"
+                        :label="getColumnName('ME_BomLst-BackFlushItem')"
+                      />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item>
-                      <el-checkbox v-model="formBom['ME_BomLst-CriticalItem']" :label="getColumnName('ME_BomLst-CriticalItem')" />
+                      <el-checkbox
+                        v-model="formBom['ME_BomLst-CriticalItem']"
+                        :label="getColumnName('ME_BomLst-CriticalItem')"
+                      />
                     </el-form-item>
                   </el-col>
-									<!-- <el-col :span="24">
+                  <!-- <el-col :span="24">
                     <el-form-item>
                       <el-button type="success" icon="el-icon-check" @click="saveBomItem">保存</el-button>
                     </el-form-item>
                   </el-col> -->
                 </el-col>
               </el-row>
-            </el-col>
-          </el-form>
+            </el-form>
+          </el-col>
         </el-tab-pane>
         <el-tab-pane label="备用字段">
           <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-col :span="8">
               <el-form-item :label="getColumnName('ME_BomHead-BomheadCval1')">
-                <el-input v-model="form['ME_BomHead-BomheadCval1']" placeholder="请输入" />
+                <el-input
+                  v-model="form['ME_BomHead-BomheadCval1']"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item :label="getColumnName('ME_BomHead-BomheadCval2')">
-                <el-input v-model="form['ME_BomHead-BomheadCval2']" placeholder="请输入" />
+                <el-input
+                  v-model="form['ME_BomHead-BomheadCval2']"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item :label="getColumnName('ME_BomHead-BomheadIval1')">
-                <el-input v-model.number="form['ME_BomHead-BomheadIval1']" placeholder="请输入" />
+                <el-input
+                  v-model.number="form['ME_BomHead-BomheadIval1']"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item :label="getColumnName('ME_BomHead-BomheadIval2')">
-                <el-input v-model.number="form['ME_BomHead-BomheadIval2']" placeholder="请输入" />
+                <el-input
+                  v-model.number="form['ME_BomHead-BomheadIval2']"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item :label="getColumnName('ME_BomHead-BomheadDval1')">
-                <el-input v-model="form['ME_BomHead-BomheadDval1']" placeholder="请输入" />
+                <el-input
+                  v-model="form['ME_BomHead-BomheadDval1']"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item :label="getColumnName('ME_BomHead-BomheadDval2')">
-                <el-input v-model="form['ME_BomHead-BomheadDval2']" placeholder="请输入" />
+                <el-input
+                  v-model="form['ME_BomHead-BomheadDval2']"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
           </el-form>
@@ -393,7 +554,7 @@ export default {
       this.formBom['ME_BomLst-TimeUom'] = undefined
       this.formBom['ME_BomLst-LossRate'] = undefined
       this.isBomlst = false
-      // this.$forceUpdate()
+      this.$forceUpdate()
     },
     deleteBomItem() {
       const bomid = this.formBom['ME_BomLst-BomId']
@@ -427,8 +588,10 @@ export default {
         this.formBom['ME_BomLst-TimeUom'] = undefined
         this.formBom['ME_BomLst-LossRate'] = undefined
         this.formBom1 = {}
-        getBomhead(bomid).then(response => {
-          this.form = response.data
+        this.$nextTick(()=>{
+          getBomhead(bomid).then(response => {
+            this.form = response.data
+          })
         })
         this.msgSuccess('删除成功')
       }).catch(function() {})
@@ -456,9 +619,47 @@ export default {
         if (this.editType === '编辑模式') {
           updateBomlst(this.formBom).then(res => {
             if (res.code === 200) {
+              this.editType = ''
               this.msgSuccess('修改成功')
-              getBomhead(bomid).then(response => {
-                this.form = response.data
+              this.form = {
+                'ME_BomHead-MatNr': undefined,
+                'ME_BomHead-BomId': undefined,
+                'ME_BomHead-Descr': undefined,
+                'ME_BomHead-BomheadCval1': undefined,
+                'ME_BomHead-BomheadCval2': undefined,
+                'ME_BomHead-BomheadIval1': undefined,
+                'ME_BomHead-BomheadIval2': undefined,
+                'ME_BomHead-BomheadDval1': undefined,
+                'ME_BomHead-BomheadDval2': undefined,
+                'ME_BomHead-BomLstLi': []
+              }
+              this.formBom['ME_BomLst-FmatNr'] = undefined
+              this.formBom['ME_BomLst-FmatName'] = undefined
+              this.formBom['ME_BomLst-FmatQty'] = undefined
+              this.formBom['ME_BomLst-FmatUom'] = undefined
+              this.formBom['ME_BomLst-CmatNr'] = undefined
+              this.formBom['ME_BomLst-LevelNr'] = undefined
+              this.formBom['ME_BomLst-CmatName'] = undefined
+              this.formBom['ME_BomLst-CmatQty'] = undefined
+              this.formBom['ME_BomLst-CmatUom'] = undefined
+              this.formBom['ME_BomLst-CmatType'] = undefined
+              this.formBom['ME_BomLst-Position'] = undefined
+              this.formBom['ME_BomLst-BackFlushItem'] = false
+              this.formBom['ME_BomLst-CriticalItem'] = false
+              this.formBom['ME_BomLst-ValidFrom'] = undefined
+              this.formBom['ME_BomLst-ValidTo'] = undefined
+              this.formBom['ME_BomLst-FmatSpec'] = undefined
+              this.formBom['ME_BomLst-BomlstCval2'] = undefined
+              this.formBom['ME_BomLst-BomlstIval1'] = undefined
+              this.formBom['ME_BomLst-BomlstIval2'] = undefined
+              this.formBom['ME_BomLst-TimeUom'] = undefined
+              this.formBom['ME_BomLst-LossRate'] = undefined
+              this.formBom1 = {}
+              this.resetForm('form')
+              this.$nextTick(()=>{
+                getBomhead(bomid).then(response => {
+                  this.form = response.data
+                })
               })
             } else {
               this.msgError(res.msg)
@@ -468,21 +669,53 @@ export default {
         if (this.editType === '新增模式') {
           addBomlst(this.formBom).then(res => {
             if (res.code === 200) {
+              this.editType = ''
               this.msgSuccess('新增成功')
-              this.formBom = {}
-              this.formBom['ME_BomLst-BackFlushItem'] = false
-              this.formBom['ME_BomLst-CriticalItem'] = false
-              this.formBom1 = {}
-              getBomhead(bomid).then(response => {
-                this.form = response.data
+              this.form = {
+        'ME_BomHead-MatNr': undefined,
+        'ME_BomHead-BomId': undefined,
+        'ME_BomHead-Descr': undefined,
+        'ME_BomHead-BomheadCval1': undefined,
+        'ME_BomHead-BomheadCval2': undefined,
+        'ME_BomHead-BomheadIval1': undefined,
+        'ME_BomHead-BomheadIval2': undefined,
+        'ME_BomHead-BomheadDval1': undefined,
+        'ME_BomHead-BomheadDval2': undefined,
+        'ME_BomHead-BomLstLi': []
+      }
+      this.formBom['ME_BomLst-FmatNr'] = undefined
+      this.formBom['ME_BomLst-FmatName'] = undefined
+      this.formBom['ME_BomLst-FmatQty'] = undefined
+      this.formBom['ME_BomLst-FmatUom'] = undefined
+      this.formBom['ME_BomLst-CmatNr'] = undefined
+      this.formBom['ME_BomLst-LevelNr'] = undefined
+      this.formBom['ME_BomLst-CmatName'] = undefined
+      this.formBom['ME_BomLst-CmatQty'] = undefined
+      this.formBom['ME_BomLst-CmatUom'] = undefined
+      this.formBom['ME_BomLst-CmatType'] = undefined
+      this.formBom['ME_BomLst-Position'] = undefined
+      this.formBom['ME_BomLst-BackFlushItem'] = false
+      this.formBom['ME_BomLst-CriticalItem'] = false
+      this.formBom['ME_BomLst-ValidFrom'] = undefined
+      this.formBom['ME_BomLst-ValidTo'] = undefined
+      this.formBom['ME_BomLst-FmatSpec'] = undefined
+      this.formBom['ME_BomLst-BomlstCval2'] = undefined
+      this.formBom['ME_BomLst-BomlstIval1'] = undefined
+      this.formBom['ME_BomLst-BomlstIval2'] = undefined
+      this.formBom['ME_BomLst-TimeUom'] = undefined
+      this.formBom['ME_BomLst-LossRate'] = undefined
+      this.formBom1 = {}
+      this.resetForm('form')
+              this.$nextTick(()=>{
+                getBomhead(bomid).then(response => {
+                  this.form = response.data
+                })
               })
             } else {
               this.msgError(res.msg)
             }
           })
         }
-        this.formBom1 = {}
-        this.editType = ''
       }
     },
     // 表单重置
@@ -539,12 +772,14 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
-      this.isAdd = false
-      getBomhead(row['ME_BomHead-BomId']).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = '修改'
-      })
+      this.isAdd = false;
+      this.$nextTick(()=>{
+        getBomhead(row['ME_BomHead-BomId']).then(({data={}}) => {
+          this.form = data;
+          this.open = true;
+          this.title = '修改'
+        })
+      });
     },
     /** 提交按钮 */
     submitForm: function() {

src/views/plant/material/part.vue

@@ -10,6 +10,63 @@
           style="width: 200px"
         />
       </el-form-item>
+      <el-form-item
+        :label="getColumnName('Article-ProjectId')"
+        prop="Article-ProjectId"
+      >
+        <el-select
+          v-model="queryParams.ProjectId"
+          filterable
+          clearable
+          placeholder="请选择"
+          style="width: 100%"
+        >
+          <el-option
+            v-for="item in projectArray"
+            :key="item['ME_Project-ProjectId']"
+            :label="item['ME_Project-Descr']"
+            :value="item['ME_Project-ProjectId']"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        :label="getColumnName('Article-Status')"
+        prop="Article-Status"
+      >
+        <el-select
+          clearable
+          v-model="queryParams.Status"
+          filterable
+          placeholder="请选择"
+          style="width: 100%"
+        >
+          <el-option
+            v-for="item in statusArray"
+            :key="item['stdeftab-stdeftyp']"
+            :label="item['stdeftab-bez']"
+            :value="item['stdeftab-stdeftyp']"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        :label="getColumnName('Article-ArtSpec1')"
+        prop="Article-ArtSpec1"
+      >
+        <el-select
+          v-model="queryParams.ArtSpec1"
+          filterable
+          clearable
+          placeholder="请选择"
+          style="width: 100%"
+        >
+          <el-option
+            v-for="item in artSpecList"
+            :key="item['stdeftab-stdeftyp']"
+            :label="item['stdeftab-bez']"
+            :value="item['stdeftab-stdeftyp']"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -45,12 +102,12 @@
           <span v-else-if="item === 'Article-CreateTime'">
             {{ parseTime(scope.row[item]) }}
           </span>
-					<span v-else-if="item ==='Article-ArtSpec1'">
-						{{ artSpec1Text(scope.row[item]) }}
-					</span>
-          <span v-else-if="item ==='Article-Status'">
-						{{ statusText(scope.row[item]) }}
-					</span>
+          <span v-else-if="item === 'Article-ArtSpec1'">
+            {{ artSpec1Text(scope.row[item]) }}
+          </span>
+          <span v-else-if="item === 'Article-Status'">
+            {{ statusText(scope.row[item]) }}
+          </span>
           <span v-else>{{ scope.row[item] }}</span>
         </template>
       </el-table-column>
@@ -188,19 +245,23 @@
                   :label="item['stdeftab-bez']"
                   :value="item['stdeftab-stdeftyp']"
                 />
-              </el-select>
+                              </el-select
+              >
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="getColumnName('Article-PartId')" prop="Article-PartId">
-              <el-input
-                v-model="form['Article-PartId']"
-                placeholder="请输入"
-              />
+            <el-form-item
+              :label="getColumnName('Article-PartId')"
+              prop="Article-PartId"
+            >
+              <el-input v-model="form['Article-PartId']" placeholder="请输入" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="getColumnName('Article-CarModel')" prop="Article-CarModel">
+            <el-form-item
+              :label="getColumnName('Article-CarModel')"
+              prop="Article-CarModel"
+            >
               <el-input
                 v-model="form['Article-CarModel']"
                 placeholder="请输入"
@@ -208,7 +269,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="getColumnName('Article-LearArtId')" prop="Article-LearArtId">
+            <el-form-item
+              :label="getColumnName('Article-LearArtId')"
+              prop="Article-LearArtId"
+            >
               <el-input
                 v-model="form['Article-LearArtId']"
                 placeholder="请输入"
@@ -236,7 +300,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="getColumnName('Article-Version')" prop="Article-Version">
+            <el-form-item
+              :label="getColumnName('Article-Version')"
+              prop="Article-Version"
+            >
               <el-input
                 v-model="form['Article-Version']"
                 placeholder="请输入"
@@ -665,6 +732,9 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
 			if (this.queryParams.ArtId === '') this.queryParams.ArtId = undefined
+      if (this.queryParams.ArtSpec1 === '') this.queryParams.ArtSpec1 = undefined
+      if (this.queryParams.Status === '') this.queryParams.Status = undefined
+      if (this.queryParams.ProjectId === '') this.queryParams.ProjectId = undefined
       this.queryParams.pageNumber = 1
       this.getList()
     },