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

# Conflicts:
#	src/components/navMenu/index.vue

src/pages/home1/components/navMenu/index.vue

@@ -3,15 +3,11 @@
     <div class="nav-menu">
         <div class="lattice">
             <div class="menu-wrap">
-                <enter-card  label="高级检索" path="/advancedSearch"></enter-card>
+                <enter-card v-for="(item, index) in list"
-                <enter-card  label="个人中心" path="/collection"></enter-card>
+                            :key="index"
-                <enter-card  label="统计图表" path="/"></enter-card>
+                            :label="item.label"
-                <enter-card  label="国内法规" path="/domesticStandardsAndRegulations"></enter-card>
+                            :path="item.path"
-                <enter-card  label="国外法规" path="/foreignStandardsAndRegulations"></enter-card>
+                            :class="list.length === 1 ? 'wx-card1' : (list.length == 2 ? 'wx-card2' :'')"></enter-card>
-                <enter-card  label="标准清单" path="/accessStandardsAndRegulations"></enter-card>
-                <enter-card  label="国内外政策" path="/"></enter-card>
-                <enter-card  label="企业标准" path="/"></enter-card>
-                <enter-card  label="标准预警" path="/standardWarning"></enter-card>
             </div>
         </div>
     </div>
@@ -25,12 +21,32 @@
         mixins: [],
         data() {
             return {
+                list: []
             }
         },
         computed: {},
         watch: {},
-        mounted() {},
+        mounted() {
+            this.getData()
+        },
         methods: {
+            getData (){
+                this.$http.get('/sarPersonalCenter/sar-user-personal-menu/getList',
+                    {
+                        userId: this.$store.getters.userInfo.userId
+                    }, {_this: this}, res => {
+                    if (res.ok) {
+                        res.data.records.forEach( item => {
+                            if (item.state == 1) {
+                                var json = {}
+                                json.label = item.menuName
+                                json.path = item.menuUrl
+                                this.list.push(json)
+                            }
+                        })
+                    }
+                    })
+            },
             toPage() {
                 this.$router.push(this.path)
             }
@@ -42,6 +58,7 @@
     .nav-menu {
         .lattice {
             .menu-wrap {
+                height: 324px;
                 display: flex;
                 flex-wrap: wrap;
                 justify-content:space-between;
@@ -55,6 +72,12 @@
                     width: 32%;
                     margin: 0 0 10px 0;
                 }
+                .wx-card1 {
+                    width: 100%;
+                }
+                .wx-card2 {
+                    width: 49%;
+                }
                 .menu-item {
                     flex: 1;
                     line-height: 88px;

src/pages/home1/components/todoList/index.vue

@@ -7,7 +7,7 @@
     </div>
     <ul>
       <li v-for="item in toDoTaskList" :key="item.id" class="time-title">
-        <a>{{ item.prcName }}</a>
+        <a @click="dealWith(item)">{{ item.prcName }}</a>
       </li>
     </ul>
   </div>
@@ -48,7 +48,125 @@ export default {
     },
     toPage() {
       this.$router.push(this.path)
-    }
+    },
+    dealWith (row) { // 办理
+      // this.setHandleInfo(JSON.stringify(row))
+      const prcType = row.prcType
+      switch(prcType) {
+        case '1':
+          if (row.taskInfo === '标准法规业务经理审批') {
+            this.$router.push({
+              name: 'bzrkStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if (row.taskInfo === '责任人会签'){
+            this.$router.push({
+              name: 'bzrkStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if (row.taskInfo === '申请人修订'){
+            this.$router.push({
+              name: 'bzrkStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+        case '2':
+          if (row.taskInfo === '责任对接人选择责任人') {
+            this.$router.push({
+              name: 'bzdyStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '责任人上传调研结果') {
+            this.$router.push({
+              name: 'bzdyStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break;
+          //标准清单更新/发布流程
+        case'4' :
+          if (row.taskInfo === '进行会签，填写意见') {
+            this.$router.push({
+              name: 'bzqdfbStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '根据会签意见修订') {
+            this.$router.push({
+              name: 'bzqdfbStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if (row.taskInfo === '业务经理审批') {
+            this.$router.push({
+              name: 'bzqdfbStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break;
+          //项目合规评估流程
+        case '5' :
+          if(row.taskInfo === ''){
+            this.$router.push({
+              name: '',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+
+      }
+    },
   },
 }
 </script>

src/pages/personal/pages/individual-plate/index.vue

@@ -50,11 +50,14 @@ export default {
   methods: {
     // 右侧列表元素变化时触发
     handleChange (newTargetKeys, direction, moveKeys) {
-        if (direction === 'left') {
+      if (newTargetKeys.length > 9) {
+        this.$message.warning('个人展示模块最多仅能展示9个')
+      }
+      if (direction === 'left') {
             this.oldData.forEach( item => {
                 moveKeys.forEach( items => {
                     if (items === item.id) {
-                        item.state = 1
+                        item.state = 0
                     }
                 })
             })
@@ -62,7 +65,7 @@ export default {
             this.oldData.forEach( item => {
                 moveKeys.forEach( items => {
                     if (items === item.id) {
-                        item.state = 0
+                        item.state = 1
                     }
                 })
             })
@@ -71,8 +74,8 @@ export default {
         this.numData = []
     },
     selectedChange (sourceSelectedKeys, targetSelectedKeys) {
-        this.numData = sourceSelectedKeys
+      this.numData = sourceSelectedKeys
-        this.sourceSelectedKeys = targetSelectedKeys
+      this.sourceSelectedKeys = targetSelectedKeys
     },
     savePersonal () {
       if (this.targetKeys.length === 0) {
@@ -81,6 +84,9 @@ export default {
           type: 'warning'
         })
         return
+      } else if (this.targetKeys.length > 9) {
+        this.$message.warning('个人展示模块最多仅能展示9个')
+        return
       }
       this.$http.postData('sarPersonalCenter/sar-user-personal-menu/update',
         {
@@ -107,7 +113,7 @@ export default {
           res.data.records.map((item) => {
             if (item.menuName === '首页') {
               this.selected.push(item)
-            } else if (item.state == 0) {
+            } else if (item.state == 1) {
               this.selected.push(item)
             }
           })

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -189,14 +189,14 @@
       <div class="standards-drawer-table standards-drawer-table-one" v-if="!showTableFlag">
         <el-table
           v-show="!isListType"
+          ref="searchTable"
+          @selection-change="sarAccessInfoSearchSelect"
           :data="sarAccessInfoSearchList"
           style="width: 100%"
           border
           height="300px"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-          @selection-change="sarAccessInfoSearchSelect"
-          ref="searchTable"
         >
           <el-table-column
             type="selection"
@@ -253,7 +253,7 @@
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           @selection-change="accessSarTypeSelect"
-          ref="searchTable"
+          ref="accessTypeSelect"
         >
           <el-table-column
             type="selection"
@@ -293,15 +293,6 @@
     <div class="list-entry">
       <el-divider content-position="left">清单条目</el-divider>
       <div class="action-bar">
-        <el-button
-          class="common-button-default"
-          size="small" @click="moveUp" v-if="!disabledFlag"
-        >上移</el-button>
-        <el-button
-          class="common-button-default"
-          size="small" @click="moveDown"
-          v-if="!disabledFlag"
-        >下移</el-button>
         <el-button
           class="common-button-default export-button"
           size="mini" @click="exportAccessInfo('apart')"
@@ -315,7 +306,7 @@
         ><i class="iconfont">&#xe61b;</i>删除</el-button>
       </div>
       <el-table
-               ref="entryTable"
+              ref="entryTable"
               :data="sarAccessInfoList"
               class="un-select"
               style="width: 100%"
@@ -366,6 +357,22 @@
           width="120px"
           label="文本状态">
         </el-table-column>
+        <el-table-column>
+          <template slot-scope="scope">
+            <el-button
+              class="common-button-default"
+              type="primary"
+              size="small" @click="moveUp(scope.$index, scope.row)"
+              v-if="!disabledFlag"
+            >上移</el-button>
+            <el-button
+              class="common-button-default"
+              type="danger"
+              size="small" @click="moveDown(scope.$index, scope.row)"
+              v-if="!disabledFlag"
+            >下移</el-button>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <div class="footer">
@@ -1011,73 +1018,45 @@ export default {
             })
             if(addList > -1){
               this.$message.warning('请勿添加重复数据')
-            } else(
+              this.$refs.accessTypeSelect.clearSelection()
+              this.$refs.entryTable.clearSelection()
+              this.$refs.searchTable.clearSelection()
+            } else{
               this.sarAccessInfoList.push(item)
-            )
+              this.$refs.accessTypeSelect.clearSelection()
+              this.$refs.entryTable.clearSelection()
+              this.$refs.searchTable.clearSelection()
+            }
           })
-          this.selectedAccInfoSearchList = []
-          this.$refs.entryTable.clearSelection()
-          this.$refs.searchTable.clearSelection()
         } else {
           this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
         }
     },
+
     // 上移 事件
-    moveUp () {
+    moveUp (index, row) {
-      // i   全部对象数组的下标
+      if (index === 0) {
-      // s   选中对象数组的下标
+        this.$message({
-        let sarAccessInfoListArry = JSON.parse(JSON.stringify(this.sarAccessInfoListArry))
+          message: '已经是列表中第一个素材！',
-        if (sarAccessInfoListArry.length === 1) {
+          type: 'warning'
-          //数组交换下标
+        })
-          console.log('s', sarAccessInfoListArry);
+      } else {
-          console.log('i',this.sarAccessInfoList);
+        let temp = this.sarAccessInfoList[index - 1]
-          for (var s in sarAccessInfoListArry) {
+        this.$set(this.sarAccessInfoList, index - 1, this.sarAccessInfoList[index])
-            for (var i in this.sarAccessInfoList) {
+        this.$set(this.sarAccessInfoList, index, temp)
-              if (sarAccessInfoListArry[s].resId === this.sarAccessInfoList[i].resId) {
+      }
-                if (Number(i) !== 0) {
-                  let tempOption = this.sarAccessInfoList[i - 1]
-                  this.$set(this.sarAccessInfoList, i - 1, this.sarAccessInfoList[i])
-                  this.$set(this.sarAccessInfoList, i, tempOption)
-                  // this.sarAccessInfoListArry = []
-                  return
-                } else {
-                  this.$message.error('数据已经是第一个,请选择其他数据上移!')
-                }
-              }
-            }
-          }
-        } else if (this.sarAccessInfoListArry.length === 0) {
-          this.$message.error('请选择需要移动的数据!')
-        } else {
-          this.$message.error('请选择单一数据进行移动!')
-        }
     },
-    // 下移事件
+    moveDown (index) {
-    moveDown () {
+      if (index === (this.sarAccessInfoList.length - 1)) {
-      // y   全部对象数组的下标
+        this.$message({
-      // t   选中对象数组的下标
+          message: '已经是列表中最后一个素材！',
-        if (this.sarAccessInfoListArry.length === 1) {
+          type: 'warning'
-          for (var t in this.sarAccessInfoListArry) {
+        })
-            for (var y in this.sarAccessInfoList) {
+      } else {
-              if (this.sarAccessInfoListArry[t].resId === this.sarAccessInfoList[y].resId) {
+        let i = this.sarAccessInfoList[index + 1]
-                var ass = this.sarAccessInfoList.length - 1
+        this.$set(this.sarAccessInfoList, index + 1, this.sarAccessInfoList[index])
-                if (Number(y) !== Number(ass)) {
+        this.$set(this.sarAccessInfoList, index, i)
-                  var s = parseInt(y) + 1
+      }
-                  var tempOption = this.sarAccessInfoList[parseInt(s)]
-                  this.$set(this.sarAccessInfoList, parseInt(s), this.sarAccessInfoList[parseInt(y)])
-                  this.$set(this.sarAccessInfoList, parseInt(y), tempOption)
-                  return
-                } else {
-                  this.$message.error('数据已经是最后一个,请选择其他数据进行移动!')
-                }
-              }
-            }
-          }
-        } else if (this.sarAccessInfoListArry.length === 0) {
-          this.$message.error('请选择需要移动的数据!')
-        } else {
-          this.$message.error('请选择单一数据进行移动!')
-        }
     },
     // 点击清单条目导入按钮事件
     importmodalFlags () {
@@ -1120,12 +1099,8 @@ export default {
         }
     },
     // 清单条目 table select事件
-    sarAccessInfoSelect (data) {
+    sarAccessInfoSelect (selectData) {
-      let sarAccessInfoListArry =  [];
+      this.sarAccessInfoListArry = selectData
-      for(let i = 0; i< data.length; i++){
-        this.sarAccessInfoListArry.push(data[i].id)
-      }
-      console.log(this.sarAccessInfoListArry);
     },
     // 点击取消按钮 返回事件
     backCancal () {
@@ -1207,12 +1182,9 @@ export default {
       return row.isRelateAccess === '1'
     },
     // 数据搜索 table select事件
-    sarAccessInfoSearchSelect (selectData) {
+    sarAccessInfoSearchSelect (val) {
-      this.selectedAccInfoSearchList = selectData
+      this.selectedAccInfoSearchList = val
-      this.selectSearch = []
+      console.log(val)
-      for(let i = 0; i <selectData.length; i++) {
-        this.selectSearch.push(selectData[i].id)
-      }
     },
     // 数据搜索 清单类型 table select事件
     accessSarTypeSelect (selectData) {

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -238,7 +238,7 @@
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           @selection-change="accessSarTypeSelect"
-          ref="searchTable"
+          ref="accessTypeSelect"
         >
           <el-table-column
             type="selection"
@@ -278,15 +278,6 @@
     <div class="list-entry">
       <el-divider content-position="left">清单条目</el-divider>
       <div class="action-bar">
-        <el-button
-          class="common-button-default"
-          size="small" @click="moveUp" v-if="!disabledFlag"
-        >上移</el-button>
-        <el-button
-          class="common-button-default"
-          size="small" @click="moveDown"
-          v-if="!disabledFlag"
-        >下移</el-button>
         <el-button
           class="common-button-default export-button"
           size="mini" @click="exportAccessInfo('apart')"
@@ -351,6 +342,22 @@
           width="120px"
           label="文本状态">
         </el-table-column>
+        <el-table-column>
+          <template slot-scope="scope">
+            <el-button
+              class="common-button-default"
+              type="primary"
+              size="small" @click="moveUp(scope.$index, scope.row)"
+              v-if="!disabledFlag"
+            >上移</el-button>
+            <el-button
+              class="common-button-default"
+              type="danger"
+              size="small" @click="moveDown(scope.$index, scope.row)"
+              v-if="!disabledFlag"
+            >下移</el-button>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <div class="footer">
@@ -996,9 +1003,15 @@ export default {
           })
           if(addList > -1){
             this.$message.warning('请勿添加重复数据')
-          } else(
+            this.$refs.accessTypeSelect.clearSelection()
+            this.$refs.entryTable.clearSelection()
+            this.$refs.searchTable.clearSelection()
+          } else{
             this.sarAccessInfoList.push(item)
-          )
+            this.$refs.accessTypeSelect.clearSelection()
+            this.$refs.entryTable.clearSelection()
+            this.$refs.searchTable.clearSelection()
+          }
         })
         this.selectedAccInfoSearchList = []
         this.$refs.entryTable.clearSelection()
@@ -1008,60 +1021,28 @@ export default {
       }
     },
     // 上移 事件
-    moveUp () {
+    moveUp (index, row) {
-      // i   全部对象数组的下标
+      if (index === 0) {
-      // s   选中对象数组的下标
+        this.$message({
-      let sarAccessInfoListArry = JSON.parse(JSON.stringify(this.sarAccessInfoListArry))
+          message: '已经是列表中第一个素材！',
-      if (sarAccessInfoListArry.length === 1) {
+          type: 'warning'
-        //数组交换下标
+        })
-        console.log('s', sarAccessInfoListArry);
-        console.log('i',this.sarAccessInfoList);
-        for (var s in sarAccessInfoListArry) {
-          for (var i in this.sarAccessInfoList) {
-            if (sarAccessInfoListArry[s].resId === this.sarAccessInfoList[i].resId) {
-              if (Number(i) !== 0) {
-                let tempOption = this.sarAccessInfoList[i - 1]
-                this.$set(this.sarAccessInfoList, i - 1, this.sarAccessInfoList[i])
-                this.$set(this.sarAccessInfoList, i, tempOption)
-                // this.sarAccessInfoListArry = []
-                return
-              } else {
-                this.$message.error('数据已经是第一个,请选择其他数据上移!')
-              }
-            }
-          }
-        }
-      } else if (this.sarAccessInfoListArry.length === 0) {
-        this.$message.error('请选择需要移动的数据!')
       } else {
-        this.$message.error('请选择单一数据进行移动!')
+        let temp = this.sarAccessInfoList[index - 1]
+        this.$set(this.sarAccessInfoList, index - 1, this.sarAccessInfoList[index])
+        this.$set(this.sarAccessInfoList, index, temp)
       }
     },
-    // 下移事件
+    moveDown (index) {
-    moveDown () {
+      if (index === (this.sarAccessInfoList.length - 1)) {
-      // y   全部对象数组的下标
+        this.$message({
-      // t   选中对象数组的下标
+          message: '已经是列表中最后一个素材！',
-      if (this.sarAccessInfoListArry.length === 1) {
+          type: 'warning'
-        for (var t in this.sarAccessInfoListArry) {
+        })
-          for (var y in this.sarAccessInfoList) {
-            if (this.sarAccessInfoListArry[t].resId === this.sarAccessInfoList[y].resId) {
-              var ass = this.sarAccessInfoList.length - 1
-              if (Number(y) !== Number(ass)) {
-                var s = parseInt(y) + 1
-                var tempOption = this.sarAccessInfoList[parseInt(s)]
-                this.$set(this.sarAccessInfoList, parseInt(s), this.sarAccessInfoList[parseInt(y)])
-                this.$set(this.sarAccessInfoList, parseInt(y), tempOption)
-                return
-              } else {
-                this.$message.error('数据已经是最后一个,请选择其他数据进行移动!')
-              }
-            }
-          }
-        }
-      } else if (this.sarAccessInfoListArry.length === 0) {
-        this.$message.error('请选择需要移动的数据!')
       } else {
-        this.$message.error('请选择单一数据进行移动!')
+        let i = this.sarAccessInfoList[index + 1]
+        this.$set(this.sarAccessInfoList, index + 1, this.sarAccessInfoList[index])
+        this.$set(this.sarAccessInfoList, index, i)
       }
     },
     // 点击清单条目导入按钮事件
@@ -1188,12 +1169,9 @@ export default {
       return row.isRelateAccess === '1'
     },
     // 数据搜索 table select事件
-    sarAccessInfoSearchSelect (selectData) {
+    sarAccessInfoSearchSelect (val) {
-      this.selectedAccInfoSearchList = selectData
+      this.selectedAccInfoSearchList = val
-      this.selectSearch = []
+      console.log(val)
-      for(let i = 0; i <selectData.length; i++) {
-        this.selectSearch.push(selectData[i].id)
-      }
     },
     // 数据搜索 清单类型 table select事件
     accessSarTypeSelect (selectData) {

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -6,7 +6,7 @@
         <el-form inline :model="localProTableSearch" class="label-input-form" @keyup.enter.native="getLocalProductTableBtn">
           <el-form-item label="项目编号" class="search-item">
             <el-input
-                    v-model="localProTableSearch.productName"
+                    v-model="localProTableSearch.projectNumber"
                     placeholder="根据项目编号查找"
                     :maxlength="100"
                     clearable
@@ -22,12 +22,12 @@
           </el-form-item>
           <el-form-item label="项目分类" class="search-item">
             <el-select
-              v-model="projectLibrarySearch.projectSort"
+              v-model="projectLibrarySearch.projectClassification"
               placeholder="请选择项目类别"
             >
               <el-option
                 v-for="opt in productTypeOptions"
-                :value="opt.value"
+                :value="opt.label"
                 :key="opt.value"
                 :label="opt.label"
               >{{ opt.label}}</el-option>
@@ -38,7 +38,7 @@
               <el-option
                 v-for="opr in xmztOptions"
                 :key="opr.value"
-                :value="opr.value"
+                :value="opr.label"
                 :label="opr.label"
               ></el-option>
             </el-select>
@@ -66,6 +66,21 @@
               v-btn-permission="'e5ca15122f554414e6365eb09efac5c4'"
               @click="selectMoreBtn"
             ><i class="iconfont">&#xe7a5;</i>高级查询</el-button>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
           </el-form-item>
         </el-form>
       </div>
@@ -144,9 +159,18 @@
                 align="center"
         >
         </el-table-column>
+        <el-table-column
+                show-overflow-tooltip
+                prop="productLine"
+                label="产品线"
+                min-width="120"
+                align="center"
+        >
+        </el-table-column>
         <el-table-column
                 prop="projectStartDate"
                 label="项目计划开始日期"
+                :formatter="dateFormat"
                 min-width="120"
                 width="160"
                 align="center"
@@ -156,6 +180,7 @@
         <el-table-column
                 prop="projectEndDate"
                 label="项目计划完成日期"
+                :formatter="dateFormat"
                 min-width="120"
                 width="160"
                 align="center"
@@ -201,14 +226,8 @@
               @pageSizeChange="pageSizeChange"></pagination>
       <loading :loading="loading">数据获取中</loading>
     </div>
-    <AdvancedQuery
-      :isAdvancedSearch.sync="isAdvancedSearch"
-      :twoOptions="twoOptions"
-      :threeOptions="threeOptions"
-      @twoSelectChange="twoSelectChange"
-      @getDomesticStandardTableBtn="getStandardTableBtn"
-    ></AdvancedQuery>
   </div>
+
 </template>
 <script>
 import DatePickerGroup from './components/DatePickerGroup'
@@ -216,6 +235,7 @@ import OrgTree from '@/components/CustomFormComponents/OrgTree'
 import eventHub from '@/common/eventHub'
 import ProjectRelatedPersonnel from '@/components/CustomFormComponents/ProjectRelatedPersonnel'
 import {dateFormat} from '@/common/date/index'
+import moment from 'moment'
 function checkFD (rules, value, callback) {
   this.value = value
   let arr = []
@@ -253,16 +273,21 @@ export default {
       //查询3类
       projectLibrarySearch: {
         projectName: '',
-        projectSort: '',
+        projectClassification: '',
+        projectStatus: '',
+      },
+      //查询3类
+      projectLibrarySearchDefault: {
+        projectName: '',
+        projectClassification: '',
         projectStatus: '',
-
       },
       // 查询条件
       localProTableSearch: {
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
-        prodectCode: '',
+        projectNumber:'',
         productSet: '',
         productName: '',
         productBrand: '',
@@ -273,7 +298,7 @@ export default {
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
-        prodectCode: '',
+        projectNumber:'',
         productSet: '',
         productName: '',
         productBrand: '',
@@ -679,11 +704,20 @@ export default {
      * @author zmf
      * @date 2021/3/8
      */
+    //时间格式化
+    dateFormat(row, column) {
+      var date = row[column.property];
+      if (date == undefined) {
+        return "";
+      }
+      return moment(date).format("YYYY-MM-DD");
+    },
     selectMoreBtn () {
       this.isAdvancedSearch = true
       this.threeOptions = []
     },
     twoSelectChange (val, obj) {
+      console.log('twoSelectChange')
       if (val === 'product_type') {
         this.threeOptions = this.productTypeOptions
       } else if (val === 'product_brand') {
@@ -700,13 +734,6 @@ export default {
         }]
       }
     },
-    // 高级检索搜索
-    getStandardTableBtn (advancedSearch) {
-      this.localProTableSearch = {...this.localProTableSearchDefault}
-      this.localProTableSearch.page = 1
-      this.localProTableSearch.advanceSearchVOStr = JSON.stringify(advancedSearch) || ''
-      this.getLocalProductTable()
-    },
     // 编辑项目相关人员回显选中人员数据
     relatePersonTreeShow () {
       let checkedArr = this.localProEO.relatePerson ? this.localProEO.relatePerson.split(',') : []
@@ -925,6 +952,7 @@ export default {
     // 清空条件查询
     clearAllSearch () {
       this.localProTableSearch = {...this.localProTableSearchDefault}
+      this.projectLibrarySearch = {...this.projectLibrarySearchDefault}
       this.localProTableSearch.page = 1
       this.getLocalProductTable()
     },
@@ -1029,7 +1057,6 @@ export default {
       this.$refs['addLocalProductForm'].validate((valid, fields) => {
         if (valid) {
           const formData = this.resolveTime(this.localProEO)
-          console.log(formData)
           if (formData.energyKind != null && (formData.energyKind instanceof Array)) {
             formData.energyKind = formData.energyKind.join(',') // 能源种类
           }
@@ -1129,13 +1156,14 @@ export default {
       this.localProTableSearch.dataType = this.insideTabsActiveName
       this.SarExportSearchEo = this.localProTableSearch
       this.$http.get('sarStandProjectLibrary/queryProject',{
-        projectName: this.projectLibrarySearch.projectName,
+        // projectName: this.projectLibrarySearch.projectName,
-        projectClassification: this.projectLibrarySearch.projectSort,
+        // projectClassification: this.projectLibrarySearch.projectSort,
-        projectStatus: this.projectLibrarySearch.projectStatus
+        // projectStatus: this.projectLibrarySearch.projectStatus
+        ...this.localProTableSearch,
+        ...this.projectLibrarySearch,
       },{
         _this: this, loading: 'loading'
       }, res => {
-        // console.log(res.data)
         if (this.localProTableSearch.prodectCode === 'Maintenance') {
           this.localProTableList = res.data.Maintenance.records
         }