Merge remote-tracking branch 'origin/dev' into dev

src/api/sync/spsSyncStatus.js

@@ -42,6 +42,22 @@ export function findConfig(query) {
   });
 }
 
+export function getSelectedBussinessType(query) {
+  return axios({
+    url: "/system/param/syncData/selectedBus",
+    method: "get",
+    params: query
+  });
+}
+
+export function getSelectedToInBussinessType(query) {
+  return axios({
+    url: "/system/param/syncData/selectedToInBus",
+    method: "get",
+    params: query
+  });
+}
+
 export function updateConfig(query) {
   return axios({
     url: "/system/param/syncData/save",

src/views/sync/SysUdimsConfig.vue

@@ -350,6 +350,24 @@
             label="单据(单据类型)"
             label-style="width: 150px"
           >
+            <div style="float: left; margin-bottom: 10px; margin-right: 25px">
+              <el-form :model="selectedToInBusTypesQuery" ref="queryForm" size="mini" :inline="true">
+                <el-form-item label="单据类型:" prop="name">
+                  <el-input
+                    v-model="selectedToInBusTypesQuery.name"
+                    placeholder="请输入单据类型名称"
+                    clearable
+                    @keyup.enter.native="querySeletedToInBus"
+                  />
+                </el-form-item>
+                <el-form-item>
+                  <el-button-group>
+                    <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetSeletedToInBus">重置</el-button>
+                    <el-button type="primary" icon="el-icon-search" size="mini" @click="querySeletedToInBus">查询</el-button>
+                  </el-button-group>
+                </el-form-item>
+              </el-form>
+            </div>
             <div style="float: right; margin-bottom: 10px; margin-right: 25px">
               <el-button
                 type="primary"
@@ -467,6 +485,24 @@
             label="单据(单据类型)"
             label-style="width: 150px"
           >
+            <div style="float: left; margin-bottom: 10px; margin-right: 25px">
+              <el-form :model="selectedBusTypesQuery" ref="queryForm" size="mini" :inline="true">
+                <el-form-item label="单据类型:" prop="name">
+                  <el-input
+                    v-model="selectedBusTypesQuery.name"
+                    placeholder="请输入单据类型名称"
+                    clearable
+                    @keyup.enter.native="querySeletedBus"
+                  />
+                </el-form-item>
+                <el-form-item>
+                  <el-button-group>
+                    <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetSeletedBus">重置</el-button>
+                    <el-button type="primary" icon="el-icon-search" size="mini" @click="querySeletedBus">查询</el-button>
+                  </el-button-group>
+                </el-form-item>
+              </el-form>
+            </div>
             <div style="float: right; margin-bottom: 10px; margin-right: 25px">
               <el-button
                 type="primary"
@@ -609,6 +645,24 @@
         :close-on-press-escape="false"
         v-if="addBusToInDialogVisible"
       >
+        <div style="float: left; margin-bottom: 10px; margin-right: 25px">
+          <el-form :model="busQuery" ref="queryForm" size="mini" :inline="true">
+            <el-form-item label="单据类型:" prop="name">
+              <el-input
+                v-model="busQuery.name"
+                placeholder="请输入单据类型名称"
+                clearable
+                @keyup.enter.native="getBusType"
+              />
+            </el-form-item>
+            <el-form-item>
+              <el-button-group>
+                <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetBus">重置</el-button>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="getBusType">查询</el-button>
+              </el-button-group>
+            </el-form-item>
+          </el-form>
+        </div>
         <div style="float: right; margin-bottom: 10px; margin-right: 25px">
           <el-button type="primary" size="small" @click="addToInBusType()"
           >选入
@@ -655,6 +709,24 @@
         :close-on-press-escape="false"
         v-if="addBusDialogVisible"
       >
+        <div style="float: left; margin-bottom: 10px; margin-right: 25px">
+          <el-form :model="busQuery" ref="queryForm" size="mini" :inline="true">
+            <el-form-item label="单据类型:" prop="name">
+              <el-input
+                v-model="busQuery.name"
+                placeholder="请输入单据类型名称"
+                clearable
+                @keyup.enter.native="getBusType"
+              />
+            </el-form-item>
+            <el-form-item>
+              <el-button-group>
+                <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetBus">重置</el-button>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="getBusType">查询</el-button>
+              </el-button-group>
+            </el-form-item>
+          </el-form>
+        </div>
         <div style="float: right; margin-bottom: 10px; margin-right: 25px">
           <el-button type="primary" size="small" @click="addBusType()"
           >选入
@@ -749,6 +821,8 @@ import {
   findConfig,
   testConnect,
   updateConfig,
+  getSelectedBussinessType,
+  getSelectedToInBussinessType
 } from "@/api/sync/spsSyncStatus";
 import store from "@/store";
 import {getBussinessType} from "@/api/basic/bussinessType";
@@ -758,6 +832,16 @@ export default {
   name: "SysUdimsConfig",
   data() {
     return {
+      selectedBusTypesQuery: {
+        name: null,
+        page: 1,
+        limit: null
+      },
+      selectedToInBusTypesQuery: {
+        name: null,
+        page: 1,
+        limit: null
+      },
       activeNames: ["2"],
       configQuery: {
         id: null,
@@ -806,6 +890,7 @@ export default {
       checkedToInBusTypes: [],
       checkedChangeBusTypes: [],
       busQuery: {
+        name: null,
         page: 1,
         limit: 10,
       },
@@ -827,6 +912,42 @@ export default {
     };
   },
   methods: {
+    querySeletedBus(){
+      getSelectedBussinessType(this.selectedBusTypesQuery)
+        .then((response) => {
+          this.checkedBusTypes = response.data.list || [];
+        })
+        .catch(() => {
+        });
+    },
+    resetSeletedBus(){
+      this.selectedBusTypesQuery = {
+        name: null
+      }
+      this.getConfig()
+    },
+    querySeletedToInBus(){
+      getSelectedToInBussinessType(this.selectedToInBusTypesQuery)
+        .then((response) => {
+          this.checkedToInBusTypes = response.data.list || [];
+        })
+        .catch(() => {
+        });
+    },
+    resetSeletedToInBus(){
+      this.selectedToInBusTypesQuery = {
+        name: null
+      }
+      this.getConfig()
+    },
+    resetBus(){
+      this.busQuery = {
+          name: null,
+          page: 1,
+          limit: 10,
+      },
+      this.getBusType()
+    },
     getConfig() {
       findConfig()
         .then((response) => {
@@ -909,11 +1030,13 @@ export default {
     },
 
     addBusTypeDialog() {
+      this.resetBus()
       this.addBusDialogVisible = true;
       this.multipleSelection = [];
     },
 
     addToInBusTypeDialog() {
+      this.resetBus()
       this.addBusToInDialogVisible = true;
       this.toInSelecttions = [];
     },