全局搜索按钮统一改为查询输入框变为可清除重置数据未清空等问题

2 years ago · bbbc0d379e
parent 5229cb7181
commit bbbc0d379e
34 changed files with 38 additions and 28 deletions
--- a/src/views/basic/corpMaintain/corpExport.vue
+++ b/src/views/basic/corpMaintain/corpExport.vue
@ -5,7 +5,7 @@
          <el-row>
            <el-col :span="6">
                <el-form-item label="记录ID:">
-                    <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input>
+                    <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID" clearable></el-input>
                </el-form-item>
            </el-col>
            </el-row>
--- a/src/views/basic/corpMaintain/corpImport.vue
+++ b/src/views/basic/corpMaintain/corpImport.vue
@ -5,7 +5,7 @@
          <el-row>
            <el-col :span="6">
                <el-form-item label="记录ID:">
-                    <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input>
+                    <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID" clearable></el-input>
                </el-form-item>
            </el-col>
            <el-col :span="6">
--- a/src/views/basic/product/udiInfoImport.vue
+++ b/src/views/basic/product/udiInfoImport.vue
@ -5,7 +5,7 @@
            <el-row>
              <el-col :span="6">
                <el-form-item label="记录ID:">
-                    <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input>
+                    <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID" clearable></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="6">
--- a/src/views/basic/product/udiinfoExport.vue
+++ b/src/views/basic/product/udiinfoExport.vue
@ -5,7 +5,7 @@
            <el-row>
              <el-col :span="6">
                <el-form-item label="记录ID:">
-                    <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input>
+                    <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID" clearable></el-input>
                </el-form-item>
              </el-col>
            </el-row>
--- a/src/views/inout/uploadManage/receiveLog.vue
+++ b/src/views/inout/uploadManage/receiveLog.vue
@ -167,6 +167,7 @@ export default {
      loading: false,
      list: [],
      total: 0,
+      actDateRange:[],
      statusMap: {
        0: "未提交",
        1: "正在提交",
@ -196,6 +197,7 @@ export default {
        page: 1,
        limit: 20
      }
+      this.actDateRange=[];
      this.onSubmit();
    },
    onSubmit() {
--- a/src/views/inout/uploadManage/uploadLog.vue
+++ b/src/views/inout/uploadManage/uploadLog.vue
@ -164,6 +164,7 @@ export default {
        page: 1,
        limit: 20
      },
+      actDateRange:[],
      loading: false,
      list: [],
      total: 0,
@ -196,6 +197,7 @@ export default {
        page: 1,
        limit: 20
      }
+      this.actDateRange=[];
      this.onSubmit();
    },
    onSubmit() {
--- a/src/views/inout/uploadManage/uploadOrder.vue
+++ b/src/views/inout/uploadManage/uploadOrder.vue
@ -478,6 +478,7 @@ export default {
        page: 1,
        limit: 10
      };
+      this.actDateRange= [];
      this.getList();
    },
    onSubmit() {
--- a/src/views/inventory/inner/innerOrder.vue
+++ b/src/views/inventory/inner/innerOrder.vue
@ -22,7 +22,7 @@
          </el-form-item>
          <el-form-item>
            <el-button-group style="display:flex;">
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
              <el-button type="primary" icon="search" @click="onSubmitFind">查询</el-button>
              <el-button type="primary" icon="search" @click="newDistributionForm()" :loading="loading">
                新增打印单
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@ -35,7 +35,7 @@
      <el-form-item>
        <el-button-group>
          <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
          <el-button
            type="primary"
            icon="el-icon-delete"
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@ -49,7 +49,7 @@

      <el-form-item>
        <el-button-group>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
          <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
          <el-button
            type="primary"
--- a/src/views/remind/invRemindSet.vue
+++ b/src/views/remind/invRemindSet.vue
@ -69,7 +69,7 @@
        <el-button-group>
          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-          <el-button type="primary" @click.native="search" icon="el-icon-search">搜索</el-button>
+          <el-button type="primary" @click.native="search" icon="el-icon-search">查询</el-button>
          <el-button type="primary" @click.native="addSet" icon="el-icon-plus">新增库存预警设置</el-button>
        </el-button-group>
      </div>
--- a/src/views/sync/SysUdimsData.vue
+++ b/src/views/sync/SysUdimsData.vue
@ -23,7 +23,7 @@
          </el-form-item>
          <el-form-item>
            <el-button-group style="display:flex;">
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
              <el-button type="primary" icon="search" @click="getList">查询</el-button>
              <!--              <el-button type="primary" icon="search" @click="createScheduleDialog(1)"-->
              <!--                v-if="configParms.orderScanFinish==1 || configParms.orderUnReceive==1 || configParms.orderUnCheck==1">-->
--- a/src/views/sync/SysUdimsDownloadData.vue
+++ b/src/views/sync/SysUdimsDownloadData.vue
@ -18,7 +18,7 @@
          </el-form-item>
          <el-form-item>
            <el-button-group style="display:flex;">
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
              <el-button type="primary" icon="search" @click="getList">查询</el-button>
            </el-button-group>
          </el-form-item>
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@ -23,7 +23,7 @@
        <el-button-group>
          <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
-                     v-hasPermi="['system:menu:query']">搜索
+                     v-hasPermi="['system:menu:query']">查询
          </el-button>
          <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:menu:add']"
          >新增
--- a/src/views/system/param/BasicEntrutsRece.vue
+++ b/src/views/system/param/BasicEntrutsRece.vue
@ -6,6 +6,7 @@
          <el-input
            v-model="filterQuery.name"
            placeholder="单据类型名称"
+            clearable
          ></el-input>
        </el-form-item>
        <el-form-item>
--- a/src/views/system/param/busTypeChange.vue
+++ b/src/views/system/param/busTypeChange.vue
@ -6,12 +6,14 @@
          <el-input
            v-model="filterQuery.originName"
            placeholder="请输入单据类型名称"
+            clearable
          ></el-input>
        </el-form-item>
        <el-form-item class="query-form-item" label="单据类型代码:">
          <el-input
            v-model="filterQuery.originAction"
            placeholder="请输入单据类型代码"
+            clearable
          ></el-input>
        </el-form-item>
        <el-form-item>
--- a/src/views/system/param/helpSettings.vue
+++ b/src/views/system/param/helpSettings.vue
@ -21,7 +21,7 @@

      <el-form-item>
        <el-button-group>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
          <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
          <el-button
            type="primary" icon="el-icon-plus"  @click="addMenu"
--- a/src/views/system/param/systemParamConfig.vue
+++ b/src/views/system/param/systemParamConfig.vue
@ -12,7 +12,7 @@
              <el-button type="primary"
                         @click.native="search"
                         icon="el-icon-search">
-                搜索
+                查询
              </el-button>
            </el-button-group>
          </el-form-item>
--- a/src/views/system/print/pdfBizPrintSet.vue
+++ b/src/views/system/print/pdfBizPrintSet.vue
@ -13,7 +13,7 @@
          </el-form-item>
          <el-form-item>
            <el-button-group>
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
              <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
            </el-button-group>
          </el-form-item>
--- a/src/views/system/print/pdfCodePrintSet.vue
+++ b/src/views/system/print/pdfCodePrintSet.vue
@ -13,7 +13,7 @@
        </el-form-item>
        <el-form-item>
          <el-button-group>
-            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+            <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
            <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
          </el-button-group>
        </el-form-item>
--- a/src/views/system/print/pdfLabelPrintSet.vue
+++ b/src/views/system/print/pdfLabelPrintSet.vue
@ -13,7 +13,7 @@
        </el-form-item>
        <el-form-item>
          <el-button-group>
-            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+            <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
            <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
          </el-button-group>
        </el-form-item>
--- a/src/views/system/print/pdfStatementPrintSet.vue
+++ b/src/views/system/print/pdfStatementPrintSet.vue
@ -13,7 +13,7 @@
        </el-form-item>
        <el-form-item>
          <el-button-group>
-            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+            <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
            <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
          </el-button-group>
        </el-form-item>
--- a/src/views/system/print/pdfTmpleateManage.vue
+++ b/src/views/system/print/pdfTmpleateManage.vue
@ -21,7 +21,7 @@
          </el-form-item>
          <el-form-item>
            <el-button-group>
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
              <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
              <el-button type="primary" icon="el-icon-plus" @click="handleAddForm()">新增模板</el-button>
            </el-button-group>
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@ -24,7 +24,7 @@

          <el-button-group>
            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</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-button-group>

--- a/src/views/thirdSys/api/index.vue
+++ b/src/views/thirdSys/api/index.vue
@ -6,12 +6,14 @@
          <el-input
            v-model="filterQuery.thirdId"
            placeholder="系统标识"
+            clearable
          ></el-input>
        </el-form-item>
        <el-form-item class="query-form-item" label="系统名称:">
          <el-input
            v-model="filterQuery.thirdName"
            placeholder="系统名称"
+            clearable
          ></el-input>
        </el-form-item>
        <el-form-item class="query-form-item" label="状态:">
--- a/src/views/thirdSys/corps/thrCorpsExport.vue
+++ b/src/views/thirdSys/corps/thrCorpsExport.vue
@ -5,7 +5,7 @@
        <el-row>
          <el-col :span="6">
          <el-form-item label="记录ID:">
-            <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input>
+            <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID" clearable></el-input>
          </el-form-item>
          </el-col>
        </el-row>
--- a/src/views/thirdSys/corps/thrCorpsImport.vue
+++ b/src/views/thirdSys/corps/thrCorpsImport.vue
@ -5,7 +5,7 @@
        <el-row>
          <el-col :span="6">
            <el-form-item label="记录ID:">
-              <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input>
+              <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID" clearable></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6">
--- a/src/views/thirdSys/invProducts/thrInvProductsExport.vue
+++ b/src/views/thirdSys/invProducts/thrInvProductsExport.vue
@ -5,7 +5,7 @@
        <el-row>
          <el-col :span="6">
            <el-form-item label="记录ID:">
-              <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input>
+              <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID" clearable></el-input>
            </el-form-item>
          </el-col>
        </el-row>
--- a/src/views/thirdSys/invProducts/thrInvProductsImport.vue
+++ b/src/views/thirdSys/invProducts/thrInvProductsImport.vue
@ -5,7 +5,7 @@
        <el-row>
          <el-col :span="6">
            <el-form-item label="记录ID:">
-              <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input>
+              <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID" clearable></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6">
--- a/src/views/thirdSys/order/thrOrderExport.vue
+++ b/src/views/thirdSys/order/thrOrderExport.vue
@ -5,7 +5,7 @@
        <el-row>
          <el-col :span="6">
            <el-form-item label="记录ID:">
-              <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="清输入记录ID"></el-input>
+              <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="清输入记录ID" clearable></el-input>
            </el-form-item>
          </el-col>
        </el-row>
--- a/src/views/thirdSys/order/thrOrderImport.vue
+++ b/src/views/thirdSys/order/thrOrderImport.vue
@ -5,7 +5,7 @@
        <el-row>
          <el-col :span="6">
            <el-form-item label="记录ID:">
-              <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input>
+              <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID" clearable></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6">
--- a/src/views/thirdSys/order/thrOrderImportDetail.vue
+++ b/src/views/thirdSys/order/thrOrderImportDetail.vue
@ -5,7 +5,7 @@
        <el-row>
          <el-col :span="6">
            <el-form-item label="UDI编码:">
-              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入UDI编码"></el-input>
+              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入UDI编码" clearable></el-input>
            </el-form-item>
          </el-col>
        </el-row>
--- a/src/views/thirdSys/product/thrProductsExport.vue
+++ b/src/views/thirdSys/product/thrProductsExport.vue
@ -5,7 +5,7 @@
        <el-row>
          <el-col :span="6">
            <el-form-item label="记录ID:">
-              <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input>
+              <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID" clearable></el-input>
            </el-form-item>
          </el-col>
        </el-row>
--- a/src/views/thirdSys/product/thrProductsImport.vue
+++ b/src/views/thirdSys/product/thrProductsImport.vue
@ -5,7 +5,7 @@
        <el-row>
          <el-col :span="6">
            <el-form-item class="query-form-item" label="记录ID:">
-              <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input>
+              <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID" clearable></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6">