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

src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue

@@ -9,63 +9,84 @@
     </div>
     <div class="search-area">
       <div class="left">
-        <el-form :modal="historySearch" :inline="true" class="label-input-form" >
+        <el-form :modal="sarSarAccessEOSearch" inline class="label-input-form">
           <el-form-item label="编号/名称" class="search-item">
-            <el-input v-model="historySearch.standId"
+            <el-input v-model="sarSarAccessEOSearch.lawNumOrName"
                       placeholder="请输入"
                       clearable
-                      @keyup.enter="getTableBtn"
+                      @change="lawNumOrNameKeyup"
+                      @keyup.enter.native="searchSarAccessBtn"
                       :maxlength="100"></el-input>
           </el-form-item>
-          <el-form-item label="项目名称" class="search-item">
+          <el-form-item label="产品类型" class="search-item">
-            <el-input v-model="historySearch.productName"
+            <el-input v-model="sarSarAccessEOSearch.productType"
+                      @keyup.enter.native="searchSarAccessBtn"
                       placeholder="请输入"
                       clearable
-                      @keyup.enter="getTableBtn"
                       :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item">
-            <el-input v-model="historySearch.responseUnit" v-show="false" />
+            <el-input v-model="sarSarAccessEOSearch.responseDept"
-            <el-popover
+                      @keyup.enter.native="searchSarAccessBtn"
-              placement="bottom"
+                      placeholder="请输入"
-              popper-class="user-dept-popper"
+                      clearable
-              trigger="click"
+                      :maxlength="100"></el-input>
-              :value="false"
+            <el-input v-model="sarSarAccessEOSearch.isClose"
-            >
+                      v-show="false"></el-input>
-              <el-input
-                slot="reference"
-                v-model="historySearch.responseUnitShow"
-                placeholder="根据责任部门查找"
-                readonly
-                clearable
-                id="searchResp"
-              />
-              <div class="api">
-                <laws-tree
-                  :zNodes="zNodesSItem"
-                  treeDivId="zNodesSItemSearch"
-                  deptSelect
-                  showRMenu
-                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
-                  class="ztree" style="width: 200px;height: 400px;overflow: auto">
-                </laws-tree>
-              </div>
-            </el-popover>
           </el-form-item>
+          <!--          <el-form-item label="产品类型" class="search-item">-->
+          <!--            <el-select filterable clearable v-model="sarSarAccessEOSearch.productType">-->
+          <!--              <el-option v-for="item1 in productNameList"-->
+          <!--                         :key="item1.value"-->
+          <!--                         :label="item1.label"-->
+          <!--                         :value="item1.value"></el-option>-->
+          <!--            </el-select>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="责任部门" class="search-item">-->
+          <!--            <el-input v-model="sarSarAccessEOSearch.responseDept" v-show="false" />-->
+          <!--            <el-popover-->
+          <!--              placement="bottom"-->
+          <!--              popper-class="user-dept-popper"-->
+          <!--              trigger="click"-->
+          <!--              :value="false"-->
+          <!--            >-->
+          <!--              <el-input-->
+          <!--                slot="reference"-->
+          <!--                v-model="sarSarAccessEOSearch.responseDeptShow"-->
+          <!--                placeholder="根据责任部门查找"-->
+          <!--                readonly-->
+          <!--                clearable-->
+          <!--                id="searchResp"-->
+          <!--              />-->
+          <!--              <div class="api">-->
+          <!--                <laws-tree-->
+          <!--                  :zNodes="zNodesSItem"-->
+          <!--                  treeDivId="zNodesSItemSearch"-->
+          <!--                  deptSelect-->
+          <!--                  showRMenu-->
+          <!--                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"-->
+          <!--                  class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
+          <!--                </laws-tree>-->
+          <!--              </div>-->
+          <!--            </el-popover>-->
+          <!--          </el-form-item>-->
           <el-form-item class="search-item btn-box">
             <el-button
-              type="primary"
+                type="primary"
-              size="mini"
+                class="common-button-primary"
-              class="common-button-primary"
+                size="mini"
-              @click="getTableBtn">
+                v-btn-permission="'aff4a409c3c3856986c535a5f4782b13'"
+                @click="searchSarAccessBtn('')">
               查询
             </el-button>
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
-              size="mini"
+                class="common-button-default"
-              class="common-button-default"
+                size="mini"
-              @click="clearAllSearch">清空</el-button>
+                v-btn-permission="'66fa37fc93e298b03d272fe17aeca6de'"
+                @click="clearAllSearch">清空
+            </el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -73,305 +94,135 @@
     <div class="content">
       <loading :loading="loading">数据获取中</loading>
       <el-table
-        :data="historyList"
+          :data="sarAccessListDatas"
-        tooltip-effect="dark"
+          tooltip-effect="dark"
-        style="width: 100%;"
+          style="width: 100%;"
-        height="100%"
+          height="100%"
-        border
+          border
-        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          @selection-change="standSelectChange"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-        @selection-change="handleRowChange"
-        ref="selection"
       >
         <el-table-column
-          type="selection"
+            type="selection"
-          width="55"
+            width="55"
-          fixed="left"
+            fixed="left"
-          align="center">
+            align="center">
         </el-table-column>
         <el-table-column
-          prop="standId"
+            prop="lawNumber"
-          width="180px"
+            fixed="left"
-          label="标准编号/政策编号">
+            width="180"
+            label="标准编号/政策编号">
           <template slot-scope="scope">
-            <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standId }}</a>
+            <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.lawNumber }}</a>
           </template>
         </el-table-column>
         <el-table-column
-          prop="standName"
+            prop="lawName"
-          width="180px"
+            fixed="left"
-          label="标准名称/政策名称">
+            width="180"
+            label="标准名称/政策名称">
           <template slot-scope="scope">
-            <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.lawName }}</a>
           </template>
         </el-table-column>
         <el-table-column
-          prop="itemsNum"
+            prop="productType"
-          label="产品类型">
+            width="180"
+            label="产品类型">
         </el-table-column>
         <el-table-column
-          prop="itemsName"
+            prop="implTime"
-          label="实施时间">
+            width="180"
+            sortable="custom"
+            label="实施时间">
         </el-table-column>
         <el-table-column
-          prop="productLine"
+            prop="implRequire"
-          label="实施要求">
+            width="180"
+            label="实施要求">
         </el-table-column>
         <el-table-column
-          prop="productName"
+            prop="conformSituation"
-          label="问题类型">
+            width="180"
+            label="资源符合情况">
         </el-table-column>
         <el-table-column
-          prop="responsibleUnit"
+            prop="devScheme"
-          width="110"
+            width="150"
-          label="资源符合情况">
+            label="开发计划">
         </el-table-column>
         <el-table-column
-          prop="dutyEngineer"
+            prop="responseDept"
-          width="150px"
+            width="150"
-          label="开发计划">
+            label="责任部门">
         </el-table-column>
         <el-table-column
-          prop="actualCloseTime"
+            prop="responsePeople"
-          width="150px"
+            width="150"
-          sortable
+            label="责任人">
-          label="要求关闭时间">
-          <template slot-scope="scope">{{(scope.row.actualCloseTime ? scope.row.actualCloseTime.substring(0, 11): '')}}</template>
         </el-table-column>
         <el-table-column
-          prop="authEngineer"
+            prop="sopTime"
-          width="150px"
+            width="150"
-          label="计划完成情况">
+            sortable="custom"
+            label="SOP时间">
+          <!--              <template slot-scope="scope">{{(scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11): '')}}</template>-->
         </el-table-column>
         <el-table-column
-          prop="qaEngineer"
+            prop="completeSituation"
-          width="320px"
+            width="150"
-          label="SOP时间超过法规时间的空档期的业务应对方案">
+            label="完成情况">
         </el-table-column>
         <el-table-column
-          prop="responsibleUnit"
+            prop="timeoutSituation"
-          label="责任部门">
+            width="150"
-        </el-table-column>
+            label="SOP时间超过法规时限的空档期的业务应对方案">
-        <el-table-column
-          prop="responsibleUnit"
-          width="100"
-          label="责任工程师">
-        </el-table-column>
-        <el-table-column
-          prop="responsibleUnit"
-          width="120"
-          label="时间完成情况">
-        </el-table-column>
-        <el-table-column
-          prop="actualCloseTime"
-          width="150px"
-          sortable
-          label="实际完成时间">
-          <template slot-scope="scope">{{(scope.row.actualCloseTime ? scope.row.actualCloseTime.substring(0, 11): '')}}</template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="50" fixed="right">
-          <template slot-scope="scope">
-            <div @click.stop style="display: inline-block">
-              <el-dropdown trigger="click" @command="handleCommand">
-                <i class="iconfont">&#xe61e;</i>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-            </div>
-          </template>
         </el-table-column>
+        <!--            <el-table-column label="操作" align="center" width="50" fixed="right">-->
+        <!--              <template slot-scope="scope">-->
+        <!--                <div @click.stop style="display: inline-block">-->
+        <!--                  <el-dropdown trigger="click" @command="">-->
+        <!--                    <i class="iconfont">&#xe61e;</i>-->
+        <!--                    <el-dropdown-menu slot="dropdown">-->
+        <!--                      <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'887ec926ad9a2b85395159db38885d96'">查看</el-dropdown-item>-->
+        <!--                    </el-dropdown-menu>-->
+        <!--                  </el-dropdown>-->
+        <!--                </div>-->
+        <!--              </template>-->
+        <!--            </el-table-column>-->
       </el-table>
     </div>
-    <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+    <pagination :page="sarSarAccessEOSearch.page" :total="sarAccessListTotal" @pageChange="pageChange"
-    <el-drawer
+                @pageSizeChange="pageSizeChange"></pagination>
-      title='查看'
-      :visible.sync="historySee"
-      destroy-on-close
-      :wrapperClosable="false"
-      class="seeHisToryDraw"
-      size="1000px"
-    >
-      <div class="demo-drawer-content">
-        <div class="el-drawer-form" style="height: auto">
-          <el-form
-            class="label-input-form"
-            label-width="150px"
-            ref="nonAddForm"
-            style="width: 100%;"
-            :model="historySeeForm"
-          >
-            <el-form-item class="add-form-item" label="标准编号:">
-              <div class="seeItem">{{historySeeForm.standId}}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="标准名称:">
-              <div class="seeItem">{{historySeeForm.standName}}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="条款号:">
-              <div class="seeItem">{{historySeeForm.itemsNum}}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="条款名称:">
-              <div class="seeItem">{{historySeeForm.itemsName}}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="产品线:">
-              <div class="seeItem">{{historySeeForm.productLine}}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="项目名称:">
-              <div class="seeItem">{{historySeeForm.productName}}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="责任部门:">
-              <div class="seeItem">{{historySeeForm.responsibleUnit}}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="责任工程师:">
-              <div class="seeItem">{{historySeeForm.dutyEngineer}}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="认证工程师:">
-              <div class="seeItem">{{historySeeForm.authEngineer}}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="质量工程师:">
-              <div class="seeItem">{{historySeeForm.qaEngineer}}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="要求关闭时间:">
-              <div class="seeItem">{{historySeeForm.actualCloseTime}}</div>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div class="typebox" v-if="historySeeForm.inconItemEOList != null && historySeeForm.inconItemEOList.length > 0">
-          <el-divider content-position="left">不符合项</el-divider>
-          <div class="typeitem" v-for="(item, index) in historySeeForm.inconItemEOList" :key="index">
-            <div class="typeitems">
-              <div class="itemsLeft">条款号:</div>
-              <div class="itemsRight">{{item.itemNum}}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">涉及项目:</div>
-              <div class="itemsRight">{{item.productNameShow}}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">目前状态:</div>
-              <!--              <div class="itemsRight" v-if="item.itemState == '2'">符合</div>-->
-              <div class="itemsRight">不符合</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">设计完成时间:</div>
-              <div class="itemsRight">{{(item.stepFirTime ? item.stepFirTime.substring(0, 10): '')}}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">佐证材料:</div>
-              <!--              <div class="itemsRight">{{item.supportFile}}</div>-->
-              <div class="itemsRight">
-                <p
-                  class="files-title"
-                  v-for="(file, fileIndex) in item.supportFileList"
-                  :key="fileIndex"
-                >
-                  <span>{{ file.oldFileName }}</span>
-                  <i title="下载" @click="downloadFile(file.id)" class="icon-download" />
-                </p>
-              </div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">备注信息:</div>
-              <div class="itemsRight">{{item.remark}}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">验证完成时间:</div>
-              <div class="itemsRight">{{(item.stepSecTime ? item.stepSecTime.substring(0, 10): '')}}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">佐证材料:</div>
-              <div class="itemsRight">
-                <p
-                  class="files-title"
-                  v-for="(file, fileIndex) in item.secSupportFileList"
-                  :key="fileIndex"
-                >
-                  <span>{{ file.oldFileName }}</span>
-                  <i title="下载" @click="downloadFile(file.id)" class="icon-download" />
-                </p>
-              </div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">备注信息:</div>
-              <div class="itemsRight">{{item.secRemark}}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">整改完成时间:</div>
-              <div class="itemsRight">{{(item.stepThiTime ? item.stepThiTime.substring(0, 10): '')}}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">佐证材料:</div>
-              <div class="itemsRight">
-                <p
-                  class="files-title"
-                  v-for="(file, fileIndex) in item.thrSupportFileList"
-                  :key="fileIndex"
-                >
-                  <span>{{ file.oldFileName }}</span>
-                  <i title="下载" @click="downloadFile(file.id)" class="icon-download" />
-                </p>
-              </div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">备注信息:</div>
-              <div class="itemsRight">{{item.thrRemark}}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">责任部门:</div>
-              <div class="itemsRight">{{item.responseUnitShow}}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">责任工程师:</div>
-              <div class="itemsRight">{{item.responseEnginShow}}</div>
-            </div>
-          </div>
-        </div>
-        <div class="typebox" v-if="historySeeForm.besureItemEOList != null && historySeeForm.besureItemEOList.length > 0">
-          <el-divider content-position="left">待验证项</el-divider>
-          <div class="typeitem" v-for="(item, index) in historySeeForm.besureItemEOList" :key="index">
-            <div class="typeitems">
-              <div class="itemsLeft">条款号:</div>
-              <div class="itemsRight">{{item.itemNum}}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">涉及项目:</div>
-              <div class="itemsRight">{{item.productNameShow}}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">责任部门:</div>
-              <div class="itemsRight">{{item.responseUnitShow}}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">责任工程师:</div>
-              <div class="itemsRight">{{item.responseEnginShow}}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">验证时间:</div>
-              <div class="itemsRight">{{(item.validTime ? item.validTime.substring(0, 11): '')}}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">验证结果:</div>
-              <div class="itemsRight">待验证</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </el-drawer>
   </div>
 </template>
 <script>
 export default {
   name: 'BusinessDetails',
   components: {},
-  data () {
+  data() {
     return {
-      loading: false,
+      sarAccessListTotal: 0,
-      // 搜索条件字段
+      sarAccessListDatas: [],
-      historySearch: {
+      // 查询相关参数
-        standId: '', // 标准号/名称
+      sarSarAccessEOSearch: {
-        productName: '', // 项目名称
+        isClose: '1',
-        responsibleUnit: '' // 责任部门
+        lawNumOrName: '', // 编号/名称
+        productType: '', // 产品类型
+        responseDept: '', // 责任部门
+        lawNumber: '',
+        lawName: '',
+        accessContent: '',
+        energyKind: '',
+        applyArctic: '',
+        region: '',
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0
       },
+      loading: false,
       zNodesSItem: [],
       // table列表数据
       historyList: [],
@@ -397,7 +248,39 @@ export default {
     }
   },
   methods: {
-    openFileInPdf (attId, oldFileName) {
+    lawNumOrNameKeyup() {
+      this.sarSarAccessEOSearch.lawName = this.sarSarAccessEOSearch.lawNumOrName
+      this.sarSarAccessEOSearch.lawNumber = this.sarSarAccessEOSearch.lawNumOrName
+    },
+    // 修改成表格样式后，选择项勾选改变
+    standSelectChange(data) {
+      this.selectedList = []
+      for (let i = 0; i < data.length; i++) {
+        this.selectedList.push(data[i].id)
+      }
+    },
+    // 搜索
+    searchSarAccessBtn() {
+      this.sarSarAccessEOSearch.page = 1
+      this.searchSarAccess()
+    },
+    //未整改项抽屉中的查询按钮
+    searchSarAccess() {//多条件和模糊查询
+      this.$http.get("sarStandUnqualified/businessDeptIssue", {
+        current: this.sarSarAccessEOSearch.page,
+        pageSize: this.$store.getters.userInfo.configContent,
+        ...this.sarSarAccessEOSearch,
+      }, {
+        _this: this
+      }, res => {
+        let arr = res.data.records;
+        this.sarAccessListDatas = arr
+        this.tableLoading = false
+        this.sarAccessListTotal = res.data.total
+      }, e => {
+      });
+    },
+    openFileInPdf(attId, oldFileName) {
       // 缺少文件
       if (this.$hasPermission('ZWBGBNTL11')) {
         this.$http.get('lawss/sarStandFile/queryConvertAtt', {
@@ -442,14 +325,14 @@ export default {
         this.$message.error('没有在线预览文档权限！')
       }
     },
-    downloadFile (attId) {
+    downloadFile(attId) {
       if (attId != null && attId !== '') {
         window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
       } else {
         this.$message.error('请选择要下载的文件')
       }
     },
-    downloadFileByWater (attId, fileSuffix) {
+    downloadFileByWater(attId, fileSuffix) {
       if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
@@ -460,46 +343,7 @@ export default {
         }
       }
     },
-    typeColor (row, type) {
+    detailsStandard(item) {
-      this.$confirm('确定修改此标准分级?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        var color = ''
-        if (type === 1) {
-          if (row.color === '#f00') {
-            color = '#ff0'
-          } else {
-            color = '#f00'
-          }
-        } else {
-          color = '#f00'
-        }
-        this.$http.postData('lawss/sarInconformInfo/updateInconformInfo',
-          {
-            id: row.id,
-            color: color
-          }, {
-            _this: this
-          }, res => {
-            if (res.ok) {
-              this.getTableBtn()
-            } else {
-              this.$message({
-                type: 'error',
-                message: '修改失败!'
-              })
-            }
-          })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消修改'
-        })
-      })
-    },
-    detailsStandard (item) {
       this.$http.post('lawss/sarTestItem/validateStandNumber', {
         standnumber: item.standNum
       }, {
@@ -517,141 +361,51 @@ export default {
       }, e => {
       })
     },
-    getOrgTreeSource () {
-      this.$http.get('sys/org/getTree', {}, {_this: this},
-        res => {
-          if (res.ok) {
-            let treeNode = []
-            res.data.map((item, index) => {
-              let treeItem = {}
-              for (let key in item) {
-                if (key === 'orgName') {
-                  treeItem.name = item[key]
-                } else {
-                  treeItem[key] = item[key]
-                }
-              }
-              treeNode[index] = treeItem
-            })
-            this.zNodesSItem = treeNode
-            // this.searchInlandNodes = treeNode
-          }
-        }, e => {})
-    },
-    // 更多
-    handleCommand (command) {
-      switch (command[1]) {
-        case '查看':
-          this.showUser(command[0])
-          break
-      }
-    },
-    // 查看方法
-    showUser (row) {
-      this.historySeeForm = JSON.parse(JSON.stringify(row))
-      this.historySee = true
-      this.$nextTick(() => {
-        const arr = []
-        let questionType = []
-        questionType = this.historySeeForm.quesType.split(',')
-        questionType.map((item) => {
-          this.optionList.map((opr) => {
-            if (item === opr.value) {
-              item = opr.label
-              arr.push(item)
-            }
-          })
-        })
-        this.historySeeForm.quesType = arr.toString()
-      })
-    },
     // 分页事件
-    pageChange (page) {
+    pageChange(page) {
-      this.pageNo = page
+      this.sarSarAccessEOSearch.page = page
-      this.getTableBtn()
+      this.searchSarAccess()
     },
-    pageSizeChange (pageSize) {
+    pageSizeChange(pageSize) {
-      this.pageSize = this.$store.getters.userInfo.configContent
+      this.sarSarAccessEOSearch.page = 1
-      this.getTableBtn()
+      this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent
+      this.searchSarAccess()
     },
-    back () {
+    back() {
       this.$router.push({
         name: 'NonConfomity'
       })
     },
-    // 未符合项table selected事件
+// 清空 查询条件
-    handleRowChange (selection) {
+    clearAllSearch(search = true) {
-      //
+      this.sarSarAccessEOSearch = {
-    },
+        lawNumOrName: '', // 编号/名称
-    // 分页查询未符合项数据
+        productType: '', // 产品类型
-    getTableBtn () {
+        responseDept: '', // 责任部门
-      this.$http.get('sarStandUnqualified/sar-stand-unqualified/history', {
+        lawNumber: '',
-        ...this.historySearch,
+        lawName: '',
-        current: this.pageNo,
+        accessContent: '',
-        size: this.pageSize,
+        energyKind: '',
-      },{
+        applyArctic: '',
-        _this: this
+        region: '',
-      }, res => {
+        page: 1,
-        console.log(res);
+        pageSize: this.$store.getters.userInfo.configContent,
-        this.historyList = res.data.records
+        validFlag: 0
-        this.total = res.data.total
-      }, e => {
-        console.log(e);
-      })
-    },
-    // getTableBtn () {
-    //   this.$http.get('sarStandUnqualified/sar-stand-unqualified/history', {
-    //     ...this.historySearch,
-    //     current: this.pageNo,
-    //     size: this.pageSize,
-    //   }, {
-    //     _this: this,
-    //     loading: 'loading'
-    //   }, res => {
-    //     console.log(res);
-    //     if (res.ok) {
-    //       this.historyList = res.data.records
-    //       this.total = res.data.count
-    //     } else {}
-    //   }, e => {
-    //   })
-    // },
-    treeClickSearch (treeId, treeNode) {
-      this.historySearch.responseUnit = treeNode.id
-      this.historySearch.responseUnitShow = treeNode.name
-    },
-    // 点击清空按钮事件
-    clearAllSearch () {
-      this.historySearch = {
-        standNumOrName: '',
-        quesType: '',
-        productName: '',
-        responseUnit: ''
       }
-      this.getTableBtn()
+      this.searchSarAccessBtn()
+      console.log(this.sarSarAccessEOSearch)
     },
-    /**
-     * @Description: 跳转流程
-     */
-    processCenterClick (item) {
-      let routeUrl = this.$router.resolve({
-        name: 'ProcessDetail',
-        query: {
-          prcNum: item
-        }
-      })
-      window.open(routeUrl.href, '_blank')
-    }
   },
-  mounted () {
+  mounted() {
-    this.getTableBtn()
+      // 分页查询数据
-    this.getOrgTreeSource()
+      this.searchSarAccess()
   }
 }
 </script>
 <style lang="less" scoped>
-.historical-data{
+.historical-data {
   height: 100%;
+
   .laws-details-header {
     background: #fff;
     // height: 30px;
@@ -662,6 +416,7 @@ export default {
       display: inline-block;
       margin-right: 10px;
     }
+
     .title {
       display: inline-block;
       font-weight: bold;
@@ -671,13 +426,16 @@ export default {
       text-align: center;
     }
   }
-  .content{
+
+  .content {
     height: calc(~'100% - 56px - 107px');
-    .iconClass{
+
+    .iconClass {
       width: 18px;
       height: 18px;
     }
   }
+
   .typebox {
     .typeitem {
       border: 1px solid #f4f4f4;
@@ -685,32 +443,39 @@ export default {
       margin: 10px 0;
       display: flex;
       flex-wrap: wrap;
+
       .typeitems {
         margin-bottom: 10px;
         display: flex;
         line-height: 30px;
         width: 100%;
+
         .itemsLeft {
           min-width: 140px;
           margin-right: 10px;
           text-align: right;
         }
+
         .itemsRight {
           /*width: 150px;*/
           flex-wrap: wrap;
           display: flex;
-          .files-title{
+
+          .files-title {
             margin-right: 10px;
           }
-          a{
+
+          a {
             cursor: pointer;
             color: #409EFF;
           }
-          a:hover{
+
+          a:hover {
             text-decoration: underline;
             color: #409EFF;
           }
-          i{
+
+          i {
             display: inline-block;
             margin-left: 3px;
             width: 18px;
@@ -721,23 +486,27 @@ export default {
             vertical-align: sub;
             cursor: pointer;
           }
-          .icon-download{
+
+          .icon-download {
             background-image: url("~assets/images/shangqi/img/download.png");
           }
-          .icon-download2{
+
+          .icon-download2 {
             background-image: url("~assets/images/shangqi/img/download2.png");
           }
         }
       }
     }
   }
-  .seeHisToryDraw{
+
-    /deep/.el-form-item__content{
+  .seeHisToryDraw {
+    /deep/ .el-form-item__content {
       line-height: 50px;
     }
   }
 }
-.add-form-item{
+
+.add-form-item {
   width: 100%;
 }
 </style>

src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue

@@ -25,6 +25,8 @@
                       placeholder="请输入"
                       clearable
                       :maxlength="100"></el-input>
+            <el-input v-model="sarSarAccessEOSearch.isClose"
+                      v-show="false"></el-input>
           </el-form-item>
           <!--          <el-form-item label="产品类型" class="search-item">-->
           <!--            <el-select filterable clearable v-model="sarSarAccessEOSearch.productType">-->
@@ -120,6 +122,7 @@
               style="width: 100%;"
               height="100%"
               border
+              @selection-change="standSelectChange"
               :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           >
@@ -228,10 +231,12 @@ export default {
   name: "businessDivision",
   data() {
     return {
+      selectedList: [], //标准选中的数据
       sarAccessListTotal: 0,
       sarAccessListDatas: [],
       // 查询相关参数
       sarSarAccessEOSearch: {
+        isClose:'0',
         lawNumOrName: '', // 编号/名称
         productType: '', // 产品类型
         responseDept: '', // 责任部门
@@ -262,9 +267,40 @@ export default {
       this.sarSarAccessEOSearch.lawName = this.sarSarAccessEOSearch.lawNumOrName
       this.sarSarAccessEOSearch.lawNumber = this.sarSarAccessEOSearch.lawNumOrName
     },
+    // 修改成表格样式后，选择项勾选改变
+    standSelectChange (data) {
+      this.selectedList = []
+      for (let i = 0; i < data.length; i++) {
+        this.selectedList.push(data[i].id)
+      }
+    },
     //点击批量关闭按钮事件
     userCloAll() {
-      console.log('至少选择一条数据');
+      if (this.selectedList.length === 0){
+        this.$message.warning('请选择一条数据进行关闭')
+      }else{
+        this.$confirm('确认关闭这些数据?', '提示', {
+          confirmButtonText: '确定',
+          confirmButtonClass:  'common-button-primary',
+          cancelButtonTxe: '取消',
+          type: 'warning',
+          roundButton: false,
+        }).then(() => {
+          this.$http.post('sarStandUnqualified/businessDeptIssue/closeIssue',{
+            ids:  this.selectedList
+          },{
+            _this: this
+          }, res => {
+            if (res.ok) {
+              this.searchSarAccessBtn()
+              this.selectedList = []
+              this.$message.success('关闭成功')
+            }
+          })
+        }).catch(() => {
+
+        })
+      }
     },
     //点击历史数据按钮事件
     historyClick() {

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

@@ -26,7 +26,7 @@
                         size="mini"
                         class="common-button-primary"
                         v-if="editButton"
-                        @click="">
+                        @click="editItem">
                     编辑
                 </el-button>
                 <el-button
@@ -34,7 +34,7 @@
                         size="mini"
                         class="common-button-primary"
                         v-if="seeButton"
-                        @click="">
+                        @click="seeItem">
                     查看
                 </el-button>
                 <el-button
@@ -50,7 +50,7 @@
                         size="mini"
                         class="common-button-default"
                         v-if="delectButton"
-                        @click="">
+                        @click="delItem">
                     删除
                 </el-button>
             </div>
@@ -62,7 +62,7 @@
                 :title="addDrawerTitle"
                 :visible.sync="addDrawer"
                 :before-close="addDrawerClose">
-            <div class="demo-drawer-content">
+            <div class="demo-drawer-content" v-if="addDrawer">
                 <div class="content">
                 <div class="standard-table-search">
                     <el-row :gutter="24">
@@ -80,40 +80,46 @@
                                             disabled
                                             :maxlength="100"/>
                                 </el-form-item>
-                                <el-form-item label="编号" style="width: 100%; margin-right:10px" prop="number" class="add-form-item">
+                                <el-form-item label="编号" style="width: 100%; margin-right:10px" prop="number" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                     <el-input
                                             v-model="addForm.number"
                                             placeholder="请输入编号"
+                                            :disabled="DrawerType === 'see'"
                                             :maxlength="100"/>
                                 </el-form-item>
-                                <el-form-item label="名称" style="width: 100%; margin-right:10px" prop="name" class="add-form-item">
+                                <el-form-item label="名称" style="width: 100%; margin-right:10px" prop="name" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                     <el-input
                                             v-model="addForm.name"
+                                            :disabled="DrawerType === 'see'"
                                             placeholder="请输入名称"
                                             :maxlength="100"/>
                                 </el-form-item>
-                                <el-form-item label="换届时间" style="width: 100%; margin-right:10px" prop="hjTime" class="add-form-item">
+                                <el-form-item label="换届时间" style="width: 100%; margin-right:10px" prop="changeTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                     <el-date-picker
-                                            v-model="addForm.hjTime"
+                                            v-model="addForm.changeTime"
+                                            :disabled="DrawerType === 'see'"
+                                            value-format="yyyy-MM-dd HH:mm:ss"
                                             type="date"
                                             placeholder="请选择换届时间">
                                     </el-date-picker>
                                 </el-form-item>
-                                <el-form-item label="标准化工作领域" style="width: 100%; margin-right:10px" prop="field" class="add-form-item">
+                                <el-form-item label="标准化工作领域" style="width: 100%; margin-right:10px" prop="standerArea" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                     <el-input
-                                            v-model="addForm.field"
+                                            v-model="addForm.standerArea"
+                                            :disabled="DrawerType === 'see'"
                                             placeholder="请输入标准化工作领域"
                                             :maxlength="100"/>
                                 </el-form-item>
-                                <el-form-item label="备注" style="width: 100%; margin-right:10px" prop="mark" class="add-form-item">
+                                <el-form-item label="备注" style="width: 100%; margin-right:10px" prop="mark" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                     <el-input
                                             v-model="addForm.mark"
+                                            :disabled="DrawerType === 'see'"
                                             placeholder="请输入备注"
                                             :maxlength="100"/>
                                 </el-form-item>
                                 <div class="formTitle">
                                     <div class="left">秘书处联系方式</div>
-                                    <div class="right">
+                                    <div class="right" v-if="DrawerType !== 'see'">
                                         <el-button
                                                 type="primary"
                                                 size="mini"
@@ -141,7 +147,7 @@
                                             type="selection"
                                             align="center"
                                             width="55"
-                                            v-if="addForm.wgNetInfos.length">
+                                            v-if="addForm.wgNetInfos.length && DrawerType !== 'see'">
                                     </el-table-column>
                                     <el-table-column
                                             label="联络人"
@@ -150,7 +156,7 @@
                                             width="150">
                                         <template slot-scope="scope">
                                             <el-input v-model="scope.row.netId" style="display: none;"></el-input>
-                                            <el-input style="margin: 10px 0;" @click.native="checkRole('选择联络人', scope.$index, scope.row.netId)" v-model="scope.row.name"></el-input>
+                                            <el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" @click.native="checkRole('选择联络人', scope.$index, scope.row.netId)" v-model="scope.row.name"></el-input>
                                         </template>
                                     </el-table-column>
                                     <el-table-column
@@ -182,7 +188,7 @@
                                 </el-table>
                                 <div class="formTitle">
                                     <div class="left">集团参与情况</div>
-                                    <div class="right">
+                                    <div class="right" v-if="DrawerType !== 'see'">
                                         <el-button
                                                 type="primary"
                                                 size="mini"
@@ -194,7 +200,7 @@
                                                 type="danger"
                                                 size="mini"
                                                 class="common-button-primary"
-                                                v-if="addForm.wgNetInfos.length"
+                                                v-if="addForm.wgDepts.length"
                                                 @click="delCyItem">
                                             删除
                                         </el-button>
@@ -210,7 +216,7 @@
                                             type="selection"
                                             align="center"
                                             width="55"
-                                            v-if="addForm.wgDepts.length">
+                                            v-if="addForm.wgDepts.length && DrawerType !== 'see'">
                                     </el-table-column>
                                     <el-table-column
                                             label="我司在工作组排名顺序"
@@ -218,7 +224,7 @@
                                             align="center"
                                             width="150">
                                         <template slot-scope="scope">
-                                            <el-input style="margin: 10px 0;" v-model="scope.row.deptOrder"></el-input>
+                                            <el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.deptOrder"></el-input>
                                         </template>
                                     </el-table-column>
                                     <el-table-column
@@ -228,7 +234,8 @@
                                             width="150">
                                         <template slot-scope="scope">
                                             <el-input v-model="scope.row.deptPeopleId" style="display: none;"></el-input>
-                                            <el-input style="margin: 10px 0;" @click.native="checkRole('选择我司人员', scope.$index, scope.row.deptPeopleId)" v-model="scope.row.name"></el-input>
+                                            <el-input v-if="DrawerType === 'see'" :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.name"></el-input>
+                                            <el-input v-else style="margin: 10px 0;" @click.native="checkRole('选择我司人员', scope.$index, scope.row.deptPeopleId)" v-model="scope.row.name"></el-input>
                                         </template>
                                     </el-table-column>
                                     <el-table-column
@@ -273,7 +280,7 @@
                                             align="center"
                                             width="200">
                                         <template slot-scope="scope">
-                                            <el-input style="margin: 10px 0;" v-model="scope.row.identity"></el-input>
+                                            <el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.identity"></el-input>
                                         </template>
                                     </el-table-column>
                                     <el-table-column
@@ -282,7 +289,15 @@
                                             width="250"
                                             align="center">
                                         <template slot-scope="scope">
-                                            <div v-if="scope.row.joinfile.length > 0" class="fileClass">
+                                            <div v-if="DrawerType === 'see'" class="fileClass">
+                                                <div v-if="scope.row.joinfile.length > 0" v-for="(item, index) in scope.row.joinfile" :key="index" @click="updateFile(scope.row)" style="margin-right: 5px;">
+                                                    {{ item.name }}
+                                                </div>
+                                                <div v-else>
+                                                    - -
+                                                </div>
+                                            </div>
+                                            <div v-else-if="scope.row.joinfile.length > 0" class="fileClass">
                                                 <div v-for="(item, index) in scope.row.joinfile" :key="index" @click="fileUpload('集团参与情况', scope.$index)" style="margin-right: 5px;">
                                                     {{ item.name }}
                                                 </div>
@@ -301,7 +316,7 @@
                                 </el-table>
                                 <div class="formTitle">
                                     <div class="left">支付信息</div>
-                                    <div class="right">
+                                    <div class="right" v-if="DrawerType !== 'see'">
                                         <el-button
                                                 type="primary"
                                                 size="mini"
@@ -329,7 +344,7 @@
                                             type="selection"
                                             align="center"
                                             width="55"
-                                            v-if="addForm.wgPayInfos.length">
+                                            v-if="addForm.wgPayInfos.length && DrawerType !== 'see'">
                                     </el-table-column>
                                     <el-table-column
                                             label="费用"
@@ -337,7 +352,7 @@
                                             align="center"
                                             width="150">
                                         <template slot-scope="scope">
-                                            <el-input style="margin: 10px 0;" v-model="scope.row.price"></el-input>
+                                            <el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.price"></el-input>
                                         </template>
                                     </el-table-column>
                                     <el-table-column
@@ -347,6 +362,7 @@
                                             width="250">
                                         <template slot-scope="scope">
                                             <el-date-picker
+                                                    :disabled="DrawerType === 'see'"
                                                     v-model="scope.row.year"
                                                     value-format="yyyy"
                                                     type="year"
@@ -360,7 +376,7 @@
                                             width="150"
                                             align="center">
                                         <template slot-scope="scope">
-                                            <el-input style="margin: 10px 0;" v-model="scope.row.status"></el-input>
+                                            <el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.status"></el-input>
                                         </template>
                                     </el-table-column>
                                     <el-table-column
@@ -369,7 +385,7 @@
                                             prop="inplan"
                                             align="center">
                                         <template slot-scope="scope">
-                                            <el-select v-model="scope.row.inplan" placeholder="请选择">
+                                            <el-select :disabled="DrawerType === 'see'" v-model="scope.row.inplan" placeholder="请选择">
                                                 <el-option label="计划内" value="0"></el-option>
                                                 <el-option label="计划外" value="1"></el-option>
                                             </el-select>
@@ -381,7 +397,7 @@
                                             align="center"
                                             width="150">
                                         <template slot-scope="scope">
-                                            <el-input style="margin: 10px 0;" v-model="scope.row.payWay"></el-input>
+                                            <el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.payWay"></el-input>
                                         </template>
                                     </el-table-column>
                                     <el-table-column
@@ -390,7 +406,7 @@
                                             align="center"
                                             width="200">
                                         <template slot-scope="scope">
-                                            <el-input style="margin: 10px 0;" v-model="scope.row.payInfo"></el-input>
+                                            <el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.payInfo"></el-input>
                                         </template>
                                     </el-table-column>
                                     <el-table-column
@@ -399,7 +415,15 @@
                                             width="250"
                                             align="center">
                                         <template slot-scope="scope">
-                                            <div v-if="scope.row.joinfile.length > 0" class="fileClass">
+                                            <div v-if="DrawerType === 'see'" class="fileClass">
+                                                <div v-if="scope.row.joinfile.length > 0" v-for="(item, index) in scope.row.joinfile" :key="index" @click="updateFile(scope.row)" style="margin-right: 5px;">
+                                                    {{ item.name }}
+                                                </div>
+                                                <div v-else>
+                                                    - -
+                                                </div>
+                                            </div>
+                                            <div v-else-if="scope.row.joinfile.length > 0" class="fileClass">
                                                 <div v-for="(item, index) in scope.row.joinfile" :key="index" @click="fileUpload('支付信息', scope.$index)" style="margin-right: 5px;">
                                                     {{ item.name }}
                                                 </div>
@@ -418,7 +442,7 @@
                                 </el-table>
                                 <div class="formTitle">
                                     <div class="left">参会记录</div>
-                                    <div class="right">
+                                    <div class="right" v-if="DrawerType !== 'see'">
                                         <el-button
                                                 type="primary"
                                                 size="mini"
@@ -446,7 +470,7 @@
                                             type="selection"
                                             align="center"
                                             width="55"
-                                            v-if="addForm.wgMeetingInfos.length">
+                                            v-if="addForm.wgMeetingInfos.length && DrawerType !== 'see'">
                                     </el-table-column>
                                     <el-table-column
                                             label="参会日期"
@@ -458,6 +482,7 @@
                                                     v-model="scope.row.meetingTime"
                                                     value-format="yyyy-MM-dd HH:mm:ss"
                                                     type="datetime"
+                                                    :disabled="DrawerType === 'see'"
                                                     placeholder="请选择参会日期">
                                             </el-date-picker>
                                         </template>
@@ -468,7 +493,7 @@
                                             align="center"
                                             width="200">
                                         <template slot-scope="scope">
-                                            <el-input style="margin: 10px 0;" v-model="scope.row.meetingName"></el-input>
+                                            <el-input style="margin: 10px 0;" :disabled="DrawerType === 'see'" v-model="scope.row.meetingName"></el-input>
                                         </template>
                                     </el-table-column>
                                     <el-table-column
@@ -478,7 +503,8 @@
                                             width="200">
                                         <template slot-scope="scope">
 <!--                                            <el-input v-model="scope.row.meetingPeople" style="display: none;"></el-input>-->
-                                            <el-input style="margin: 10px 0;" @click.native="checkRoles(scope.$index, scope.row.meetingPeople)" v-model="scope.row.meetingPeopleName"></el-input>
+                                            <el-input v-if="DrawerType === 'see'" :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.meetingPeopleName"></el-input>
+                                            <el-input v-else style="margin: 10px 0;" @click.native="checkRoles(scope.$index, scope.row.meetingPeople)" v-model="scope.row.meetingPeopleName"></el-input>
                                         </template>
                                     </el-table-column>
                                     <el-table-column
@@ -487,7 +513,7 @@
                                             align="center"
                                             width="200">
                                         <template slot-scope="scope">
-                                            <el-input style="margin: 10px 0;" v-model="scope.row.meetingReport"></el-input>
+                                            <el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.meetingReport"></el-input>
                                         </template>
                                     </el-table-column>
                                     <el-table-column
@@ -496,7 +522,15 @@
                                             width="250"
                                             align="center">
                                         <template slot-scope="scope">
-                                            <div v-if="scope.row.joinfile.length > 0" class="fileClass">
+                                            <div v-if="DrawerType === 'see'" class="fileClass">
+                                                <div v-if="scope.row.joinfile.length > 0" v-for="(item, index) in scope.row.joinfile" :key="index" @click="updateFile(scope.row)" style="margin-right: 5px;">
+                                                    {{ item.name }}
+                                                </div>
+                                                <div v-else>
+                                                    - -
+                                                </div>
+                                            </div>
+                                            <div v-else-if="scope.row.joinfile.length > 0" class="fileClass">
                                                 <div v-for="(item, index) in scope.row.joinfile" :key="index" @click="fileUpload('参会记录', scope.$index)" style="margin-right: 5px;">
                                                     {{ item.name }}
                                                 </div>
@@ -519,7 +553,7 @@
                 </div>
             </div>
             </div>
-            <div class="demo-drawer-footer">
+            <div class="demo-drawer-footer" v-if="DrawerType !== 'see'">
                 <el-button
                         size="mini"
                         class="common-button-primary"
@@ -594,8 +628,8 @@
                     name: '', // 名字
                     state: '', // 状态
                     properties: '', // 性质
-                    hjTime: '', // 换届时间
+                    changeTime: '', // 换届时间
-                    field: '', // 标准化工作领域
+                    standerArea: '', // 标准化工作领域
                     mark: '', // 备注
                     wgNetInfos: [], // 秘书联系方式
                     wgMeetingInfos: [], // 参会记录
@@ -625,11 +659,18 @@
                 fileType: '',
                 pIndex: '',
                 pType: '',
+                DrawerType: '',
+                row: {},
+                row2: {}
             }
         },
         methods: {
+            updateFile (item) {
+                window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
+            },
             checkRole(type, index, row) {
                 if (row) {
+                    this.nodeList = []
                     this.nodeList.push(row)
                 } else {
                     this.nodeList = []
@@ -670,6 +711,8 @@
                 })
                 this.addForm.wgMeetingInfos[this.pIndex].meetingPeople = ids
                 this.addForm.wgMeetingInfos[this.pIndex].meetingPeopleName = nameList
+                this.$set(this.addForm.wgMeetingInfos, this.addForm.wgMeetingInfos[this.pIndex].meetingPeople, ids)
+                this.$set(this.addForm.wgMeetingInfos, this.addForm.wgMeetingInfos[this.pIndex].meetingPeopleName, nameList)
             },
             fileUpload(type, index) {
                 this.fileIndex = index
@@ -909,26 +952,235 @@
                 }
             }, // 删除参会记录
             addItem () {
+                this.DrawerType = 'add'
+                let row = this.row
+                if (row.level === '0') {
+                    this.addDrawerTitle = '新增标委会'
+                } else if (row.level === '1') {
+                    this.addDrawerTitle = '新增分标委'
+                } else if (row.level === '2') {
+                    this.addDrawerTitle = '新增工作组'
+                } else if (row.level === '3') {
+                    this.addDrawerTitle = '新增标准'
+                } else if (row.level === '4') {}
+                this.addForm = {
+                    pid: row.id,
+                    wgNetInfos: [],
+                    nature: (parseInt(row.nature) + 1).toString(),
+                    status: '0',
+                    wgDepts: [],
+                    wgPayInfos: [],
+                    wgMeetingInfos: [],
+                    level: (parseInt(row.level) + 1).toString(),
+                    types: row.types,
+                    pName: row.name,
+                    itemType: row.level === '0' ? '标委会' : (row.level === '1' ? '分标委' : (row.level === '2' ? '工作组' : '标准'))
+                }
                 this.addDrawer = true
             }, // 新增
+            editItem () {
+                this.DrawerType = 'edit'
+                let row = this.row
+                if (row.level === '0') {
+                    this.addDrawerTitle = '编辑标委会'
+                } else if (row.level === '1') {
+                    this.addDrawerTitle = '编辑分标委'
+                } else if (row.level === '2') {
+                    this.addDrawerTitle = '编辑工作组'
+                } else if (row.level === '3') {
+                    this.addDrawerTitle = '编辑标准'
+                } else if (row.level === '4') {}
+                this.getArr(row.wgDepts)
+                this.getArr(row.wgPayInfos)
+                this.getArr(row.wgMeetingInfos)
+                if (row.wgMeetingInfos) {
+                    for (let a = 0; a < row.wgMeetingInfos.length; a++) {
+                        row.wgMeetingInfos[a].meetingPeopleName = []
+                        row.wgMeetingInfos[a].meetingPeople = []
+                        if (row.wgMeetingInfos[a].joinMeetingPeopleInfo) {
+                            row.wgMeetingInfos[a].joinMeetingPeopleInfo.forEach(item => {
+                                row.wgMeetingInfos[a].meetingPeopleName.push(item.name)
+                                row.wgMeetingInfos[a].meetingPeople.push(item.userId)
+                            })
+                        } else {
+                            row.wgMeetingInfos[a].meetingPeopleName = []
+                            row.wgMeetingInfos[a].meetingPeople = []
+                        }
+                    }
+                } else {
+                    row.wgMeetingInfos = []
+                }
+                this.addForm = {
+                    id: row.id,
+                    pid: row.pid,
+                    wgNetInfos: row.wgNetInfos || [],
+                    nature: row.nature,
+                    status: '0',
+                    wgDepts: row.wgDepts || [],
+                    wgPayInfos: row.wgPayInfos || [],
+                    wgMeetingInfos: row.wgMeetingInfos || [],
+                    level: row.level,
+                    types: row.types,
+                    pName: row.name,
+                    name: row.name,
+                    number: row.number,
+                    changeTime: row.changeTime,
+                    mark: row.mark,
+                    standerArea: row.standerArea,
+                    itemType: row.level === '0' ? '标委会' : (row.level === '1' ? '分标委' : (row.level === '2' ? '工作组' : '标准'))
+                }
+                this.addDrawer = true
+            }, // 编辑
+            seeItem () {
+                this.DrawerType = 'see'
+                let row = this.row2
+                if (row.level === '0') {
+                    this.addDrawerTitle = '查看标委会'
+                } else if (row.level === '1') {
+                    this.addDrawerTitle = '查看分标委'
+                } else if (row.level === '2') {
+                    this.addDrawerTitle = '查看工作组'
+                } else if (row.level === '3') {
+                    this.addDrawerTitle = '查看标准'
+                } else if (row.level === '4') {}
+                this.getArr(row.wgDepts)
+                this.getArr(row.wgPayInfos)
+                this.getArr(row.wgMeetingInfos)
+                if (row.wgMeetingInfos) {
+                    for (let a = 0; a < row.wgMeetingInfos.length; a++) {
+                        row.wgMeetingInfos[a].meetingPeopleName = []
+                        row.wgMeetingInfos[a].meetingPeople = []
+                        if (row.wgMeetingInfos[a].joinMeetingPeopleInfo) {
+                            row.wgMeetingInfos[a].joinMeetingPeopleInfo.forEach(item => {
+                                row.wgMeetingInfos[a].meetingPeopleName.push(item.name)
+                                row.wgMeetingInfos[a].meetingPeople.push(item.userId)
+                            })
+                        } else {
+                            row.wgMeetingInfos[a].meetingPeopleName = []
+                            row.wgMeetingInfos[a].meetingPeople = []
+                        }
+                    }
+                } else {
+                    row.wgMeetingInfos = []
+                }
+                this.addForm = {
+                    id: row.id,
+                    pid: row.pid,
+                    wgNetInfos: row.wgNetInfos || [],
+                    nature: row.nature,
+                    status: '0',
+                    wgDepts: row.wgDepts || [],
+                    wgPayInfos: row.wgPayInfos || [],
+                    wgMeetingInfos: row.wgMeetingInfos || [],
+                    level: row.level,
+                    types: row.types,
+                    pName: row.name,
+                    name: row.name,
+                    number: row.number,
+                    changeTime: row.changeTime,
+                    mark: row.mark,
+                    standerArea: row.standerArea,
+                    itemType: row.level === '0' ? '标委会' : (row.level === '1' ? '分标委' : (row.level === '2' ? '工作组' : '标准'))
+                }
+                this.addDrawer = true
+            }, // 查看
+            delItem () {
+                if (this.row.children.length > 0) {
+                    this.$message.warning('不可删除!')
+                } else {
+                    this.$confirm('您是否确认删除选中数据?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning',
+                        confirmButtonClass: 'common-button-primary',
+                        roundButton: true
+                    }).then(() => {
+                        let ids = []
+                        if (this.row.wgMeetingInfos.length > 0) {
+                            this.row.wgMeetingInfos.forEach(item => {
+                                ids.push(item.id)
+                            })
+                        }
+                        this.$http.post('wg_work_group/deleteData', {
+                            id: this.row.id,
+                            meetingId: ids
+                        }, {
+                            _this: this
+                        }, res => {
+                            if (res.ok) {
+                                this.headerNo = false
+                                this.$message.success('删除成功')
+                                this.destoryGraph()
+                                this.getData()
+                            }
+                        })
+                    }).catch(() => {
+                    })
+                }
+            }, // 删除
+            getArr (row) {
+                if (row) {
+                    row.forEach( item => {
+                        if (typeof (item.joinfile) === 'string') {
+                            item.joinfile = JSON.parse(item.joinfile) || []
+                        }
+                    })
+                    return row
+                } else {
+                    return []
+                }
+            },
             addDrawerSubmit () {
                 this.submitLoading = true
-                this.addForm.wgDepts.forEach(item => {
+                if (this.DrawerType === 'add') {
-                    item.joinfile = JSON.stringify(item.joinfile)
+                    this.addForm.wgDepts.forEach(item => {
-                })
+                        item.joinfile = JSON.stringify(item.joinfile)
-                this.addForm.wgPayInfos.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.addForm.wgMeetingInfos.forEach(item => {
-                })
+                        item.joinfile = JSON.stringify(item.joinfile)
-                this.$http.postData('wg_work_group/add', this.addForm, {
+                    })
-                    _this: this
+                    this.$http.postData('wg_work_group/add', this.addForm, {
-                }, res => {
+                        _this: this
-                    this.submitLoading = false
+                    }, res => {
-                    this.addDrawer = false
+                        this.submitLoading = false
-                    if (res.ok) {}
+                        this.addDrawer = false
-                })
+                        if (res.ok) {
+                            this.headerNo = false
+                            this.$message.success('添加成功')
+                            this.destoryGraph()
+                            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('修改失败')
+                        }
+                    })
+                }
             }, // 新增提交
             addDrawerClose () {
                 this.addDrawer = false
@@ -947,22 +1199,10 @@
             handleNodeClick (node) {
                 this.headerNo = true
                 let row = node._cfg.model
-                console.log(row);
+                this.addForm.pName = row.name
-                this.addForm = {
+                this.row = JSON.parse(JSON.stringify(row))
-                    pid: row.id,
+                this.row2 = JSON.parse(JSON.stringify(row))
-                    wgNetInfos: [],
-                    nature: (parseInt(row.nature) + 1).toString(),
-                    status: '0',
-                    wgDepts: [],
-                    wgPayInfos: [],
-                    wgMeetingInfos: [],
-                    level: (parseInt(row.level) + 1).toString(),
-                    types: row.types,
-                    pName: row.name,
-                    itemType: row.level === '0' ? '标委会' : (row.level === '1' ? '分标委' : (row.level === '2' ? '工作组' : '标准'))
-                }
                 if (row.level === '0') {
-                    this.addDrawerTitle = '新增标委会'
                     this.addButton = true
                     this.addItemButton = false
                     this.editButton = false
@@ -970,7 +1210,6 @@
                     this.seeButton = false
                     this.seeItemButton = false
                 } else if (row.level === '1') {
-                    this.addDrawerTitle = '新增分标委'
                     this.addButton = true
                     this.addItemButton = false
                     this.editButton = true
@@ -978,7 +1217,6 @@
                     this.seeButton = true
                     this.seeItemButton = false
                 } else if (row.level === '2') {
-                    this.addDrawerTitle = '新增工作组'
                     this.addButton = true
                     this.addItemButton = false
                     this.editButton = true
@@ -986,7 +1224,6 @@
                     this.seeButton = true
                     this.seeItemButton = false
                 } else if (row.level === '3') {
-                    this.addDrawerTitle = '新增标准'
                     this.addButton = false
                     this.addItemButton = true
                     this.editButton = true
@@ -1239,9 +1476,6 @@
             this.getData();
             this.getList()
         },
-        created() {
-            // this.getData();
-        },
         beforeDestroy() {
             this.destoryGraph()
         }
@@ -1266,6 +1500,7 @@
             }
         }
         .formTitle {
+            height: 48px;
             display: flex;
             justify-content: space-between;
             align-items: center;