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

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

@@ -284,6 +284,9 @@
                    size="mini" @click="selectBuss()" style="float: right;margin-top: 11px;"
                    v-btn-permission="'76742566e1cf930f384ef78cecb86f61'"><i class="iconfont">&#xe606;</i>企标复审计划
         </el-button>
+        <el-button class="common-button-default" v-btn-permission="'6d0daae8471f16d635bec1529801670a'"
+                   size="mini" @click="MobileStandard('2')"><i class="iconfont">&#xe611;</i>移动标准
+        </el-button>
       </div>
       <!--表格-->
       <div class="content">
@@ -489,6 +492,32 @@
                     @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
         <loading :loading="loading">数据获取中</loading>
       </div>
+      <!--   移动标准           -->
+      <el-drawer title="移动标准" :visible.sync="mobileModal" size="500px" @close="mobileeCancel">
+        <div class="demo-drawer-content">
+          <el-tree
+              ref="menuTree"
+              node-key="id"
+              class="tree-line"
+              icon-class="icon-tree"
+              :indent="0"
+              show-checkbox
+              :check-strictly="true"
+              @check-change="handleCheckChange"
+              :props="props"
+              :data="treeList1"
+              :default-expanded-keys="['1']"
+              highlight-current
+              :filter-node-method="filterNode">
+          </el-tree>
+        </div>
+        <div class="demo-drawer-footer">
+          <el-button size="mini" type="primary" class="common-button-primary" icon="el-icon-check"
+                     @click="mobileStandardBt">提交
+          </el-button>
+          <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="mobileeCancel">取消</el-button>
+        </div>
+      </el-drawer>
       <!-- 新增、编辑模态窗 -->
       <el-drawer :title="drawerTitle"
                  :visible.sync="modalshowflag"
@@ -1792,6 +1821,7 @@ export default {
       nodeKeyModel: 'model',
       defaultCheckedKeys: [],
       productModal: false, // 模态框是否打开
+      mobileModal: false, // 移动标准
       modalType: '',
       productTitle: '', // 模态框标题
       // 规范
@@ -1841,6 +1871,7 @@ export default {
       },
       filterText: '', // 企业标准库过滤
       treeList: [],
+      treeList1: [],
       standId: '',
       visibleOrgTable: false,
       visibleShare: false,
@@ -2971,6 +3002,19 @@ export default {
         })
       })
     },
+    // 查询二级菜单
+    selectMenuListNew1() {
+      return new Promise((resolve, reject) => {
+        this.$http.get('sarResource/ts-resource/getListStandLimitData',  {
+          sorDivide: 'BUSINESS_STAND',
+          userId: this.$store.getters.userInfo.userId
+        }, {
+          _this: this
+        }, res => {
+          this.treeList1 = res.data
+        })
+      })
+    },
     selectMenuList() {
       return new Promise((resolve, reject) => {
         this.$http.get('sarResource/ts-resource/getListStandLimitData',  {
@@ -3192,6 +3236,75 @@ export default {
         }
       })
     },
+    //节点选中状态发生变化时的回调，当选中另一个后，当前的的节点状态变化也会触发这个事件
+    handleCheckChange(item,checked,self){
+      if(checked){
+        console.log(item)
+        this.editCheckd = item.id
+        this.NewTreeType = item.treeType
+        this.$refs.menuTree.setCheckedKeys([item.id]);
+        // this.nodeClick(item)
+      }else{
+        if(this.editCheckd === item.id){
+          this.$refs.menuTree.setCheckedKeys([item.id]);
+        }
+
+      }
+    },
+    //移动标准
+    MobileStandard(){
+      let checkedObj = []
+      if(this.selectSarMenu.parentId == null || this.selectSarMenu.parentId === '' || this.selectSarMenu.parentId === undefined){
+        this.$message.error('请选择二级及以下目录')
+      }else if (this.selectedList < 1){
+        this.$message.error('请至少选择一条标准')
+      }else {
+        this.selectMenuListNew1()
+        this.mobileModal = true
+      }
+    },
+    // 取消
+    mobileeCancel() {
+      let checkedObj = []
+      this.$nextTick(() => {
+        this.$refs.menuTree.setCheckedKeys(checkedObj);
+      })
+      this.editCheckd = ''
+      this.mobileModal = false
+
+
+    },
+    // 移动标准提交
+    mobileStandardBt(){
+      let checkedObj = []
+      let search = {}
+      // 取最外层目录id
+      search.oldMenuId = this.selectSarMenu.id
+      search.menuId = this.editCheckd
+      search.treeType = this.selectSarMenu.treeType
+      // search.oldTreeType = this.selectSarMenu.treeType
+      // search.NewTreeType = this.NewTreeType
+      search.idlist = []
+      for (let i = 0; i < this.selectedList.length; i++) {
+        search.idlist.push(this.selectedList[i])
+      }
+      if(search.menuId == '' || search.menuId == null || search.menuId == undefined){
+        this.$message.error('请至少选择一个节点')
+      }else{
+        this.$http.putData('lawss/sarBussStandMenu/moveStandInfo', search, {
+          _this: this
+        }, res => {
+          // this.$Message.success('取消配置成功!')
+          this.$nextTick(() => {
+            this.$refs.menuTree.setCheckedKeys(checkedObj);
+          })
+          this.editCheckd = ''
+          this.mobileModal = false
+          this.getBussionStandTable()
+        }, e => {
+        })
+      }
+    },
     // 树点击
     isTreeOk(checkedList) {
       this.shareStandardSelect = []