Merge branch 'master' of gitlab.gavelinfo.com:lisu/sgaqgl-vue

src/views/outsourcingDirector/approve/index.vue

@@ -246,9 +246,10 @@ export default {
       baseUrl: "aqgl/wxgl/wxdwsp",
       /* 查询参数*/
       queryParams: {
-        code: "",
-        name: "",
-        dwlx: ""
+         operatype:'W',
+         code: '',
+         name: '',
+         dwlx: ''
       },
       /* 表格标题对应参数*/
       tableTitle: [

src/views/outsourcingDirector/declare/index.vue

@@ -4,6 +4,12 @@
     <div class="search" v-condition>
       <SearchButton :app="app"></SearchButton>
       <el-row :gutter="20" class="search-row-1">
+       <el-col :span="6" class="search-col">
+          <div class="search-item">
+            <span class="search-span">事务类型:</span>
+            <RelSelect  src='wf/common/wfstate' :match="{value:'id',label:'name'}" v-model='queryParams.operatype' ></RelSelect>
+          </div>
+        </el-col>
         <el-col :span="6" class="search-col">
           <div class="search-item">
             <span class="search-span">档案编号:</span>
@@ -249,9 +255,10 @@ export default {
       baseUrl: "aqgl/wxgl/wxdwsb",
       /* 查询参数*/
       queryParams: {
-        code: "",
-        name: "",
-        dwlx: ""
+        operatype:'W',
+        code: '',
+        name: '',
+        dwlx: ''
       },
       /* 表格标题对应参数*/
       tableTitle: [