Merge branch 'develop' into FOTON

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -1336,7 +1336,7 @@
       </div>
     </el-drawer>
     <el-dialog
-              title="企标复审计划"
+              title="企标复审计划 -（已复审过的企标列表记录以及未来一个月内需要复审的企标信息列表以及复审结果）"
               :visible.sync="replaceLawsNumModel"
               width="875px"
               :close-on-click-modal="false"
@@ -2653,9 +2653,17 @@ export default {
       if (checkedData) {
         if (checkedData.length > 0) {
           this.sarBussionessStandEO.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
+          this.sarBussionessStandEO.menuId = checkedData.map(item => item.menuId).join(",")
+          this.sarBussionessStandEO.treeType = checkedData.map(item => item.treeType).join(",")
           this.sarBussionessSearch.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
         } else {
+          if (checkedData.parentId == null || checkedData.parentId === '') {
+            this.$message.error('请选择二级及以下目录')
+            return
+          }
           this.sarBussionessStandEO.TXLBBUSS = checkedData.menuName
+          this.sarBussionessStandEO.menuId = checkedData.id
+          this.sarBussionessStandEO.treeType = checkedData.treeType
           this.sarBussionessSearch.TXLBBUSS = checkedData.menuName
         }
       }
@@ -3172,10 +3180,31 @@ export default {
       this.configPage = 1
       this.selectConfigStand = []
     },
+    async saveConfStand(item) {
+      if(item.menuId && item.menuId !== ''){
+        let search = {}
+        let list = []
+        list.push(item.id)
+        search.menuId = item.menuId
+        search.menuName = item.TXLBBUSS
+        search.treeType = 'sarMs'
+        search.idlist = list
+        return new Promise((resolve, reject) => {
+          this.$http.postData('lawss/sarBussionessStand/saveStandardsMenu',  search, {
+            _this: this
+          }, res => {
+            const history = res;
+            this.getBussionStandTable(this.tableFlag)
+            resolve(history)
+          })
+        })
+      }
+    },
     // 提交配置搜索项
     saveConfigStand() {
       let search = {}
       search.menuId = this.selectSarMenu.id
+      search.menuName = this.selectSarMenu.menuName
       search.treeType = this.selectSarMenu.treeType
       if (this.selectConfigStand.length === 0) {
         this.$message({
@@ -3666,7 +3695,10 @@ export default {
                   loading: 'isSubmit'
                 }, res => {
                   if (res.ok) {
-                    this.getBussionStandTable(this.tableFlag)
+
+                    // 自动匹配 左侧树 指定菜单
+                    this.saveConfStand(nowstandinfo)
+
                     // this.pageChange(1)
                     this.resetForm()
                   }
@@ -3932,6 +3964,7 @@ export default {
             let search = {}
             // 取最外层目录id
             search.menuId = this.selectSarMenu.id
+            console.log(this.selectSarMenu)
             search.treeType = this.selectSarMenu.treeType
             // search.menuId = this.removeOneId
             search.idlist = []
@@ -4088,7 +4121,6 @@ export default {
       return data.menuName.indexOf(value) !== -1;
     },
     treeClick(treeNode) {
-      console.log(treeNode)
       this.selectSarMenu = treeNode // 记录当前选中的二级菜单
       this.sarBussionessSearch.menuId = treeNode.id
       this.sarBussionessSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询