Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -66,30 +66,10 @@
               v-btn-permission="'e5ca15122f554414e6365eb09efac5c4'"
               @click="selectMoreBtn"
             ><i class="iconfont">&#xe7a5;</i>高级查询</el-button>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
           </el-form-item>
         </el-form>
       </div>
-      <div class="right">
     </div>
-    </div>
-
-
-
 
     <div class="container">
       <div class="non-content">
@@ -212,7 +192,6 @@
                 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'633e82816590af9027dc2fddc562d046'">查看</el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'0b59eceb360b7bd7ae6f64835a8c4514'">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -225,6 +204,76 @@
               @pageChange="pageChange"
               @pageSizeChange="pageSizeChange"></pagination>
       <loading :loading="loading">数据获取中</loading>
+<!--      高级搜索-->
+      <table-tools-bar v-model="isAdvancedSearch" @search="getLocalProductTableBtn"
+                       @reset="clearAllSearch" >
+        <div slot="content">
+          <el-form :model="localProTableSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">
+            <!--            产品平台-->
+            <el-form-item label="产品平台"  class="serch-form-item">
+              <el-input v-model="localProTableSearch.projectPlatfor" placeholder="根据产品平台" clearable :maxlength="100"
+                        @keyup.enter.native="getLocalProductTableBtn"></el-input>
+            </el-form-item>
+            <!--            项目编号-->
+            <el-form-item label="项目编号" class="serch-form-item">
+              <el-input v-model="localProTableSearch.projectNumber" placeholder="根据项目编号" clearable :maxlength="500"
+                        @keyup.enter.native="getLocalProductTableBtn"></el-input>
+            </el-form-item>
+            <!--            项目名称-->
+            <el-form-item label="项目名称" class="serch-form-item">
+              <el-input v-model="projectLibrarySearch.projectName" placeholder="根据项目名称" clearable :maxlength="500"
+                        @keyup.enter.native="getLocalProductTableBtn"></el-input>
+            </el-form-item>
+            <!--            项目分类-->
+            <el-form-item label="项目分类"  class="serch-form-item">
+              <el-select v-model="projectLibrarySearch.projectClassification" placeholder="根据项目分类" clearable
+                         @keyup.enter.native="getLocalProductTableBtn">
+                <el-option v-for="opt in productTypeOptions" :value="opt.value === undefined ? '' :opt.label" :key="opt.label" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+            <!--            项目状态-->
+            <el-form-item label="项目状态"  class="serch-form-item">
+              <el-select v-model="projectLibrarySearch.projectStatus" placeholder="根据项目状态" clearable
+                         @keyup.enter.native="getLocalProductTableBtn">
+                <el-option v-for="opt in xmztOptions" :value="opt.value === undefined ? '' :opt.label" :key="opt.label" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+            <!--            项目群-->
+            <el-form-item label="项目群" class="serch-form-item">
+              <el-input v-model="localProTableSearch.projectGroup" placeholder="根据项目群" clearable :maxlength="500"
+                        @keyup.enter.native="getLocalProductTableBtn"></el-input>
+            </el-form-item>
+            <!--            产品线-->
+            <el-form-item label="产品线" class="serch-form-item">
+              <el-input v-model="localProTableSearch.productLine" placeholder="根据产品线" clearable :maxlength="500"
+                        @keyup.enter.native="getLocalProductTableBtn"></el-input>
+            </el-form-item>
+            <!--            项目开始时间-->
+            <el-form-item label="项目开始时间" class="serch-form-item">
+              <el-date-picker type="date" placeholder="选择日期" v-model="localProTableSearch.projectStartDate" style="width: 100%;"></el-date-picker>
+            </el-form-item>
+            <!--            项目完成时间-->
+            <el-form-item label="项目完成时间" class="serch-form-item">
+              <el-date-picker type="date" placeholder="选择日期" v-model="localProTableSearch.projectEndDate" style="width: 100%;"></el-date-picker>
+            </el-form-item>
+            <!--            当前节点-->
+            <el-form-item label="当前节点" class="serch-form-item">
+              <el-input v-model="localProTableSearch.currentNode" placeholder="根据当前节点" clearable :maxlength="500"
+                        @keyup.enter.native="getLocalProductTableBtn"></el-input>
+            </el-form-item>
+            <!--            项目级别-->
+            <el-form-item label="项目级别" class="serch-form-item">
+              <el-input v-model="localProTableSearch.projectLevel" placeholder="根据项目级别" clearable :maxlength="500"
+                        @keyup.enter.native="getLocalProductTableBtn"></el-input>
+            </el-form-item>
+            <!--            项目经理-->
+            <el-form-item label="项目经理" class="serch-form-item">
+              <el-input v-model="localProTableSearch.projectManager" placeholder="根据项目经理" clearable :maxlength="500"
+                        @keyup.enter.native="getLocalProductTableBtn"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+      </table-tools-bar>
     </div>
   </div>
 
@@ -272,14 +321,20 @@ export default {
       deptUser: [],
       //查询3类
       projectLibrarySearch: {
+        // 项目名称
         projectName: '',
+        // 项目分类
         projectClassification: '',
+        // 项目状态
         projectStatus: '',
       },
       //查询3类
       projectLibrarySearchDefault: {
+        // 项目名称
         projectName: '',
+        // 项目分类
         projectClassification: '',
+        // 项目状态
         projectStatus: '',
       },
       // 查询条件
@@ -287,22 +342,60 @@ export default {
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
+        // 项目编号
         projectNumber:'',
         productSet: '',
         productName: '',
         productBrand: '',
-        advanceSearchVOStr: ''
+        advanceSearchVOStr: '',
+        // 产品平台
+        projectPlatfor:'',
+        // 产品线
+        productLine:'',
+        //  项目名称
+        projectName: '',
+        //  项目群
+        projectGroup: '',
+        //  项目开始日期
+        projectStartDate: '',
+        //  项目完成日期
+        projectEndDate: '',
+        //  当前节点
+        currentNode: '',
+        //  项目级别
+        projectLevel: '',
+        //  项目经理
+        projectManager: '',
       },
       // 查询条件
       localProTableSearchDefault: {
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
+        // 项目编号
         projectNumber:'',
         productSet: '',
         productName: '',
         productBrand: '',
-        advanceSearchVOStr: ''
+        advanceSearchVOStr: '',
+        // 产品平台
+        projectPlatfor:'',
+        // 产品线
+        productLine:'',
+        //  项目名称
+        projectName: '',
+        //  项目群
+        projectGroup: '',
+        //  项目开始日期
+        projectStartDate: '',
+        //  项目完成日期
+        projectEndDate: '',
+        //  当前节点
+        currentNode: '',
+        //  项目级别
+        projectLevel: '',
+        //  项目经理
+        projectManager: '',
       },
       total: 0,
       // 列表数据
@@ -339,94 +432,6 @@ export default {
           value: '2'
         }
       ],
-      //9宫格列表
-      localProLib:{
-        //  产品平台
-        projectPlatfor: '',
-        //  项目编号
-        projectNumber: '',
-        //  项目名称
-        projectName: '',
-        //  项目分类
-        projectClassification: '',
-        //  项目状态
-        projectStatus: '',
-        //  项目群
-        projectGroup: '',
-        //  项目开始日期
-        projectStartDate: '',
-        //  项目完成日期
-        projectEndDate: '',
-        //  当前节点
-        currentNode: '',
-        //  项目级别
-        projectLevel: '',
-        //  项目经理
-        projectManager: '',
-      },
-      localProEO: {
-        // 项目相关人员
-        userEOList: [],
-        //  产品代码
-        produceCode: '',
-        //  项目阶段
-        productStage: '',
-        //  整车项目编号
-        zhengcarNo: '',
-        // 整车SOP时间
-        zhengcarSopTime: '',
-        // 项目编号
-        productNo: '',
-        // 项目类型
-        productTypeCode: '',
-        // 生产基地
-        producePlace: '',
-        // 基础车型
-        baseCartype: '',
-        // 左驾右驾
-        leftRight: '',
-        // 项目经理
-        productManager: '',
-        productManagerShow: '',
-        // 是否纳入开发
-        isDevelop: '',
-        energyKind: '',
-        // 平台
-        flatform: '',
-        // 项目名称
-        productName: '',
-        // 车型系列
-        productSet: '',
-        // 项目类别
-        productType: '',
-        // 项目状态
-        productBrand: '',
-        // SOP时间
-        sopTime: '',
-        // 阀点
-        pointTime: [],
-        // 计划通过时间
-        planPassTime: '',
-        // 实际通过时间
-        actualPassTime: '',
-        // 目标市场
-        targetMarket: '',
-        // 公告车型号
-        carModel: '',
-        // 项目相关人员id
-        relatePerson: '',
-        // eop信息
-        eopTime: '',
-        // 项目相关信息
-        saleMarket: '',
-        // 判断是国内还是海外
-        prodectCode: '',
-        // carModeFile: ''
-        // carModeFileList: ''
-        // 相关人员信息
-        relatePersonShow: ''
-        // 相关人员姓名
-      },
       // 项目类型
       protypeOptions: [],
       // 生产基地
@@ -716,31 +721,6 @@ export default {
       this.isAdvancedSearch = true
       this.threeOptions = []
     },
-    twoSelectChange (val, obj) {
-      console.log('twoSelectChange')
-      if (val === 'product_type') {
-        this.threeOptions = this.productTypeOptions
-      } else if (val === 'product_brand') {
-        this.threeOptions = this.xmztOptions
-      } else if (val === 'target_market') {
-        this.threeOptions = this.targetMarketOptions
-      } else if (val === 'left_right') {
-        this.threeOptions = [{
-          label: '左驾',
-          value: '1'
-        },{
-          label: '右驾',
-          value: '2'
-        }]
-      }
-    },
-    // 编辑项目相关人员回显选中人员数据
-    relatePersonTreeShow () {
-      let checkedArr = this.localProEO.relatePerson ? this.localProEO.relatePerson.split(',') : []
-      if (checkedArr.length > 0) {
-        this.$refs.relatePersonRoleTree.checkedNode(this.localProEO.relatePerson.split(','))
-      }
-    },
     // 获取标准类别List数据
     getAllInforList () {
       this.$http.get('sys/dictype/getDicTypeListCode', {}, {_this: this}, res => {
@@ -954,6 +934,7 @@ export default {
       this.localProTableSearch = {...this.localProTableSearchDefault}
       this.projectLibrarySearch = {...this.projectLibrarySearchDefault}
       this.localProTableSearch.page = 1
+      this.isAdvancedSearch=false
       this.getLocalProductTable()
     },
     resolveTime (data) {
@@ -1146,7 +1127,7 @@ export default {
     // 条件分页查询
     getLocalProductTableBtn () {
       this.projectLibrarySearch.page = 1
-
+      this.isAdvancedSearch=false
       this.getLocalProductTable()
     },
     // 查询本地产品
@@ -1551,6 +1532,8 @@ export default {
 </script>
 
 <style lang="less" scoped>
+@import '~@/assets/styles/mixins';
+@import '~@/assets/styles/style';
   .local-products-or-project-library {
     //position: relative;
     height: 100%;
@@ -1580,4 +1563,24 @@ export default {
   ::v-deep .el-drawer{
       outline: none!important;
   }
+.label-input-form {
+  &.table-lattice{
+    /deep/.el-form-item__label {
+      width:100px;
+      height:30px;
+      border: 1px solid #DCDFE6;
+      border-right: none;
+      line-height:30px;
+      text-align: center;
+      margin-top: 7px;
+      background: #F9F9F9;
+    }
+    /deep/.el-input__inner {
+      height: 30px;
+      line-height: 30px;
+      border-radius: 0 !important;
+      width: 200px;
+    }
+  }
+}
 </style>