commit

src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue

@@ -18,7 +18,7 @@
                         size="mini"
                         class="common-button-primary"
                         v-if="addItemButton"
-                        @click="">
+                        @click="addItem2">
                     新增标准
                 </el-button>
                 <el-button
@@ -42,7 +42,7 @@
                         size="mini"
                         class="common-button-primary"
                         v-if="seeItemButton"
-                        @click="">
+                        @click="handlePreview(standId)">
                     查看标准
                 </el-button>
                 <el-button
@@ -67,7 +67,7 @@
                 <div class="standard-table-search">
                     <el-row :gutter="24">
                         <el-col :span="24">
-                            <el-form :model="addForm" inline class="label-input-form">
+                            <el-form :model="addForm" inline class="label-input-form" label-width="120px"  :rules="addFormRules" ref="addForm">
                                 <el-form-item label="上级节点" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="addForm.pName"
@@ -569,6 +569,90 @@
                         @click="addDrawerClose">取消</el-button>
             </div>
         </el-drawer>
+        <el-drawer
+                ref="standard2"
+                size="1000px"
+                title="添加标准"
+                v-if="addDrawer2"
+                :visible.sync="addDrawer2"
+                :before-close="addDrawerClose2">
+            <div class="demo-drawer-content">
+                <div style="margin: 10px;">
+                    <el-select v-model="itemType" placeholder="请选择" @change="selectChange" class="">
+                        <el-option
+                                label="国内法规标准"
+                                value="INLAND">
+                        </el-option>
+                        <el-option
+                                label="海外法规标准"
+                                value="FOREIGN">
+                        </el-option>
+                        <el-option
+                                label="企业标准"
+                                value="3">
+                        </el-option>
+                    </el-select>
+                </div>
+                <div class="drawerTable">
+                    <el-table
+                            :data="data1"
+                            style="width: 100%"
+                            border
+                            @selection-change="changeItem"
+                            height="100%"
+                    >
+                        <el-table-column
+                                type="selection"
+                                align="center"
+                                width="55">
+                        </el-table-column>
+                        <el-table-column
+                                label="标准号"
+                                width="180"
+                        >
+                            <template slot-scope="scope">
+                                <a v-if="itemType === '3'" class="table-jump" style="color: #333333" @click="handlePreview(scope.row.id)">
+                                    {{ scope.row.standCode }}
+                                </a>
+                                <a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333"
+                                   @click="handlePreview(scope.row.id)">{{ scope.row.standSortShow }} {{
+                                    scope.row.standNumber
+                                    }}-{{ scope.row.standYear }}</a>
+                                <a v-else @click="handlePreview(scope.row.id)" class="table-jump" style="color: #333333">
+                                    {{ scope.row.standSortShow }}
+                                    {{ scope.row.standNumber }}</a>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                                show-overflow-tooltip
+                                prop="standName"
+                                label="标准名称"
+                        >
+                            <template slot-scope="scope">
+                                <a @click="handlePreview(scope.row.id)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                    <pagination :page="page" :total="count" id="pagination"
+                                @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+                </div>
+            </div>
+            <div class="demo-drawer-footer">
+                <el-button
+                        size="mini"
+                        class="common-button-primary"
+                        icon="el-icon-check"
+                        type="primary"
+                        :loading="submitLoading"
+                        @click="ItemSubmit">提交
+                </el-button>
+                <el-button
+                        size="mini"
+                        class="common-button-default"
+                        icon="el-icon-close"
+                        @click="addDrawerClose2">取消</el-button>
+            </div>
+        </el-drawer>
         <el-dialog width='400px' :visible.sync="fileMadel" title="上传资料">
             <el-upload
                     v-if="fileMadel"
@@ -614,6 +698,15 @@
         name: "workingGroup1",
         data() {
             return {
+                standId:'',
+                ItemList: [],
+                itemType: 'INLAND',
+                page: 1,
+                pageSize: this.$store.getters.userInfo.configContent,
+                count: 0,
+                addDrawer2: false,
+                data1: [],
+
                 modalshowflag2: false,
                 nodeList2: [],
                 submitLoading: false,
@@ -637,6 +730,17 @@
                     wgStandorpolicyInfos: [], // 标准政策
                     wgPayInfos: [], // 支付信息
                 },
+                addFormRules: {
+                    number: [
+                        { required: true, message: '请输入编号', trigger: 'blur' },
+                    ],
+                    name: [
+                        { required: true, message: '请输入名称', trigger: 'blur' },
+                    ],
+                    standerArea: [
+                        { required: true, message: '请输入标准化工作领域', trigger: 'blur' },
+                    ]
+                },
                 delNetInfos: [], // 删除秘书处数据集合
                 delDepts: [], // 删除集团参与数据集合
                 delPayInfos: [], // 删除支付信息数据集合
@@ -665,6 +769,113 @@
             }
         },
         methods: {
+            ItemSubmit () {
+                if (this.ItemList.length > 0) {
+                    this.submitLoading = true
+                    let row = JSON.parse(JSON.stringify(this.row))
+                    let row1 = row
+                    row1.pid = row.id
+                    row1.id = ''
+                    row1.level = '4'
+                    row1.nature = '4'
+                    row1.wgStandorpolicyInfos = []
+                    this.ItemList.forEach(item => {
+                        row1.wgStandorpolicyInfos.push({
+                            standId: item.id
+                        })
+                    })
+                    this.$http.postData('wg_work_group/addStand', row1, {
+                        _this: this
+                    }, res => {
+                        if (res.ok) {
+                            this.submitLoading = false
+                            this.addDrawer2 = false
+                            if (res.ok) {
+                                this.headerNo = false
+                                this.$message.success('添加成功')
+                                this.destoryGraph()
+                                this.getData()
+                            } else {
+                                this.$message.warning('添加失败')
+                            }
+                        }
+                    })
+                } else {
+                    this.$message.warning('请选择要带入的标准')
+                }
+            }, // 提交标准事件
+            selectChange (val) {
+                this.itemType = val
+                this.getItemData()
+            }, // 切换数据来源事件
+            handlePreview (val) {
+                let Type = ''
+                let url = ''
+                if (this.itemType === 'INLAND') {
+                    Type = 'INLAND_STAND'
+                    url = 'OtherStandardDetails'
+                } else if (this.itemType === 'FOREIGN') {
+                    Type = 'FOREIGN_STAND'
+                    url = 'OtherStandardDetails'
+                } else if (this.itemType === '3'){
+                    url = 'OtherBussStandardDetails'
+                    Type = 'BUSINESS_STAND'
+                }
+                let routeUrl = this.$router.resolve({
+                    name: url,
+                    params: {
+                        id: val,
+                        pageType: Type
+                    }
+                })
+                window.open(routeUrl.href, '_blank')
+            }, // 标准跳转
+            pageChange (page) {
+                this.page = page
+                this.getItemData()
+            }, // 分页
+            pageSizeChange (pageSize) {
+                this.pageSize = pageSize
+                this.getItemData()
+            }, // 分页
+            changeItem (val) {
+                this.ItemList = val
+            }, // 标准选中change事件
+            getItemData () {
+                if (this.itemType === '3') {
+                    this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', {
+                        page: this.page,
+                        pageSize: this.pageSize
+                    }, {
+                        _this: this,
+                    }, res => {
+                        this.data1 = res.data.list
+                        this.count = res.data.count
+                    }, e => {
+                    })
+                } else {
+                    this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+                        standType: this.itemType,
+                        standNumber: '',
+                        page: this.page,
+                        pageSize: this.pageSize
+                    }, {
+                        _this: this
+                    }, res => {
+                        this.data1 = res.data.list;
+                        this.count = res.data.count;
+                    }, e => {
+                    });
+                }
+            }, // 获取标准数据
+            addItem2 () {
+                this.addDrawer2 = true
+                this.getItemData()
+            }, // 点击添加标准事件
+            addDrawerClose2 () {
+                this.addDrawer2 = false
+            }, // 关闭添加标准事件
+
             updateFile (item) {
                 window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
             },
@@ -982,14 +1193,15 @@
                 this.DrawerType = 'edit'
                 let row = this.row
                 if (row.level === '0') {
-                    this.addDrawerTitle = '编辑标委会'
                 } else if (row.level === '1') {
-                    this.addDrawerTitle = '编辑分标委'
+                    this.addDrawerTitle = '编辑标委会'
                 } else if (row.level === '2') {
-                    this.addDrawerTitle = '编辑工作组'
+                    this.addDrawerTitle = '编辑分标委'
                 } else if (row.level === '3') {
+                    this.addDrawerTitle = '编辑工作组'
+                } else if (row.level === '4') {
                     this.addDrawerTitle = '编辑标准'
-                } else if (row.level === '4') {}
+                }
                 this.getArr(row.wgDepts)
                 this.getArr(row.wgPayInfos)
                 this.getArr(row.wgMeetingInfos)
@@ -1027,7 +1239,7 @@
                     changeTime: row.changeTime,
                     mark: row.mark,
                     standerArea: row.standerArea,
-                    itemType: row.level === '0' ? '标委会' : (row.level === '1' ? '分标委' : (row.level === '2' ? '工作组' : '标准'))
+                    itemType: row.level === '1' ? '标委会' : (row.level === '2' ? '分标委' : (row.level === '3' ? '工作组' : '标准'))
                 }
                 this.addDrawer = true
             }, // 编辑
@@ -1035,14 +1247,15 @@
                 this.DrawerType = 'see'
                 let row = this.row2
                 if (row.level === '0') {
-                    this.addDrawerTitle = '查看标委会'
                 } else if (row.level === '1') {
-                    this.addDrawerTitle = '查看分标委'
+                    this.addDrawerTitle = '查看标委会'
                 } else if (row.level === '2') {
-                    this.addDrawerTitle = '查看工作组'
+                    this.addDrawerTitle = '查看分标委'
                 } else if (row.level === '3') {
+                    this.addDrawerTitle = '查看工作组'
+                } else if (row.level === '4') {
                     this.addDrawerTitle = '查看标准'
-                } else if (row.level === '4') {}
+                }
                 this.getArr(row.wgDepts)
                 this.getArr(row.wgPayInfos)
                 this.getArr(row.wgMeetingInfos)
@@ -1080,14 +1293,14 @@
                     changeTime: row.changeTime,
                     mark: row.mark,
                     standerArea: row.standerArea,
-                    itemType: row.level === '0' ? '标委会' : (row.level === '1' ? '分标委' : (row.level === '2' ? '工作组' : '标准'))
+                    itemType: row.level === '1' ? '标委会' : (row.level === '2' ? '分标委' : (row.level === '3' ? '工作组' : '标准'))
                 }
                 this.addDrawer = true
             }, // 查看
             delItem () {
-                if (this.row.children.length > 0) {
+                if (this.row.children) {
                     this.$message.warning('不可删除!')
-                } else {
+                } else  {
                     this.$confirm('您是否确认删除选中数据?', '提示', {
                         confirmButtonText: '确定',
                         cancelButtonText: '取消',
@@ -1096,7 +1309,7 @@
                         roundButton: true
                     }).then(() => {
                         let ids = []
-                        if (this.row.wgMeetingInfos.length > 0) {
+                        if (this.row.wgMeetingInfos) {
                             this.row.wgMeetingInfos.forEach(item => {
                                 ids.push(item.id)
                             })
@@ -1131,56 +1344,63 @@
                 }
             },
             addDrawerSubmit () {
-                this.submitLoading = true
+                this.$refs['addForm'].validate((valid) => {
-                if (this.DrawerType === 'add') {
+                    if (valid) {
-                    this.addForm.wgDepts.forEach(item => {
+                        this.submitLoading = true
-                        item.joinfile = JSON.stringify(item.joinfile)
+                        if (this.DrawerType === 'add') {
-                    })
+                            this.addForm.wgDepts.forEach(item => {
-                    this.addForm.wgPayInfos.forEach(item => {
+                                item.joinfile = JSON.stringify(item.joinfile)
-                        item.joinfile = JSON.stringify(item.joinfile)
+                            })
-                    })
+                            this.addForm.wgPayInfos.forEach(item => {
-                    this.addForm.wgMeetingInfos.forEach(item => {
+                                item.joinfile = JSON.stringify(item.joinfile)
-                        item.joinfile = JSON.stringify(item.joinfile)
+                            })
-                    })
+                            this.addForm.wgMeetingInfos.forEach(item => {
-                    this.$http.postData('wg_work_group/add', this.addForm, {
+                                item.joinfile = JSON.stringify(item.joinfile)
-                        _this: this
+                            })
-                    }, res => {
+                            this.$http.postData('wg_work_group/add', this.addForm, {
-                        this.submitLoading = false
+                                _this: this
-                        this.addDrawer = false
+                            }, res => {
-                        if (res.ok) {
+                                this.submitLoading = false
-                            this.headerNo = false
+                                this.addDrawer = false
-                            this.$message.success('添加成功')
+                                if (res.ok) {
-                            this.destoryGraph()
+                                    this.headerNo = false
-                            this.getData()
+                                    this.$message.success('添加成功')
-                        } else {
+                                    this.destoryGraph()
-                            this.$message.warning('添加失败')
+                                    this.getData()
+                                } else {
+                                    this.$message.warning('添加失败')
+                                }
+                            })
+                        } else if (this.DrawerType === 'edit') {
+                            this.addForm.wgDepts.forEach(item => {
+                                item.joinfile = JSON.stringify(item.joinfile)
+                            })
+                            this.addForm.wgPayInfos.forEach(item => {
+                                item.joinfile = JSON.stringify(item.joinfile)
+                            })
+                            this.addForm.wgMeetingInfos.forEach(item => {
+                                item.joinfile = JSON.stringify(item.joinfile)
+                            })
+                            this.$http.postData('wg_work_group/updateData', this.addForm, {
+                                _this: this
+                            }, res => {
+                                this.submitLoading = false
+                                this.addDrawer = false
+                                if (res.ok) {
+                                    this.headerNo = false
+                                    this.$message.success('修改成功')
+                                    this.destoryGraph()
+                                    this.getData()
+                                } else {
+                                    this.$message.warning('修改失败')
+                                }
+                            })
                         }
-                    })
+                    } else {
-                } else if (this.DrawerType === 'edit') {
+                        this.$message.warning('请完善提交信息')
-                    this.addForm.wgDepts.forEach(item => {
+                        return false;
-                        item.joinfile = JSON.stringify(item.joinfile)
+                    }
-                    })
+                })
-                    this.addForm.wgPayInfos.forEach(item => {
-                        item.joinfile = JSON.stringify(item.joinfile)
-                    })
-                    this.addForm.wgMeetingInfos.forEach(item => {
-                        item.joinfile = JSON.stringify(item.joinfile)
-                    })
-                    this.$http.postData('wg_work_group/updateData', this.addForm, {
-                        _this: this
-                    }, res => {
-                        this.submitLoading = false
-                        this.addDrawer = false
-                        if (res.ok) {
-                            this.headerNo = false
-                            this.$message.success('修改成功')
-                            this.destoryGraph()
-                            this.getData()
-                        } else {
-                            this.$message.warning('修改失败')
-                        }
-                    })
-                }
             }, // 新增提交
             addDrawerClose () {
                 this.addDrawer = false
@@ -1200,6 +1420,10 @@
                 this.headerNo = true
                 let row = node._cfg.model
                 this.addForm.pName = row.name
+                if (row.level === '4') {
+                    this.standId = row.wgStandorpolicyInfos[0].standId
+                    this.itemType = row.wgStandorpolicyInfos[0].dataType
+                }
                 this.row = JSON.parse(JSON.stringify(row))
                 this.row2 = JSON.parse(JSON.stringify(row))
                 if (row.level === '0') {
@@ -1484,6 +1708,15 @@
 
 <style lang="less" scoped>
     .workingGroup1{
+        #pagination {
+            bottom: 57px !important;
+        }
+        .drawerTable {
+            height: calc(~'100% - 126px');
+        }
+        /deep/.el-form-item__content {
+            width: calc(~'100% - 120px');
+        }
         height: 100%;
         /deep/.el-form-item__label {
             height: 100%;

src/pages/regulatoryRepository/workingGroup/index.vue

@@ -6,11 +6,11 @@
                 class="home-tabs"
         >
             <el-tab-pane name="workingGroup1">
-                <span slot="label"><i class="el-icon-s-order"></i> 工作组1</span>
+                <span slot="label"><i class="el-icon-s-order"></i> 标准法规工作组</span>
                 <workingGroup1 v-if="activeName === 'workingGroup1'"></workingGroup1>
             </el-tab-pane>
             <el-tab-pane name="workingGroup2">
-                <span slot="label"><i class="el-icon-s-promotion"></i> 工作组2</span>
+                <span slot="label"><i class="el-icon-s-promotion"></i> 政策工作组</span>
                 <workingGroup2 v-if="activeName === 'workingGroup2'"></workingGroup2>
             </el-tab-pane>
         </el-tabs>