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

2021-07-08 17:31:27 +08:00
parent edf0a1ad03 ea9a271c1a
commit eaab0d5016
23 changed files with 2873 additions and 2019 deletions
@@ -20,7 +20,7 @@
  box-shadow: 0 0 0 5px rgba(0, 0, 0, 0.2) inset;
 }
 .el-table__fixed {
-  height:auto !important; // 让固定列的高自适应，且设置!important覆盖ele-ui的默认样式
+  //height:auto !important; // 让固定列的高自适应，且设置!important覆盖ele-ui的默认样式
  bottom:17px; // 固定列默认设置了定位，    position: absolute;top: 0;left: 0;只需要再设置一下bottom的值，让固定列和父元素的底部出现距离即可
  position: absolute;
  top: 0;
@@ -381,16 +381,25 @@ export default {
    },
    goNuwPage (item) {
      this.$store.commit('setDetailMap', this.$route.path)
-      this.$router.push({
-        name: 'StandLawsAttrDetails',
-        params: {
-          id: item.id,
-          dictionaryName: item.dictionaryName,
-          dictionType: item.dictionType,
-          isRelate: item.isRelate,
-          relateDicId: item.relateDicId
-        }
-      })
+      const params = {
+        id: item.id,
+        dictionaryName: item.dictionaryName,
+        dictionType: item.dictionType,
+        isRelate: item.isRelate,
+        relateDicId: item.relateDicId
+      }
+      if(item.dictionType && item.dictionType === 'TREE'){
+        this.$router.push({
+          name: 'standLawsAttrTreeDetails',
+          params: params
+        })
+      }else {
+        this.$router.push({
+          name: 'StandLawsAttrDetails',
+          params: params
+        })
+      }
+
    },
    handleSelectone (data) {
      this.selectedList = []
@@ -852,7 +852,7 @@ export default {
          }
        })
      } else {
-        this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', {
+        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', {
          page: this.conditionForm.page,
          pageSize: this.conditionForm.pageSize,
          standNumber: this.conditionForm.numberName,
@@ -31,8 +31,8 @@
      </table-tools-bar>
      <div class="content">
        <div class="action-bar">
-          <el-button size="mini" v-btn-permission="'HS9BVNTNX2PNRRWL42AW'" @click="contrastStandFile" style="width:77px; height:32px;">比对</el-button>
-          <el-button size="mini" v-btn-permission="'Z9SMGAUX2JA3X3CTVVCP'" @click="batchDelete"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
+          <el-button size="mini" v-btn-permission="''" @click="contrastStandFile" style="width:77px; height:32px;">比对</el-button>
+          <el-button size="mini" v-btn-permission="''" @click="batchDelete"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
        </div>
        <div class="table-wrap">
          <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
@@ -120,19 +120,19 @@
                  <el-dropdown trigger="click" @command="handleCommand">
                    <i class="iconfont">&#xe61e;</i>
                    <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item v-btn-permission="'C6P4Z2E7MJ5RBTYCS554'" :command="[scope.row, '查看']">查看</el-dropdown-item>
-                      <el-dropdown-item v-btn-permission="'Z9SMGAUX2JA3X3CTVVCP'" :command="[scope.row, '删除']">删除</el-dropdown-item>
-                      <el-dropdown-item v-btn-permission="'WEJNHYG4J5ETSA9VFJWP'" :command="[scope.row, '分享']">分享</el-dropdown-item>
+                      <el-dropdown-item v-btn-permission="''" :command="[scope.row, '查看']">查看</el-dropdown-item>
+                      <el-dropdown-item v-btn-permission="''" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                      <el-dropdown-item v-btn-permission="''" :command="[scope.row, '分享']">分享</el-dropdown-item>
                      <el-dropdown-item
                        v-if="scope.row.collectBtn"
-                        v-btn-permission="'UGBLFYXKA78BHHJSNSER'"
+                        v-btn-permission="''"
                        :command="[scope.row, '收藏']"
                      >
                        收藏
                      </el-dropdown-item>
                      <el-dropdown-item
                        v-else
-                        v-btn-permission="'UGBLFYXKA78BHHJSNSER'"
+                        v-btn-permission="''"
                        :command="[scope.row, '取消收藏']"
                      >
                        取消收藏
@@ -7,7 +7,7 @@
    </ProcessHeader>
    <div class="headerTabs">
      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
+      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
    </div>
    <div class="content" v-if="active == '1'">
      <div style="flex: auto; overflow: auto">
@@ -15,7 +15,9 @@
          <template slot="title">基础信息</template>
        </process-title>
        <el-form
+          ref="qdfbForm"
          :model="listForm"
+          :rules="formRules"
          class="label-input-form prc-content-border"
          label-width="150px"
        >
@@ -51,9 +53,9 @@
                  clearable
                ></el-input>
              </el-form-item>
-              <el-form-item label="附件" prop="enclosure" class="add-form-item form-item-disabled">
+              <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
                <el-upload
-                  v-if="listForm.enclosure == 'null' || this.listForm.enclosure== 'undefined' || this.listForm.enclosure == '' "
+                  v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
                  :action="uploadFileListPath"
                  show-file-list
                  :file-list="fileInfoList"
@@ -69,11 +71,11 @@
                </el-upload>
                <el-input
                  v-else
-                  v-model="listForm.enclosure"
+                  v-model="listForm.fileId"
                  placeholder=""
                ></el-input>
              </el-form-item>
-              <el-form-item label="会签" prop="sign"  class="add-form-item form-item-disabled">
+              <el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
                <el-radio-group v-model="signFlag" @change="selectSign">
                  <el-radio label="1">是</el-radio>
                  <el-radio label="2">否</el-radio>
@@ -94,8 +96,9 @@
        <el-table
          :data="dataList"
          border
+          ref="selection"
          height="49%"
-          style="width: 100%"
+          style="width: 100%;"
          @selection-change="selectStandChange"
          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', height: '48px'}">
@@ -110,8 +113,11 @@
            width="180px"
            label="标准号">
            <template slot-scope="scope">
-              <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
-              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
+              <a v-if="scope.row.standYear" class="table-jump"
+                 @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
+                }}-{{ scope.row.standYear }}</a>
+              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                {{ scope.row.standNumber }}</a>
            </template>
          </el-table-column>
          <el-table-column
@@ -127,13 +133,11 @@
          </el-table-column>
          <el-table-column
            prop="xcxssrq"
-            sortable
            label="新车型实施日期">
          </el-table-column>
          <el-table-column
            show-overflow-tooltip
            prop="zccssrq"
-            sortable
            label="在产车实施日期">
          </el-table-column>
          <el-table-column
@@ -145,7 +149,7 @@
        </el-table>
      </div>
    </div>
-    <div class="content" v-if="active === '2'">
+    <div class="content" v-show="active === '2'">
      <div class="block" style="padding-top: 20px;">
        <el-timeline>
          <el-form
@@ -164,25 +168,27 @@
                </el-form-item>
              </el-card>
            </el-timeline-item>
-            <el-timeline-item timestamp="选择责任人进行会签" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
              <el-card>
                <el-form-item prop="dockUserName" style="margin-bottom: 0">
-                  <h4>填写会签意见</h4>
+                  <h4>会签人</h4>
                  <div style="margin-top: 10px;width: 300px;">
                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" placeholder="选择责任人" @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
+                    <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"
+                              @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
                    </el-input>
                  </div>
                </el-form-item>
              </el-card>
            </el-timeline-item>
-            <el-timeline-item timestamp="根据会签内容修订" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="根据会签意见修订" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
              <el-card>
                <el-form-item prop="ministerUserName" style="margin-bottom: 0">
                  <h4>标准/政策法规工程师</h4>
                  <div style="margin-top: 10px;width: 300px;">
                    <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.ministerUserName" placeholder="选择标准/政策法规工程师" @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
+                    <el-input v-model="roleForm.ministerUserName" placeholder="选择标准/政策法规工程师"
+                              @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
                  </div>
                </el-form-item>
              </el-card>
@@ -193,7 +199,8 @@
                  <h4>业务经理</h4>
                  <div style="margin-top: 10px;width: 300px;">
                    <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.directorUserName" placeholder="选择业务经理" @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>
+                    <el-input v-model="roleForm.directorUserName" placeholder="选择业务经理"
+                              @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>
                  </div>
                </el-form-item>
              </el-card>
@@ -455,7 +462,6 @@
            @pageSizeChange="pageSizeChange"
          />
        </div>
-
      </div>
      <div class="demo-drawer-footer">
        <el-button size="mini" @click="closeDrawer">取消</el-button>
@@ -469,62 +475,75 @@
      size="900px"
      custom-class="demo-drawer"
    >
-      <el-table
-        :data="standardData"
-        tooltip-effect="dark"
-        style="width: 100%"
-        border
-        height="100%"
-        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+      <div class="demo-drawer-content">
+        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <el-table
+              :data="standardData"
+              tooltip-effect="dark"
+              style="width: 100%"
+              border
+              ref="table"
+              height="100%"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
         fontWeight: 'bold', height: '48px'}"
-        @selection-change="selectThree"
-      >
-        <el-table-column
-          type="selection"
-          width="55"
-          align="center">
-        </el-table-column>
-        <el-table-column
-          prop="content"
-          label="标准号"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="deptName"
-          label="中文名称"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="deptName"
-          label="英文名称"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="deptName"
-          label="发布日期"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="deptName"
-          label="新车型实施日期"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="deptName"
-          label="在产车实施日期"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="deptName"
-          label="适用车型"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="deptName"
-          label="文本状态"
-        >
-        </el-table-column>
-      </el-table>
+              @selection-change="selectThree"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="code"
+                fixed="left"
+                label="标准号">
+                <template slot-scope="scope">
+                  <a v-if="scope.row.standYear" class="table-jump"
+                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
+                    }}-{{ scope.row.standYear }}</a>
+                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                    {{ scope.row.standNumber }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="standName"
+                label="标准名称"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="issueTime"
+                label="发布日期">
+              </el-table-column>
+              <el-table-column
+                prop="xcxssrq"
+                label="新车型实施日期">
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                prop="zccssrq"
+                label="在产车实施日期">
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                prop="textStatus"
+                label="文本状态">
+              </el-table-column>
+            </el-table>
+          </div>
+          <pagination
+            :page="pageNo"
+            :pageSize="pageSizeNo"
+            :total="totalNo"
+            @pageChange="pageChangeNo"
+            @pageSizeChange="pageSizeChangeNo"
+          />
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="cancelStand">取消</el-button>
+        <el-button type="primary" size="mini" @click="okStand">添加</el-button>
+      </div>
    </el-drawer>

    <ProcessFooter
@@ -536,7 +555,7 @@
      @submit="handleSubmit"
    >
    </ProcessFooter>
-<!--    选择责任人-->
+    <!--    选择责任人-->
    <el-drawer
      :title="drawerTitle"
      :visible.sync="modalshowflag"
@@ -559,7 +578,9 @@
        ref="tree">
      </el-tree>
      <div id="roleFormButton" class="demo-drawer-footer">
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">
+          确定
+        </el-button>
        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
      </div>
    </el-drawer>
@@ -582,43 +603,53 @@ export default {
  },
  data() {
    return {
+      standList: [], //新添加的标准
      modalshowflag: false, // drawer开关
-      drawerTitle: '', //drawer标题
+      drawerTitle: "", //drawer标题
      nodeList: [],
      defaultProps: {
-        children: 'children',
-        label: 'name'
+        children: "children",
+        label: "name"
      },
      roleForm: {
-        startUserName: this.$store.getters.userInfo.account,
+        startUserName: this.$store.getters.userInfo.userName,
        startUser: this.$store.getters.userInfo.id,
-        dockUser: '',
-        responUserList: '',
-        ministerUser: '',
-        directorUser: '',
-        presidentUser: '',
-        dockUserName: '',
-        responUserListName: '',
-        ministerUserName: '',
-        directorUserName: '',
-        presidentUserName: ''
+        dockUser: "",
+        responUserList: "",
+        ministerUser: "",
+        directorUser: "",
+        presidentUser: "",
+        dockUserName: "",
+        responUserListName: "",
+        ministerUserName: "",
+        directorUserName: "",
+        presidentUserName: ""
+      },
+      formRules: {
+        listType: [
+          { required: true, message: "请选择清单类型", trigger: "blur" }
+        ],
+        listName: [
+          { required: true, message: "请填写清单名称", trigger: "change" }
+        ]
      },
      roleFormRules: {
-        dockUserName: [
-          { required: true, message: '请选择会签责任人', trigger: 'blur' },
-        ],
+        // dockUserName: [
+        //   { required: true, message: "请选择会签责任人", trigger: "blur" }
+        // ],
        ministerUserName: [
-          { required: true, message: '请选择修订责任人', trigger: 'blur' },
+          { required: true, message: "请选择修订责任人", trigger: "blur" }
        ],
        directorUserName: [
-          { required: true, message: '请选择审批责任人', trigger: 'blur' },
-        ],
+          { required: true, message: "请选择审批责任人", trigger: "blur" }
+        ]
      },
      dataList: [],//清单里的标准数据
      sarAccessListDatas: [], //国家地区清单表格
-      uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
+      uploadFileListPath: "api/att/attFile/upload", // 上传的地址
      fileInfoList: [], // 上传的附件
      standardData: [], //添加标准数据
+      standardData1: [], //添加标准数据
      ListModel: false, //选择清单抽屉状态
      standModel: false, // 选择标准抽屉状态
      active: "1",
@@ -633,15 +664,18 @@ export default {
      page: 1,
      total: 0,
      pageSize: this.$store.getters.userInfo.configContent,
+      pageNo: 1,
+      totalNo: 0,
+      pageSizeNo: this.$store.getters.userInfo.configContent,
      listForm: {
        listType: "", //区分是哪个清单
        listName: "", //清单名称
        applyRegion: "", //适用区域
        descriptionList: "", //清单说明
-        enclosure: "", //附件
+        fileId: "", //附件
        standId: "", //选择的清单的id
        signFlag: "1",  //是否会签  1为会签 2为不会签
-        inforlist:"" , //用来存放标准列表的标准id
+        inforlist: "", //用来存放标准列表的标准id
        dataList: [{
          code: "", //标准号
          standName: "", //标准名称
@@ -663,24 +697,24 @@ export default {
    };
  },
  methods: {
-    saveUserInfo () {
-      if (this.type === 'dockUser') {
-        this.roleForm.dockUser = this.roleRow.id
-        this.roleForm.dockUserName = this.roleRow.name
-      } else if (this.type === 'ministerUser') {
-        this.roleForm.ministerUser = this.roleRow.id
-        this.roleForm.ministerUserName = this.roleRow.name
-      } else if (this.type === 'directorUser') {
-        this.roleForm.directorUser = this.roleRow.id
-        this.roleForm.directorUserName = this.roleRow.name
-      } else if (this.type === 'presidentUser') {
-        this.roleForm.presidentUser = this.roleRow.id
-        this.roleForm.presidentUserName = this.roleRow.name
+    saveUserInfo() {
+      if (this.type === "dockUser") {
+        this.roleForm.dockUser = this.roleRow.id;
+        this.roleForm.dockUserName = this.roleRow.name;
+      } else if (this.type === "ministerUser") {
+        this.roleForm.ministerUser = this.roleRow.id;
+        this.roleForm.ministerUserName = this.roleRow.name;
+      } else if (this.type === "directorUser") {
+        this.roleForm.directorUser = this.roleRow.id;
+        this.roleForm.directorUserName = this.roleRow.name;
+      } else if (this.type === "presidentUser") {
+        this.roleForm.presidentUser = this.roleRow.id;
+        this.roleForm.presidentUserName = this.roleRow.name;
      }
-      this.modalshowflag = false
+      this.modalshowflag = false;
    },
-    cancleUserInfo () {
-      this.modalshowflag = false
+    cancleUserInfo() {
+      this.modalshowflag = false;
    },
    //tab发生变化
    handleTabs(name) {
@@ -689,21 +723,21 @@ export default {
    choiceShow() {
      this.ListModel = true;
    },
-    drawerCheck (data) {
-      // var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
-      // if(getlist.length == 1) {
-      //   this.roleRow = getlist[0]
-      // }else {
-      //   this.$refs.tree.setCheckedKeys([data.id]);
-      //   this.roleRow = this.$refs.tree.getCheckedNodes()[0]
-      // }
+    drawerCheck(data) {
+      var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+      if (getlist.length == 1) {
+        this.roleRow = getlist[0];
+      } else {
+        this.$refs.tree.setCheckedKeys([data.id]);
+        this.roleRow = this.$refs.tree.getCheckedNodes()[0];
+      }
    },
    //判断当前是否会签
-    selectSign (type) {
-      if(type ==='1'){
-        this.listForm.signFlag = 1
-      }else if(type == '2'){
-        this.listForm.signFlag = 2
+    selectSign(type) {
+      if (type === "1") {
+        this.listForm.signFlag = 1;
+      } else if (type == "2") {
+        this.listForm.signFlag = 2;
      }
    },
    // //判断当前选中的是哪个清单
@@ -746,13 +780,13 @@ export default {
        });
      }
    },
-    //点击新增事件
+    //点击添加事件
    addList() {
      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
        _this: this
      }, res => {
-        console.log(res);
        this.standardData = res.data.list;
+        this.totalNo = res.data.pageCount
      }, e => {
      });
      this.standModel = true;
@@ -786,62 +820,74 @@ export default {
    },
    //保存事件
    handleSave() {
-      this.saveLoading = true
-      let _formData = new FormData()
-      _formData.append('createUser', this.$store.getters.userInfo.userId)
-      _formData.append('createUserName', this.$store.getters.userInfo.uName)
-      _formData.append('prcType', this.$route.query.type)
-      _formData.append('json', JSON.stringify({
+      this.saveLoading = true;
+      let _formData = new FormData();
+      _formData.append("createUser", this.$store.getters.userInfo.userId);
+      _formData.append("createUserName", this.$store.getters.userInfo.uName);
+      _formData.append("prcType", this.$route.query.type);
+      _formData.append("json", JSON.stringify({
        prcForm: this.prcForm,
        sarAccessInfoList: this.sarAccessInfoList,
        sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
        bzqdForm: this.bzqdForm,
        listInfo: this.listInfo,
        id: this.id
-      }))
+      }));
      saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false
-        this.$message.success('保存成功')
+        this.saveLoading = false;
+        this.$message.success("保存成功");
      }).catch(e => {
-        this.saveLoading = false
-      })
+        this.saveLoading = false;
+      });
    },
    //提交事件
    handleSubmit() {
-      let json = this.listForm
-      json.zrUserId = this.$store.getters.userInfo.userId
-      json.jlUserId = this.$store.getters.userInfo.userId
-      json.applyUpdUserId = this.$store.getters.userInfo.userId
-      json.approvalOpinion = ''
-      json.prcCreateUser = this.$store.getters.userInfo.userId
-      json.prcCreateUserName = this.$store.getters.userInfo.account
-      json.standName = this.listForm.listName
-      json.standId = this.listForm.standId
-     this.$http.get('lawss/activiti/startProcess' , {type: '4'}, {
-       _this: this
-     }, res => {
-       if(res.ok){
-         this.$http.post('lawss/activiti/completeTask',{
-           taskIds: res.data,
-           userId : this.$store.getters.userInfo.userId,
-           json: JSON.stringify(json)
-         },{
-           _this: this
-         }, res => {
-           if(res.success) {
-             this.$message.success(res.message)
-             this.$router.push('/processCenter')
-           }
-         })
-       }
-     })
+      let json = this.listForm;
+      json.zrUserId = this.$store.getters.userInfo.userId;
+      json.jlUserId = this.$store.getters.userInfo.userId;
+      json.applyUpdUserId = this.$store.getters.userInfo.userId;
+      json.approvalOpinion = "";
+      json.prcCreateUser = this.$store.getters.userInfo.userId;
+      json.prcCreateUserName = this.$store.getters.userInfo.account;
+      json.standName = this.listForm.listName;
+      json.standId = this.listForm.standId;
+      this.$refs["qdfbForm"].validate((valid) => {
+        if (valid) {
+          this.$refs["Form"].validate((valid) => {
+            if (valid) {
+              this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
+                _this: this
+              }, res => {
+                if (res.ok) {
+                  this.$http.post("lawss/activiti/completeTask", {
+                    taskIds: res.data,
+                    userId: this.$store.getters.userInfo.userId,
+                    json: JSON.stringify(json)
+                  }, {
+                    _this: this
+                  }, res => {
+                    if (res.success) {
+                      this.$message.success(res.message);
+                      this.$router.push("/processCenter");
+                    }
+                  });
+                }
+              });
+            } else {
+              return this.$message.warning("请完善人员信息");
+            }
+          });
+        } else {
+          return this.$message.warning("请完善基础信息");
+        }
+      });
    },
    // 删除上传的文件
-    delFileInfo (file, fileList) {
+    delFileInfo(file, fileList) {
      // this.fileInfoList = fileList
    },
    // 上传文件成功回调
-    uploadBackSuccess (res, file, fileList) {
+    uploadBackSuccess(res, file, fileList) {
      // if (res.ok) {
      //   this.fileInfoList = fileList
      //   this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
@@ -852,13 +898,41 @@ export default {
      // }
    },
    //上传之前的钩子
-    beforeUpload () {
+    beforeUpload() {

    },
-    //选择标准取消事件
+    //选择清单取消事件
    closeDrawer() {
      this.ListModel = false;
    },
+    //添加标准取消事件
+    cancelStand() {
+      this.standModel = false;
+    },
+    //添加标准确定事件
+    okStand() {
+      let _this = this;
+      if (this.standList.length < 1) {
+        _this.$message.warning("请选择需要添加进清单的数据");
+      } else {
+        _this.standList.map(item => {
+          let newStand = false;
+          for (let itemKey of _this.dataList) {
+            if (item.id == itemKey.id) {
+              newStand = true;
+              break;
+            }
+          }
+          if (newStand) {
+            _this.$message.warning("请勿重复添加数据");
+          } else {
+            _this.dataList.push(item);
+          }
+        });
+        this.standardData = []
+        _this.standModel = false;
+      }
+    },
    //选择清单确定事件
    OkDrawer() {
      if (this.selectedList.length === 1) {
@@ -870,27 +944,28 @@ export default {
        for (let i = 0; i < this.selectedList.length; i++) {
          bringData.push(deposit.get(this.selectedList[i]));
        }
-        this.listForm.standId = bringData[0].id
+        this.listForm.standId = bringData[0].id;
        this.listForm.listName = bringData[0].detailedListName;
        this.listForm.applyRegion = bringData[0].applicationScope;
        this.listForm.descriptionList = bringData[0].remark;
-        this.listForm.enclosure = bringData[0].detailedListName;
+        this.listForm.fileId = bringData[0].fileId;
        this.ListModel = false;
-        this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: bringData[0].id}, {
+        this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { id: bringData[0].id }, {
          _this: this
        }, res => {
-          this.dataList = res.data
-          this.listForm.dataList = res.data
-          let formId = ""
-         this.dataList.forEach(item => {
-            if(this.dataList.length !== 0){
-              formId += ','
-              formId += item.id
-            }
-         })
-          this.listForm.inforlist = formId
+          if(res.data==null){
+              res.data=[]
+          }
+          this.dataList = res.data;
+          console.log(res.data);
+          this.listForm.dataList = res.data;
+          let formId = []
+          this.dataList.map(item => {
+              formId.push(item.id)
+          });
+          this.listForm.inforlist = formId.join(',');
        }, e => {
-        })
+        });
      } else if (this.selectedList.length > 1) {
        this.$message.warning("只能选择一条数据进行带入");
      } else {
@@ -903,6 +978,7 @@ export default {
      for (let i = 0; i < data.length; i++) {
        this.selectedList.push(data[i].id);
      }
+      console.log(this.selectedList);
    },
    //标准表格选择框改变
    selectStandChange(data) {
@@ -911,34 +987,45 @@ export default {
        this.selectList.push(data[i].id);
      }
    },
-    selectThree() {
+    //添加标准select的改变
+    selectThree(data) {
+      this.standList = data;
    },
-    choiceZRR (type, title, id) {
-      this.nodeList = []
-      this.nodeList.push(id)
-      this.type = type
-      this.drawerTitle = title
-      this.modalshowflag = true
+    choiceZRR(type, title, id) {
+      this.nodeList = [];
+      this.nodeList.push(id);
+      this.type = type;
+      this.drawerTitle = title;
+      this.modalshowflag = true;
    },
-    getTree () {
-      // this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
-      //   this.treeData = res.data
-      // })
+    getTree() {
+      this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
+        this.treeData = res.data;
+      });
    },
    pageChange(page) {
      this.page = page;
-      this.searchData();
+      this.selectionList();
    },
    pageSizeChange(pageSize) {
      this.pageSize = this.$store.getters.userInfo.configContent;
-      this.searchData();
-    }
+      this.selectionList();
+    },
+    pageChangeNo(page){
+      this.page = page
+      this.addList()
+    },
+    pageSizeChangeNo(pageSize){
+      this.pageSizeNo = this.$store.getters.userInfo.configContent;
+      this.addList()
+
+    },
  },
  computed: {},
  mounted() {
-    this.selectionList()
+    this.selectionList();
    this.selectSign();
-    this.getTree()
+    this.getTree();
    for (let i = 0; i < this.dataList.length; i++) {
      this.standMap.set(this.dataList[i].id, this.dataList[i]);
    }
@@ -53,11 +53,16 @@
                  clearable
                ></el-input>
              </el-form-item>
-              <el-form-item label="附件" prop="enclosure" class="add-form-item form-item-disabled">
+              <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
+               <el-input
+                 v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
+                 placeholder="暂无数据"
+               >
+               </el-input>
                <el-input
-                  disabled
-                  v-model="listForm.enclosure"
-                  placeholder="暂无数据"
+                  v-else
+                  v-model="listForm.fileId"
+                  placeholder=""
                ></el-input>
              </el-form-item>
            </el-col>
@@ -352,7 +357,6 @@ export default {
     */
    getFormFieldList (item) {
      this.$nextTick(() => {
-        console.log(item);
        this.listForm = JSON.parse(JSON.stringify(item))
        this.listForm.prcNum = this.prcNum
        this.listForm.prcName = this.prcName
@@ -51,9 +51,9 @@
                  clearable
                ></el-input>
              </el-form-item>
-              <el-form-item label="附件" prop="enclosure" class="add-form-item form-item-disabled">
+              <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
                <el-upload
-                  v-if="listForm.enclosure == 'null' || this.listForm.enclosure== 'undefined' || this.listForm.enclosure == '' "
+                  v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
                  :action="uploadFileListPath"
                  show-file-list
                  :file-list="fileInfoList"
@@ -69,7 +69,7 @@
                </el-upload>
                <el-input
                  v-else
-                  v-model="listForm.enclosure"
+                  v-model="listForm.fileId"
                  placeholder=""
                ></el-input>
              </el-form-item>
@@ -215,62 +215,75 @@
      size="900px"
      custom-class="demo-drawer"
    >
-      <el-table
-        :data="standardData"
-        tooltip-effect="dark"
-        style="width: 100%"
-        border
-        height="100%"
-        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+      <div class="demo-drawer-content">
+        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <el-table
+              :data="standardData"
+              tooltip-effect="dark"
+              style="width: 100%"
+              border
+              ref="table"
+              height="100%"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
         fontWeight: 'bold', height: '48px'}"
-        @selection-change="selectThree"
-      >
-        <el-table-column
-          type="selection"
-          width="55"
-          align="center">
-        </el-table-column>
-        <el-table-column
-          prop="content"
-          label="标准号"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="deptName"
-          label="中文名称"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="deptName"
-          label="英文名称"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="deptName"
-          label="发布日期"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="deptName"
-          label="新车型实施日期"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="deptName"
-          label="在产车实施日期"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="deptName"
-          label="适用车型"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="deptName"
-          label="文本状态"
-        >
-        </el-table-column>
-      </el-table>
+              @selection-change="selectThree"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="code"
+                fixed="left"
+                label="标准号">
+                <template slot-scope="scope">
+                  <a v-if="scope.row.standYear" class="table-jump"
+                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
+                    }}-{{ scope.row.standYear }}</a>
+                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                    {{ scope.row.standNumber }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="standName"
+                label="标准名称"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="issueTime"
+                label="发布日期">
+              </el-table-column>
+              <el-table-column
+                prop="xcxssrq"
+                label="新车型实施日期">
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                prop="zccssrq"
+                label="在产车实施日期">
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                prop="textStatus"
+                label="文本状态">
+              </el-table-column>
+            </el-table>
+          </div>
+          <pagination
+            :page="pageNo"
+            :pageSize="pageSizeNo"
+            :total="totalNo"
+            @pageChange="pageChangeNo"
+            @pageSizeChange="pageSizeChangeNo"
+          />
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="cancelStand">取消</el-button>
+        <el-button type="primary" size="mini" @click="okStand">添加</el-button>
+      </div>
    </el-drawer>

    <ProcessFooter
@@ -301,6 +314,7 @@ export default {
  data() {
    return {
      detailData: [],
+      standList: [], //新添加的标准
      // 当前流程类型(1待办/2已办)
      processType: 1,
      loading: false,
@@ -323,6 +337,9 @@ export default {
      page: 1,
      total: 0,
      pageSize: this.$store.getters.userInfo.configContent,
+      pageNo: 1,
+      totalNo: 0,
+      pageSizeNo: this.$store.getters.userInfo.configContent,
      listForm: {
        listName: "", //清单名称
        applyRegion: "", //适用区域
@@ -368,16 +385,49 @@ export default {
    handleTabs(name) {
      this.active = name;
    },
-    //点击新增事件
+    //点击添加事件
    addList() {
      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
        _this: this
      }, res => {
        this.standardData = res.data.list;
+        this.totalNo = res.data.pageCount
      }, e => {
      });
      this.standModel = true;
    },
+    //添加标准select的改变
+    selectThree(data) {
+      this.standList = data;
+    },
+    //添加标准取消事件
+    cancelStand() {
+      this.standModel = false;
+    },
+    //添加标准确定事件
+    okStand() {
+      let _this = this;
+      if (this.standList.length < 1) {
+        _this.$message.warning("请选择需要添加进清单的数据");
+      } else {
+        _this.standList.map(item => {
+          let newStand = false;
+          for (let itemKey of _this.dataList) {
+            if (item.id == itemKey.id) {
+              newStand = true;
+              break;
+            }
+          }
+          if (newStand) {
+            _this.$message.warning("请勿重复添加数据");
+          } else {
+            _this.dataList.push(item);
+          }
+        });
+        this.standardData = []
+        _this.standModel = false;
+      }
+    },
    // 点击批量删除事件
    deleteList() {
      if (this.selectList.length < 1) {
@@ -407,18 +457,18 @@ export default {
    },
    // 删除上传的文件
    delFileInfo (file, fileList) {
-      // this.fileInfoList = fileList
+      this.fileInfoList = fileList
    },
    // 上传文件成功回调
    uploadBackSuccess (res, file, fileList) {
-      // if (res.ok) {
-      //   this.fileInfoList = fileList
-      //   this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
-      //   this.$message.success('上传成功')
-      // } else {
-      //   this.$message.error(res.message)
-      //   fileList.pop()
-      // }
+      if (res.ok) {
+        this.fileInfoList = fileList
+        this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
+        this.$message.success('上传成功')
+      } else {
+        this.$message.error(res.message)
+        fileList.pop()
+      }
    },
    //上传之前的钩子
    beforeUpload () {
@@ -492,9 +542,6 @@ export default {
      for (let i = 0; i < data.length; i++) {
        this.selectList.push(data[i].id);
      }
-    },
-    selectThree() {
-
    },
    pageChange(page) {
      this.page = page;
@@ -503,7 +550,16 @@ export default {
    pageSizeChange(pageSize) {
      this.pageSize = this.$store.getters.userInfo.configContent;
      this.searchData();
-    }
+    },
+    pageChangeNo(page){
+      this.page = page
+      this.addList()
+    },
+    pageSizeChangeNo(pageSize){
+      this.pageSizeNo = this.$store.getters.userInfo.configContent;
+      this.addList()
+
+    },
  },
  computed: {
    listNoDataText () {
@@ -53,11 +53,17 @@
                  clearable
                ></el-input>
              </el-form-item>
-              <el-form-item label="附件" prop="enclosure" class="add-form-item form-item-disabled">
+              <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
                <el-input
-                  disabled
-                  v-model="listForm.enclosure"
+                  v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
+                  v-model="listForm.fileId"
                  placeholder="暂无数据"
+                >
+                </el-input>
+                <el-input
+                  v-else
+                  v-model="listForm.fileId"
+                  placeholder=""
                ></el-input>
              </el-form-item>
            </el-col>
@@ -198,7 +198,7 @@
        height="100%"
        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
         fontWeight: 'bold', height: '48px'}"
-        @selection-change="selectThree"
+        @selection-change="selectedChange"
      >
        <el-table-column type="selection" width="55" align="center"/>
        <el-table-column prop="standId" label="标准号/标准名称"/>
@@ -316,6 +316,9 @@ export default {
    ProcessFooter,
    ProcessTitle
  },
+  mounted () {
+    this.getTree()
+  },
  methods: {
    //点击新增事件
    addList() {
@@ -367,27 +370,15 @@ export default {
    //未符合项整合确定事件
    OkDrawer() {
      if (this.selectedList.length !== 0) {
-        let deposit = new Map();
-        this.unqualidiedData.forEach(item => {
-          deposit.set(item.id, item);
-        });
-        let bringData = [];
-        for (let i = 0; i < this.selectedList.length; i++) {
-          bringData.push(deposit.get(this.selectedList[i]));
-        }
-        this.dataList.standId = bringData[0].standId
-        this.dataList.productName = bringData[0].productName;
-        this.dataList.itemsNum = bringData[0].itemsNum;
-        this.dataList.itemsName = bringData[0].itemsName;
-        this.dataList.planCloseTime = bringData[0].planCloseTime;
-        this.dataList.responsibleUnit = bringData[0].responsibleUnit;
-        this.dataList.dutyEngineer = bringData[0].dutyEngineer;
+        this.dataList = this.selectedList
        this.ListModel = false;
      } else {
        this.$message.warning("请选择至少一条数据进行带入");
      }
    },
-    selectThree() {},
+    selectedChange(val) {
+      this.selectedList = val
+    },
    handleTabs(name) {
      this.active = name
    },
@@ -6,7 +6,6 @@
    </ProcessHeader>
    <div class="headerTabs">
      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div>
    </div>
    <div class="content" v-if="active === '1'">
      <div style="flex: auto;">
@@ -16,18 +15,20 @@
        <el-form :modal="dataList" inline class="label-input-form">
            <el-form-item label="标准号/标准名称" class="search-item">
              <el-input v-model="dataList.standId"
+                size="small"
                placeholder="请输入"
                clearable
                :maxlength="100"></el-input>
            </el-form-item>
            <el-form-item label="项目名称" class="search-item">
              <el-input v-model="dataList.productName"
+                size="small"
                placeholder="请输入"
                clearable
                :maxlength="100"></el-input>
            </el-form-item>
-            <el-form-item label="责任部门" class="search-item">
-              <el-input v-model="dataList.responsibleUnit" v-show="false" />
+          <el-form-item label="责任部门" class="search-item">
+              <el-input v-model="dataList.responsibleUnit" v-show="false"/>
              <el-popover
                placement="bottom"
                popper-class="user-dept-popper"
@@ -35,6 +36,7 @@
                :value="false"
              >
                <el-input
+                  size="small"
                  slot="reference"
                  v-model="dataList.responseUnitShow"
                  placeholder="根据责任部门查找"
@@ -60,7 +62,7 @@
                class="common-button-primary"
                size="mini"
                v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
-                @click="getTableByPage('dataList')">
+                @click="getTableByPage">
                查询
              </el-button>
            </el-form-item>
@@ -80,7 +82,6 @@
              class="common-button-default"
              size="small"
              type="primary"
-              v-btn-permission="'5905d0743c3504799aee83ac9697f8c5'"
              @click="dutyEngineerList">
              批量分发负责人
            </el-button>
@@ -88,7 +89,8 @@
        <el-table
          :data="dataList"
          border
-          @selection-change="handleSelectionChange"
+          ref="multipleTable"
+          @select="handleSelectionChange"
          height="49%"
          style="width: 100%"
          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -101,12 +103,17 @@
          <el-table-column prop="planCloseTime" label="整改完成时间"/>
          <el-table-column prop="responsibleUnit" label="责任部门"/>
          <el-table-column prop="dutyEngineer" label="责任工程师"/>
-          <el-table-column label="选择分发责任人" prop="duty">
+          <el-table-column label="选择分发责任人" prop="dutyPeople">
              <template slot-scope="scope">
                <span v-if="scope.row.show">
-                  <el-input size="mini"  placeholder="请输入内容" @blur="choiceDuty" v-model="scope.row.duty"></el-input>
+                  <el-input
+                    v-model="scope.row.dutyPeople"
+                    size="mini"
+                    placeholder="请输入内容"
+                    @click.native="choiceDuty"
+                  />
                </span>
-                <span v-else :disabled="true">{{scope.row.duty}}</span>
+                <span v-else>{{scope.row.dutyPeople}}</span>
            </template>
          </el-table-column>
        </el-table>
@@ -126,74 +133,6 @@
          </el-collapse-item>
        </el-collapse>
    </div>
-    <div class="content" v-if="active === '2'">
-      <div class="block" style="padding-top: 20px;">
-        <el-timeline>
-          <el-form
-            ref="Form"
-            :model="roleForm"
-            :rules="roleFormRules"
-            class="label-input-form">
-            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="startUserName" style="margin-bottom: 0">
-                  <h4>流程发起人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="下发标准法规工程师" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="dockUserName" style="margin-bottom: 0">
-                  <h4>标准法规工程师</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" placeholder="选择标准法规工程师" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
-                    </el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="确认分发责任人" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="ministerUserName" style="margin-bottom: 0">
-                  <h4>分发责任人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.ministerUserName" placeholder="选择分发责任人" @click.native="choiceZRR('ministerUser', '选择分发责任人', roleForm.ministerUser)"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="负责人上传材料" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="directorUserName" style="margin-bottom: 0">
-                  <h4>负责人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.directorUserName" placeholder="选择负责人" @click.native="choiceZRR('directorUser', '选择负责人', roleForm.directorUser)"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="批准人" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="presidentUserName" style="margin-bottom: 0">
-                  <h4>分发责任人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.presidentUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.presidentUserName" placeholder="选择分发负责人" @click.native="choiceZRR('presidentUser', '选择分发负责人', roleForm.presidentUser)"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-          </el-form>
-        </el-timeline>
-      </div>
-    </div>
    <ProcessFooter
      show-save
      show-submit
@@ -253,45 +192,7 @@ export default {
      active: '1', // 默认显示
      isSubmit: false,
      saveLoading: false,
-      dataList: [
-        {
-          standId: '1',
-          productName: '1',
-          itemsNum: '1',
-          itemsName: '1',
-          planCloseTime: '1',
-          responsibleUnit: '1',
-          dutyEngineer: '1',
-          duty: '',
-      },{
-          standId: '332',
-          productName: '333',
-          itemsNum: '33',
-          itemsName: '33',
-          planCloseTime: '33',
-          responsibleUnit: '33',
-          dutyEngineer: '33',
-          duty: ''
-        },{
-          standId: '312`',
-          productName: '31312',
-          itemsNum: '31`2',
-          itemsName: '312`1`',
-          planCloseTime: '321`3`2',
-          responsibleUnit: '312`123`',
-          dutyEngineer: '312123',
-          duty: '121'
-        },{
-          standId: '32123',
-          productName: '32132',
-          itemsNum: '312321',
-          itemsName: '3123',
-          planCloseTime: '3123',
-          responsibleUnit: '3123',
-          dutyEngineer: '3123',
-          duty: ''
-        },
-      ],
+      dataList: [],
      // 新增选择分发责任人数组
      multipleSelection: [],
      // 当前页数
@@ -310,13 +211,6 @@ export default {
        dutyEngineer: ''
      }],
      clearSelection: false,
-      selectedList: [],  //未整改项的选择框
-      roleForm: {
-        startUserName: this.$store.getters.userInfo.userName,
-        startUser: this.$store.getters.userInfo.userId,
-      },
-      roleFormRules: {
-      },
      nodeList: [],
      drawerTitle: '', //drawer标题
      modalshowflag: false, // drawer开关
@@ -333,23 +227,50 @@ export default {
    ProcessTitle
  },
  created() {
+    this.getData()
+    this.getTree()
  },
  methods: {
-    getList() {
-      this.myLoading.loadData = true
-      this.$http.get('sarStandUnqualified/sar-stand-unqualified', {
-        ...this.nonConformitySearch,
-        current: this.pageNo,
-        size: this.$store.getters.userInfo.configContent
-      }, {
-        _this: this
-      }, res => {
-        this.myLoading.loadData = false
-        this.nonList = res.data.records
-        this.total = res.data.total
-      }, e => {
-        this.myLoading.loadData = false
-      })
+    getData() {
+      this.dataList = [
+        {
+          standId: '1',
+          productName: '1',
+          itemsNum: '1',
+          itemsName: '1',
+          planCloseTime: '1',
+          responsibleUnit: '1',
+          dutyEngineer: '1',
+          dutyPeople: '',
+        },{
+          standId: '332',
+          productName: '333',
+          itemsNum: '33',
+          itemsName: '33',
+          planCloseTime: '33',
+          responsibleUnit: '33',
+          dutyEngineer: '33',
+          dutyPeople: ''
+        },{
+          standId: '312`',
+          productName: '31312',
+          itemsNum: '31`2',
+          itemsName: '312`1`',
+          planCloseTime: '321`3`2',
+          responsibleUnit: '312`123`',
+          dutyEngineer: '312123',
+          dutyPeople: '121'
+        },{
+          standId: '32123',
+          productName: '32132',
+          itemsNum: '312321',
+          itemsName: '3123',
+          planCloseTime: '3123',
+          responsibleUnit: '3123',
+          dutyEngineer: '3123',
+          dutyPeople: ''
+        },
+      ]
    },

    // 批量选择分发责任人
@@ -357,32 +278,23 @@ export default {
      if (this.multipleSelection.length === 0) {
        this.$message.warning("请选择至少一条数据进行分发责任人");
      } else {
-        this.multipleSelection.forEach((val, index)=> {
-          val.show = true
-          this.$set(val, index)
+        this.multipleSelection.map((i, index)=> {
+          i.show = true
+          this.$set(this.dataList, i, index)
        })
-        // this.modalshowflag = true
-        // this.$set(this.dataList.duty)
      }
    },
    // 选择勾选项的集合
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-      console.log(this.multipleSelection)
+    handleSelectionChange(value) {
+      this.multipleSelection = value
+      console.log(value)
    },
    // 选择分发责任人时
-    choiceDuty() {
-      for (let i = 0; i < this.multipleSelection.length; i++ ) {
-        if (this.multipleSelection[i].duty !== '') {
-          console.log(i)
-          for (let b = 0; b < this.multipleSelection.length; b++) {
-            this.multipleSelection[b].duty = this.multipleSelection[i].duty
-            this.multipleSelection.forEach(val=> {
-              val.show = false
-            })
-          }
-        }
-      }
+    choiceDuty(type, title, id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.drawerTitle = title
+      this.modalshowflag = true
    },
    selectPeople(row) {
      this.modalshowflag = true
@@ -402,14 +314,6 @@ export default {
        this.treeData = res.data
      })
    },
-    // 流程阶段负责人选择
-    choiceZRR (type, title, id) {
-      this.nodeList = []
-      this.nodeList.push(id)
-      this.type = type
-      this.drawerTitle = title
-      this.modalshowflag = true
-    },
    drawerCheck (data) {
      var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
      if(getlist.length == 1) {
@@ -421,18 +325,17 @@ export default {
    },
    // 流程节点负责人抽屉保存按钮
    saveUserInfo () {
-      if (this.type === 'dockUser') {
-        this.roleForm.dockUser = this.roleRow.id
-        this.roleForm.dockUserName = this.roleRow.name
-      } else if (this.type === 'ministerUser') {
-        this.roleForm.ministerUser = this.roleRow.id
-        this.roleForm.ministerUserName = this.roleRow.name
-      } else if (this.type === 'directorUser') {
-        this.roleForm.directorUser = this.roleRow.id
-        this.roleForm.directorUserName = this.roleRow.name
-      } else if (this.type === 'presidentUser') {
-        this.roleForm.presidentUser = this.roleRow.id
-        this.roleForm.presidentUserName = this.roleRow.name
+      // 选取负责人时的操作
+      for (let i = 0; i < this.multipleSelection.length; i++ ) {
+          this.multipleSelection[i].dutyPeople = this.roleRow.name
+          for (let b = 0; b < this.multipleSelection.length; b++) {
+            this.multipleSelection[b].dutyPeople = this.multipleSelection[i].dutyPeople
+            this.dataList.forEach(val=> {
+              val.show = false
+            })
+          }
+        this.multipleSelection = []
+        this.$refs.multipleTable.clearSelection();
      }
      this.modalshowflag = false
    },
@@ -440,8 +343,9 @@ export default {
    cancleUserInfo () {
      this.modalshowflag = false
    },
-    //未整改项抽屉中的查询按钮
+    //查询按钮
    getTableByPage() {
+      this.getData()
    },
    // 清空 查询条件
    clearAllSearch (search = true) {
@@ -505,19 +409,6 @@ export default {
    justify-content: space-between;
    height: calc(~'100% - 103px');
    overflow: auto;
-    .tableTitle {
-      margin-bottom: 10px;
-      height: 30px;
-      line-height: 30px;
-      position: relative;
-      font-size: 13px;
-      font-weight: bold;
-      .tableButton {
-        position: absolute;
-        right: 0;
-        top: 0;
-      }
-    }
  }
 }
 </style>
@@ -6,7 +6,6 @@
    </ProcessHeader>
    <div class="headerTabs">
      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div>
    </div>
    <div class="content" v-if="active === '1'">
      <div style="flex: auto;">
@@ -15,16 +14,20 @@
        </ProcessTitle>
        <el-form :modal="dataList" inline class="label-input-form">
          <el-form-item label="标准号/标准名称" class="search-item">
-            <el-input v-model="dataList.standId"
-                      placeholder="请输入"
-                      clearable
-                      :maxlength="100"></el-input>
+            <el-input
+              size="small"
+              v-model="dataList.standId"
+              placeholder="请输入"
+              clearable
+              :maxlength="100"></el-input>
          </el-form-item>
          <el-form-item label="项目名称" class="search-item">
-            <el-input v-model="dataList.productName"
-                      placeholder="请输入"
-                      clearable
-                      :maxlength="100"></el-input>
+            <el-input
+              size="small"
+              v-model="dataList.productName"
+              placeholder="请输入"
+              clearable
+              :maxlength="100"></el-input>
          </el-form-item>
          <el-form-item label="责任部门" class="search-item">
            <el-input v-model="dataList.responsibleUnit" v-show="false" />
@@ -35,6 +38,7 @@
              :value="false"
            >
              <el-input
+                size="small"
                slot="reference"
                v-model="dataList.responseUnitShow"
                placeholder="根据责任部门查找"
@@ -81,7 +85,6 @@
          style="width: 100%"
          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', height: '48px'}">
-          <el-table-column type="selection" width="55" align="center"/>
          <el-table-column prop="standId" label="标准号/标准名称"/>
          <el-table-column prop="productName" label="项目名称"/>
          <el-table-column prop="itemsNum" label="条款号"/>
@@ -89,9 +92,21 @@
          <el-table-column prop="planCloseTime" label="整改完成时间"/>
          <el-table-column prop="responsibleUnit" label="责任部门"/>
          <el-table-column prop="dutyEngineer" label="责任工程师"/>
-          <el-table-column label="选择责任人">
+          <el-table-column label="选择责任人" prop="dutyPeople" width="200">
            <template slot-scope="scope">
-              <el-button type="primary" size="small" @click="selectPeople(scope.row)">选择责任人</el-button>
+              <div style="display: inline;">
+                <el-input
+                  class="input-button"
+                  style="width: 60%"
+                  :disabled="true"
+                  v-model="scope.row.dutyPeople"
+                  size="mini"
+                  placeholder="请选择责任人"
+                />
+              </div>
+              <div style="display: inline">
+                <el-button size="mini" type="primary" @click="selectPeople(scope.row)">选择</el-button>
+              </div>
            </template>
          </el-table-column>
        </el-table>
@@ -111,74 +126,6 @@
        </el-collapse-item>
      </el-collapse>
    </div>
-    <div class="content" v-if="active === '2'">
-      <div class="block" style="padding-top: 20px;">
-        <el-timeline>
-          <el-form
-            ref="Form"
-            :model="roleForm"
-            :rules="roleFormRules"
-            class="label-input-form">
-            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="startUserName" style="margin-bottom: 0">
-                  <h4>流程发起人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="下发标准法规工程师" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="dockUserName" style="margin-bottom: 0">
-                  <h4>标准法规工程师</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" placeholder="选择标准法规工程师" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
-                    </el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="确认分发责任人" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="ministerUserName" style="margin-bottom: 0">
-                  <h4>分发责任人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.ministerUserName" placeholder="选择分发责任人" @click.native="choiceZRR('ministerUser', '选择分发责任人', roleForm.ministerUser)"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="负责人上传材料" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="directorUserName" style="margin-bottom: 0">
-                  <h4>负责人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.directorUserName" placeholder="选择负责人" @click.native="choiceZRR('directorUser', '选择负责人', roleForm.directorUser)"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="批准人" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="presidentUserName" style="margin-bottom: 0">
-                  <h4>分发责任人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.presidentUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.presidentUserName" placeholder="选择负责人" @click.native="choiceZRR('presidentUser', '选择负责人', roleForm.presidentUser)"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-          </el-form>
-        </el-timeline>
-      </div>
-    </div>
    <ProcessFooter
      show-save
      show-submit
@@ -246,7 +193,8 @@ export default {
          itemsName: '1',
          planCloseTime: '1',
          responsibleUnit: '1',
-          dutyEngineer: '1'
+          dutyEngineer: '1',
+          dutyPeople: '13123'
        },{
          standId: '',
          productName: '',
@@ -254,30 +202,14 @@ export default {
          itemsName: '',
          planCloseTime: '',
          responsibleUnit: '',
-          dutyEngineer: ''
+          dutyEngineer: '',
+          dutyPeople: ''
        }],
-      // 当前页数
-      pageNo: 1,
-      total: 0,
-      myLoading: false,
+      newDataList: [],
+
      // 责任部门
      zNodesSItem: [],
-      unqualidiedData: [{
-        standId: '',
-        productName: '',
-        itemsNum: '',
-        itemsName: '',
-        planCloseTime: '',
-        responsibleUnit: '',
-        dutyEngineer: ''
-      }],
-      selectedList: [],  //未整改项的选择框
-      roleForm: {
-        startUserName: this.$store.getters.userInfo.userName,
-        startUser: this.$store.getters.userInfo.userId,
-      },
-      roleFormRules: {
-      },
+
      nodeList: [],
      drawerTitle: '', //drawer标题
      modalshowflag: false, // drawer开关
@@ -294,26 +226,13 @@ export default {
    ProcessTitle
  },
  created() {
+    this.getTree()
  },
  methods: {
-    getList() {
-      this.myLoading.loadData = true
-      this.$http.get('sarStandUnqualified/sar-stand-unqualified', {
-        ...this.nonConformitySearch,
-        current: this.pageNo,
-        size: this.$store.getters.userInfo.configContent
-      }, {
-        _this: this
-      }, res => {
-        this.myLoading.loadData = false
-        this.nonList = res.data.records
-        this.total = res.data.total
-      }, e => {
-        this.myLoading.loadData = false
-      })
-    },
-
-    selectPeople(row) {
+    // 选择责任人的按钮操作
+    selectPeople(val) {
+      this.newDataList = val
+      this.nodeList = []
      this.modalshowflag = true
    },
    handleTabs(name) {
@@ -331,14 +250,6 @@ export default {
        this.treeData = res.data
      })
    },
-    // 流程阶段负责人选择
-    choiceZRR (type, title, id) {
-      this.nodeList = []
-      this.nodeList.push(id)
-      this.type = type
-      this.drawerTitle = title
-      this.modalshowflag = true
-    },
    drawerCheck (data) {
      var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
      if(getlist.length == 1) {
@@ -350,26 +261,15 @@ export default {
    },
    // 流程节点负责人抽屉保存按钮
    saveUserInfo () {
-      if (this.type === 'dockUser') {
-        this.roleForm.dockUser = this.roleRow.id
-        this.roleForm.dockUserName = this.roleRow.name
-      } else if (this.type === 'ministerUser') {
-        this.roleForm.ministerUser = this.roleRow.id
-        this.roleForm.ministerUserName = this.roleRow.name
-      } else if (this.type === 'directorUser') {
-        this.roleForm.directorUser = this.roleRow.id
-        this.roleForm.directorUserName = this.roleRow.name
-      } else if (this.type === 'presidentUser') {
-        this.roleForm.presidentUser = this.roleRow.id
-        this.roleForm.presidentUserName = this.roleRow.name
-      }
+      // 选择责任人时input框内值
+      this.newDataList.dutyPeople = this.roleRow.name
      this.modalshowflag = false
    },
    // 流程节点负责人抽屉取消按钮
    cancleUserInfo () {
      this.modalshowflag = false
    },
-    //未整改项抽屉中的查询按钮
+    //查询按钮
    getTableByPage() {
    },
    // 清空 查询条件
@@ -434,19 +334,6 @@ export default {
    justify-content: space-between;
    height: calc(~'100% - 103px');
    overflow: auto;
-    .tableTitle {
-      margin-bottom: 10px;
-      height: 30px;
-      line-height: 30px;
-      position: relative;
-      font-size: 13px;
-      font-weight: bold;
-      .tableButton {
-        position: absolute;
-        right: 0;
-        top: 0;
-      }
-    }
  }
 }
 </style>
@@ -6,7 +6,6 @@
    </ProcessHeader>
    <div class="headerTabs">
      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div>
    </div>
    <div class="content" v-if="active === '1'">
      <div style="flex: auto;">
@@ -15,16 +14,20 @@
        </ProcessTitle>
        <el-form :modal="dataList" inline class="label-input-form">
          <el-form-item label="标准号/标准名称" class="search-item">
-            <el-input v-model="dataList.standId"
-                      placeholder="请输入"
-                      clearable
-                      :maxlength="100"></el-input>
+            <el-input
+              size="small"
+              v-model="dataList.standId"
+              placeholder="请输入"
+              clearable
+              :maxlength="100"></el-input>
          </el-form-item>
          <el-form-item label="项目名称" class="search-item">
-            <el-input v-model="dataList.productName"
-                      placeholder="请输入"
-                      clearable
-                      :maxlength="100"></el-input>
+            <el-input
+              size="small"
+              v-model="dataList.productName"
+              placeholder="请输入"
+              clearable
+              :maxlength="100"></el-input>
          </el-form-item>
          <el-form-item label="责任部门" class="search-item">
            <el-input v-model="dataList.responsibleUnit" v-show="false" />
@@ -35,6 +38,7 @@
              :value="false"
            >
              <el-input
+                size="small"
                slot="reference"
                v-model="dataList.responseUnitShow"
                placeholder="根据责任部门查找"
@@ -87,11 +91,27 @@
          <el-table-column prop="itemsName" label="条款名称"/>
          <el-table-column prop="planCloseTime" label="整改完成时间"/>
          <el-table-column prop="responsibleUnit" label="责任部门"/>
-          <el-table-column prop="duty" label="负责人"/>
+          <el-table-column prop="dutyPeople" label="负责人"/>
          <el-table-column label="佐证材料">
            <template slot-scope="scope">
-              <el-upload>
-                <el-button type="primary" size="small" @click="uploadText(scope.row)">上传佐证材料</el-button>
+              <el-upload
+                v-model="fileText"
+                ref="uploadFile"up
+                :action="uploadPath"
+                class="upload-demo"
+                :http-request="handleUpload"
+                :on-success="handleOnsuccess"
+                :on-error="handleOnError"
+                :before-upload="handleBeforeUpload"
+                :before-remove="handleBeforeRemove"
+                :on-remove="handleOnRemove"
+                :on-exceed="handleExceed"
+                :limit="10"
+                :file-list="uploadFileList"
+                list-type="picture"
+                :auto-upload="true"
+              >
+                <el-button type="text">上传佐证材料</el-button>
              </el-upload>
            </template>
          </el-table-column>
@@ -112,74 +132,6 @@
        </el-collapse-item>
      </el-collapse>
    </div>
-    <div class="content" v-if="active === '2'">
-      <div class="block" style="padding-top: 20px;">
-        <el-timeline>
-          <el-form
-            ref="Form"
-            :model="roleForm"
-            :rules="roleFormRules"
-            class="label-input-form">
-            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="startUserName" style="margin-bottom: 0">
-                  <h4>流程发起人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="下发标准法规工程师" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="dockUserName" style="margin-bottom: 0">
-                  <h4>标准法规工程师</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" placeholder="选择标准法规工程师" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
-                    </el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="确认分发责任人" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="ministerUserName" style="margin-bottom: 0">
-                  <h4>分发责任人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.ministerUserName" placeholder="选择分发责任人" @click.native="choiceZRR('ministerUser', '选择分发责任人', roleForm.ministerUser)"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="负责人上传材料" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="directorUserName" style="margin-bottom: 0">
-                  <h4>负责人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.directorUserName" placeholder="选择负责人" @click.native="choiceZRR('directorUser', '选择负责人', roleForm.directorUser)"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="批准人" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="presidentUserName" style="margin-bottom: 0">
-                  <h4>分发责任人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.presidentUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.presidentUserName" placeholder="选择分发负责人" @click.native="choiceZRR('presidentUser', '选择分发负责人', roleForm.presidentUser)"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-          </el-form>
-        </el-timeline>
-      </div>
-    </div>
    <ProcessFooter
      show-save
      show-submit
@@ -189,32 +141,6 @@
      @submit="handleSubmit"
    >
    </ProcessFooter>
-    <el-drawer
-      :title="drawerTitle"
-      :visible.sync="modalshowflag"
-      :wrapperClosable="false"
-      size="800px">
-      <el-tree
-        v-if="modalshowflag"
-        style="height: 100%;"
-        node-key="id"
-        class="filter-tree"
-        :data="treeData"
-        :props="defaultProps"
-        :default-checked-keys="nodeList"
-        highlight-current
-        check-strictly
-        @check="drawerCheck"
-        default-expand-all
-        :expand-on-click-node="false"
-        show-checkbox
-        ref="tree">
-      </el-tree>
-      <div id="roleFormButton" class="demo-drawer-footer">
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
-        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
-      </div>
-    </el-drawer>
  </div>
 </template>

@@ -247,7 +173,8 @@ export default {
          itemsName: '1',
          planCloseTime: '1',
          responsibleUnit: '1',
-          dutyEngineer: '1'
+          dutyEngineer: '1',
+          dutyPeople: '13123'
        },{
          standId: '',
          productName: '',
@@ -255,38 +182,19 @@ export default {
          itemsName: '',
          planCloseTime: '',
          responsibleUnit: '',
-          dutyEngineer: ''
+          dutyEngineer: '',
+          dutyPeople: '13123'
        }],
      // 当前页数
      pageNo: 1,
      total: 0,
      myLoading: false,
+      // 上传路径
+      uploadPath: 'api/att/attFile/upload',
+      // 上传文件所储存的数组
+      uploadFileList: [],
      // 责任部门
      zNodesSItem: [],
-      unqualidiedData: [{
-        standId: '',
-        productName: '',
-        itemsNum: '',
-        itemsName: '',
-        planCloseTime: '',
-        responsibleUnit: '',
-        dutyEngineer: ''
-      }],
-      selectedList: [],  //未整改项的选择框
-      roleForm: {
-        startUserName: this.$store.getters.userInfo.userName,
-        startUser: this.$store.getters.userInfo.userId,
-      },
-      roleFormRules: {
-      },
-      nodeList: [],
-      drawerTitle: '', //drawer标题
-      modalshowflag: false, // drawer开关
-      treeData: [], // 人员数据
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
    }
  },
  components: {
@@ -297,78 +205,36 @@ export default {
  created() {
  },
  methods: {
-    getList() {
-      this.myLoading.loadData = true
-      this.$http.get('sarStandUnqualified/sar-stand-unqualified', {
-        ...this.nonConformitySearch,
-        current: this.pageNo,
-        size: this.$store.getters.userInfo.configContent
-      }, {
-        _this: this
-      }, res => {
-        this.myLoading.loadData = false
-        this.nonList = res.data.records
-        this.total = res.data.total
-      }, e => {
-        this.myLoading.loadData = false
-      })
-    },

-    uploadText(row) {
-    },
+
    handleTabs(name) {
      this.active = name
    },
-
+    /************ 上传佐证材料 *****************/
+    // 上传材料
+    handleUpload() {},
+    // 文件上传成功
+    handleOnsuccess(res, file) {
+      this.$message.success('上传成功!')
+      console.log(file)
+    },
+    // 文件上传失败后回调
+    handleOnError(res, file) {},
+    // 文件上传限制条件
+    handleBeforeUpload() {},
+    // 移除上传的文件
+    handleBeforeRemove() {},
+    handleOnRemove() {},
+    // 文件超过限制数量提示
+    handleExceed() {
+      this.$message.error(``)
+    },
+    /************ ********* *****************/
    // 保存按钮
    handleSave() {},
    // 提交按钮
    handleSubmit() {},

-    // 获取流程节点数据
-    getTree () {
-      this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
-        this.treeData = res.data
-      })
-    },
-    // 流程阶段负责人选择
-    choiceZRR (type, title, id) {
-      this.nodeList = []
-      this.nodeList.push(id)
-      this.type = type
-      this.drawerTitle = title
-      this.modalshowflag = true
-    },
-    drawerCheck (data) {
-      var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
-      if(getlist.length == 1) {
-        this.roleRow = getlist[0]
-      }else {
-        this.$refs.tree.setCheckedKeys([data.id]);
-        this.roleRow = this.$refs.tree.getCheckedNodes()[0]
-      }
-    },
-    // 流程节点负责人抽屉保存按钮
-    saveUserInfo () {
-      if (this.type === 'dockUser') {
-        this.roleForm.dockUser = this.roleRow.id
-        this.roleForm.dockUserName = this.roleRow.name
-      } else if (this.type === 'ministerUser') {
-        this.roleForm.ministerUser = this.roleRow.id
-        this.roleForm.ministerUserName = this.roleRow.name
-      } else if (this.type === 'directorUser') {
-        this.roleForm.directorUser = this.roleRow.id
-        this.roleForm.directorUserName = this.roleRow.name
-      } else if (this.type === 'presidentUser') {
-        this.roleForm.presidentUser = this.roleRow.id
-        this.roleForm.presidentUserName = this.roleRow.name
-      }
-      this.modalshowflag = false
-    },
-    // 流程节点负责人抽屉取消按钮
-    cancleUserInfo () {
-      this.modalshowflag = false
-    },
    //未整改项抽屉中的查询按钮
    getTableByPage() {
    },
@@ -434,19 +300,6 @@ export default {
    justify-content: space-between;
    height: calc(~'100% - 103px');
    overflow: auto;
-    .tableTitle {
-      margin-bottom: 10px;
-      height: 30px;
-      line-height: 30px;
-      position: relative;
-      font-size: 13px;
-      font-weight: bold;
-      .tableButton {
-        position: absolute;
-        right: 0;
-        top: 0;
-      }
-    }
  }
 }
 </style>
@@ -6,7 +6,6 @@
    </ProcessHeader>
    <div class="headerTabs">
      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div>
    </div>
    <div class="content" v-if="active === '1'">
      <div style="flex: auto;">
@@ -15,16 +14,20 @@
        </ProcessTitle>
        <el-form :modal="dataList" inline class="label-input-form">
          <el-form-item label="标准号/标准名称" class="search-item">
-            <el-input v-model="dataList.standId"
-                      placeholder="请输入"
-                      clearable
-                      :maxlength="100"></el-input>
+            <el-input
+              size="small"
+              v-model="dataList.standId"
+              placeholder="请输入"
+              clearable
+              :maxlength="100"></el-input>
          </el-form-item>
          <el-form-item label="项目名称" class="search-item">
-            <el-input v-model="dataList.productName"
-                      placeholder="请输入"
-                      clearable
-                      :maxlength="100"></el-input>
+            <el-input
+              size="small"
+              v-model="dataList.productName"
+              placeholder="请输入"
+              clearable
+              :maxlength="100"></el-input>
          </el-form-item>
          <el-form-item label="责任部门" class="search-item">
            <el-input v-model="dataList.responsibleUnit" v-show="false" />
@@ -35,6 +38,7 @@
              :value="false"
            >
              <el-input
+                size="small"
                slot="reference"
                v-model="dataList.responseUnitShow"
                placeholder="根据责任部门查找"
@@ -108,74 +112,6 @@
        </el-collapse-item>
      </el-collapse>
    </div>
-    <div class="content" v-if="active === '2'">
-      <div class="block" style="padding-top: 20px;">
-        <el-timeline>
-          <el-form
-            ref="Form"
-            :model="roleForm"
-            :rules="roleFormRules"
-            class="label-input-form">
-            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="startUserName" style="margin-bottom: 0">
-                  <h4>流程发起人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="下发标准法规工程师" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="dockUserName" style="margin-bottom: 0">
-                  <h4>标准法规工程师</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" placeholder="选择标准法规工程师" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
-                    </el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="确认分发责任人" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="ministerUserName" style="margin-bottom: 0">
-                  <h4>分发责任人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.ministerUserName" placeholder="选择分发责任人" @click.native="choiceZRR('ministerUser', '选择分发责任人', roleForm.ministerUser)"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="负责人上传材料" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="directorUserName" style="margin-bottom: 0">
-                  <h4>负责人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.directorUserName" placeholder="选择负责人" @click.native="choiceZRR('directorUser', '选择负责人', roleForm.directorUser)"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="批准人" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="presidentUserName" style="margin-bottom: 0">
-                  <h4>分发责任人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.presidentUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.presidentUserName" placeholder="选择分发负责人" @click.native="choiceZRR('presidentUser', '选择分发负责人', roleForm.presidentUser)"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-          </el-form>
-        </el-timeline>
-      </div>
-    </div>
    <ProcessFooter
      show-back
      show-submit
@@ -185,32 +121,6 @@
      @submit="handleSubmit"
    >
    </ProcessFooter>
-    <el-drawer
-      :title="drawerTitle"
-      :visible.sync="modalshowflag"
-      :wrapperClosable="false"
-      size="800px">
-      <el-tree
-        v-if="modalshowflag"
-        style="height: 100%;"
-        node-key="id"
-        class="filter-tree"
-        :data="treeData"
-        :props="defaultProps"
-        :default-checked-keys="nodeList"
-        highlight-current
-        check-strictly
-        @check="drawerCheck"
-        default-expand-all
-        :expand-on-click-node="false"
-        show-checkbox
-        ref="tree">
-      </el-tree>
-      <div id="roleFormButton" class="demo-drawer-footer">
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
-        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
-      </div>
-    </el-drawer>
  </div>
 </template>

@@ -259,34 +169,9 @@ export default {
      myLoading: false,
      // 责任部门
      zNodesSItem: [],
-      unqualidiedData: [{
-        standId: '',
-        productName: '',
-        itemsNum: '',
-        itemsName: '',
-        planCloseTime: '',
-        responsibleUnit: '',
-        dutyEngineer: ''
-      }],
-      selectedList: [],  //未整改项的选择框
-      roleForm: {
-        startUserName: this.$store.getters.userInfo.userName,
-        startUser: this.$store.getters.userInfo.userId,
-      },
-      roleFormRules: {
-      },
      // 驳回弹窗状态
      backDialog: false,

-
-      nodeList: [],
-      drawerTitle: '', //drawer标题
-      modalshowflag: false, // drawer开关
-      treeData: [], // 人员数据
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
    }
  },
  components: {
@@ -297,80 +182,13 @@ export default {
  created() {
  },
  methods: {
-    getList() {
-      this.myLoading.loadData = true
-      this.$http.get('sarStandUnqualified/sar-stand-unqualified', {
-        ...this.nonConformitySearch,
-        current: this.pageNo,
-        size: this.$store.getters.userInfo.configContent
-      }, {
-        _this: this
-      }, res => {
-        this.myLoading.loadData = false
-        this.nonList = res.data.records
-        this.total = res.data.total
-      }, e => {
-        this.myLoading.loadData = false
-      })
-    },
-    // 批准俺妞妞操作
-    handleBack() {
-      this.backDialog = true
-    },
-    handleSuccess() {},
+
    handleTabs(name) {
      this.active = name
    },

-    // 保存按钮
-    handleSave() {},
    // 提交按钮
    handleSubmit() {},
-
-    // 获取流程节点数据
-    getTree () {
-      this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
-        this.treeData = res.data
-      })
-    },
-    // 流程阶段负责人选择
-    choiceZRR (type, title, id) {
-      this.nodeList = []
-      this.nodeList.push(id)
-      this.type = type
-      this.drawerTitle = title
-      this.modalshowflag = true
-    },
-    drawerCheck (data) {
-      var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
-      if(getlist.length == 1) {
-        this.roleRow = getlist[0]
-      }else {
-        this.$refs.tree.setCheckedKeys([data.id]);
-        this.roleRow = this.$refs.tree.getCheckedNodes()[0]
-      }
-    },
-    // 流程节点负责人抽屉保存按钮
-    saveUserInfo () {
-      if (this.type === 'dockUser') {
-        this.roleForm.dockUser = this.roleRow.id
-        this.roleForm.dockUserName = this.roleRow.name
-      } else if (this.type === 'ministerUser') {
-        this.roleForm.ministerUser = this.roleRow.id
-        this.roleForm.ministerUserName = this.roleRow.name
-      } else if (this.type === 'directorUser') {
-        this.roleForm.directorUser = this.roleRow.id
-        this.roleForm.directorUserName = this.roleRow.name
-      } else if (this.type === 'presidentUser') {
-        this.roleForm.presidentUser = this.roleRow.id
-        this.roleForm.presidentUserName = this.roleRow.name
-      }
-      this.modalshowflag = false
-    },
-    // 流程节点负责人抽屉取消按钮
-    cancleUserInfo () {
-      this.modalshowflag = false
-    },
    //未整改项抽屉中的查询按钮
    getTableByPage() {
    },
@@ -436,19 +254,6 @@ export default {
    justify-content: space-between;
    height: calc(~'100% - 103px');
    overflow: auto;
-    .tableTitle {
-      margin-bottom: 10px;
-      height: 30px;
-      line-height: 30px;
-      position: relative;
-      font-size: 13px;
-      font-weight: bold;
-      .tableButton {
-        position: absolute;
-        right: 0;
-        top: 0;
-      }
-    }
  }
 }
 </style>
@@ -0,0 +1,708 @@
+<!--项目合规评估流程 xmpgStep1-->
+<template>
+  <div class="xmpg-step1">
+    <ProcessHeader toggle>
+      <template slot="proName">项目合规评估流程</template>
+      <template slot="proNode">申请人发起流程</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
+    </div>
+    <div class="content" v-if="active == '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          :rules="formRules"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="选择标准" prop="orgName" class="add-form-item form-item-disabled">
+                <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">选择已拆分标准</el-button>
+              </el-form-item>
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standNumber"
+                  placeholder="请输入标准编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standName"
+                  placeholder="请输入标准名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <div class="tableTitle">
+          <div class="tableButton">
+            <el-button plain class="common-button-primary" size="mini"  @click="addList">新增</el-button>
+            <el-button plain class="common-button-primary" size="mini"  @click="addList">批量删除</el-button>
+          </div>
+        </div>
+        <el-table
+          :data="dataList"
+          border
+          ref="selection"
+          height="49%"
+          style="width: 100%;"
+          @selection-change="selectStandChange"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="productLine"
+            label="产品线">
+          </el-table-column>
+          <el-table-column
+            prop="cpxzrr"
+            label="产品线责任人">
+          </el-table-column>
+          <el-table-column
+            prop="ffzrr"
+            label="分发责任人">
+            <template>
+              <el-input
+                placeholder="请选择分发责任人"
+              >
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="content" v-show="active === '2'">
+      <div class="block" style="padding-top: 20px;">
+        <el-timeline>
+          <el-form
+            ref="Form"
+            :model="roleForm"
+            :rules="roleFormRules"
+            class="label-input-form">
+            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="startUserName" style="margin-bottom: 0">
+                  <h4>标准法规工程师</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人"></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="审核" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                  <h4>标准法法规业务经理</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.dockUserName" placeholder="选择审核责任人"
+                              @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="分发责任人进行任务分发" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="ministerUserName" style="margin-bottom: 0">
+                  <h4>分发责任人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.ministerUserName" placeholder="选择标准/政策法规工程师"
+                              @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="审批" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="directorUserName" style="margin-bottom: 0">
+                  <h4>业务经理</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.directorUserName" placeholder="选择业务经理"
+                              @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+          </el-form>
+        </el-timeline>
+      </div>
+    </div>
+    <!-- 选择已拆分标准抽屉-->
+    <el-drawer
+      title="选择已拆分标准"
+      :visible.sync="ListModel"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="demo-drawer-content">
+        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <el-table
+              :data="sarAccessListDatas"
+              tooltip-effect="dark"
+              style="width: 100%"
+              border
+              height="100%"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+              @selection-change="selectListChange"
+              ref="selection"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="detailedList"
+                label="清单类别"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="detailedListName"
+                label="清单名称"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="detailedListState"
+                label="清单状态"
+                align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.detailedListState === '1'">未发布</span>
+                  <span v-if="scope.row.detailedListState === '2'">已发布</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="detailedListVision"
+                label="清单版本"
+                align="center">
+                <template slot-scope="scope">
+            <span
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="applicationScope"
+                label="适用领域"
+                align="center">
+                <template slot-scope="scope">
+            <span
+              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
+              }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="updateTime"
+                label="更新时间"
+                sortable
+                align="center">
+                <template slot-scope="scope">
+                  <div>
+                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
+                    }}
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="updatePeople"
+                label="更新人"
+                align="center">
+              </el-table-column>
+            </el-table>
+          </div>
+          <pagination
+            :page="page"
+            :pageSize="pageSize"
+            :total="total"
+            @pageChange="pageChange"
+            @pageSizeChange="pageSizeChange"
+          />
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="closeDrawer">取消</el-button>
+        <el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
+      </div>
+    </el-drawer>
+<!--    添加抽屉-->
+    <el-drawer
+      title="添加产品线"
+      :visible.sync="standModel"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="demo-drawer-content">
+        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <el-table
+              :data="productData"
+              tooltip-effect="dark"
+              style="width: 100%"
+              border
+              ref="table"
+              height="100%"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+              @selection-change="selectThree"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="productLine"
+                label="产品线">
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                prop="projectManager"
+                label="产品线责任人">
+              </el-table-column>
+            </el-table>
+          </div>
+          <pagination
+            :page="pageNo"
+            :pageSize="pageSizeNo"
+            :total="totalNo"
+            @pageChange="pageChangeNo"
+            @pageSizeChange="pageSizeChangeNo"
+          />
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="cancelStand">取消</el-button>
+        <el-button type="primary" size="mini" @click="okStand">添加</el-button>
+      </div>
+    </el-drawer>
+    <ProcessFooter
+      show-save
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!--    选择责任人-->
+    <el-drawer
+      :title="drawerTitle"
+      :visible.sync="modalshowflag"
+      :wrapperClosable="false"
+      size="800px">
+      <el-tree
+        v-if="modalshowflag"
+        style="height: 100%;"
+        node-key="id"
+        class="filter-tree"
+        :data="treeData"
+        :props="defaultProps"
+        :default-checked-keys="nodeList"
+        highlight-current
+        check-strictly
+        @check="drawerCheck"
+        default-expand-all
+        :expand-on-click-node="false"
+        show-checkbox
+        ref="tree">
+      </el-tree>
+      <div id="roleFormButton" class="demo-drawer-footer">
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">
+          确定
+        </el-button>
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { saveTaskFirst } from "api/process";
+
+export default {
+  name: "xmpgStep1",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      active: "1",
+      standModel: false,
+      sarAccessListDatas: [],
+      productData:[], //添加抽屉的数据
+      standList: [], //新添加的标准
+      modalshowflag: false, // drawer开关
+      drawerTitle: "", //drawer标题
+      nodeList: [],
+      defaultProps: {
+        children: "children",
+        label: "name"
+      },
+      roleForm: {
+        startUserName: this.$store.getters.userInfo.userName,
+        startUser: this.$store.getters.userInfo.id,
+        dockUser: "",
+        responUserList: "",
+        ministerUser: "",
+        directorUser: "",
+        presidentUser: "",
+        dockUserName: "",
+        responUserListName: "",
+        ministerUserName: "",
+        directorUserName: "",
+        presidentUserName: ""
+      },
+      formRules: {
+        listType: [
+          { required: true, message: "请选择清单类型", trigger: "blur" }
+        ],
+        listName: [
+          { required: true, message: "请填写清单名称", trigger: "change" }
+        ]
+      },
+      roleFormRules: {
+        // dockUserName: [
+        //   { required: true, message: "请选择会签责任人", trigger: "blur" }
+        // ],
+        ministerUserName: [
+          { required: true, message: "请选择修订责任人", trigger: "blur" }
+        ],
+        directorUserName: [
+          { required: true, message: "请选择审批责任人", trigger: "blur" }
+        ]
+      },
+      ListModel: false, //选择拆分标准抽屉状态
+      isSubmit: false,
+      saveLoading: false,
+      selectedList: [],  //拆分标准的选择框
+      dataList:[],
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      pageNo: 1,
+      totalNo: 0,
+      pageSizeNo: this.$store.getters.userInfo.configContent,
+      product: new Map(),
+      listForm: {
+        standNumber: "", //标准编号
+        standName: "",//标准名称
+        dataList: [{
+          code: "", //标准号
+          standName: "", //标准名称
+          issueTime: "", //发布日期
+          xcxssrq: "", //新车型实施日期
+          zccssrq: "", //在产车实施日期
+          textStatus: "", //文本状态
+          id: ""
+        }]
+      },
+      choiceForm: {}, //选择标准清单列表
+    };
+  },
+  methods: {
+    saveUserInfo() {
+      if (this.type === "dockUser") {
+        this.roleForm.dockUser = this.roleRow.id;
+        this.roleForm.dockUserName = this.roleRow.name;
+      } else if (this.type === "ministerUser") {
+        this.roleForm.ministerUser = this.roleRow.id;
+        this.roleForm.ministerUserName = this.roleRow.name;
+      } else if (this.type === "directorUser") {
+        this.roleForm.directorUser = this.roleRow.id;
+        this.roleForm.directorUserName = this.roleRow.name;
+      } else if (this.type === "presidentUser") {
+        this.roleForm.presidentUser = this.roleRow.id;
+        this.roleForm.presidentUserName = this.roleRow.name;
+      }
+      this.modalshowflag = false;
+    },
+    cancleUserInfo() {
+      this.modalshowflag = false;
+    },
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    choiceShow() {
+      this.ListModel = true;
+    },
+    drawerCheck(data) {
+      var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+      if (getlist.length == 1) {
+        this.roleRow = getlist[0];
+      } else {
+        this.$refs.tree.setCheckedKeys([data.id]);
+        this.roleRow = this.$refs.tree.getCheckedNodes()[0];
+      }
+    },
+    //导入功能
+    leading() {
+
+    },
+    //点击新增事件
+    addList() {
+      this.standModel = true;
+    },
+    //取消添加事件
+    cancelStand() {
+     this.standModel = false
+    },
+    //确认添加事件
+    okStand() {
+      if(this.standList.length >= 1){
+        let deposit = new Map();
+        this.sarAccessListDatas.forEach(item => {
+          deposit.set(item.id, item);
+        });
+        let bringData = [];
+        for (let i = 0; i < this.standList.length; i++) {
+          bringData.push(deposit.get(this.standList[i]));
+        }
+        console.log(bringData);
+        this.standModel = false
+      }else{
+        this.$message.warning('请选择一条数据进行添加')
+      }
+    },
+    //保存事件
+    handleSave() {
+      this.saveLoading = true;
+      let _formData = new FormData();
+      _formData.append("createUser", this.$store.getters.userInfo.userId);
+      _formData.append("createUserName", this.$store.getters.userInfo.uName);
+      _formData.append("prcType", this.$route.query.type);
+      _formData.append("json", JSON.stringify({
+        prcForm: this.prcForm,
+        sarAccessInfoList: this.sarAccessInfoList,
+        sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
+        bzqdForm: this.bzqdForm,
+        listInfo: this.listInfo,
+        id: this.id
+      }));
+      saveTaskFirst(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+      }).catch(e => {
+        this.saveLoading = false;
+      });
+    },
+    //提交事件
+    handleSubmit() {
+      let json = this.listForm;
+      json.zrUserId = this.$store.getters.userInfo.userId;
+      json.jlUserId = this.$store.getters.userInfo.userId;
+      json.applyUpdUserId = this.$store.getters.userInfo.userId;
+      json.approvalOpinion = "";
+      json.prcCreateUser = this.$store.getters.userInfo.userId;
+      json.prcCreateUserName = this.$store.getters.userInfo.account;
+      json.standName = this.listForm.listName;
+      json.standId = this.listForm.standId;
+      this.$refs["qdfbForm"].validate((valid) => {
+        if (valid) {
+          this.$refs["Form"].validate((valid) => {
+            if (valid) {
+              this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
+                _this: this
+              }, res => {
+                if (res.ok) {
+                  this.$http.post("lawss/activiti/completeTask", {
+                    taskIds: res.data,
+                    userId: this.$store.getters.userInfo.userId,
+                    json: JSON.stringify(json)
+                  }, {
+                    _this: this
+                  }, res => {
+                    if (res.success) {
+                      this.$message.success(res.message);
+                      this.$router.push("/processCenter");
+                    }
+                  });
+                }
+              });
+            } else {
+              return this.$message.warning("请完善人员信息");
+            }
+          });
+        } else {
+          return this.$message.warning("请完善基础信息");
+        }
+      });
+    },
+    //选择拆分标准取消事件
+    closeDrawer() {
+      this.ListModel = false;
+    },
+
+    //选择拆分标准确定事件
+    OkDrawer() {
+    },
+    //选择拆分标准选择框改变
+    selectListChange(data) {
+      this.selectedList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectedList.push(data[i].id);
+      }
+    },
+    //标准表格选择框改变
+    selectStandChange(data) {
+      this.selectList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectList.push(data[i].id);
+      }
+    },
+    //添加产品线select的改变
+    selectThree(data) {
+      this.standList = [];
+      for(let i=0;i<data.length; i++){
+        this.standList.push(data[i].id)
+      }
+    },
+    choiceZRR(type, title, id) {
+      this.nodeList = [];
+      this.nodeList.push(id);
+      this.type = type;
+      this.drawerTitle = title;
+      this.modalshowflag = true;
+    },
+    getTree() {
+      this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
+        this.treeData = res.data;
+      });
+    },
+    pageChange(page) {
+      this.page = page;
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = this.$store.getters.userInfo.configContent;
+    },
+    pageChangeNo(page) {
+      this.pageNO = page;
+    },
+    pageSizeChangeNo(pageSize) {
+      this.pageSizeNo = this.$store.getters.userInfo.configContent;
+    },
+    //获取产品线数据
+    getProductData() {
+      this.$http.get('sarStandProjectLibrary/queryProjectManager','',{
+        _this: this
+      }, res => {
+        this.productData = res.data
+      }, e => {
+
+      })
+    },
+  },
+  computed: {},
+  mounted() {
+    this.getTree();
+    this.getProductData()
+  }
+
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.xmpg-step1 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
+
@@ -1,225 +0,0 @@
-<template>
-  <div class="zqyjStep1">
-    <!--    标准征求意见流程-->
-    <ProcessHeader toggle>
-      <template slot="proName">标准征求意见流程</template>
-      <template slot="proNode">申请人发起流程</template>
-    </ProcessHeader>
-    <div class="headerTabs">
-      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div>
-    </div>
-    <div class="content" v-if="active === '1'">
-      <div style="flex: auto; overflow: auto;">
-        <el-form
-            ref="qbkwForm"
-            :model="form"
-            class="label-input-form"
-            label-width="210px"
-        >
-          <ProcessTitle>
-            <template slot="title">基础信息</template>
-          </ProcessTitle>
-          <div class="prc-content-border">
-            <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="标准编号" prop="title" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.encodes" placeholder="请选择标准编号">
-                    <el-option label="GB 472726" value="1"></el-option>
-                    <el-option label="GB/T 8453291" value="2"></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="标准名称" prop="title" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.names" placeholder="请选择标准名称">
-                    <el-option label="标准1" value="1"></el-option>
-                    <el-option label="标准2" value="2"></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="征求意见结束日期" prop="year" class="add-form-item form-item-disabled">
-                  <el-date-picker
-                      v-model="form.year"
-                      type="year"
-                      placeholder="请选择结束日期">
-                  </el-date-picker>
-                </el-form-item>
-
-              </el-col>
-            </el-row>
-          </div>
-        </el-form>
-      </div>
-    </div>
-    <div class="content" v-if="active === '2'">
-      <div class="block" style="padding-top: 20px;">
-        <el-timeline>
-          <el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>流程发起人</h4>
-              <div style="margin-top: 10px;width: 300px;">
-                <el-input v-model="user1" placeholder="流程发起人"></el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="选择责任人" placement="top" :color="user2 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>责任对接人</h4>
-              <div style="margin-top: 10px;width: 300px;">
-                <el-input v-model="user2" placeholder="选择责任人">
-
-                </el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="填写意见" placement="top" :color="user3 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>责任人</h4>
-              <div style="margin-top: 10px;width: 300px;">
-                <el-input v-model="user3" placeholder="责任人"></el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="意见汇总并发起会签" placement="top" :color="user4 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>标准法规工程师</h4>
-              <div style="margin-top: 10px;width: 300px;">
-                <el-input v-model="user4" placeholder="标准法规工程师"></el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="审核" placement="top" :color="user5 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>责任对接人，标准法规部部门负责人</h4>
-              <div style="margin-top: 10px;width: 300px;">
-                <el-input v-model="user5" placeholder="责任对接人，标准法规部部门负责人"></el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </div>
-    <ProcessFooter
-        show-save
-        show-submit
-        :submitLoading="isSubmit"
-        :saveLoading="saveLoading"
-        @save="handleSave"
-        @submit="handleSubmit"
-    >
-    </ProcessFooter>
-
-  </div>
-</template>
-
-
-<script>
-import ProcessHeader from '../../components/ProcessHeader'
-import ProcessFooter from '../../components/ProcessFooter'
-import ProcessTitle from '../../components/ProcessTitle'
-
-export default {
-  name: "zqyjStep1",
-  data() {
-    return {
-      textarea: '', // 意见
-      title: '', // 新增编辑抽屉标题
-      ListModel: false, // 新增编辑抽屉开关
-      active: '1', // 默认显示
-      isSubmit: false,
-      saveLoading: false,
-      form: {
-        encodes: '', // 编号
-        year: '', // 结束日期
-        names: '', // 名称
-      },
-      data: [], // 标准列表数据
-      ListForm: {}, // 新增数据
-      user1: '',
-      user2: '',
-      user3: '',
-      user4: '',
-      user5: '',
-    }
-  },
-  components: {
-    ProcessHeader,
-    ProcessFooter,
-    ProcessTitle
-  },
-  methods: {
-    closeDrawer() {
-      this.ListModel = false
-    },
-    OkDrawer() {
-      this.ListModel = false
-      var item = {
-        remarks: '123'
-      }
-      this.data.push(item)
-    },
-    addList() {
-      this.title = '新增标准'
-      this.ListModel = true
-    },
-    handleTabs(name) {
-      this.active = name
-    },
-    handleSave() {},
-    handleSubmit() {}
-  },
-  mounted () {}
-}
-</script>
-
-<style lang="less" scoped>
-@import '~@/assets/styles/style';
-.zqyjStep1 {
-  /deep/.el-drawer__container {
-    .prc-content-border {
-      border: none;
-      padding: 0 20px 0;
-    }
-  }
-  position: relative;
-  height: 100%;
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 0;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
-  .content {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    height: calc(~'100% - 103px');
-    overflow: auto;
-    .tableTitle {
-      margin-bottom: 10px;
-      height: 30px;
-      line-height: 30px;
-      position: relative;
-      font-size: 13px;
-      font-weight: bold;
-      .tableButton {
-        position: absolute;
-        right: 0;
-        top: 0;
-      }
-    }
-  }
-}
-</style>
@@ -10,7 +10,8 @@
        <div class="process-name" @click="handleCreateProcess('4')">标准需求(翻译)申请流程</div>
        <div class="process-name" @click="handleCreateProcess('5')">标准发放申请流程</div>
        <div class="process-name" @click="handleCreateProcess('6')">标准清单发布/更新流程</div>
-        <div class="process-name" @click="handleCreateProcess('7')">未符合项整改流程</div>
+        <div class="process-name" @click="handleCreateProcess('7')">项目合规评估流程</div>
+        <div class="process-name" @click="handleCreateProcess('8')">未符合项整改流程</div>
      </div>
    </div>
    <div v-if="zcgllc">
@@ -85,13 +86,17 @@ export default {
          })
          break
        case '7':
+          //项目评估流程
+          this.$router.push({
+            name: 'xmpgStep1'
+          })
+          break
+        case '8':
          //未符合项整改流程
          this.$router.push({
            name:'wfhxzgStep1'
          })
          break
-        case '8':
-          break
        case '9':
          break
        case '10':
@@ -315,6 +315,7 @@
        ><i class="iconfont">&#xe61b;</i>删除</el-button>
      </div>
      <el-table
+               ref="entryTable"
              :data="sarAccessInfoList"
              class="un-select"
              style="width: 100%"
@@ -322,7 +323,6 @@
              :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', height: '48px'}"
              @selection-change="sarAccessInfoSelect"
-              ref="entryTable"
      >
        <el-table-column
          type="selection"
@@ -1120,8 +1120,12 @@ export default {
        }
    },
    // 清单条目 table select事件
-    sarAccessInfoSelect (selectData) {
-      this.sarAccessInfoListArry = selectData
+    sarAccessInfoSelect (data) {
+      let sarAccessInfoListArry =  [];
+      for(let i = 0; i< data.length; i++){
+        this.sarAccessInfoListArry.push(data[i].id)
+      }
+      console.log(this.sarAccessInfoListArry);
    },
    // 点击取消按钮 返回事件
    backCancal () {
@@ -76,12 +76,12 @@
        </div>
      </table-tools-bar>
      <div class="action-bar">
-        <el-button type="primary"
-                   class="common-button-primary add-button"
-                   @click="addModal"
-                   size="mini"
-                   v-btn-permission="'57f40856850c95912be0760a082db0e0'"
-                   :disabled="addBtnDisabled"><i class="iconfont">&#xe84e;</i>新增</el-button>
+<!--        <el-button type="primary"-->
+<!--                   class="common-button-primary add-button"-->
+<!--                   @click="addModal"-->
+<!--                   size="mini"-->
+<!--                   v-btn-permission="'57f40856850c95912be0760a082db0e0'"-->
+<!--                   :disabled="addBtnDisabled"><i class="iconfont">&#xe84e;</i>新增</el-button>-->
        <el-button class="common-button-default in-button"
                   :loading="searching"
                   size="mini"
@@ -3,7 +3,7 @@
  <div id="enterBSysRevPlanManaLib" class="v-class">
    <div class="search-area">
      <div class="left">
-        <el-form :modal="condition" :inline="true" class="label-input-form"  @keyup.enter.native="handleSearchByCondition">
+        <el-form :modal="condition" :inline="true" class="lab-form"  @keyup.enter.native="handleSearchByCondition">
          <el-form-item label="计划状态" class="search-item">
            <el-select
              v-model="condition.planStatus"
@@ -276,13 +276,22 @@ const routes = [
          title: '标准清单发布/更新流程'
        }
      },
+      {
+        path: '/xmpgStep1',
+        name: 'xmpgStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目合规评估流程'
+        }
+      },
      {
        path: '/wfhxzgStep1',
-        name: 'wfhxzgStep1',
+        name: 'wfhxzgStep2',
        component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue'),
        meta: {
          requireAuth: true,
-          title: '未符合项整改流程'
+          title: '未符合项整改发布/更新流程'
        }
      },
      {
@@ -492,15 +501,6 @@ const routes = [
          title: '标准调研流程'
        }
      },
-      {
-        path: '/zqyjStep1',
-        name: 'zqyjStep1',
-        component: () => import('@/pages/processCenter/pages/creatProcess/zqyj/step1.vue'),
-        meta: {
-          requireAuth: true,
-          title: '标准征求意见流程'
-        }
-      },
    ]
  },
  // 本地工具
@@ -1126,6 +1126,17 @@ const routes = [
          title: '标准法规属性管理详情页'
        }
      },
+      {
+        path: '/standLawsAttrTreeDetails/:id?/:dictionaryName?/:dictionType?/:isRelate?/:relateDicId?',
+        name: 'standLawsAttrTreeDetails',
+        component: () =>
+          import('@/pages/config/pages/standLawsAttrManage/pages/standLawsAttrTreeDetails'),
+        meta: {
+          requireAuth: true,
+          parentPath: '/standLawsAttrManage',
+          title: '标准法规属性管理详情页'
+        }
+      },
      {
        path: '/attributeCustom',
        name: 'AttributeCustom',
@@ -6,8 +6,8 @@
 // 服务器地址
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
-const devIp = '192.168.10.248'
-const devInterfacePORT = '9999'
+const devIp = '192.168.10.121'
+const devInterfacePORT = '9988'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
 const simpleFilePath = 'att/attFile/upload'
@@ -51,4 +51,4 @@ module.exports = {
    enterprise: enterprise, // GQ广汽 SJZX数据中心
    theme: theme, // 主题
    processInterfaceURL: `http://${serverIP}:${processPort}/bat-wkflow`
-}
+}