Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop

src/assets/styles/scroll.less

@@ -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;

src/pages/config/pages/standLawsAttrManage/index.vue

@@ -381,16 +381,25 @@ export default {
     },
     goNuwPage (item) {
       this.$store.commit('setDetailMap', this.$route.path)
-      this.$router.push({
+      const params = {
-        name: 'StandLawsAttrDetails',
+        id: item.id,
-        params: {
+        dictionaryName: item.dictionaryName,
-          id: item.id,
+        dictionType: item.dictionType,
-          dictionaryName: item.dictionaryName,
+        isRelate: item.isRelate,
-          dictionType: item.dictionType,
+        relateDicId: item.relateDicId
-          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 = []

src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue

@@ -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-if="scope.row.standYear" class="table-jump"
-              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
+                 @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
+      <div class="demo-drawer-content">
-        :data="standardData"
+        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
-        tooltip-effect="dark"
+          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
-        style="width: 100%"
+            <el-table
-        border
+              :data="standardData"
-        height="100%"
+              tooltip-effect="dark"
-        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+              style="width: 100%"
+              border
+              ref="table"
+              height="100%"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-        @selection-change="selectThree"
+              @selection-change="selectThree"
-      >
+            >
-        <el-table-column
+              <el-table-column
-          type="selection"
+                type="selection"
-          width="55"
+                width="55"
-          align="center">
+                align="center">
-        </el-table-column>
+              </el-table-column>
-        <el-table-column
+              <el-table-column
-          prop="content"
+                prop="code"
-          label="标准号"
+                fixed="left"
-        >
+                label="标准号">
-        </el-table-column>
+                <template slot-scope="scope">
-        <el-table-column
+                  <a v-if="scope.row.standYear" class="table-jump"
-          prop="deptName"
+                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
-          label="中文名称"
+                    }}-{{ scope.row.standYear }}</a>
-        >
+                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
-        </el-table-column>
+                    {{ scope.row.standNumber }}</a>
-        <el-table-column
+                </template>
-          prop="deptName"
+              </el-table-column>
-          label="英文名称"
+              <el-table-column
-        >
+                prop="standName"
-        </el-table-column>
+                label="标准名称"
-        <el-table-column
+              >
-          prop="deptName"
+              </el-table-column>
-          label="发布日期"
+              <el-table-column
-        >
+                prop="issueTime"
-        </el-table-column>
+                label="发布日期">
-        <el-table-column
+              </el-table-column>
-          prop="deptName"
+              <el-table-column
-          label="新车型实施日期"
+                prop="xcxssrq"
-        >
+                label="新车型实施日期">
-        </el-table-column>
+              </el-table-column>
-        <el-table-column
+              <el-table-column
-          prop="deptName"
+                show-overflow-tooltip
-          label="在产车实施日期"
+                prop="zccssrq"
-        >
+                label="在产车实施日期">
-        </el-table-column>
+              </el-table-column>
-        <el-table-column
+              <el-table-column
-          prop="deptName"
+                show-overflow-tooltip
-          label="适用车型"
+                prop="textStatus"
-        >
+                label="文本状态">
-        </el-table-column>
+              </el-table-column>
-        <el-table-column
+            </el-table>
-          prop="deptName"
+          </div>
-          label="文本状态"
+          <pagination
-        >
+            :page="pageNo"
-        </el-table-column>
+            :pageSize="pageSizeNo"
-      </el-table>
+            :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',
+        children: "children",
-        label: 'name'
+        label: "name"
       },
       roleForm: {
-        startUserName: this.$store.getters.userInfo.account,
+        startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.id,
-        dockUser: '',
+        dockUser: "",
-        responUserList: '',
+        responUserList: "",
-        ministerUser: '',
+        ministerUser: "",
-        directorUser: '',
+        directorUser: "",
-        presidentUser: '',
+        presidentUser: "",
-        dockUserName: '',
+        dockUserName: "",
-        responUserListName: '',
+        responUserListName: "",
-        ministerUserName: '',
+        ministerUserName: "",
-        directorUserName: '',
+        directorUserName: "",
-        presidentUserName: ''
+        presidentUserName: ""
+      },
+      formRules: {
+        listType: [
+          { required: true, message: "请选择清单类型", trigger: "blur" }
+        ],
+        listName: [
+          { required: true, message: "请填写清单名称", trigger: "change" }
+        ]
       },
       roleFormRules: {
-        dockUserName: [
+        // dockUserName: [
-          { required: true, message: '请选择会签责任人', trigger: 'blur' },
+        //   { 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 () {
+    saveUserInfo() {
-      if (this.type === 'dockUser') {
+      if (this.type === "dockUser") {
-        this.roleForm.dockUser = this.roleRow.id
+        this.roleForm.dockUser = this.roleRow.id;
-        this.roleForm.dockUserName = this.roleRow.name
+        this.roleForm.dockUserName = this.roleRow.name;
-      } else if (this.type === 'ministerUser') {
+      } else if (this.type === "ministerUser") {
-        this.roleForm.ministerUser = this.roleRow.id
+        this.roleForm.ministerUser = this.roleRow.id;
-        this.roleForm.ministerUserName = this.roleRow.name
+        this.roleForm.ministerUserName = this.roleRow.name;
-      } else if (this.type === 'directorUser') {
+      } else if (this.type === "directorUser") {
-        this.roleForm.directorUser = this.roleRow.id
+        this.roleForm.directorUser = this.roleRow.id;
-        this.roleForm.directorUserName = this.roleRow.name
+        this.roleForm.directorUserName = this.roleRow.name;
-      } else if (this.type === 'presidentUser') {
+      } else if (this.type === "presidentUser") {
-        this.roleForm.presidentUser = this.roleRow.id
+        this.roleForm.presidentUser = this.roleRow.id;
-        this.roleForm.presidentUserName = this.roleRow.name
+        this.roleForm.presidentUserName = this.roleRow.name;
       }
-      this.modalshowflag = false
+      this.modalshowflag = false;
     },
-    cancleUserInfo () {
+    cancleUserInfo() {
-      this.modalshowflag = false
+      this.modalshowflag = false;
     },
     //tab发生变化
     handleTabs(name) {
@@ -689,21 +723,21 @@ export default {
     choiceShow() {
       this.ListModel = true;
     },
-    drawerCheck (data) {
+    drawerCheck(data) {
-      // var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+      var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
-      // if(getlist.length == 1) {
+      if (getlist.length == 1) {
-      //   this.roleRow = getlist[0]
+        this.roleRow = getlist[0];
-      // }else {
+      } else {
-      //   this.$refs.tree.setCheckedKeys([data.id]);
+        this.$refs.tree.setCheckedKeys([data.id]);
-      //   this.roleRow = this.$refs.tree.getCheckedNodes()[0]
+        this.roleRow = this.$refs.tree.getCheckedNodes()[0];
-      // }
+      }
     },
     //判断当前是否会签
-    selectSign (type) {
+    selectSign(type) {
-      if(type ==='1'){
+      if (type === "1") {
-        this.listForm.signFlag = 1
+        this.listForm.signFlag = 1;
-      }else if(type == '2'){
+      } else if (type == "2") {
-        this.listForm.signFlag = 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
+      this.saveLoading = true;
-      let _formData = new FormData()
+      let _formData = new FormData();
-      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append("createUser", this.$store.getters.userInfo.userId);
-      _formData.append('createUserName', this.$store.getters.userInfo.uName)
+      _formData.append("createUserName", this.$store.getters.userInfo.uName);
-      _formData.append('prcType', this.$route.query.type)
+      _formData.append("prcType", this.$route.query.type);
-      _formData.append('json', JSON.stringify({
+      _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.saveLoading = false;
-        this.$message.success('保存成功')
+        this.$message.success("保存成功");
       }).catch(e => {
-        this.saveLoading = false
+        this.saveLoading = false;
-      })
+      });
     },
     //提交事件
     handleSubmit() {
-      let json = this.listForm
+      let json = this.listForm;
-      json.zrUserId = this.$store.getters.userInfo.userId
+      json.zrUserId = this.$store.getters.userInfo.userId;
-      json.jlUserId = this.$store.getters.userInfo.userId
+      json.jlUserId = this.$store.getters.userInfo.userId;
-      json.applyUpdUserId = this.$store.getters.userInfo.userId
+      json.applyUpdUserId = this.$store.getters.userInfo.userId;
-      json.approvalOpinion = ''
+      json.approvalOpinion = "";
-      json.prcCreateUser = this.$store.getters.userInfo.userId
+      json.prcCreateUser = this.$store.getters.userInfo.userId;
-      json.prcCreateUserName = this.$store.getters.userInfo.account
+      json.prcCreateUserName = this.$store.getters.userInfo.account;
-      json.standName = this.listForm.listName
+      json.standName = this.listForm.listName;
-      json.standId = this.listForm.standId
+      json.standId = this.listForm.standId;
-     this.$http.get('lawss/activiti/startProcess' , {type: '4'}, {
+      this.$refs["qdfbForm"].validate((valid) => {
-       _this: this
+        if (valid) {
-     }, res => {
+          this.$refs["Form"].validate((valid) => {
-       if(res.ok){
+            if (valid) {
-         this.$http.post('lawss/activiti/completeTask',{
+              this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
-           taskIds: res.data,
+                _this: this
-           userId : this.$store.getters.userInfo.userId,
+              }, res => {
-           json: JSON.stringify(json)
+                if (res.ok) {
-         },{
+                  this.$http.post("lawss/activiti/completeTask", {
-           _this: this
+                    taskIds: res.data,
-         }, res => {
+                    userId: this.$store.getters.userInfo.userId,
-           if(res.success) {
+                    json: JSON.stringify(json)
-             this.$message.success(res.message)
+                  }, {
-             this.$router.push('/processCenter')
+                    _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
+          if(res.data==null){
-          this.listForm.dataList = res.data
+              res.data=[]
-          let formId = ""
+          }
-         this.dataList.forEach(item => {
+          this.dataList = res.data;
-            if(this.dataList.length !== 0){
+          console.log(res.data);
-              formId += ','
+          this.listForm.dataList = res.data;
-              formId += item.id
+          let formId = []
-            }
+          this.dataList.map(item => {
-         })
+              formId.push(item.id)
-          this.listForm.inforlist = formId
+          });
+          this.listForm.inforlist = formId.join(',');
         }, e => {
-        })
+        });
       } else if (this.selectedList.length > 1) {
         this.$message.warning("只能选择一条数据进行带入");
       } else {
@@ -911,34 +986,45 @@ export default {
         this.selectList.push(data[i].id);
       }
     },
-    selectThree() {
+    //添加标准select的改变
+    selectThree(data) {
+      this.standList = data;
     },
-    choiceZRR (type, title, id) {
+    choiceZRR(type, title, id) {
-      this.nodeList = []
+      this.nodeList = [];
-      this.nodeList.push(id)
+      this.nodeList.push(id);
-      this.type = type
+      this.type = type;
-      this.drawerTitle = title
+      this.drawerTitle = title;
-      this.modalshowflag = true
+      this.modalshowflag = true;
     },
-    getTree () {
+    getTree() {
-      // this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
+      this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
-      //   this.treeData = res.data
+        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]);
     }

src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue

@@ -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-else
-                  v-model="listForm.enclosure"
+                  v-model="listForm.fileId"
-                  placeholder="暂无数据"
+                  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

src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue

@@ -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
+      <div class="demo-drawer-content">
-        :data="standardData"
+        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
-        tooltip-effect="dark"
+          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
-        style="width: 100%"
+            <el-table
-        border
+              :data="standardData"
-        height="100%"
+              tooltip-effect="dark"
-        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+              style="width: 100%"
+              border
+              ref="table"
+              height="100%"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-        @selection-change="selectThree"
+              @selection-change="selectThree"
-      >
+            >
-        <el-table-column
+              <el-table-column
-          type="selection"
+                type="selection"
-          width="55"
+                width="55"
-          align="center">
+                align="center">
-        </el-table-column>
+              </el-table-column>
-        <el-table-column
+              <el-table-column
-          prop="content"
+                prop="code"
-          label="标准号"
+                fixed="left"
-        >
+                label="标准号">
-        </el-table-column>
+                <template slot-scope="scope">
-        <el-table-column
+                  <a v-if="scope.row.standYear" class="table-jump"
-          prop="deptName"
+                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
-          label="中文名称"
+                    }}-{{ scope.row.standYear }}</a>
-        >
+                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
-        </el-table-column>
+                    {{ scope.row.standNumber }}</a>
-        <el-table-column
+                </template>
-          prop="deptName"
+              </el-table-column>
-          label="英文名称"
+              <el-table-column
-        >
+                prop="standName"
-        </el-table-column>
+                label="标准名称"
-        <el-table-column
+              >
-          prop="deptName"
+              </el-table-column>
-          label="发布日期"
+              <el-table-column
-        >
+                prop="issueTime"
-        </el-table-column>
+                label="发布日期">
-        <el-table-column
+              </el-table-column>
-          prop="deptName"
+              <el-table-column
-          label="新车型实施日期"
+                prop="xcxssrq"
-        >
+                label="新车型实施日期">
-        </el-table-column>
+              </el-table-column>
-        <el-table-column
+              <el-table-column
-          prop="deptName"
+                show-overflow-tooltip
-          label="在产车实施日期"
+                prop="zccssrq"
-        >
+                label="在产车实施日期">
-        </el-table-column>
+              </el-table-column>
-        <el-table-column
+              <el-table-column
-          prop="deptName"
+                show-overflow-tooltip
-          label="适用车型"
+                prop="textStatus"
-        >
+                label="文本状态">
-        </el-table-column>
+              </el-table-column>
-        <el-table-column
+            </el-table>
-          prop="deptName"
+          </div>
-          label="文本状态"
+          <pagination
-        >
+            :page="pageNo"
-        </el-table-column>
+            :pageSize="pageSizeNo"
-      </el-table>
+            :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) {
+      if (res.ok) {
-      //   this.fileInfoList = fileList
+        this.fileInfoList = fileList
-      //   this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
+        this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
-      //   this.$message.success('上传成功')
+        this.$message.success('上传成功')
-      // } else {
+      } else {
-      //   this.$message.error(res.message)
+        this.$message.error(res.message)
-      //   fileList.pop()
+        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 () {

src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue

@@ -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-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
-                  v-model="listForm.enclosure"
+                  v-model="listForm.fileId"
                   placeholder="暂无数据"
+                >
+                </el-input>
+                <el-input
+                  v-else
+                  v-model="listForm.fileId"
+                  placeholder=""
                 ></el-input>
               </el-form-item>
             </el-col>

src/pages/processCenter/pages/creatProcess/xmpg/step1.vue

@@ -0,0 +1,694 @@
+<!--项目合规评估流程 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="分发责任人">
+
+          </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="issueTime"
+                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
+      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:[
+        {
+          id: 1,
+          productLine: '风景线',
+          cpxzrr: '李四',
+          ffzrr: '张三',
+        },
+        {
+          id: 2,
+          productLine: '风景线',
+          cpxzrr: '李四',
+          ffzrr: '张三',
+        }, {
+          id: 3,
+          productLine: '风景线',
+          cpxzrr: '李四',
+          ffzrr: '张三',
+        },
+
+      ],
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      pageNo: 1,
+      totalNo: 0,
+      pageSizeNo: this.$store.getters.userInfo.configContent,
+      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() {
+      this.standModel = false
+    },
+    //保存事件
+    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 = data;
+    },
+    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;
+    },
+  },
+  computed: {},
+  mounted() {
+    this.getTree();
+  }
+
+};
+</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>
+

src/pages/processCenter/pages/newProcess/index.vue

@@ -10,6 +10,7 @@
         <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>
     </div>
@@ -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':

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -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"
@@ -1015,7 +1015,6 @@ export default {
               this.sarAccessInfoList.push(item)
             )
           })
-          this.selectedAccInfoSearchList = []
           this.$refs.entryTable.clearSelection()
           this.$refs.searchTable.clearSelection()
         } else {

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -76,12 +76,12 @@
         </div>
       </table-tools-bar>
       <div class="action-bar">
-        <el-button type="primary"
+<!--        <el-button type="primary"-->
-                   class="common-button-primary add-button"
+<!--                   class="common-button-primary add-button"-->
-                   @click="addModal"
+<!--                   @click="addModal"-->
-                   size="mini"
+<!--                   size="mini"-->
-                   v-btn-permission="'57f40856850c95912be0760a082db0e0'"
+<!--                   v-btn-permission="'57f40856850c95912be0760a082db0e0'"-->
-                   :disabled="addBtnDisabled"><i class="iconfont">&#xe84e;</i>新增</el-button>
+<!--                   :disabled="addBtnDisabled"><i class="iconfont">&#xe84e;</i>新增</el-button>-->
         <el-button class="common-button-default in-button"
                    :loading="searching"
                    size="mini"

src/router/index.js

@@ -285,6 +285,15 @@ const routes = [
           title: '未符合项整改流程'
         }
       },
+      {
+        path: '/xmpgStep1',
+        name: 'xmpgStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目合规评估流程'
+        }
+      },
       {
         path: '/wfhxzgStep2',
         name: 'wfhxzgStep2',
@@ -1126,6 +1135,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',