Merge remote-tracking branch 'origin/V0.0.4' into V0.0.4

.env.development

@@ -10,7 +10,7 @@ ENV = 'development'
 #罗俊
 # VUE_APP_BASE_API = 'http://10.87.10.49:8080'
 #罗伟
-# VUE_APP_BASE_API = 'http://10.87.10.47:8080'
+# VUE_APP_BASE_API = 'http://10.87.23.62:8080'
 #高雄
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
 #景远超

src/views/check/index.vue

@@ -28,7 +28,7 @@
               v-show="showSearch"
             >
               <el-row>
-                <el-form-item label="行社名称" prop="orgId">
+                <el-form-item label="行社名称">
                   <org-tree
                     v-model="queryParams.orgId"
                     @defaultKey="getDefaultKey"

src/views/core/accessPlan/index.vue

@@ -11,7 +11,7 @@
         <div class="main-right-box">
           <div class="main-search-box">
             <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-              <el-form-item label="创建机构" prop="orgId">
+              <el-form-item label="创建机构">
                 <org-tree
                 v-model="queryParams.orgId" @defaultKey="getDefaultKey" @defaultOrg="getDefaultOrg" @checkChange="checkChange"
                 @click="clickTreeNode" :defaultCheckSub="false" hangsheTree

src/views/core/drill/drillDictionary/index.vue

@@ -20,7 +20,7 @@
             <el-input v-model="queryParams.id" placeholder="请输入编号" clearable
                       @keyup.enter.native="handleQuery"/>
           </el-form-item> -->
-              <el-form-item label="机构名称" prop="orgId">
+              <el-form-item label="机构名称">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultKey="getDefaultKey"

src/views/core/drill/plan/index.vue

@@ -17,7 +17,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="创建机构" prop="orgId">
+              <el-form-item label="创建机构">
                 <org-tree
                   v-model="queryParams.belongOrgId"
                   @defaultKey="getDefaultKey"

src/views/core/drill/task/index.vue

@@ -15,7 +15,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="演练机构" prop="orgId">
+              <el-form-item label="演练机构"">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultOrg="getDefaultOrg"
@@ -407,6 +407,7 @@ export default {
       this.handleQuery();
     },
     clearQueryForm() {
+      this.queryParams.title=null;
       this.queryParams.type = null;
       this.queryParams.status = null;
       this.queryParams.range = [];

src/views/core/edu/plan/index.vue

@@ -23,7 +23,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="行社名称" prop="orgId">
+              <el-form-item label="行社名称">
                 <org-tree
                   v-model="queryParams.belongOrgId"
                   @defaultKey="getDefaultKey"

src/views/core/edu/task/index.vue

@@ -15,7 +15,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="受训机构" prop="orgId">
+              <el-form-item label="受训机构">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultOrg="getDefaultOrg"

src/views/core/materials/index.vue

@@ -11,7 +11,7 @@
         <div class="main-right-box">
           <div class="main-search-box">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-          <el-form-item label="创建机构" prop="orgId">
+          <el-form-item label="创建机构">
             <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
                   @click="clickTreeNode" wholeTree></org-tree>
           </el-form-item>

src/views/core/message/index.vue

@@ -9,7 +9,7 @@
       <div class="main-right-box">
         <div class="main-search-box">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-        <el-form-item label="创建机构" prop="orgId">
+        <el-form-item label="创建机构">
           <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey"  @checkChange="checkChange"
                 @click="clickTreeNode"></org-tree>
         </el-form-item>

src/views/core/outIn/outInLog/index.vue

@@ -30,7 +30,7 @@
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item> -->
-              <el-form-item label="接待机构" prop="orgId">
+              <el-form-item label="接待机构">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultKey="getDefaultKey"

src/views/core/task/index.vue

@@ -21,7 +21,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="调阅机构" prop="orgId">
+              <el-form-item label="调阅机构">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultKey="getDefaultKey"

src/views/question/list/index.vue

@@ -21,7 +21,7 @@
               v-show="showSearch"
               label-width="80px"
             >
-              <el-form-item label="机构名称" prop="orgId">
+              <el-form-item label="机构名称">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultOrg="getDefaultOrg"

src/views/question/reform/index.vue

@@ -21,7 +21,7 @@
               v-show="showSearch"
               label-width="80px"
             >
-              <el-form-item label="机构名称" prop="orgId">
+              <el-form-item label="机构名称">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultOrg="getDefaultOrg"

src/views/registerBook/index.vue

@@ -17,7 +17,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="所属机构" prop="orgId">
+              <el-form-item label="所属机构">
                 <org-tree
                   v-model="queryParams.belongOrgId"
                   @defaultKey="getDefaultKey"

src/views/resumption/plan/index.vue

@@ -26,7 +26,7 @@
               label-width="90px"
             >
               <el-row>
-                <el-form-item label="行社名称" prop="orgId">
+                <el-form-item label="行社名称">
                   <org-tree
                     v-model="queryParams.orgId"
                     @defaultKey="getDefaultKey"
@@ -694,7 +694,6 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("search");
-      this.queryParams.orgId = undefined;
       // this.$refs.tree.setCurrentKey(null);
       this.getList();
     },

src/views/resumption/protection/index.vue

@@ -22,7 +22,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="所属机构" prop="orgId">
+              <el-form-item label="所属机构">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultOrg="getDefaultOrg"

src/views/resumption/rule/index.vue

@@ -24,7 +24,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="发布机构" prop="orgId">
+              <el-form-item label="发布机构">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultKey="getDefaultKey"

src/views/resumption/taskManager/index.vue

@@ -21,7 +21,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="履职机构" prop="orgId">                
+              <el-form-item label="履职机构">                
                   <org-tree
                     v-model="queryParams.orgId"
                     @defaultOrg="getDefaultOrg"

src/views/resumptionEvaluate/evaluate/index.vue

@@ -22,7 +22,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="创建机构" prop="orgId">
+              <el-form-item label="创建机构">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultKey="getDefaultKey"

src/views/resumptionEvaluate/evaluatePlan/index.vue

@@ -22,7 +22,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="评价机构" prop="orgId">
+              <el-form-item label="评价机构">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultKey="getDefaultKey"

src/views/safetycheck/rule/index.vue

@@ -23,7 +23,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="发布机构" prop="orgId">
+              <el-form-item label="发布机构">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultKey="getDefaultKey"

src/views/safetycheck/task/index.vue

@@ -21,7 +21,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="检查机构" prop="orgId">
+              <el-form-item label="检查机构">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultKey="getDefaultKey"

src/views/system/bind/index.vue

@@ -22,7 +22,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="机构名称" prop="orgId">
+              <el-form-item label="机构名称">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultKey="getDefaultKey"

src/views/system/workTimeSet/workTime.vue

@@ -22,7 +22,7 @@
               :inline="true"
               v-show="showSearch"
             >
-              <el-form-item label="机构名称" prop="orgId">
+              <el-form-item label="机构名称">
                 <org-tree
                   v-model="queryParams.orgId"
                   @defaultKey="getDefaultKey"

src/views/system/workTimeSet/workTimeWeek.vue

@@ -16,7 +16,7 @@
           <!--    搜索条件    -->
           <div class="main-search-box">
             <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-              <el-form-item label="机构名称" prop="orgId">
+              <el-form-item label="机构名称">
                 <org-tree
                 v-model="queryParams.orgId"
                 @defaultKey="getDefaultKey"