Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/addmatter/components/AddSynopsis.vue

@@ -474,11 +474,14 @@ export default {
         icon: "exclamation-circle",
         maskClosable: true,
         onOk() {
+          _this.$refs.form.resetFields();
           _this.isTimely = undefined; // 是否及时办理
           _this.isPromise = undefined; // 承诺是否及时办理
           _this.isLinked = undefined; // 是否有联办机构
-          _this.form.deptName = "";
-          _this.$refs.form.resetFields();
+          _this.baseform.deptName = "";
+          _this.baseform.deptCode = "";
+          _this.baseform.matterNo = "";
+          _this.curDpt = undefined;
         },
         onCancel() {
           console.log("Cancel");

base-manager-ui/admin/src/pages/basicset/appmarket/components/AppTheme.vue

@@ -234,7 +234,7 @@ export default {
           let { code, msg } = res.data;
           if (code === 1) {
             _this.$message.success(msg);
-            this.selectedRowKeys = [];
+            _this.selectedRowKeys = [];
             _this.getCategoryList();
           }
         },

base-manager-ui/admin/src/pages/basicset/appmarket/components/DataUpdate.vue

@@ -9,7 +9,6 @@
       <div class="search-box">
         <a-input-group compact>
           <a-select style="min-width: 100px" v-model="fieldCode">
-            <a-select-option value=""> 全部 </a-select-option>
             <a-select-option
               v-for="v in appTemplate"
               :key="v.id"
@@ -214,6 +213,9 @@ export default {
         this.appTemplate = data.sort((a, b) => {
           return a.fieldOrderNo - b.fieldOrderNo;
         });
+        if (this.appTemplate.length) {
+          this.fieldCode = this.appTemplate[0].fieldCode;
+        }
       }
     },
     // 获取数据列表
@@ -224,7 +226,7 @@ export default {
         size: this.size,
         appId: this.appId,
         fieldCode: this.fieldCode,
-        fieldValue: this.searchVal,
+        fieldValue: `%${this.searchVal}%`,
       });
       this.loading = false;
       if (res.data.code === 1) {
@@ -354,4 +356,4 @@ video {
   width: 50px;
   cursor: pointer;
 }
-</style>
+</style>
\ No newline at end of file

base-manager-ui/admin/src/pages/basicset/workman/personnel.vue

@@ -181,15 +181,23 @@
               </a-button>
             </a-dropdown>
           </div>
-          <div class="in">
+          <a-space>
+            <a-select v-model="searchType" style="width: 120px">
+              <a-select-option :value="1">
+                按姓名
+              </a-select-option>
+              <a-select-option :value="2">
+                按工号
+              </a-select-option>
+            </a-select>
             <a-input-search
-              placeholder="请输入姓名或者工号搜索"
+              placeholder="请输入关键字搜索"
               v-model="searchVal"
               enter-button="搜索"
               allowClear
               @search="onSearch"
             />
-          </div>
+          </a-space>
         </div>
         <div class="table-content">
           <!-- 表格 -->
@@ -408,6 +416,7 @@ export default {
       WorkmanData: [], // 工作人员列表
       deptSearch: "", //部门搜索
       windowSearch: "", // 窗口搜索
+      searchType: 1, // 搜索类型
       searchVal: "",
       visibleAll: false,
       page: 1,
@@ -458,9 +467,9 @@ export default {
     async getWorkmanData(search = {}) {
       this.loading = true;
       let obj = {};
-      if (/^[\u4e00-\u9fa5]+$/.test(this.searchVal)) {
+      if (this.searchType == 1) {
         obj.name = `%${this.searchVal}%`;
-      } else if (/^[a-zA-z0-9]+$/.test(this.searchVal)) {
+      } else if (this.searchType == 2) {
         obj.number = `%${this.searchVal}%`;
       }
       let res = await getWorkmanList({

portal-manager-ui/admin/src/views/dataAdmin/components/makeRecordReport/makeRecordReport.vue

@@ -232,8 +232,9 @@ export default {
       size: 10,
       total: 0,
       searchForm: {
-        search: "",
-        check_real: "-1",
+        status: "", // 状态
+        title: "",
+        sectionid: "", // 部门
         time: [
           this.$moment().format("YYYY-MM-DD"),
           this.$moment().format("YYYY-MM-DD"),

portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/networkForm.vue

@@ -256,6 +256,9 @@ export default {
     async getDataList(searchForm) {
       let list = [];
       let listTotal = 0;
+      this.searchForm.keyword
+        ? ""
+        : (this.searchForm.keyword = this.searchForm.info);
       let res = await getWLLZList({
         page: this.current,
         size: this.size,