Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/components/common/seekPage.vue

@@ -62,6 +62,18 @@
               >
               </el-date-picker>
             </div>
+            <div v-if="item.type == 'DictSelection'">
+              <dict-selection
+                v-model="defaultWhere[item.value]"
+                :placeholder="item.placeholder || '请选择内容'"
+                :multiple="item.multiple ? item.multiple : false"
+                :style="{
+                  width: item.width ? item.width + 'px' : '220px'
+                }"
+                :dictName="item.dictName"
+              >
+              </dict-selection>
+            </div>
           </div>
         </el-form-item>
       </el-form-item>
@@ -157,6 +169,18 @@
                         >
                         </el-date-picker>
                       </div>
+                      <div v-if="item.type == 'DictSelection'">
+                        <dict-selection
+                          v-model="defaultWhere[item.value]"
+                          :placeholder="item.placeholder || '请选择内容'"
+                          :multiple="item.multiple ? item.multiple : false"
+                          :style="{
+                            width: item.width ? item.width + 'px' : '220px'
+                          }"
+                          :dictName="item.dictName"
+                        >
+                        </dict-selection>
+                      </div>
                     </el-form-item>
                   </el-form-item>
                 </el-form>

src/views/rulesManagement/inspectionReportTemplate/certificateIndex.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <list :type="1"></list>
+    <list :templateType="1"></list>
   </div>
 </template>
 

src/views/rulesManagement/inspectionReportTemplate/components/list.vue

@@ -79,7 +79,7 @@
       </ele-pro-table>
     </el-card>
 
-    <edit ref="editRef" @reload="reload" :template="type"></edit>
+    <edit ref="editRef" @reload="reload" :templateType="templateType"></edit>
     <preview ref="previewRef" @reload="reload"></preview>
     <processSubmitDialog
       :processSubmitDialogFlag.sync="processSubmitDialogFlag"
@@ -105,7 +105,7 @@
     mixins: [dictMixins, tableColumnsMixin],
     components: { edit, preview, processSubmitDialog },
     props: {
-      type: {
+      templateType: {
         type: String,
         default: ''
       }
@@ -229,7 +229,7 @@
           ...order,
           pageNum: page,
           size: limit,
-          type: this.type
+          type: this.templateType
         };
         return getQmsReportTemplatePageList(body);
       },

src/views/rulesManagement/inspectionReportTemplate/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <list :type="0"></list>
+    <list :templateType="0"></list>
   </div>
 </template>
 

src/views/system/organization/components/org-user-search.vue

@@ -1,121 +1,69 @@
 <!-- 搜索表单 -->
 <template>
-  <el-form
-    size="small"
-    class="ele-form-search"
-    @keyup.enter.native="search"
-    @submit.native.prevent
-  >
-    <el-row :gutter="24">
-      <el-col v-bind="styleResponsive ? { md: 3 } : { span: 3 }">
-        <el-form-item>
-          <el-input
-            clearable
-            size="small"
-            v-model.trim="where.jobNumber"
-            placeholder="请输入工号"
-          />
-        </el-form-item>
-      </el-col>
-
-      <el-col v-bind="styleResponsive ? { md: 3 } : { span: 3 }">
-        <el-form-item>
-          <el-input
-            clearable
-            size="small"
-            v-model.trim="where.loginName"
-            placeholder="请输入用户账号"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { md: 3 } : { span: 3 }">
-        <el-form-item>
-          <el-input
-            clearable
-            size="small"
-            v-model.trim="where.name"
-            placeholder="请输入姓名"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { md: 3 } : { span: 3 }">
-        <el-form-item>
-          <el-input
-            clearable
-            size="small"
-            v-model.trim="where.phone"
-            placeholder="手机号"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
-        <DictSelection
-          dictName="岗位"
-          placeholder="请选择岗位"
-          clearable
-          filterable
-          v-model="where.postId"
-          multiple
-        >
-        </DictSelection>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
-        <el-form-item>
-          <el-button
-            size="small"
-            type="primary"
-            icon="el-icon-search"
-            class="ele-btn-icon"
-            @click="search"
-          >
-            查询
-          </el-button>
-          <el-button
-            size="small"
-            icon="el-icon-search"
-            class="ele-btn-icon"
-            @click="reset()"
-          >
-            重置
-          </el-button>
-          <slot></slot>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
+  <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
 </template>
 
 <script>
   export default {
     data() {
-      // 默认表单数据
-      const defaultWhere = {
-        jobNumber: '',
-        loginName: '',
-        name: '',
-        phone:'',
-        postId: []
-      };
-      return {
-        // 表单数据
-        where: { ...defaultWhere }
-      };
+      return { where: { jobNumber: '', loginName: '', name: '' } };
     },
     computed: {
-      // 是否开启响应式布局
-      styleResponsive() {
-        return this.$store.state.theme.styleResponsive;
+      seekList() {
+        return [
+          {
+            label: '工号:',
+            value: 'jobNumber',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '用户账号:',
+            value: 'loginName',
+            type: 'input',
+            placeholder: '请输入'
+          },
+
+          {
+            label: '姓名:',
+            value: 'name',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '手机号:',
+            value: 'phone',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '岗位:',
+            value: 'postId',
+            type: 'DictSelection',
+            dictName: '岗位',
+            placeholder: '请输入'
+          },
+          {
+            label: '状态:',
+            value: 'status',
+            type: 'select',
+            planList: [
+              { value: 1, label: '全职' },
+              { value: 2, label: '兼职' },
+              { value: 3, label: '实习' },
+              { value: 4, label: '正式' },
+              { value: 5, label: '试用' },
+              { value: 6, label: '离职' }
+            ],
+            placeholder: '请选择'
+          }
+        ];
       }
     },
     methods: {
-      /* 搜索 */
-      search() {
-        this.$emit('search', this.where);
-      },
-      /*  重置 */
-      reset() {
-        this.where = { ...this.defaultWhere };
-        this.search();
+      search(e) {
+        this.where = e;
+        this.$emit('search', { ...e });
       },
       geValue() {
         return this.where;