bug修改，列表搜索框完善，物料申请单校验等

src/components/PopDialog/index.vue

@@ -71,12 +71,12 @@
               >
               </el-table-column>
               <el-table-column
-                prop="code"
+                prop="id"
                 header-align="center"
                 align="left"
                 sortable="custom"
                 min-width="90"
-                label="code"
+                label="id"
               >
               </el-table-column>
               <el-table-column

src/components/PopDialog/productFactory.vue

@@ -80,7 +80,7 @@
               >
               </el-table-column>
               <el-table-column
-                prop="manufactureName"
+                prop="name"
                 header-align="center"
                 align="left"
                 sortable="custom"

src/views/material/changeApply/add.vue

@@ -81,9 +81,24 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="生产厂家/代理人" prop="factory">
-                <el-input :disabled="disable" v-model="basicForm.factory">
+                <el-select
+                    ref="factoryOrman"
+                    v-model="basicForm.factory"
+                    placeholder="生产厂家/代理人"
+                    clearable
+                    :disabled="disable"
+                    @focus="chooseFactory"
+                  >
+                    <el-option
+                      v-for="item in factoryOptions"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
+                    />
+                </el-select>
+                <!-- <el-input :disabled="disable" v-model="basicForm.factory">
                   <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test02"></el-button>
-                </el-input>
+                </el-input> -->
               </el-form-item>
             </el-col>
           </el-row>
@@ -315,7 +330,7 @@
         <el-button type="primary" size="small" plain @click="save" v-if="pageStu == 'add' || pageStu == 'edit'">保存</el-button>
       </el-col>
       <el-col :span="1.5" style="margin: 0 10px;">
-        <el-button type="primary" size="small" plain @click="submit" v-if="pageStu == 'add' || pageStu == 'edit'">提交</el-button>
+        <el-button type="primary" size="small" plain @click="submit" v-if="pageStu == 'edit'">提交</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="primary" size="small" plain @click="back">返回</el-button>
@@ -330,8 +345,8 @@
     />
 
     <factory
-      ref="contractSelect2"
-      @doSubmit="selectionsToInput2"
+      ref="factory"
+      @doSubmit="acceptFactory"
       :selectData="selectData2"
       :single="true"
     />
@@ -342,6 +357,8 @@
 import popDialog from '@/components/PopDialog/index.vue'
 import factory from '@/components/PopDialog/productFactory.vue'
 import { addChangeList, getMaterialDetails, getChangeDetails, editChangeList } from '@/api/changeApply/basic'
+// 生产厂商/代理人调用用于回显
+import { getProductFactory } from '@/api/changeApply/basic'
 export default {
   name: 'applyAdd',
   dicts: ['sys_storage_condition', 'sys_conditions_carriage', 'sys_medicine', 'medical_instruments', 'curing_type'],
@@ -356,6 +373,7 @@ export default {
   },
   data() {
     return{
+      factoryOptions: [],
       tabValue: 'first',
       basicForm: {
         code: '',
@@ -448,11 +466,19 @@ export default {
         console.log('页面状态',this.pageStu)
         console.log('数据', this.row)
         this.getDetails(this.row)
+        // 生产厂家代理人用于回显
+        if (this.row.factory) {
+          this.getFactoryDetails(this.row.factory)
+        }
       } else if (this.pageStu == 'edit') {
         // alert('修改页面')
         console.log('页面状态',this.pageStu)
         console.log('数据', this.row)
         this.getDetails(this.row)
+        // 生产厂家代理人用于回显
+        if (this.row.factory) {
+          this.getFactoryDetails(this.row.factory)
+        }
       } else if(this.pageStu == 'add') {
         // alert('新增页面')
         console.log('页面状态',this.pageStu)
@@ -460,6 +486,14 @@ export default {
     })
   },
   methods: {
+    // 生产厂家/代理人用于回显
+    getFactoryDetails(id) {
+       getProductFactory({id:id}).then(res => {
+        if(res.code === 200) {
+          this.factoryOptions = res.data.tableBody
+        }
+       })
+    },
     handleClick(tab, event) {
       console.log(tab, event);
       console.log('页面状态',this.pageStu)
@@ -582,19 +616,31 @@ export default {
         }
       })
     },
-    selectionsToInput2 (selections) {
-      console.log('选择的数据',selections)
-      this.basicForm.factory = selections[0].manufactureName
-    },
+    // selectionsToInput2 (selections) {
+    //   console.log('选择的数据',selections)
+    //   this.basicForm.factory = selections[0].manufactureName
+    // },
     // 显示列表
     test01() {
       console.log('测试点击')
       this.$refs.contractSelect.init()
     },
-    test02() {
-      console.log('测试弹窗2');
-      this.$refs.contractSelect2.init()
-    }
+    // test02() {
+    //   console.log('测试弹窗2');
+    //   this.$refs.contractSelect2.init()
+    // },
+    // 选择生产厂家/代理人
+    acceptFactory (selections) {
+      console.log('选择的数据',selections)
+      this.factoryOptions = selections
+      this.basicForm.factory = selections[0].id
+      this.getFactoryDetails(selections[0].id)
+    },
+    // 生产厂家/代理人显示列表
+    chooseFactory() {
+      this.$refs.factoryOrman.blur()
+      this.$refs.factory.init()
+    },
   }
 }
 </script>

src/views/material/changeApply/index.vue

@@ -1,48 +1,74 @@
 <template>
   <div class="changeApply">
     <div class="applyList" v-if="isList">
-    <el-row :gutter="10" class="mb10">
-      <el-col :span="1.5">
+      <el-row :gutter="10" class="mb10">
+          <!-- <el-select size="small" v-model="textValue" placeholder="请选择">
+          <el-option
+            v-for="item in text"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
 
-        <el-select size="small" v-model="textValue" placeholder="请选择">
-        <el-option
-          v-for="item in text"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-        </el-option>
-      </el-select>
+        <el-select size="small" v-model="ruleValue" placeholder="请选择">
+          <el-option
+            v-for="item in rule"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select> -->
+        <el-col :span="1.5">
+          <span style="font-size: 14px;margin-right: 5px;">物料编码</span>
+          <el-input
+            v-model="queryParams.code"
+            size="small"
+            placeholder="请输入物料编码查询"
+            clearable
+            style="width: 240px"
+          />
+        </el-col>
 
-      <el-select size="small" v-model="ruleValue" placeholder="请选择">
-        <el-option
-          v-for="item in rule"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-        </el-option>
-      </el-select>
+        <el-col :span="1.5">
+          <span style="font-size: 14px;margin-right: 5px;">物料名称</span>
+          <el-input
+            v-model="queryParams.materialName"
+            size="small"
+            placeholder="请输入物料名称查询"
+            clearable
+            style="width: 240px"
+          />
+        </el-col>
 
-      <el-input
-        v-model="input"
-        size="small"
-        placeholder="请输入"
-        clearable
-        style="width: 240px"
-      />
+        <el-col :span="1.5">
+          <span style="font-size: 14px;margin-right: 5px;">单据状态</span>
+          <el-select 
+            v-model="queryParams.status"
+            size="small"
+            placeholder="请选择单据状态"
+            clearable
+            style="width: 240px">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-col>
 
-      </el-col>
+        <el-col :span="1.5">
+          <el-button type="primary" size="small" plain @click="getList(queryParams)">查询</el-button>
+        </el-col>
+        <!-- <el-col :span="1.5">
+          <el-button type="primary" size="small" plain>高级查询</el-button>
+        </el-col> -->
+        <el-col :span="1.5">
+          <el-button type="primary" size="small" plain @click="reset">重置</el-button>
+        </el-col>
 
-      <el-col :span="1.5">
-        <el-button type="primary" size="small" plain>查询</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="primary" size="small" plain>高级查询</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="primary" size="small" plain>重置</el-button>
-      </el-col>
-
-    </el-row>
+      </el-row>
 
     <el-row :gutter="10" class="mb10">
       <el-col :span="1.5">
@@ -71,18 +97,18 @@
         @selection-change="handleSelectionChange"
       >
         <!-- <el-table-column type="selection" width="55" /> -->
-        <el-table-column label="序号" align="center" prop="sort" />
-        <el-table-column label="申请组织" align="center" prop="orgId" />
+        <el-table-column label="序号" align="center" type="index" width="50" />
+        <el-table-column label="申请组织" align="center" width="200" prop="orgId" />
         <el-table-column label="单据编码" align="center" width="200" prop="code" />
-        <el-table-column label="申请时间" align="center" width="150" prop="applicationTime" />
+        <el-table-column label="申请时间" align="center" width="150" prop="createTime" />
         <el-table-column label="单据状态" align="center" prop="status" :formatter="statusJug" />
         <el-table-column label="物料编码" align="center" width="150" prop="materialCode" />
-        <el-table-column label="物料名称" align="center" prop="materialName" />
-        <el-table-column label="最后审批人" align="center" width="120" prop="approver" />
-        <el-table-column label="最后审核时间" align="center" width="150" prop="approvalTime" />
-        <el-table-column label="创建人" align="center" prop="createBy" />
+        <el-table-column label="物料名称" align="center" width="150" prop="materialName" />
+        <!-- <el-table-column label="最后审批人" align="center" width="120" prop="approver" />
+        <el-table-column label="最后审核时间" align="center" width="150" prop="approvalTime" /> -->
+        <el-table-column label="创建人" align="center" prop="createByName" />
         <el-table-column label="创建时间" align="center" width="150" prop="createTime" />
-        <el-table-column label="最后修改人" align="center" width="120" prop="updateBy" />
+        <el-table-column label="最后修改人" align="center" width="120" prop="updateByName" />
         <el-table-column label="最后修改时间" align="center" width="150" prop="updateTime" />
         <el-table-column
           fixed="right"
@@ -92,8 +118,8 @@
           >
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="check(scope.row)">查看</el-button>
-            <el-button @click="edit(scope.row)" v-if="scope.row.status == 0 || scope.row.status == 4" type="text" size="small">编辑</el-button>
-            <el-button type="text" size="small" @click="deleteRow(scope.row)">删除</el-button>
+            <el-button @click="edit(scope.row)" v-if="scope.row.status == 0 || scope.row.status == 3" type="text" size="small">编辑</el-button>
+            <el-button type="text" size="small" @click="deleteRow(scope.row)" v-if="scope.row.status == 0 || scope.row.status == 3">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -124,17 +150,23 @@ export default {
   },
   data() {
     return{
-      textValue: 1,
-      text: [{label: '文本字段', value: 1}, {label: '字典字段', value: 2}],
-      ruleValue: 1,
-      rule:[{label: '包含', value: 1}, {label: '不包含', value: 2}, {label: '等于', value: 3}, {label: '不等于', value: 4}],
-      input: '',
-      // 
       tableList: [],
       queryParams: {
+        code: '',
+        materialName: '',
+        status: '',
         pageNum: 1,
         pageSize: 10
       },
+      options: [{
+        value: 0, label: '未提交'
+      },{
+        value: 1, label: '审批中'
+      },{
+        value: 2, label: '已完成'
+      },{
+        value: 3, label: '已驳回'
+      },],
       total:0,
       // isComponent
       isComponent:'addApply',
@@ -152,6 +184,13 @@ export default {
     this.getList(this.queryParams)
   },
   methods: {
+    reset() {
+      this.queryParams.code = ''
+      this.queryParams.materialName = ''
+      this.queryParams.pageNum = 1
+      this.queryParams.status = ''
+      this.getList(this.queryParams)
+    },
     newAdd() {
       this.isList = false
       this.isComponent = 'addApply'

src/views/material/requisition/add.vue

@@ -22,6 +22,7 @@
                     v-model="basicForm.classifyId"
                     placeholder="四级分类"
                     :disabled="disable"
+                    clearable
                     @focus="chooseFourClass"
                   >
                     <el-option
@@ -95,6 +96,7 @@
                     ref="units"
                     v-model="basicForm.unitId"
                     placeholder="计量单位"
+                    clearable
                     :disabled="disable"
                     @focus="chooseUnit"
                   >
@@ -116,13 +118,14 @@
                     ref="factoryOrman"
                     v-model="basicForm.manufacturerId"
                     placeholder="生产厂家/代理人"
+                    clearable
                     :disabled="disable"
                     @focus="chooseFactory"
                   >
                     <el-option
                       v-for="item in factoryOptions"
                       :key="item.id"
-                      :label="item.manufactureName"
+                      :label="item.name"
                       :value="item.id"
                     />
                 </el-select>
@@ -144,6 +147,7 @@
                     ref="places"
                     v-model="basicForm.originPlace"
                     placeholder="产地"
+                    clearable
                     :disabled="disable"
                     @focus="choosePlace"
                   >
@@ -341,6 +345,7 @@
                     ref="taxs"
                     v-model="basicForm.materialRate"
                     placeholder="物料税类"
+                    clearable
                     :disabled="disable"
                     @focus="chooseTax"
                   >
@@ -381,6 +386,7 @@
                     ref="staffs"
                     v-model="basicForm.puPersonnelId"
                     placeholder="采购员"
+                    clearable
                     :disabled="disable"
                     @focus="chooseStaff"
                   >
@@ -441,6 +447,7 @@
                     ref="lines"
                     v-model="basicForm.businessLine"
                     placeholder="业务线"
+                    clearable
                     :disabled="disable"
                     @focus="chooseLine"
                   >
@@ -584,6 +591,7 @@
                     ref="doses"
                     v-model="basicForm2.dosageFrom"
                     placeholder="剂型"
+                    clearable
                     :disabled="disable"
                     @focus="chooseDose"
                   >
@@ -734,7 +742,7 @@
         <el-button type="primary" size="small" plain @click="save" v-if="pageStu == 'add' || pageStu == 'edit'">保存</el-button>
       </el-col>
       <el-col :span="1.5" style="margin: 0 10px;">
-        <el-button type="primary" size="small" plain @click="submit" v-if="pageStu == 'add' || pageStu == 'edit'">提交</el-button>
+        <el-button type="primary" size="small" plain @click="submit" v-if="pageStu == 'edit'">提交</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="primary" size="small" plain @click="back">返回</el-button>
@@ -875,11 +883,11 @@ export default {
         registrant: '',
         originPlace: '',
         manufacturersMaterialName: '',
-        isB2c: '',
-        assembly: '',
-        isInventoryStatus: '',
-        expiryDateManagerment: '',
-        nearOnsetManagerment: '',
+        isB2c: '2',
+        assembly: '2',
+        isInventoryStatus: '0',
+        expiryDateManagerment: '0',
+        nearOnsetManagerment: '0',
         usefulLife: '',
         expiryUnitId: '',
         usefulLifeUnitId: '',
@@ -929,7 +937,21 @@ export default {
         value: '2',
         label: '否'
       }],
-      basicRules: {},
+      basicRules: {
+        classifyId: [{  required: true, message: '请选择四级分类', trigger: 'change' }],
+        name: [{required: true, message: '请输入物料名称', trigger: 'blur'}],
+        specification: [{required: true, message: '请输入规格', trigger: 'blur'}],
+        unitId: [{  required: true, message: '请选择计量单位', trigger: 'change' }],
+        manufacturerId: [{  required: true, message: '请选择生产厂家/代理人', trigger: 'change' }],
+        registrant: [{required: true, message: '请输入注册人/上市许可持有人', trigger: 'blur'}],
+        originPlace: [{ required: true, message: '请选择产地', trigger: 'change' }],
+        storageCondition: [{ required: true, message: '请选择存储条件', trigger: 'change' }],
+        deliveryPeriod: [{required: true, message: '请输入交货周期', trigger: 'blur'}],
+        minOrderQty: [{required: true, message: '请输入最小起定量', trigger: 'blur'}],
+        puPersonnelId: [{ required: true, message: '请选择采购员', trigger: 'change' }],
+        minBatchQty: [{required: true, message: '请输入最小批量', trigger: 'blur'}],
+        packExplain: [{required: true, message: '请输入包装说明', trigger: 'blur'}]
+      },
       basicForm2: {
         // 是否药品
         isDrug: '',
@@ -944,6 +966,7 @@ export default {
         // medicineTypeChanges:[
         // ],
       },
+      
       // tableList: [],
       // 子表选中
       ids: [],
@@ -1153,7 +1176,7 @@ export default {
             this.basicForm2 = res.data.sysMaterialMedcineApply
           }
           // 剂型回显
-          if (res.data.sysMaterialMedcineApply.dosageFrom) {
+          if (res.data.sysMaterialMedcineApply && res.data.sysMaterialMedcineApply.dosageFrom) {
             this.getDoseDetails(res.data.sysMaterialMedcineApply.dosageFrom)
           }
         }
@@ -1164,13 +1187,17 @@ export default {
         let sparams = {...this.basicForm, ...{status: 0}}
         sparams.sysMaterialMedcineApply = this.basicForm2
         console.log('提交参数', sparams)
-        editReq(sparams).then(res => {
-          if(res.code === 200) {
-            this.$message({
-              message: res.msg,
-              type: 'success'
-            });
-            this.back()
+        this.$refs['basic'].validate((valid) => {
+          if (valid) {
+            editReq(sparams).then(res => {
+              if(res.code === 200) {
+                this.$message({
+                  message: res.msg,
+                  type: 'success'
+                });
+                this.back()
+              }
+            })
           }
         })
       } else {
@@ -1178,13 +1205,17 @@ export default {
         let sparams = {...this.basicForm, ...{status: 0}}
         sparams.sysMaterialMedcineApply = this.basicForm2
         console.log('保存参数', sparams)
-        addReq(sparams).then(res => {
-          if(res.code === 200) {
-            this.$message({
-              message: res.msg,
-              type: 'success'
-            });
-            this.back()
+        this.$refs['basic'].validate((valid) => {
+          if(valid) {
+            addReq(sparams).then(res => {
+              if(res.code === 200) {
+                this.$message({
+                  message: res.msg,
+                  type: 'success'
+                });
+                this.back()
+              }
+            })
           }
         })
       }
@@ -1194,13 +1225,17 @@ export default {
       let sparams = {...this.basicForm, ...{status: 1}}
       sparams.sysMaterialMedcineApply = this.basicForm2
       console.log('提交参数', sparams)
-      editReq(sparams).then(res => {
-        if(res.code === 200) {
-          this.$message({
-            message: res.msg,
-            type: 'success'
-          });
-          this.back()
+      this.$refs['basic'].validate((valid) => {
+        if(valid) {
+          editReq(sparams).then(res => {
+            if(res.code === 200) {
+              this.$message({
+                message: res.msg,
+                type: 'success'
+              });
+              this.back()
+            }
+          })
         }
       })
     },

src/views/material/requisition/index.vue

@@ -3,43 +3,52 @@
     <div class="applyList" v-if="isList">
     <el-row :gutter="10" class="mb10">
       <el-col :span="1.5">
-
-        <el-select size="small" v-model="textValue" placeholder="请选择">
-        <el-option
-          v-for="item in text"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-        </el-option>
-      </el-select>
-
-      <el-select size="small" v-model="ruleValue" placeholder="请选择">
-        <el-option
-          v-for="item in rule"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-        </el-option>
-      </el-select>
-
-      <el-input
-        v-model="input"
-        size="small"
-        placeholder="请输入"
-        clearable
-        style="width: 240px"
-      />
-
+        <span style="font-size: 14px;margin-right: 5px;">单据编码</span>
+        <el-input
+          v-model="queryParams.billCode"
+          size="small"
+          placeholder="请输入单据编码查询"
+          clearable
+          style="width: 240px"
+        />
       </el-col>
 
       <el-col :span="1.5">
-        <el-button type="primary" size="small" plain>查询</el-button>
+        <span style="font-size: 14px;margin-right: 5px;">物料名称</span>
+        <el-input
+          v-model="queryParams.name"
+          size="small"
+          placeholder="请输入物料名称查询"
+          clearable
+          style="width: 240px"
+        />
       </el-col>
+
       <el-col :span="1.5">
-        <el-button type="primary" size="small" plain>高级查询</el-button>
+          <span style="font-size: 14px;margin-right: 5px;">单据状态</span>
+          <el-select 
+            v-model="queryParams.status"
+            size="small"
+            placeholder="请选择单据状态"
+            clearable
+            style="width: 240px">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-col>
+
+      <el-col :span="1.5">
+        <el-button type="primary" size="small" plain @click="getList(queryParams)">查询</el-button>
       </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="primary" size="small" plain>高级查询</el-button>
+      </el-col> -->
       <el-col :span="1.5">
-        <el-button type="primary" size="small" plain>重置</el-button>
+        <el-button type="primary" size="small" plain @click="reset">重置</el-button>
       </el-col>
 
     </el-row>
@@ -71,17 +80,17 @@
         @selection-change="handleSelectionChange"
       >
         <!-- <el-table-column type="selection" width="55" /> -->
-        <el-table-column label="序号" align="center" prop="sort" />
-        <el-table-column label="申请组织" align="center" prop="orgId" />
-        <el-table-column label="单据编码" align="center" width="200" prop="code" />
-        <el-table-column label="申请人" align="center" prop="createBy" />
-        <el-table-column label="申请时间" align="center" width="150" prop="applicationTime" />
+        <el-table-column label="序号" align="center" type="index" width="50"/>
+        <el-table-column label="申请组织" align="center" width="200" prop="orgName" />
+        <el-table-column label="单据编码" align="center" width="200" prop="billCode" />
+        <el-table-column label="申请人" align="center" prop="createName" />
+        <el-table-column label="申请时间" align="center" width="150" prop="createTime" />
         <el-table-column label="单据状态" align="center" prop="status" :formatter="statusJug" />
-        <el-table-column label="物料编码" align="center" width="150" prop="materialCode" />
-        <el-table-column label="物料名称" align="center" prop="materialName" />
-        <el-table-column label="创建人" align="center" prop="createBy" />
+        <!-- <el-table-column label="物料编码" align="center" width="150" prop="materialCode" /> -->
+        <el-table-column label="物料名称" align="center" width="150" prop="name" />
+        <el-table-column label="创建人" align="center" prop="createName"/>
         <el-table-column label="创建时间" align="center" width="150" prop="createTime" />
-        <el-table-column label="最后修改人" align="center" width="120" prop="updateBy" />
+        <el-table-column label="最后修改人" align="center" width="120" prop="updateName" />
         <el-table-column label="最后修改时间" align="center" width="150" prop="updateTime" />
         <el-table-column
           fixed="right"
@@ -91,8 +100,8 @@
           >
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="check(scope.row)">查看</el-button>
-            <el-button @click="edit(scope.row)" v-if="scope.row.status == 0 || scope.row.status == 4" type="text" size="small">编辑</el-button>
-            <el-button type="text" size="small" @click="deleteRow(scope.row)">删除</el-button>
+            <el-button @click="edit(scope.row)" v-if="scope.row.status == 0 || scope.row.status == 3" type="text" size="small">编辑</el-button>
+            <el-button type="text" size="small" @click="deleteRow(scope.row)" v-if="scope.row.status == 0 || scope.row.status == 3">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -123,17 +132,24 @@ export default {
   },
   data() {
     return{
-      textValue: 1,
-      text: [{label: '文本字段', value: 1}, {label: '字典字段', value: 2}],
-      ruleValue: 1,
-      rule:[{label: '包含', value: 1}, {label: '不包含', value: 2}, {label: '等于', value: 3}, {label: '不等于', value: 4}],
-      input: '',
       // 
       tableList: [],
       queryParams: {
+        billCode: '',
+        name: '',
+        status: '',
         pageNum: 1,
         pageSize: 10
       },
+      options: [{
+        value: 0, label: '未提交'
+      },{
+        value: 1, label: '审批中'
+      },{
+        value: 2, label: '已完成'
+      },{
+        value: 3, label: '已驳回'
+      },],
       total:0,
       // isComponent
       isComponent:'addReq',
@@ -151,6 +167,13 @@ export default {
     this.getList(this.queryParams)
   },
   methods: {
+    reset() {
+      this.queryParams.billCode = ''
+      this.queryParams.name = ''
+      this.queryParams.status = ''
+      this.queryParams.pageNum = 1
+      this.getList(this.queryParams)
+    },
     newAdd() {
       this.isList = false
       this.isComponent = 'addReq'