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

src/api/unqualProcess.js

@@ -24,3 +24,17 @@ export function uploadFileText (data) {
     params: data
   })
 }
+export function dicTypeData (data) {
+  return axios({
+    url: 'api/sys/dictype/getDicTypeListCode',
+    method: 'get',
+    params: data
+  })
+}
+export function StandardsInfoPage (data) {
+  return axios({
+    url: 'api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',
+    method: 'get',
+    params: data
+  })
+}

src/components/treeSelect/treeSelectNew.vue

@@ -218,6 +218,20 @@
                     this.isShowSelect = !this.isShowSelect;
                 }
             },
+          // 递归
+          getTreeData(data) {
+            // 循环遍历json数据
+            for (let i = 0; i < data.length; i++) {
+              if (data[i].children.length < 1) {
+                // children若为空数组，则将children设为undefined
+                delete data[i].children
+              } else {
+                // children若不为空数组，则继续 递归调用 本方法
+                this.getTreeData(data[i].children)
+              }
+            }
+            return data
+          },
             // 节点选中状态发生变化时的回调
             handleCheckChange () {
                 var checkedKeys = this.$refs.tree.getCheckedKeys(); // 所有被选中的节点的 key 所组成的数组数据

src/pages/details/otherStandardDetails/index.vue

@@ -163,13 +163,13 @@
                         title="下载"
                         @click="downloadFile(file.id)"
                         class="icon-download"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'WGJP2VRZSJ77EGH2447M' : '44KKMQHU3CNRRPNNF8VN'"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
                     />
                     <i
                         title="下载带水印"
                         @click="downloadFileByWater(file.id, file.fileSuffix)"
                         class="icon-download2"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'EZVNMCLGSB5LWG6XRRL3' : 'VSUKQX3NZW4N8CT5VQE3'"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
                     />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
@@ -179,13 +179,13 @@
                         title="下载"
                         @click="downloadFile(file.id)"
                         class="icon-download"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'JHQALHMF6F' : 'dakDL3sNLq'"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
                     />
                     <i
                         title="下载带水印"
                         @click="downloadFileByWater(file.id, file.fileSuffix)"
                         class="icon-download2"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'KDLDNFJHENFMF' : 'LKJSNLKFHOFN'"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
                     />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
@@ -256,11 +256,13 @@
                         title="下载"
                         @click="downloadFile(file.id)"
                         class="icon-download"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
                     />
                     <i
                         title="下载带水印"
                         @click="downloadFileByWater(file.id, file.fileSuffix)"
                         class="icon-download2"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
                     />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
@@ -270,13 +272,13 @@
                         title="下载"
                         @click="downloadFile(file.id)"
                         class="icon-download"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'JHQALHMF6F' : 'dakDL3sNLq'"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
                     />
                     <i
                         title="下载带水印"
                         @click="downloadFileByWater(file.id, file.fileSuffix)"
                         class="icon-download2"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'KDLDNFJHENFMF' : 'LKJSNLKFHOFN'"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
                     />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
@@ -412,9 +414,16 @@
             width="150"
             >
           </el-table-column>
+          <el-table-column
+              show-overflow-tooltip
+              prop="itemsName"
+              label="条款内容"
+              width="150"
+          >
+          </el-table-column>
           <el-table-column
             prop="termsConditions"
-            label="内容简介"
+            label="解读内容"
             width="250"
             show-overflow-tooltip
             :resizable="false"
@@ -423,45 +432,46 @@
               <div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">{{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}</div>
             </template>
           </el-table-column>
+          <el-table-column
+              show-overflow-tooltip
+              prop="putTime"
+              label="实施日期"
+              width="150"
+          >
+          </el-table-column>
+          <el-table-column
+              show-overflow-tooltip
+              prop="putTime"
+              label="适用车型"
+              width="150"
+          >
+          </el-table-column>
           <el-table-column
             prop="responsibleUnitShow"
             label="责任部门"
             width="150">
           </el-table-column>
           <el-table-column
-            prop="foShow"
+            prop="zrgcs"
-            label="FO"
+            label="责任工程师"
             width="150">
           </el-table-column>
           <el-table-column
             prop="dutyEngineerShow"
-            label="项目评估角色"
+            label="基于上一版本差异"
             width="150">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="svppsShow"
-            label="SVPPS"
+            label="符合性状态"
             width="150">
           </el-table-column>
           <el-table-column
             prop="applyArcticShow"
-            label="适用车辆类型"
+            label="合规性分析"
             width="150">
           </el-table-column>
-          <el-table-column
-            prop="claimTypeShow"
-            label="要求类型"
-            width="150">
-          </el-table-column>
-          <el-table-column
-            prop="busStandCover"
-            label="覆盖关系"
-            width="150">
-            <template slot-scope="scope">
-              <span>{{ busStandCoverName(scope.row.busStandCover) }}</span>
-            </template>
-          </el-table-column>
           <el-table-column label="操作" align="center" width="50" fixed="right">
             <template slot-scope="scope">
               <div @click.stop>

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

@@ -104,7 +104,6 @@
           </el-table-column>
           <el-table-column
             prop="code"
-            fixed="left"
             width="180px"
             align="center"
             label="标准号">
@@ -596,7 +595,6 @@
               </el-table-column>
               <el-table-column
                 prop="code"
-                fixed="left"
                 align="center"
                 label="标准号">
                 <template slot-scope="scope">
@@ -800,7 +798,6 @@ export default {
       listForm: {
         listType: "", //区分是哪个清单
         listName: "", //清单名称
-        // applyRegion: "", //适用区域
         descriptionList: "", //清单说明
         fileId: "",
         model: "", // 上传模板
@@ -1012,11 +1009,11 @@ export default {
       _formData.append('createUserName', this.$store.getters.userInfo.userName)
       _formData.append('prcType', '4')
       _formData.append('json', JSON.stringify({
-        form: this.form,
+        form: this.listForm,
         roleForm: this.roleForm,
         commentText: this.commentText
       }))
-      saveTaskFirst(_formData).then(res => {
+        saveTaskFirst(_formData).then(res => {
         this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
@@ -1097,8 +1094,7 @@ export default {
         });
         this.fileListName = middle;
         this.fileIds.push(file.response.data.id);
-        // this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
+        this.$message.success('上传成功')
-        // this.$message.success('上传成功')
       } else {
         this.$message.error(res.message);
         fileList.pop();
@@ -1110,7 +1106,6 @@ export default {
       var index1 = filename.lastIndexOf(".");
       var index2 = filename.length;
       var fileSuffix = filename.substring(index1, index2);
-      // const fileSuffix = file.name.split('.')[1] // 后缀名
       //把后缀转大写
       if (fileSuffix !== undefined && fileSuffix !== null) {
         fileSuffix = fileSuffix.toUpperCase();
@@ -1260,11 +1255,11 @@ export default {
         }
         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.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, page: this.page, Size:this.pageSize}, {
           _this: this
         }, res => {
           if (res.data == null) {

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

@@ -38,16 +38,25 @@
                 ></el-input>
               </el-form-item>
               <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
-                <el-input
+                <div class="file-box" v-if="listForm.model">
-                  v-if="listForm.modelName == null || this.listForm.modelName== 'undefined' || this.listForm.modelName == '' "
+                  <p> {{ listForm.modelName }}
-                  placeholder="暂无数据"
+                    <i
-                >
+                      title="下载"
-                </el-input>
+                      @click="downloadFile(listForm.model)"
-                <el-input
+                      class="icon-download"
-                  v-else
+                      v-btn-permission="''"
-                  v-model="listForm.modelName"
+                    />
-                  placeholder=""
+                    <i
-                ></el-input>
+                      title="下载带水印"
+                      @click="downloadFileByWater(listForm.model,listForm.modelName)"
+                      class="icon-download2"
+                      v-btn-permission="''"
+                    />
+                  </p>
+                </div>
+                <div v-else>
+                  暂无数据
+                </div>
               </el-form-item>
             </el-col>
           </el-row>
@@ -69,11 +78,8 @@
             width="180px"
             label="标准号">
             <template slot-scope="scope">
-              <a v-if="scope.row.standYear" class="table-jump"
+              <p v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p>
-                 @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
+              <p v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
-                }}-{{ 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
@@ -230,6 +236,7 @@ export default {
       selectedList: [],  //选择清单的选择框
       selectList: [], //选择标准的选择框
       bringData: [],
+      fileIds: "",
       commentText: "", //填写会签意见
       page: 1,
       total: 0,
@@ -313,27 +320,52 @@ export default {
         this.listForm.applyUpdUserId = item.applyUpdUserId;
         this.listForm.jlUserId = item.jlUserId;
         this.listForm.zrUserId = item.zrUserId;
+        this.fileIds = item.fileId
+        this.getFileInfo();
       });
     },
-
+    // 请求上传的文件信息
-
+    getFileInfo() {
+      this.$http.get("att/attFile/getMultiFileInfos", {
+        fileIds: this.fileIds
+      }, {
+        _this: this
+      }, res => {
+        console.log(res);
+        this.$nextTick(() => {
+          res.data.map(item => {
+           this.listForm.modelName = item.oldFileName
+            this.listForm.model = item.id
+          });
+        });
+      }, e => {
+      });
+    },
+    /**
+     * @Description: 点击下载
+     */
+    downloadFile(attId) {
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      } else {
+        this.$message.error("请选择要下载的文件");
+      }
+    },
+    downloadFileByWater(attId, fileSuffix) {
+      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
+      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
+        this.$message.error("水印下载仅支持PDF,pdf格式文件");
+      } else {
+        if (attId != null && attId !== "") {
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+        } else {
+          this.$message.error("请选择要下载的文件");
+        }
+      }
+    },
     //保存事件
     handleSave() {
 
-    },
-    handlePreview(item) {
-      if (item.id) {
-        let routeUrl = this.$router.resolve({
-          name: "OtherStandardDetails",
-          params: {
-            id: item.standId,
-            pageType: item.standType + "_STAND"
-          }
-        });
-        window.open(routeUrl.href, "_blank");
-      } else {
-        this.$message.warning("暂无关联的标准");
-      }
     },
     //提交事件
     handleSubmit() {
@@ -375,28 +407,6 @@ export default {
     },
     selectThree() {
 
-    },
-    // 请求上传的文件信息
-    getFileInfo() {
-      // this.$http.get("att/attFile/getMultiFileInfos", {
-      //   fileIds: this.sarAccessEO.fileIds
-      // }, {
-      //   _this: this
-      // }, res => {
-      //   console.log(res);
-      //   this.$nextTick(() => {
-      //     res.data.map(item => {
-      //       // 赋值要回显的上传文件内容
-      //       this.fileInfoList.push({
-      //         name: item.oldFileName,
-      //         uid: item.uid,
-      //         status: item.status,
-      //         id: item.id
-      //       });
-      //     });
-      //   });
-      // }, e => {
-      // });
     },
     pageChange(page) {
       this.page = page;
@@ -416,8 +426,6 @@ export default {
   mounted() {
     this.processTable();
     this.getData();
-    this.getFileInfo();
-    // console.log(this.$store.getters.getHandleInfo);
   }
 };
 </script>
@@ -432,6 +440,36 @@ export default {
       padding: 0 20px 0;
     }
   }
+  .fileClass {
+    cursor: pointer;
+  }
+  .fileClass:hover{
+    color: #0c91e5;
+  }
+  p {
+    & > a {
+      cursor: pointer;
+    }
+
+    & > i {
+      display: inline-block;
+      margin-left: 3px;
+      width: 18px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      cursor: pointer;
+    }
+    .icon-download {
+      background-image: url("~assets/images/shangqi/img/download.png");
+    }
+
+    .icon-download2 {
+      background-image: url("~assets/images/shangqi/img/download2.png");
+    }
+  }
 
   .choiceBtn {
     .el-button--primary {

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

@@ -383,6 +383,17 @@ export default {
     handleTabs(name) {
       this.active = name;
     },
+    // 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
     //点击添加事件
     addList() {
       this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {

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

@@ -1,480 +1,507 @@
 <!--标准法规清单发布 -  业务经理审批-->
 <template>
-  <div class="bzqdfb-step4">
+    <div class="bzqdfb-step4">
-    <ProcessHeader toggle>
+        <ProcessHeader toggle>
-      <template slot="proName">标准清单发布/更新流程</template>
+            <template slot="proName">标准清单发布/更新流程</template>
-      <template slot="proNode">业务经理审批</template>
+            <template slot="proNode">业务经理审批</template>
-    </ProcessHeader>
+        </ProcessHeader>
-    <div class="headerTabs">
+        <div class="headerTabs">
-      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+            <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+            <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
-    </div>
+        </div>
-    <div class="content" v-show="active == '1'">
+        <div class="content" v-show="active == '1'">
-      <div style="flex: auto; overflow: auto">
+            <div style="flex: auto; overflow: auto">
-        <process-title>
+                <process-title>
-          <template slot="title">基础信息</template>
+                    <template slot="title">基础信息</template>
-        </process-title>
+                </process-title>
-        <el-form
+                <el-form
-          :model="listForm"
+                        :model="listForm"
-          class="label-input-form prc-content-border"
+                        class="label-input-form prc-content-border"
-          label-width="150px"
+                        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-radio-group v-model="listType" @change="selectionList">-->
-              <!--                  <el-radio label="country">国家/地区清单</el-radio>-->
-              <!--                  <el-radio label="project">项目清单</el-radio>-->
-              <!--                  <el-radio label="other">其他清单</el-radio>-->
-              <!--                </el-radio-group>-->
-              <!--                <el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">选择清单</el-button>-->
-              <!--              </el-form-item>-->
-              <el-form-item label="清单名称" prop="listName" class="add-form-item form-item-disabled">
-                <el-input
-                  disabled
-                  v-model="listForm.listName"
-                  placeholder="请输入清单名称"
-                  clearable
-                ></el-input>
-              </el-form-item>
-<!--              <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">-->
-<!--                <el-input-->
-<!--                  disabled-->
-<!--                  v-model="listForm.applyRegion"-->
-<!--                  placeholder="请输入适用区域"-->
-<!--                  clearable-->
-<!--                ></el-input>-->
-<!--              </el-form-item>-->
-              <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
-                <el-input
-                  disabled
-                  v-model="listForm.descriptionList"
-                  placeholder="请输入清单说明"
-                  clearable
-                ></el-input>
-              </el-form-item>
-              <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
-                <el-input
-                  v-if="listForm.modelName == null || this.listForm.modelName== 'undefined' || this.listForm.modelName == '' "
-                  v-model="listForm.modelName"
-                  placeholder="暂无数据"
                 >
-                </el-input>
+                    <el-row :gutter="24">
-                <el-input
+                        <el-col :span="24">
-                  v-else
+                            <el-form-item label="清单名称" prop="listName" class="add-form-item form-item-disabled">
-                  v-model="listForm.modelName"
+                                <el-input
-                  placeholder=""
+                                        disabled
-                ></el-input>
+                                        v-model="listForm.listName"
-              </el-form-item>
+                                        placeholder="请输入清单名称"
-            </el-col>
+                                        clearable
-          </el-row>
+                                ></el-input>
-        </el-form>
+                            </el-form-item>
-        <process-title>
+                            <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
-          <template slot="title">填写信息</template>
+                                <el-input
-        </process-title>
+                                        disabled
-        <el-table
+                                        v-model="listForm.descriptionList"
-          :data="dataList"
+                                        placeholder="请输入清单说明"
-          border
+                                        clearable
-          height="64.6%"
+                                ></el-input>
-          style="width: 100%"
+                            </el-form-item>
-          @selection-change="selectStandChange"
+                          <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+                            <div class="file-box" v-if="listForm.model">
+                              <p> {{ listForm.modelName }}
+                                <i
+                                  title="下载"
+                                  @click="downloadFile(listForm.model)"
+                                  class="icon-download"
+                                  v-btn-permission="''"
+                                />
+                                <i
+                                  title="下载带水印"
+                                  @click="downloadFileByWater(listForm.model,listForm.modelName)"
+                                  class="icon-download2"
+                                  v-btn-permission="''"
+                                />
+                              </p>
+                            </div>
+                            <div v-else>
+                              暂无数据
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-form>
+                <process-title>
+                    <template slot="title">填写信息</template>
+                </process-title>
+                <el-table
+                        :data="dataList"
+                        border
+                        height="64.6%"
+                        style="width: 100%"
+                        @selection-change="selectStandChange"
+                        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
-          <el-table-column
+                    <el-table-column
-            prop="code"
+                            prop="code"
-            fixed="left"
+                            fixed="left"
-            width="180px"
+                            width="180px"
-            label="标准号">
+                            label="标准号">
-            <template slot-scope="scope">
+                    </el-table-column>
-              <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                    <el-table-column
-              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
+                            prop="standName"
-            </template>
+                            label="标准名称"
-          </el-table-column>
+                            width="260px"
-          <el-table-column
+                    >
-            prop="standName"
+                    </el-table-column>
-            label="标准名称"
+                    <el-table-column
-            width="260px"
+                            prop="issueTime"
-          >
+                            sortable
-          </el-table-column>
+                            label="发布日期">
-          <el-table-column
+                    </el-table-column>
-            prop="issueTime"
+                    <el-table-column
-            sortable
+                            prop="xcxssrq"
-            label="发布日期">
+                            sortable
-          </el-table-column>
+                            label="新车型实施日期">
-          <el-table-column
+                    </el-table-column>
-            prop="xcxssrq"
+                    <el-table-column
-            sortable
+                            show-overflow-tooltip
-            label="新车型实施日期">
+                            prop="zccssrq"
-          </el-table-column>
+                            sortable
-          <el-table-column
+                            label="在产车实施日期">
-            show-overflow-tooltip
+                    </el-table-column>
-            prop="zccssrq"
+                    <el-table-column
-            sortable
+                            show-overflow-tooltip
-            label="在产车实施日期">
+                            prop="textStatus"
-          </el-table-column>
+                            width="120px"
-          <el-table-column
+                            label="文本状态">
-            show-overflow-tooltip
+                    </el-table-column>
-            prop="textStatus"
+                </el-table>
-            width="120px"
-            label="文本状态">
-          </el-table-column>
-        </el-table>
-      </div>
-      <div >
-        <el-collapse accordion>
-          <el-collapse-item title="意见填写">
-            <div style="margin: 10px 0;" >
-              <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-              </el-input>
             </div>
-          </el-collapse-item>
+            <div>
-        </el-collapse>
+                <el-collapse accordion>
-      </div>
+                    <el-collapse-item title="意见填写">
-    </div>
+                        <div style="margin: 10px 0;">
-    <div class="content" v-show="active === '3'">
+                            <el-input
-      <div class="flow-list">
+                                    type="textarea"
-        <el-table
+                                    :rows="3"
-          height="100%"
+                                    resize="none"
-          ref="selection"
+                                    placeholder="请输入意见"
-          :data="detailData"
+                                    v-model="commentText">
-          tooltip-effect="dark"
+                            </el-input>
-          style="width: 100%"
+                        </div>
-          border
+                    </el-collapse-item>
-          row-key="id"
+                </el-collapse>
-          :no-data-text="listNoDataText"
+            </div>
-          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        </div>
-        >
+        <div class="content" v-show="active === '3'">
-          <el-table-column
+            <div class="flow-list">
-            type="selection"
+                <el-table
-            width="55"
+                        height="100%"
-            align="center">
+                        ref="selection"
-          </el-table-column>
+                        :data="detailData"
-          <el-table-column
+                        tooltip-effect="dark"
-            prop="name"
+                        style="width: 100%"
-            label="任务步骤"
+                        border
-            align="center"
+                        row-key="id"
-          >
+                        :no-data-text="listNoDataText"
-          </el-table-column>
+                        :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
-          <el-table-column
+                >
-            prop="assignee"
+                    <el-table-column
-            label="任务受理人"
+                            type="selection"
-            align="center"
+                            width="55"
-          >
+                            align="center">
-          </el-table-column>
+                    </el-table-column>
-          <el-table-column
+                    <el-table-column
-            prop="createTime"
+                            prop="name"
-            label="创建时间"
+                            label="任务步骤"
-            sortable="custom"
+                            align="center"
-            align="center">
+                    >
-            <template slot-scope="scope">
+                    </el-table-column>
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+                    <el-table-column
-            </template>
+                            prop="assignee"
-          </el-table-column>
+                            label="任务受理人"
-          <el-table-column
+                            align="center"
-            prop="endTime"
+                    >
-            label="完成时间"
+                    </el-table-column>
-            align="center">
+                    <el-table-column
-            <template slot-scope="scope">
+                            prop="createTime"
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+                            label="创建时间"
-            </template>
+                            sortable="custom"
-          </el-table-column>
+                            align="center">
-          <el-table-column
+                        <template slot-scope="scope">
-            prop="comment"
+                            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
-            label="审批意见"
+                        </template>
-            align="center">
+                    </el-table-column>
-            <template slot-scope="scope">
+                    <el-table-column
-              <span>{{scope.row.commentText}}</span>
+                            prop="endTime"
-            </template>
+                            label="完成时间"
-          </el-table-column>
+                            align="center">
-          <el-table-column
+                        <template slot-scope="scope">
-            prop="completeFlag"
+                            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
-            label="状态"
+                        </template>
-            align="center">
+                    </el-table-column>
-            <template slot-scope="scope">
+                    <el-table-column
-              <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+                            prop="comment"
-            </template>
+                            label="审批意见"
-          </el-table-column>
+                            align="center">
-        </el-table>
+                        <template slot-scope="scope">
-        <loading :loading="loading">流程列表加载中</loading>
+                            <span>{{scope.row.commentText}}</span>
-      </div>
+                        </template>
-    </div>
+                    </el-table-column>
+                    <el-table-column
+                            prop="completeFlag"
+                            label="状态"
+                            align="center">
+                        <template slot-scope="scope">
+                            <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <loading :loading="loading">流程列表加载中</loading>
+            </div>
+        </div>
 
-    <ProcessFooter
+        <ProcessFooter
-      show-back
+                show-back
-      show-submit
+                show-submit
-      :submitLoading="isSubmit"
+                :submitLoading="isSubmit"
-      :saveLoading="saveLoading"
+                :saveLoading="saveLoading"
-      :approval="true"
+                :approval="true"
-      @back="beforeBack"
+                @back="beforeBack"
-      @submit="handleSubmit"
+                @submit="handleSubmit"
-    >
+        >
-    </ProcessFooter>
+        </ProcessFooter>
-  </div>
+    </div>
 </template>
 
 <script>
-import ProcessHeader from "../../components/ProcessHeader";
+    import ProcessHeader from "../../components/ProcessHeader";
-import ProcessFooter from "../../components/ProcessFooter";
+    import ProcessFooter from "../../components/ProcessFooter";
-import ProcessTitle from "../../components/ProcessTitle";
+    import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail } from "api/process";
+    import {inboundLiaisonDetail} from "api/process";
 
-export default {
+    export default {
-  name: "bzqdfbStep4",
+        name: "bzqdfbStep4",
-  components: {
+        components: {
-    ProcessHeader,
+            ProcessHeader,
-    ProcessFooter,
+            ProcessFooter,
-    ProcessTitle
+            ProcessTitle
-  },
+        },
-  data() {
+        data() {
-    return {
+            return {
-      detailData: [],
+                detailData: [],
-      // 当前流程类型(1待办/2已办)
+                // 当前流程类型(1待办/2已办)
-      processType: 1,
+                processType: 1,
-      loading: false,
+                loading: false,
-      dataList: [],//清单里的标准数据
+                dataList: [],//清单里的标准数据
-      approvalOpinion: '', // 通过0/驳回1
+                approvalOpinion: '', // 通过0/驳回1
-      active: "1",
+                active: "1",
-      listType: "country",  //选择的清单类型
+                listType: "country",  //选择的清单类型
-      isSubmit: false,
+                isSubmit: false,
-      saveLoading: false,
+                saveLoading: false,
-      tabValue: "listOfCountries",
+                tabValue: "listOfCountries",
-      selectedList: [],  //选择清单的选择框
+                selectedList: [],  //选择清单的选择框
-      selectList: [], //选择标准的选择框
+                selectList: [], //选择标准的选择框
-      bringData: [],
+                bringData: [],
-      commentText: '', //填写会签意见
+                commentText: '', //填写会签意见
-      page: 1,
+                page: 1,
-      total: 0,
+                total: 0,
-      pageSize: this.$store.getters.userInfo.configContent,
+                pageSize: this.$store.getters.userInfo.configContent,
-      listForm: {
+                listForm: {
-        listType: "", //区分是哪个清单
+                    listType: "", //区分是哪个清单
-        listName: "", //清单名称
+                    listName: "", //清单名称
-        // applyRegion: "", //适用区域
+                    descriptionList: "", //清单说明
-        descriptionList: "", //清单说明
+                    enclosure: "", //附件
-        enclosure: "", //附件
+                    signFlag: "1",   //是否会签 1为会签 2为不会签
-        signFlag: "1",   //是否会签 1为会签 2为不会签
+                    approvalOpinion: '', // 通过/驳回
-        approvalOpinion: '', // 通过/驳回
+                    dataList: [{
-        dataList: [{
+                        standNumber: "", //标准号
-          standNumber: "", //标准号
+                        cnName: "", //中文名称
-          cnName: "", //中文名称
+                        enName: "", //英文名称
-          enName: "", //英文名称
+                        isSubTime: "", //发布日期
-          isSubTime: "", //发布日期
+                        newCarTime: "", //新车型实施日期
-          newCarTime: "", //新车型实施日期
+                        oldCarTime: "", //在产车实施日期
-          oldCarTime: "", //在产车实施日期
+                        applyCar: "", //适用车型
-          applyCar: "", //适用车型
+                        textState: "", //文本状态
-          textState: "", //文本状态
+                        id: ""
-          id: ""
+                    }]
-        }]
+                },
-      },
+                choiceForm: {}, //选择标准清单列表
-      choiceForm: {}, //选择标准清单列表
+                // countryOptions: [], //适用区域下拉框数据
-      // countryOptions: [], //适用区域下拉框数据
+                userId: this.$store.getters.userInfo.userId,
-      userId:this.$store.getters.userInfo.userId,
+                taskIds: this.$route.query.taskIds,
-      taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId,
-      pId: this.$route.query.prcId,
+                signFlag: "1",   //是否会签 1为会签 2为不会签
-      signFlag: "1",   //是否会签 1为会签 2为不会签
+                user1: "",
-      user1: "",
+                user2: "",
-      user2: "",
+                user3: "",
-      user3: "",
+                user4: "",
-      user4: "",
+                user5: "",
-      user5: "",
+                standMap: new Map()
-      standMap: new Map()
+            };
+        },
+        methods: {
+            processTable() {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                    sortWord: this.shunxu ? this.paixu : '',
+                    shunxu: this.shunxu
+                }, {
+                    loading: 'loading',
+                    _this: this
+                }, res => {
+                    this.detailData = res
+                }, e => {
+                })
+            },
+            //tab发生变化
+            handleTabs(name) {
+                this.active = name;
+            },
+            choiceShow() {
+                this.ListModel = true;
+            },
+            //保存事件
+            handleSave() {
+
+            },
+            getData() {
+                return new Promise((resolve, reject) => {
+                    inboundLiaisonDetail({
+                        taskIds: this.taskIds,
+                        pId: this.pId
+                    }).then(res => {
+                        if (res) {
+                            const processForm = JSON.parse(res.mesg)
+                            this.getFormFieldList(processForm)
+                        }
+                    }).catch(e => {
+                    })
+                })
+            },
+            /**
+             * @description: 动态表单读取
+             */
+            getFormFieldList(item) {
+                this.$nextTick(() => {
+                    this.listForm = JSON.parse(JSON.stringify(item))
+                    this.listForm.prcNum = this.prcNum
+                    this.listForm.prcName = this.prcName
+                    this.listForm['id'] = item.id
+                    this.listForm.dataList = item.dataList
+                    this.dataList = item.dataList
+                    this.listForm.applyUpdUserId = item.applyUpdUserId
+                    this.listForm.jlUserId = item.jlUserId
+                    this.listForm.zrUserId = item.zrUserId
+                })
+            },
+          // 请求上传的文件信息
+          getFileInfo() {
+            this.$http.get("att/attFile/getMultiFileInfos", {
+              fileIds: this.fileIds
+            }, {
+              _this: this
+            }, res => {
+              console.log(res);
+              this.$nextTick(() => {
+                res.data.map(item => {
+                  this.listForm.modelName = item.oldFileName
+                  this.listForm.model = item.id
+                });
+              });
+            }, e => {
+            });
+          },
+          /**
+           * @Description: 点击下载
+           */
+          downloadFile(attId) {
+            if (attId != null && attId !== "") {
+              window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+            } else {
+              this.$message.error("请选择要下载的文件");
+            }
+          },
+          downloadFileByWater(attId, fileSuffix) {
+            let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
+            if (fileExtension !== "pdf" && fileExtension !== "PDF") {
+              this.$message.error("水印下载仅支持PDF,pdf格式文件");
+            } else {
+              if (attId != null && attId !== "") {
+                window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+              } else {
+                this.$message.error("请选择要下载的文件");
+              }
+            }
+          },
+            //驳回事件
+            beforeBack() {
+                this.listForm.approvalOpinion = '1'
+                this.handleSubmit()
+            },
+            //提交事件
+            handleSubmit() {
+                this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
+                this.listForm.zrUserId = this.listForm.zrUserId;
+                this.listForm.jlUserId = this.listForm.jlUserId;
+                this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+                this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+                this.listForm.commentText = this.commentText;
+                this.listForm.signflag = "";
+                this.listForm.standId = this.listForm.standId;
+                const json = JSON.stringify(this.listForm);
+                this.$http.post('lawss/activiti/completeTask', {
+                    taskIds: this.taskIds,
+                    userId: this.userId,
+                    json: json,
+                }, {
+                    _this: this
+                }, res => {
+                    if (res.success) {
+                        this.$message.success(res.message)
+                        this.$router.push('/processCenter')
+                    }
+                });
+            },
+            //选择标准取消事件
+            closeDrawer() {
+                this.ListModel = false;
+            },
+            //标准表格选择框改变
+            selectStandChange(data) {
+                this.selectList = [];
+                for (let i = 0; i < data.length; i++) {
+                    this.selectList.push(data[i].id);
+                }
+            },
+            selectThree() {
+
+            },
+            pageChange(page) {
+                this.page = page;
+                this.searchData();
+            },
+            pageSizeChange(pageSize) {
+                this.pageSize = this.$store.getters.userInfo.configContent;
+                this.searchData();
+            }
+        },
+        computed: {
+            listNoDataText() {
+                return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+            }
+        },
+        mounted() {
+            this.getData()
+            this.processTable()
+        },
     };
-  },
-  methods: {
-    processTable () {
-      this.$http.get('lawss/activiti/get_list_by_instance', {
-        prcNum: this.$route.query.prcNum,
-        sortWord: this.shunxu ? this.paixu : '',
-        shunxu: this.shunxu
-      }, {
-        loading: 'loading',
-        _this: this
-      }, res => {
-        this.detailData = res
-      }, e => {})
-    },
-    //tab发生变化
-    handleTabs(name) {
-      this.active = name;
-    },
-    choiceShow() {
-      this.ListModel = true;
-    },
-    //保存事件
-    handleSave() {
-
-    },
-    getData() {
-      return new Promise((resolve, reject) => {
-        inboundLiaisonDetail({
-          taskIds: this.taskIds,
-          pId: this.pId
-        }).then(res => {
-          if (res) {
-            const processForm = JSON.parse(res.mesg)
-            this.getFormFieldList(processForm)
-          }
-        }).catch(e => {
-        })
-      })
-    },
-    /**
-     * @description: 动态表单读取
-     */
-    getFormFieldList (item) {
-      this.$nextTick(() => {
-        this.listForm = JSON.parse(JSON.stringify(item))
-        this.listForm.prcNum = this.prcNum
-        this.listForm.prcName = this.prcName
-        this.listForm['id'] = item.id
-        this.listForm.dataList = item.dataList
-        this.dataList = item.dataList
-        this.listForm.applyUpdUserId = item.applyUpdUserId
-        this.listForm.jlUserId = item.jlUserId
-        this.listForm.zrUserId = item.zrUserId
-      })
-    },
-    //驳回事件
-    beforeBack () {
-      this.listForm.approvalOpinion = '1'
-      this.handleSubmit()
-    },
-    //提交事件
-    handleSubmit() {
-      this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
-      this.listForm.zrUserId = this.listForm.zrUserId;
-      this.listForm.jlUserId = this.listForm.jlUserId;
-      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
-      this.listForm.commentText = this.commentText;
-      this.listForm.signflag = "";
-      this.listForm.standId = this.listForm.standId;
-      const json = JSON.stringify(this.listForm);
-      this.$http.post('lawss/activiti/completeTask', {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json,
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message)
-          this.$router.push('/processCenter')
-        }
-      });
-    },
-    //选择标准取消事件
-    closeDrawer() {
-      this.ListModel = false;
-    },
-    //标准表格选择框改变
-    selectStandChange(data) {
-      this.selectList = [];
-      for (let i = 0; i < data.length; i++) {
-        this.selectList.push(data[i].id);
-      }
-    },
-    selectThree() {
-
-    },
-    pageChange(page) {
-      this.page = page;
-      this.searchData();
-    },
-    pageSizeChange(pageSize) {
-      this.pageSize = this.$store.getters.userInfo.configContent;
-      this.searchData();
-    }
-  },
-  computed: {
-      listNoDataText () {
-        return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
-      }
-  },
-  mounted() {
-    this.getData()
-    this.processTable()
-  },
-};
 </script>
 
 <style lang="less" scoped>
-@import '~@/assets/styles/style';
+    @import '~@/assets/styles/style';
 
-.bzqdfb-step4 {
+    .bzqdfb-step4 {
-  /deep/ .el-drawer__container {
+        /deep/ .el-drawer__container {
-    .prc-content-border {
+            .prc-content-border {
-      border: none;
+                border: none;
-      padding: 0 20px 0;
+                padding: 0 20px 0;
-    }
+            }
-  }
+        }
 
-  .choiceBtn {
+        .choiceBtn {
-    .el-button--primary {
+            .el-button--primary {
-      width: 150px;
+                width: 150px;
-    }
+            }
-  }
+        }
 
-  position: relative;
+        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 {
+        .headerTabs {
-    margin-top: 10px;
+            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/creatProcess/xmpg/step1.vue

@@ -496,17 +496,17 @@ export default {
       } else if (this.type === "qualityEngineer") {
         this.roleForm.qualityEngineer = data[0].id;
         this.roleForm.qualityEngineerName =  data[0].name;
-        this.listForm.qualityEngineer = this.roleForm.qualityEngineer;
+        this.listForm.qualityEngineer = data[0].id;
-        this.listForm.qualityEngineerName = this.roleForm.qualityEngineerName;
+        this.listForm.qualityEngineerName = data[0].name;
       } else if (this.type === "certifiedEngineer") {
         this.roleForm.certifiedEngineer = data[0].id;
         this.roleForm.certifiedEngineerName = data[0].name;
-        this.listForm.certifiedEngineer = this.roleForm.certifiedEngineer;
+        this.listForm.certifiedEngineer =  data[0].id;
-        this.listForm.certifiedEngineerName = this.roleForm.certifiedEngineerName;
+        this.listForm.certifiedEngineerName =  data[0].name;
       } else if (this.type === "distributePerson") {
         this.listForm.distributePerson = data[0].name;
-        this.listForm.dataList[this.dsadadadsada].distributePersonId=this.roleRow.id
+        this.listForm.dataList[this.dsadadadsada].distributePersonId= data[0].id
-        this.listForm.dataList[this.dsadadadsada].distributePerson=this.roleRow.name
+        this.listForm.dataList[this.dsadadadsada].distributePerson= data[0].name
         this.showColumn = false;
         this.$nextTick(() => {
           this.showColumn = true

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

@@ -37,16 +37,16 @@
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
                 <el-input
+                  disabled
                   v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
-                  clearable
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
+                  disabled
                   v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
-                  clearable
                 ></el-input>
               </el-form-item>
             </el-col>

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

@@ -39,14 +39,14 @@
                 <el-input
                   v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -56,6 +56,9 @@
           <template slot="title">填写信息</template>
         </process-title>
         <div class="tableTitle">
+          <div class="tableButton">
+            <el-button plain class="common-button-primary" size="mini" @click="batchOperation">批量分发落实人</el-button>
+          </div>
         </div>
         <el-table
           ref="multipleTable"
@@ -113,50 +116,25 @@
               <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="落实人" prop="implementer" align="center">
-            fixed="right"
+            <template slot-scope="scope">
-            prop="implementer"
+              <div v-if="scope.row.implementer == undefined">
-            align="center"
+                {{ "请选择落实人" }}
-            label="落实人">
+              </div>
-            <template slot-scope="scope,text" v-if="showColumn">
+              <div v-else class="fileClass">
-              <div>
+                {{ scope.row.implementer || "-" }}
-                <div @click="choiceZRRS(scope)">
-                  {{ listForm.breakdownList[scope.$index].implementer == null ? "请选择落实人" : listForm.breakdownList[scope.$index].implementer
-                  }}
-                </div>
               </div>
             </template>
           </el-table-column>
         </el-table>
-        <el-drawer
+        <!--    选择责任人-->
-          title="选择责任部门对接人"
+        <Role-tree
-          :visible.sync="modalshowflag2"
+          check-box
-          :wrapperClosable="false"
+          is-title="选择落实人"
-          size="800px">
+          :is-visible.sync="modalshowflag"
-          <el-tree
+          @checkedRole="checkedRole"
-            v-if="modalshowflag2"
+          :nodeList="nodeList"
-            style="height: 100%; overflow: auto;"
+        ></Role-tree>
-            node-key="id"
-            class="filter-tree"
-            :data="treeData"
-            :props="defaultProps"
-            :default-checked-keys="nodeList"
-            highlight-current
-            check-strictly
-            default-expand-all
-            :expand-on-click-node="false"
-            show-checkbox
-            ref="tree2">
-          </el-tree>
-          <div id="roleFormButton2" class="demo-drawer-footer">
-            <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary"
-                       @click="saveUserInfo2">确定
-            </el-button>
-            <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消
-            </el-button>
-          </div>
-        </el-drawer>
-
       </div>
     </div>
 
@@ -417,69 +395,37 @@ export default {
         }
       }
     },
-    // saveUserInfo() {
+    //批量操作按钮
-    //   if (this.type === "implementer") {
+    batchOperation(id) {
-    //     // 如果有勾选的项
+      if (this.selectList.length === 0) {
-    //     if (this.selectList.length) {
+        this.$message.warning("请至少选择一条数据进行批量分发");
-    //       this.listForm.breakdownList.forEach((item, index) => {
+      } else {
-    //         if (this.selectList.includes(item.itemId)) {
+        this.nodeList = [];
-    //           this.listForm.breakdownList[index].implementerId = this.roleRow.id;
+        this.nodeList.push(id);
-    //           this.listForm.breakdownList[index].implementer = this.roleRow.name;
+        this.modalshowflag = true;
-    //         }
+      }
-    //       });
-    //     } else {
-    //       this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id;
-    //       this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name;
-    //     }
-    //     this.listForm.implementer = this.roleRow.name;
-    //     this.showColumn = false;
-    //     this.$nextTick(() => {
-    //       this.showColumn = true;
-    //     });
-    //   }
-    //   this.modalshowflag = false;
-    // },
-    saveUserInfo2 () {
-        var idList = "";
-        var nameList = "";
-        this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach(item => {
-          if (nameList.length > 0) {
-            nameList += ",";
-            idList += ",";
-          }
-          idList += item.id;
-          nameList += item.name;
-        });
-        // 如果有勾选的项
-        if (this.selectList.length) {
-          this.listForm.breakdownList.forEach((item, index) => {
-            console.log(item.itemId);
-            console.log(index);
-            if (this.selectList.includes(item.itemId)) {
-              this.listForm.breakdownList[index].implementerId = idList;
-              this.listForm.breakdownList[index].implementer = nameList;
-            }
-          });
-        } else {
-          this.listForm.breakdownList[this.dsadadadsada].implementerId = idList;
-          this.listForm.breakdownList[this.dsadadadsada].implementer = nameList;
-        }
-        this.listForm.implementer = nameList;
-        this.showColumn = false;
-        this.$nextTick(() => {
-          this.showColumn = true;
-        });
-      this.modalshowflag2 = false;
-      //不要删除 By 宋伟佳
-      console.log(this.$refs.multipleTable.clearSelection())
-        this.$nextTick(() => {
-            for(var i=0;i<this.$refs.multipleTable.length;i++){
-                this.$refs.multipleTable[i].clearSelection();
-            }
-        })
     },
-    cancleUserInfo2() {
+    checkedRole(data) {
-      this.modalshowflag2 = false;
+      // 选取负责人时的操作
+      let mis = [];
+      let miss = [];
+      this.selectList.forEach(item => {
+        item.implementer = data[0].name;
+        item.implementerId = data[0].id;
+        mis.push(item.projectNumber);
+        miss.push(item.itemNum)
+      });
+      this.listForm.breakdownList.forEach(item => {
+        if (!mis.includes(item.projectNumber) && !miss.includes(item.itemsNum)) {
+          this.selectList.push(item);
+        }
+      });
+      this.listForm.breakdownList = this.selectList;
+      this.$refs.selection.clearSelection();
+      this.modalshowflag = false;
+    },
+    cancleUserInfo() {
+      this.modalshowflag = false;
     },
     choiceZRRS(scope) {
       if (scope != null) this.dsadadadsada = scope.$index;
@@ -544,7 +490,7 @@ export default {
     },
     //标准表格选择框改变
     selectStandChange(data) {
-      this.selectList = data.map(item => item.itemId);
+      this.selectList = data
     },
     selectThree() {
 

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

@@ -39,14 +39,14 @@
                 <el-input
                   v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -244,13 +244,6 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="implementer"
-            label="落实人">
-          </el-table-column>
         </el-table>
       </div>
       <div>
@@ -500,7 +493,6 @@ export default {
       this.listForm.signFlag = "";
       this.listForm.dataList = this.dataList;
       const json = JSON.stringify(this.listForm);
-      console.log(json);
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,
@@ -543,7 +535,6 @@ export default {
   mounted() {
     this.processTable();
     this.getData();
-    // console.log(this.$store.getters.getHandleInfo);
   }
 };
 </script>

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

@@ -39,14 +39,14 @@
                 <el-input
                   v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -419,7 +419,6 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg)
             this.getFormFieldList(processForm)

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

@@ -39,14 +39,14 @@
                 <el-input
                   v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
             </el-col>

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

@@ -39,14 +39,14 @@
                 <el-input
                   v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
             </el-col>

src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue

@@ -0,0 +1,485 @@
+<template>
+  <div class="xmpg2-step10">
+    <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 === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectNumber"
+                  placeholder="请输入项目编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectName"
+                  placeholder="请输入项目名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title style="margin-top:5px; margin-bottom: 5px">
+          <template slot="title">填写信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          ref="selection"
+          height="70%"
+          style="width: 100%; border:1px solid #ccc"
+          :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="standNumber"
+            align="center"
+            width="200"
+            label="标准编号">
+          </el-table-column>
+          <el-table-column
+            prop="standName"
+            align="center"
+            width="200"
+            label="标准名称">
+          </el-table-column>
+          <el-table-column
+            prop="itemNum"
+            align="center"
+            width="200"
+            label="条款号">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
+          </el-table-column>
+          <el-table-column
+            prop="xCXSSRQ"
+            width="200"
+            align="center"
+            label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zCCSSRQ"
+            width="200"
+            align="center"
+            label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="productType"
+            align="center"
+            label="在研产品">
+            <el-table-column
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
+              <el-table-column
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="在产产品">
+            <el-table-column
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              label="不合规">
+              <el-table-column
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="workPeople"
+            label="落实人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list" style="height: 100%">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="审批意见"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-back
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail } from "api/process";
+
+export default {
+  name: "xmpg2Step10",
+  components: {
+    ProcessTitle,
+    ProcessHeader,
+    ProcessFooter
+  },
+  data() {
+    return {
+      active: "1",
+      loading: false,
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      isSubmit: false,
+      saveLoading: false,
+      //表单的数据
+      listForm: {
+        BZFlag: " ", //1审批通过 其他为驳回
+        projectNumber: "",  //项目编号
+        projectName: "",  //项目名称
+        dataList: [], //项目下的标准数据
+        breakdownList: [] //标准下的分解单数据
+      },
+      dataList: [], //展示的标准数据
+      commentText: "", //审批意见
+      detailData: [],//流程历史数据
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId
+    };
+  },
+  methods: {
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res;
+      }, e => {
+      });
+    },
+    //tab改变
+    handleTabs(type) {
+      this.active = type;
+    },
+    //获取数据
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    //动态表单读取
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item));
+        this.listForm.prcNum = this.prcNum;
+        this.listForm.prcName = this.prcName;
+        this.listForm["id"] = item.id;
+        this.listForm.dataList = item.dataList;
+        this.dataList = item.dataList;
+        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        this.listForm.breakdownList = item.breakdownList;
+      });
+    },
+    //驳回事件
+    beforeBack() {
+      this.listForm.BZFlag = "2";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+      }, e => {
+      });
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.BZFlag = "1";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+      }, e => {
+      });
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.xmpg2-step10 {
+  /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/creatProcess/xmpg2/step11.vue

@@ -0,0 +1,485 @@
+<template>
+  <div class="xmpg2-step11">
+    <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 === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectNumber"
+                  placeholder="请输入项目编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectName"
+                  placeholder="请输入项目名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title style="margin-top:5px; margin-bottom: 5px">
+          <template slot="title">填写信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          ref="selection"
+          height="70%"
+          style="width: 100%; border:1px solid #ccc"
+          :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="standNumber"
+            align="center"
+            width="200"
+            label="标准编号">
+          </el-table-column>
+          <el-table-column
+            prop="standName"
+            align="center"
+            width="200"
+            label="标准名称">
+          </el-table-column>
+          <el-table-column
+            prop="itemNum"
+            align="center"
+            width="200"
+            label="条款号">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
+          </el-table-column>
+          <el-table-column
+            prop="xCXSSRQ"
+            width="200"
+            align="center"
+            label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zCCSSRQ"
+            width="200"
+            align="center"
+            label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="productType"
+            align="center"
+            label="在研产品">
+            <el-table-column
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
+              <el-table-column
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="在产产品">
+            <el-table-column
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              label="不合规">
+              <el-table-column
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="workPeople"
+            label="落实人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list" style="height: 100%">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="审批意见"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-back
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail } from "api/process";
+
+export default {
+  name: "xmpg2Step11",
+  components: {
+    ProcessTitle,
+    ProcessHeader,
+    ProcessFooter
+  },
+  data() {
+    return {
+      active: "1",
+      loading: false,
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      isSubmit: false,
+      saveLoading: false,
+      //表单的数据
+      listForm: {
+        BZFlag: " ", //1审批通过 其他为驳回
+        projectNumber: "",  //项目编号
+        projectName: "",  //项目名称
+        dataList: [], //项目下的标准数据
+        breakdownList: [] //标准下的分解单数据
+      },
+      dataList: [], //展示的标准数据
+      commentText: "", //审批意见
+      detailData: [],//流程历史数据
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId
+    };
+  },
+  methods: {
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res;
+      }, e => {
+      });
+    },
+    //tab改变
+    handleTabs(type) {
+      this.active = type;
+    },
+    //获取数据
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    //动态表单读取
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item));
+        this.listForm.prcNum = this.prcNum;
+        this.listForm.prcName = this.prcName;
+        this.listForm["id"] = item.id;
+        this.listForm.dataList = item.dataList;
+        this.dataList = item.dataList;
+        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        this.listForm.breakdownList = item.breakdownList;
+      });
+    },
+    //驳回事件
+    beforeBack() {
+      this.listForm.BZFlag = "2";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+      }, e => {
+      });
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.BZFlag = "1";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+      }, e => {
+      });
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.xmpg2-step11 {
+  /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/creatProcess/xmpg2/step12.vue

@@ -0,0 +1,485 @@
+<template>
+  <div class="xmpg2-step12">
+    <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 === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectNumber"
+                  placeholder="请输入项目编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectName"
+                  placeholder="请输入项目名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title style="margin-top:5px; margin-bottom: 5px">
+          <template slot="title">填写信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          ref="selection"
+          height="70%"
+          style="width: 100%; border:1px solid #ccc"
+          :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="standNumber"
+            align="center"
+            width="200"
+            label="标准编号">
+          </el-table-column>
+          <el-table-column
+            prop="standName"
+            align="center"
+            width="200"
+            label="标准名称">
+          </el-table-column>
+          <el-table-column
+            prop="itemNum"
+            align="center"
+            width="200"
+            label="条款号">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
+          </el-table-column>
+          <el-table-column
+            prop="xCXSSRQ"
+            width="200"
+            align="center"
+            label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zCCSSRQ"
+            width="200"
+            align="center"
+            label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="productType"
+            align="center"
+            label="在研产品">
+            <el-table-column
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
+              <el-table-column
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="在产产品">
+            <el-table-column
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              label="不合规">
+              <el-table-column
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="workPeople"
+            label="落实人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list" style="height: 100%">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="审批意见"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-back
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail } from "api/process";
+
+export default {
+  name: "xmpg2Step12",
+  components: {
+    ProcessTitle,
+    ProcessHeader,
+    ProcessFooter
+  },
+  data() {
+    return {
+      active: "1",
+      loading: false,
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      isSubmit: false,
+      saveLoading: false,
+      //表单的数据
+      listForm: {
+        BZFlag: " ", //1审批通过 其他为驳回
+        projectNumber: "",  //项目编号
+        projectName: "",  //项目名称
+        dataList: [], //项目下的标准数据
+        breakdownList: [] //标准下的分解单数据
+      },
+      dataList: [], //展示的标准数据
+      commentText: "", //审批意见
+      detailData: [],//流程历史数据
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId
+    };
+  },
+  methods: {
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res;
+      }, e => {
+      });
+    },
+    //tab改变
+    handleTabs(type) {
+      this.active = type;
+    },
+    //获取数据
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    //动态表单读取
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item));
+        this.listForm.prcNum = this.prcNum;
+        this.listForm.prcName = this.prcName;
+        this.listForm["id"] = item.id;
+        this.listForm.dataList = item.dataList;
+        this.dataList = item.dataList;
+        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        this.listForm.breakdownList = item.breakdownList;
+      });
+    },
+    //驳回事件
+    beforeBack() {
+      this.listForm.BZFlag = "2";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+      }, e => {
+      });
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.BZFlag = "1";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+      }, e => {
+      });
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.xmpg2-step12 {
+  /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/creatProcess/xmpg2/step2.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="xmpg-step2">
+  <div class="xmpg2-step2">
     <ProcessHeader toggle>
       <template slot="proName">项目合规评估流程-项目</template>
       <template slot="proNode">业务经理审批流程</template>
@@ -289,7 +289,6 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -335,7 +334,6 @@ export default {
       this.listForm.BZFlag = "1";
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
-      console.log(json);
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,
@@ -366,7 +364,7 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 
-.xmpg-step2 {
+.xmpg2-step2 {
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="xmpg-step3">
+  <div class="xmpg2-step3">
     <ProcessHeader toggle>
       <template slot="proName">项目合规评估流程-项目</template>
       <template slot="proNode">工程经理进行转办</template>
@@ -39,7 +39,7 @@
                   v-model="listForm.jgUser"
                   placeholder="请选择架构经理"
                   clearable
-                  @click.native="choiceZRR(null,'jgUser', '选择质量工程师', roleForm.jgUser)"
+                  @click.native="choiceZRR(null,'jgUser', '选择架构经理', roleForm.jgUser)"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -261,7 +261,6 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -294,7 +293,6 @@ export default {
       } else {
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
-        console.log(json);
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,
@@ -364,7 +362,7 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 
-.xmpg-step3 {
+.xmpg2-step3 {
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="xmpg-step3">
+  <div class="xmpg2-step4">
     <ProcessHeader toggle>
       <template slot="proName">项目合规评估流程-项目</template>
       <template slot="proNode">架构经理选择分发负责人</template>
@@ -184,7 +184,7 @@
     <!--    选择责任人-->
     <Role-tree
       check-box
-      :is-title="drawerTitle"
+      is-title="选择分发负责人"
       :is-visible.sync="modalshowflag"
       @checkedRole="checkedRole"
       :nodeList="nodeList"
@@ -267,7 +267,6 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -295,7 +294,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-
       this.listForm.dataList.forEach(item => {
         if(item.liablePeople !== undefined){
             this.peopleFlag = true
@@ -306,7 +304,6 @@ export default {
       if(this.peopleFlag === true){
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
-        console.log(json);
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,
@@ -389,7 +386,7 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 
-.xmpg-step3 {
+.xmpg2-step4 {
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;

src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="xmpg-step3">
+  <div class="xmpg2-step5">
     <ProcessHeader toggle>
       <template slot="proName">项目合规评估流程-项目</template>
       <template slot="proNode">选择分发责任人</template>
@@ -48,12 +48,12 @@
         <el-table
           :data="dataList"
           style="width: 100%"
-          row-key= "standId"
+          row-key="standId"
           height="70%"
           border
           @selection-change="selectStandChange"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-        fontWeight: 'bold', height: '48px'}"
+          fontWeight: 'bold', height: '48px'}"
         >
           <el-table-column
             type="selection"
@@ -61,7 +61,7 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="standId"
+            prop="standEnName"
             label="标准编号"
           >
           </el-table-column>
@@ -70,6 +70,16 @@
             label="标准名称"
           >
           </el-table-column>
+          <el-table-column
+            prop="itemsNum"
+            label="条款号"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            label="条款名称"
+          >
+          </el-table-column>
           <el-table-column label="责任人" prop="workPeople" align="center">
             <template slot-scope="scope">
               <div v-if="scope.row.workPeople == undefined">
@@ -162,7 +172,7 @@
     <!--    选择责任人-->
     <Role-tree
       check-box
-      :is-title="drawerTitle"
+      is-title="选择责任人"
       :is-visible.sync="modalshowflag"
       @checkedRole="checkedRole"
       :nodeList="nodeList"
@@ -211,7 +221,7 @@ export default {
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
         dataList: [], //项目下的标准数据
-        children: [], //标准下的分解单数据
+        children: [] //标准下的分解单数据
       },
       dataList: [], //展示的标准数据
       commentText: "", //审批意见
@@ -222,13 +232,6 @@ export default {
     };
   },
   methods: {
-    // load(tree, treeNode, resolve) {
-    //   setTimeout(() => {
-    //     resolve(
-    //       this.listForm.children
-    //     )
-    //   }, 1000)
-    // },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
@@ -253,7 +256,6 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -271,34 +273,31 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.dataList = item.dataList;
-        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        let children = [];
-        this.listForm.breakdownList = item.breakdownList;
-        this.listForm.children = item.breakdownList;
-        let children = []
         item.breakdownList.forEach(
           item => {
             let aa = {
               key: item.standId,
-              id:item.id,
+              id: item.id,
-              standId:'条款号:   '+ item.itemsNum,
+              standId: item.itemsNum,
-              standName:'条款名称:   '+  item.itemsName,
+              itemsNum: item.itemsNum,
-              workPeople: '请选择责任人'
+              itemsName: item.itemsName,
-            }
+              workPeople: "请选择责任人"
-            children.push(aa)
+            };
+            children.push(aa);
           }
-        )
+        );
         this.dataList.forEach(key => {
-          key['children'] = []
+          key["children"] = [];
           children.forEach(breakDown => {
             if (key.standId === breakDown.key) {
-              key['children'].push(breakDown)
+              key["children"].push(breakDown);
             }
-          })
+          });
-          if( key['children'].length === 0) {
+          if (key["children"].length === 0) {
-            delete key['children']
+            delete key["children"];
           }
-        })
+        });
-        console.log(this.dataList)
         this.listForm.children = children;
       });
     },
@@ -312,7 +311,6 @@ export default {
         if (item.workPeople !== undefined) {
           this.listForm.commentText = this.commentText;
           const json = JSON.stringify(this.listForm);
-          console.log(json);
           this.$http.post("lawss/activiti/completeTask", {
             taskIds: this.taskIds,
             userId: this.userId,
@@ -333,7 +331,6 @@ export default {
     },
     //批量分发按钮
     batchOperation(id) {
-      console.log(this.selectList);
       if (this.selectList.length === 0) {
         this.$message.warning("请至少选择一条数据进行批量分发");
       } else {
@@ -367,28 +364,32 @@ export default {
       this.selectList.forEach(item => {
         item.workPeople = data[0].name;
         item.workPeopleId = data[0].id;
-        mis2.set(item.standId,item)
+        if (item.children !== undefined) {
-        if (item.children !== undefined ){
+          item.children.forEach(items => {
-          item.children.forEach(items =>{
+            deposit.set(items.standId, items);
-            deposit.set(items.standId,items)
+          });
-          })
+        }
+        mis2.set(item.standId, item);
+      });
+
+      this.dataList.forEach(item => {
+        if (undefined !== mis2.get(item.standId)) {
+          if (undefined !== item.children) {
+            item.children.forEach(i => {
+              i.workPeopleId = undefined;
+              i.workPeople = undefined;
+            });
+          }
+        } else {
+          if (item.children !== undefined) {
+            item.children.forEach(items => {
+              if (undefined !== deposit.get(items.standId)) {
+                items = deposit.get(items.standId);
+              }
+            });
+          }
         }
       });
-      this.dataList.forEach(item => {
-          if (undefined!==mis2.get(item.standId)){
-            item=deposit.get(item.standId)
-          } else {
-            if (item.children !== undefined && mis2.get(item.standId)===undefined) {
-              item.children.forEach(items => {
-                if (undefined !== deposit.get(items.standId)) {
-                  items = deposit.get(items.standId)
-                }
-              })
-            }
-          }
-      });
-      console.log(this.dataList);
-      // this.dataList = this.selectList;
       this.$refs.selection.clearSelection();
       this.modalshowflag = false;
     },
@@ -412,7 +413,7 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 
-.xmpg-step3 {
+.xmpg2-step5 {
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;

src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="xmpg-step3">
+  <div class="xmpg2-step6">
     <ProcessHeader toggle>
       <template slot="proName">项目合规评估流程-项目</template>
       <template slot="proNode">责任人填写评估反馈</template>
@@ -42,29 +42,34 @@
         </process-title>
         <el-table
           :data="dataList"
-          border
+          style="width: 100%; border: 1px solid #cccccc"
-          ref="selection"
+          row-key="standId"
           height="70%"
-          style="width: 100%; border:1px solid #ccc"
+          border
           @selection-change="selectStandChange"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
+          fontWeight: 'bold', height: '48px'}"
+        >
           <el-table-column
             type="selection"
             width="55"
             align="center">
           </el-table-column>
           <el-table-column
-            prop="standId"
+            prop="standEnName"
+            label="标准编号"
+            width="180"
+            fixed="left"
             align="center"
-            width="200"
+          >
-            label="标准编号">
           </el-table-column>
           <el-table-column
             prop="standName"
+            fixed="left"
+            width="180"
             align="center"
-            width="200"
+            label="标准名称"
-            label="标准名称">
+          >
           </el-table-column>
           <el-table-column
             prop="itemNum"
@@ -220,13 +225,6 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
-          <el-table-column
-            fixed="right"
-            align="center"
-            width="150"
-            prop="implementer"
-            label="落实人">
-          </el-table-column>
         </el-table>
       </div>
     </div>
@@ -306,14 +304,6 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
-    <!--    选择责任人-->
-    <Role-tree
-      check-box
-      :is-title="drawerTitle"
-      :is-visible.sync="modalshowflag"
-      @checkedRole="checkedRole"
-      :nodeList="nodeList"
-    ></Role-tree>
   </div>
 </template>
 
@@ -345,22 +335,34 @@ export default {
       selectList: [],
       treeData: [], // 人员数据
       roleForm: {
-        liablePeople: ""
+        workPeople: ""
       },
+      itemFlag: true,
       peopleFlag: true,
-      nodeList: [],
       defaultProps: {
         children: "children",
         label: "name"
       },
+      complianceReasons:'',
+      zcComplianceReasons:'',
       //表单的数据
       listForm: {
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
-        dataList: [], //项目下的标准数据
+        dataList: [
-        children: [], //标准下的分解单数据
+          {
+            complianceReasons:'',
+            zcComplianceReasons:'',
+          }
+        ], //项目下的标准数据
+        children: [] //标准下的分解单数据
       },
-      dataList: [], //展示的标准数据
+      dataList: [
+        {
+          complianceReasons:'',
+          zcComplianceReasons:'',
+        }
+      ], //展示的标准数据
       commentText: "", //审批意见
       detailData: [], //流程历史数据
       userId: this.$store.getters.userInfo.userId,
@@ -393,7 +395,6 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -410,10 +411,33 @@ export default {
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
-        console.log(item.dataList);
         this.dataList = item.dataList;
-        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        let children = [];
-        this.listForm.breakdownList = item.breakdownList;
+        item.breakdownList.forEach(
+          item => {
+            let aa = {
+              key: item.standId,
+              id: item.id,
+              standId: item.itemsNum,
+              itemsNum: item.itemsNum,
+              itemsName: item.itemsName,
+              workPeople: "请选择责任人"
+            };
+            children.push(aa);
+          }
+        );
+        this.dataList.forEach(key => {
+          key["children"] = [];
+          children.forEach(breakDown => {
+            if (key.standId === breakDown.key) {
+              key["children"].push(breakDown);
+            }
+          });
+          if (key["children"].length === 0) {
+            delete key["children"];
+          }
+        });
+        this.listForm.children = children;
       });
     },
     //保存事件
@@ -423,10 +447,9 @@ export default {
     //提交事件
     handleSubmit() {
       this.listForm.dataList.forEach(item => {
-        if (item.liablePeople !== undefined) {
+        if (item.workPeople !== undefined) {
           this.listForm.commentText = this.commentText;
           const json = JSON.stringify(this.listForm);
-          console.log(json);
           this.$http.post("lawss/activiti/completeTask", {
             taskIds: this.taskIds,
             userId: this.userId,
@@ -445,17 +468,6 @@ export default {
         }
       });
     },
-    //批量操作按钮
-    batchOperation(id) {
-      console.log(this.selectList);
-      if (this.selectList.length === 0) {
-        this.$message.warning("请至少选择一条数据进行批量分发");
-      } else {
-        this.nodeList = [];
-        this.nodeList.push(id);
-        this.modalshowflag = true;
-      }
-    },
     //标准表格选择框改变
     selectStandChange(data) {
       this.selectList = data;
@@ -474,26 +486,6 @@ export default {
         this.roleRow = this.$refs.tree.getCheckedNodes()[0];
       }
     },
-    checkedRole(data) {
-      // 选取负责人时的操作
-      let mis = [];
-      this.selectList.forEach(item => {
-        item.liablePeople = data[0].name;
-        item.liablePeopleId = data[0].id;
-        mis.push(item.standId);
-      });
-      this.dataList.forEach(item => {
-        if (!mis.includes(item.standId)) {
-          this.selectList.push(item);
-        }
-      });
-      this.dataList = this.selectList;
-      this.$refs.selection.clearSelection();
-      this.modalshowflag = false;
-    },
-    cancleUserInfo() {
-      this.modalshowflag = false;
-    }
   },
   computed: {
     listNoDataText() {
@@ -511,7 +503,7 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 
-.xmpg-step3 {
+.xmpg2-step6 {
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
@@ -558,24 +550,9 @@ export default {
     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 {

src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue

@@ -0,0 +1,485 @@
+<template>
+  <div class="xmpg2-step7">
+    <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 === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectNumber"
+                  placeholder="请输入项目编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectName"
+                  placeholder="请输入项目名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title style="margin-top:5px; margin-bottom: 5px">
+          <template slot="title">填写信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          ref="selection"
+          height="70%"
+          style="width: 100%; border:1px solid #ccc"
+          :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="standNumber"
+            align="center"
+            width="200"
+            label="标准编号">
+          </el-table-column>
+          <el-table-column
+            prop="standName"
+            align="center"
+            width="200"
+            label="标准名称">
+          </el-table-column>
+          <el-table-column
+            prop="itemNum"
+            align="center"
+            width="200"
+            label="条款号">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
+          </el-table-column>
+          <el-table-column
+            prop="xCXSSRQ"
+            width="200"
+            align="center"
+            label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zCCSSRQ"
+            width="200"
+            align="center"
+            label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="productType"
+            align="center"
+            label="在研产品">
+            <el-table-column
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
+              <el-table-column
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="在产产品">
+            <el-table-column
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              label="不合规">
+              <el-table-column
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="workPeople"
+            label="落实人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list" style="height: 100%">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="审批意见"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-back
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail } from "api/process";
+
+export default {
+  name: "xmpg2Step7",
+  components: {
+    ProcessTitle,
+    ProcessHeader,
+    ProcessFooter
+  },
+  data() {
+    return {
+      active: "1",
+      loading: false,
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      isSubmit: false,
+      saveLoading: false,
+      //表单的数据
+      listForm: {
+        BZFlag: " ", //1审批通过 其他为驳回
+        projectNumber: "",  //项目编号
+        projectName: "",  //项目名称
+        dataList: [], //项目下的标准数据
+        breakdownList: [] //标准下的分解单数据
+      },
+      dataList: [], //展示的标准数据
+      commentText: "", //审批意见
+      detailData: [],//流程历史数据
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId
+    };
+  },
+  methods: {
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res;
+      }, e => {
+      });
+    },
+    //tab改变
+    handleTabs(type) {
+      this.active = type;
+    },
+    //获取数据
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    //动态表单读取
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item));
+        this.listForm.prcNum = this.prcNum;
+        this.listForm.prcName = this.prcName;
+        this.listForm["id"] = item.id;
+        this.listForm.dataList = item.dataList;
+        this.dataList = item.dataList;
+        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        this.listForm.breakdownList = item.breakdownList;
+      });
+    },
+    //驳回事件
+    beforeBack() {
+      this.listForm.BZFlag = "2";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+      }, e => {
+      });
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.BZFlag = "1";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+      }, e => {
+      });
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.xmpg2-step7 {
+  /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/creatProcess/xmpg2/step8.vue

@@ -0,0 +1,485 @@
+<template>
+  <div class="xmpg2-step8">
+    <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 === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectNumber"
+                  placeholder="请输入项目编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectName"
+                  placeholder="请输入项目名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title style="margin-top:5px; margin-bottom: 5px">
+          <template slot="title">填写信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          ref="selection"
+          height="70%"
+          style="width: 100%; border:1px solid #ccc"
+          :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="standNumber"
+            align="center"
+            width="200"
+            label="标准编号">
+          </el-table-column>
+          <el-table-column
+            prop="standName"
+            align="center"
+            width="200"
+            label="标准名称">
+          </el-table-column>
+          <el-table-column
+            prop="itemNum"
+            align="center"
+            width="200"
+            label="条款号">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
+          </el-table-column>
+          <el-table-column
+            prop="xCXSSRQ"
+            width="200"
+            align="center"
+            label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zCCSSRQ"
+            width="200"
+            align="center"
+            label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="productType"
+            align="center"
+            label="在研产品">
+            <el-table-column
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
+              <el-table-column
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="在产产品">
+            <el-table-column
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              label="不合规">
+              <el-table-column
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="workPeople"
+            label="落实人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list" style="height: 100%">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="审批意见"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-back
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail } from "api/process";
+
+export default {
+  name: "xmpg2Step8",
+  components: {
+    ProcessTitle,
+    ProcessHeader,
+    ProcessFooter
+  },
+  data() {
+    return {
+      active: "1",
+      loading: false,
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      isSubmit: false,
+      saveLoading: false,
+      //表单的数据
+      listForm: {
+        BZFlag: " ", //1审批通过 其他为驳回
+        projectNumber: "",  //项目编号
+        projectName: "",  //项目名称
+        dataList: [], //项目下的标准数据
+        breakdownList: [] //标准下的分解单数据
+      },
+      dataList: [], //展示的标准数据
+      commentText: "", //审批意见
+      detailData: [],//流程历史数据
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId
+    };
+  },
+  methods: {
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res;
+      }, e => {
+      });
+    },
+    //tab改变
+    handleTabs(type) {
+      this.active = type;
+    },
+    //获取数据
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    //动态表单读取
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item));
+        this.listForm.prcNum = this.prcNum;
+        this.listForm.prcName = this.prcName;
+        this.listForm["id"] = item.id;
+        this.listForm.dataList = item.dataList;
+        this.dataList = item.dataList;
+        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        this.listForm.breakdownList = item.breakdownList;
+      });
+    },
+    //驳回事件
+    beforeBack() {
+      this.listForm.BZFlag = "2";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+      }, e => {
+      });
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.BZFlag = "1";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+      }, e => {
+      });
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.xmpg2-step8 {
+  /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/creatProcess/xmpg2/step9.vue

@@ -0,0 +1,485 @@
+<template>
+  <div class="xmpg2-step9">
+    <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 === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectNumber"
+                  placeholder="请输入项目编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectName"
+                  placeholder="请输入项目名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title style="margin-top:5px; margin-bottom: 5px">
+          <template slot="title">填写信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          ref="selection"
+          height="70%"
+          style="width: 100%; border:1px solid #ccc"
+          :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="standNumber"
+            align="center"
+            width="200"
+            label="标准编号">
+          </el-table-column>
+          <el-table-column
+            prop="standName"
+            align="center"
+            width="200"
+            label="标准名称">
+          </el-table-column>
+          <el-table-column
+            prop="itemNum"
+            align="center"
+            width="200"
+            label="条款号">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
+          </el-table-column>
+          <el-table-column
+            prop="xCXSSRQ"
+            width="200"
+            align="center"
+            label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zCCSSRQ"
+            width="200"
+            align="center"
+            label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="productType"
+            align="center"
+            label="在研产品">
+            <el-table-column
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
+              <el-table-column
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="在产产品">
+            <el-table-column
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              label="不合规">
+              <el-table-column
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="workPeople"
+            label="落实人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list" style="height: 100%">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="审批意见"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-back
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail } from "api/process";
+
+export default {
+  name: "xmpg2Step9",
+  components: {
+    ProcessTitle,
+    ProcessHeader,
+    ProcessFooter
+  },
+  data() {
+    return {
+      active: "1",
+      loading: false,
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      isSubmit: false,
+      saveLoading: false,
+      //表单的数据
+      listForm: {
+        BZFlag: " ", //1审批通过 其他为驳回
+        projectNumber: "",  //项目编号
+        projectName: "",  //项目名称
+        dataList: [], //项目下的标准数据
+        breakdownList: [] //标准下的分解单数据
+      },
+      dataList: [], //展示的标准数据
+      commentText: "", //审批意见
+      detailData: [],//流程历史数据
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId
+    };
+  },
+  methods: {
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res;
+      }, e => {
+      });
+    },
+    //tab改变
+    handleTabs(type) {
+      this.active = type;
+    },
+    //获取数据
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    //动态表单读取
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item));
+        this.listForm.prcNum = this.prcNum;
+        this.listForm.prcName = this.prcName;
+        this.listForm["id"] = item.id;
+        this.listForm.dataList = item.dataList;
+        this.dataList = item.dataList;
+        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        this.listForm.breakdownList = item.breakdownList;
+      });
+    },
+    //驳回事件
+    beforeBack() {
+      this.listForm.BZFlag = "2";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+      }, e => {
+      });
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.BZFlag = "1";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+      }, e => {
+      });
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.xmpg2-step9 {
+  /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/processList/tabComponents/taskDraft/index.vue

@@ -226,6 +226,16 @@ export default {
             }
           })
           break
+        case '4':
+          this.$router.push({
+            name: 'bzqdfbStep1-1',
+            query: {
+              type: '4',
+              processName: '标准清单发布更新流程',
+              bpnId: id
+            }
+          })
+          break
       }
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),

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

@@ -80,7 +80,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="标准名称" class="search-item">
+            <el-form-item  label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item">
               <el-input
                   v-model="sarAccessInfoSearch.standName"
                   placeholder="请输入"
@@ -159,14 +159,6 @@
       </div>
       <div class="showSelectBox" v-if="!showSelectBox">
         <el-form  :model="sarAccessInfoSearch" class="label-input-form" v-if="!disabledFlag" inline>
-          <el-form-item label="标准名称"  class="search-item"  v-show="!isListType">
-            <el-input
-              v-model="sarAccessInfoSearch.standName"
-              placeholder="请输入"
-              :maxlength="100"
-              size="small"
-            />
-          </el-form-item>
           <el-form-item label="文本状态"  v-show="!isListType">
             <el-select
               v-model="sarAccessInfoSearch.textStatus"
@@ -191,15 +183,6 @@
               placeholder="选择发布日期">
             </el-date-picker>
           </el-form-item>
-          <el-form-item lable="更新时间"  v-show="isListType">
-            <el-date-picker
-              v-model="sarAccessInfoSearch.modifyTime"
-              type="date"
-              value-format="yyyy-MM-DD"
-              size="small"
-              placeholder="选择发布日期">
-            </el-date-picker>
-          </el-form-item>
           <el-form-item label="更新人"  v-show="isListType">
             <el-input
               v-model="sarAccessInfoSearch.standName"
@@ -207,6 +190,15 @@
               :maxlength="100"
               size="small"/>
           </el-form-item>
+          <el-form-item label="更新时间"  v-show="isListType">
+            <el-date-picker
+              v-model="sarAccessInfoSearch.modifyTime"
+              type="date"
+              size="small"
+              value-format="yyyy-MM-DD"
+              placeholder="选择更新日期">
+            </el-date-picker>
+          </el-form-item>
         </el-form>
       </div>
       <div class="action-bar">
@@ -403,18 +395,12 @@
           align="center"
           width="180px"
           label="适用车型">
-          <template slot-scope="scope">
-            <span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
-          </template>
         </el-table-column>
         <el-table-column
           prop="nylx"
           align="center"
           width="180px"
           label="能源类型">
-          <template slot-scope="scope">
-            <span>{{ nylxMap[scope.row.nylx] }}</span>
-          </template>
         </el-table-column>
         <el-table-column
           prop="putTime"
@@ -453,9 +439,6 @@
           width="210px"
           align="center"
           label="责任部门">
-          <template slot-scope="scope">
-            <span>{{ zrbmMap[scope.row.zrbm] }}</span>
-          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -463,9 +446,6 @@
           width="180px"
           align="center"
           label="适用产品线">
-          <template slot-scope="scope">
-            <span>{{ sycpxMap[scope.row.sycpx] }}</span>
-          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -495,7 +475,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="240" label="操作">
+        <el-table-column width="240" align="center" label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -657,7 +637,7 @@ import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPoli
 import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
 import stand from "../../../config/pages/attributeCustom/components/stand";
 import { mapGetters } from 'vuex'
-import { editDataInfo } from '@/api/unqualProcess'
+import { dicTypeData, StandardsInfoPage } from '@/api/unqualProcess'
 import {interfaceUrl} from "@/sysConfig";
 export default {
   name: 'ListOfStandardsAndRegulationsDetails',
@@ -682,25 +662,6 @@ export default {
     CustomRoleTree
   },
   data () {
-    // let validatePass = (rule, value, callback) => {
-    //   let list = []
-    //   //sarAccessInfoListADMIN  可能不存在
-    //   if (this.sarAccessInfoListADMIN.length > 0) {
-    //     for (let a  = 0; a < this.sarAccessInfoListADMIN.length;a++) {
-    //       list.push(this.sarAccessInfoListADMIN[a].code)
-    //     }
-    //   }
-    //   if (this.sarAccessInfoList.length > 0) {
-    //     for (let b = 0; b < this.sarAccessInfoList.length;b++) {
-    //       list.push(this.sarAccessInfoList[b].code)
-    //     }
-    //   }
-    //   for (let c = 0; c < list.length; c++) {
-    //     if (value === list[c]) {
-    //       callback(new Error('此标准号已存在'))
-    //     }
-    //   }
-    // }
     return {
       textStatusMap: {},
       countryAreaMap: {},
@@ -708,7 +669,6 @@ export default {
       nylxMap: {},
       zrbmMap: {},
       sycpxMap: {},
-      zrbmOptions: [],
       // 编辑抽屉状态
       drawerEdit: false,
       // 编辑框数据
@@ -762,8 +722,13 @@ export default {
       drawerCountryOptions: [], // 基础信息 国家list
       textStatusOptions: [], // 文本状态
       applyOptions: [], //基础信息适用领域list
-      applyArcticOptions: [], // 基础车型 适用车型list
+      /** ****************************/
+      zrbmOptions: [], // 责任部门
+      categoryOptions: [], // 能源类型
       energyKindOptions: [], // 能源种类list
+      sycpxOptions: [], // 适用产品线
+      applyArcticOptions: [], // 基础车型 适用车型list
+      /** ******************************/
       accessSarTypeOptions: [], // 要求类型list
       standSortOptions: [], // 标准类别
       standStateOptions: [], // 标准状态
@@ -1009,6 +974,20 @@ export default {
       uuid: '',
     }
   },
+  created() {
+    this.selectLawsStands()
+    dicTypeData().then(res => {
+      // 责任部门数据字典
+      this.zrbmOptions = res.data.ZRBMCLASS
+      // 能源类型数据字典
+      this.energyKindOptions = res.data.ENERGYTYPES
+      // this.categoryOptions = res.data.NYLXCLASS // 能源类型
+      // 适用车型数据字典
+      this.applyArcticOptions = res.data.PRODUCTTYPE
+      // 适用产品线数据字典
+      this.sycpxOptions = res.data.SYCPXCLASS
+    })
+  },
   methods: {
     // 高级检索
     selectMoreBtn () {
@@ -1427,7 +1406,6 @@ export default {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
             }
           }
-          console.log(rowlist2)
           rowlist = rowlist.join(',')
           rowlist1 = rowlist1.join(',')
           rowlist2 = rowlist2.join(',')
@@ -1487,22 +1465,9 @@ export default {
     },
     // 查询数据搜索 table 数据
     selectLawsStands () {
-      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, {
+      StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
-        _this: this
-      }, res =>{
         this.sarAccessInfoSearchList = res.data.list
-        this.sarAccessInfoSearchList.forEach(item => {
+        this.drawerTotal = res.data.list.length
-          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
-          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
-          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
-          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
-          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
-          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
-          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
-          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
-          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
-        })
       }, e => {
       })
     },
@@ -1513,6 +1478,68 @@ export default {
     // 数据搜索 table select事件
     sarAccessInfoSearchSelect (val) {
       this.selectedAccInfoSearchList = val
+      this.selectedAccInfoSearchList.forEach(item => {
+        this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+        this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+        this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+        this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+        this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+        this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+        this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+        this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+        this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+        this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+      })
+      this.selectedAccInfoSearchList.forEach(item => {
+        // 责任部门转换
+        if (item.zrbm !== null || item.zrbm !== "") {
+          let k = (item.zrbm || "").split(',')
+            for (let i in this.zrbmOptions) {
+              for (let m = 0; m< k.length; m++) {
+                if (this.zrbmOptions[i].value === k[m]) {
+                  k[m]  = this.zrbmOptions[i].label
+                }
+                item.zrbm = k.join(',')
+              }
+            }
+        }
+        // 能源类型转换
+        if (item.nylx !== null) {
+          let k = (item.nylx || "").split(',')
+          for (let i in this.categoryOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.categoryOptions[i].value === k[m]) {
+                k[m]  = this.categoryOptions[i].label
+              }
+              item.nylx = k.join(',')
+            }
+          }
+        }
+        // 适用车型转换
+        if (item.typeApplicable !== null) {
+          let k = (item.typeApplicable || "").split(',')
+          for (let i in this.energyKindOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.energyKindOptions[i].value === k[m]) {
+                k[m]  = this.energyKindOptions[i].label
+              }
+              item.typeApplicable = k.join(',')
+            }
+          }
+        }
+        // s适用产品线转换
+        if (item.sycpx !== null) {
+          let k = (item.sycpx || "").split(',')
+          for (let i in this.sycpxOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.sycpxOptions[i].value === k[m]) {
+                k[m]  = this.sycpxOptions[i].label
+              }
+              item.sycpx = k.join(',')
+            }
+          }
+        }
+      })
     },
     // 数据搜索 清单类型 table select事件
     accessSarTypeSelect (selectData) {
@@ -1865,7 +1892,7 @@ export default {
         name: routerName,
         params: {
           id: item.resId,
-          pageType: item.sarType
+          pageType: this.sarAccessInfoSearch.dataSource
         }
       })
       window.open(routeUrl.href, '_blank')
@@ -1967,7 +1994,6 @@ export default {
         _this: this
       }, res => {
         this.sarAccessInfoList = res.data
-        console.log(res.data)
       }, e => {
       })
     },
@@ -1988,7 +2014,6 @@ export default {
     isListType (newVal, oldVal) {
       this.sarAccessInfoSearchList = []
       this.sarAccessInfoSearch.page = 1
-      this.drawerTotal = 0
       this.selectedAccInfoSearchList = []
       this.accessSarTypeList = []
     }
@@ -2008,8 +2033,8 @@ export default {
     }, res => {
       this.allSelectOptions = res.data || {}
       this.regionOptions = res.data.REGION // 基础信息 区域list
-      this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list
+      this.applyArcticOptions = res.data.PRODUCTTYPE // 基础车型 适用车型list
-      this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list
+      this.energyKindOptions = res.data.ENERGYTYPES // 能源种类list
       this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
       this.applyOptions = res.data.COUNTRY  //适用区域list
       this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质
@@ -2024,10 +2049,6 @@ export default {
       this.textStatusOptions = res.data.WBZTCLASS
       this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
       this.setMap(this.textStatusOptions)
-      this.setMap(this.zrbmOptions)
-      this.setMap(this.categoryOptions)
-      this.setMap(this.sycpxOptions)
-      this.setMap(this.energyKindOptions)
       this.setMap(this.drawerCountryOptions)
       this.getGzzOption()
     }, e => {

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -13,13 +13,14 @@
     </div>
     <transition name="el-zoom-in-top">
       <div v-show="heightShow" class="transition-box">
-        <p class="transition-box-p">
+        <p class="transition-box-p"  v-if="sarAccessEO.sortKey === '1'">
           <label class="transition-box-label">国家/地区：</label>
           <span class="transition-box-span"  v-if="sarAccessEO.countryArea !== null && sarAccessEOInfo  > 0">
               <span>{{ sarAccessEO.countryArea }}</span>
             </span>
           <span class="transition-box-span" v-else>{{ countryAreaMap[sarAccessEO.countryArea] }}</span>
         </p>
+        <p v-else></p>
         <p class="transition-box-p">
           <label class="transition-box-label">清单说明：</label>
           <span class="transition-box-span">{{ sarAccessEO.remark || "-" }}</span>
@@ -102,15 +103,7 @@
           </el-button>
         </el-form>
         <div v-if="!showSelectBox">
-          <el-form  :model="standardForm" class="label-input-form" label-width="150px" inline>
+          <el-form  :model="standardForm" class="label-input-form" label-width="108px" inline>
-            <el-form-item label="中文名称"  class="search-item">
-              <el-input
-                v-model="standardForm.standName"
-                placeholder="请输入"
-                :maxlength="100"
-                size="small"
-              />
-            </el-form-item>
             <el-form-item label="英文名称"  class="search-item">
               <el-input
                 v-model="standardForm.standEnName"
@@ -119,7 +112,7 @@
                 size="small"
               />
             </el-form-item>
-            <el-form-item label="适用车型">
+            <el-form-item label="适用车型" class="labelBox"  label-width="61px">
               <el-select
                 class="showBox"
                 v-model="standardForm.typeApplicable"
@@ -151,22 +144,6 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="责任部门"  >
-              <el-select
-                class="showBox"
-                v-model="standardForm.zrbm"
-                placeholder="请选择"
-                filterable
-                size="small"
-              >
-                <el-option
-                  v-for="item in zrbmOptions"
-                  :value="item.value"
-                  :key="item.value"
-                  :label="item.label"
-                />
-              </el-select>
-            </el-form-item>
             <el-form-item label="适用产品线"  >
               <el-select
                 class="showBox"
@@ -183,47 +160,6 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="乘用车VPPS编码"  class="search-item">
-              <el-input
-                v-model="standardForm.cycvppsbm"
-                placeholder="请输入"
-                :maxlength="100"
-                size="small"
-              />
-            </el-form-item>
-            <el-form-item label="乘用车VPPS中文名称"  class="search-item">
-              <el-input
-                v-model="standardForm.cycvppscn"
-                placeholder="请输入"
-                :maxlength="100"
-                size="small"
-              />
-            </el-form-item>
-            <el-form-item label="卡车VPPS编码"  class="search-item">
-              <el-input
-                v-model="standardForm.kccvppsbm"
-                placeholder="请输入"
-                :maxlength="100"
-                size="small"
-              />
-            </el-form-item>
-            <el-form-item label="卡车VPPS中文名称"  class="search-item">
-              <el-input
-                v-model="standardForm.kccvppscn"
-                placeholder="请输入"
-                :maxlength="100"
-                size="small"
-              />
-            </el-form-item>
-<!--            <el-form-item label="标准实施日期">
-              <el-date-picker
-                v-model="standardForm.issueTime"
-                type="date"
-                value-format="yyyy-MM-DD"
-                size="small"
-                placeholder="选择发布日期">
-              </el-date-picker>
-            </el-form-item>-->
           </el-form>
         </div>
       </div>
@@ -780,6 +716,7 @@ export default {
       let accessRow = JSON.parse(sessionStorage.getItem("accessRow"));
       this.pageId = accessRow.id
       this.sarAccessEO = accessRow;
+      console.log(this.sarAccessEO)
       this.selectInfobyAccid();
       this.getOrgTreeSource();
       this.getFileInfo();
@@ -943,7 +880,11 @@ export default {
       }
     }
   }
-
+  .labelBox {
+    /deep/ .el-form-item__label {
+      padding-right: 5px;
+    }
+  }
   /deep/ .relateClass {
     & > button {
       height: 30px;

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -65,7 +65,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="标准名称" class="search-item">
+            <el-form-item label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item">
               <el-input
                 v-model="sarAccessInfoSearch.standName"
                 placeholder="请输入"
@@ -92,21 +92,6 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="国家/地区" class="search-item" v-show="isListType">
-              <el-select
-                v-model="sarAccessInfoSearch.countryArea"
-                placeholder="请选择"
-                filterable
-              >
-                <el-option
-                  v-for="item in drawerCountryOptions"
-                  :value="item.value"
-                  :key="item.value"
-                  :label="item.label"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
             <el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
               <el-input
                 v-model="sarAccessInfoSearch.detailedListName"
@@ -138,6 +123,58 @@
           </el-form>
         </div>
       </div>
+      <div class="showSelectBox" v-if="!showSelectBox">
+        <el-form  :model="sarAccessInfoSearch" class="label-input-form" label-width="70px" v-if="!disabledFlag" inline>
+          <el-form-item label="文本状态"  v-show="!isListType">
+            <el-select
+              v-model="sarAccessInfoSearch.textStatus"
+              placeholder="请选择"
+              filterable
+              size="small"
+            >
+              <el-option
+                v-for="item in textStatusOptions"
+                :value="item.value"
+                :key="item.value"
+                :label="item.label"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="发布日期"  v-show="!isListType">
+            <el-date-picker
+              v-model="sarAccessInfoSearch.issueTime"
+              type="date"
+              value-format="yyyy-MM-DD"
+              size="small"
+              placeholder="选择发布日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="项目类别"  v-show="isListType">
+            <el-input
+              size="small"
+              v-model="sarAccessInfoSearch.standSystem"
+              placeholder="请输入"
+              :maxlength="100"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="更新人"  v-show="isListType">
+            <el-input
+              v-model="sarAccessInfoSearch.standName"
+              placeholder="请输入"
+              :maxlength="100"
+              size="small"/>
+          </el-form-item>
+          <el-form-item label="更新时间"  v-show="isListType">
+            <el-date-picker
+              v-model="sarAccessInfoSearch.modifyTime"
+              type="date"
+              size="small"
+              value-format="yyyy-MM-DD"
+              placeholder="选择更新日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-form>
+      </div>
       <div class="action-bar">
         <el-button
           class="common-button-default"
@@ -326,18 +363,12 @@
           align="center"
           width="180px"
           label="适用车型">
-          <template slot-scope="scope">
-            <span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
-          </template>
         </el-table-column>
         <el-table-column
           prop="nylx"
           align="center"
           width="180px"
           label="能源类型">
-          <template slot-scope="scope">
-            <span>{{ nylxMap[scope.row.nylx] }}</span>
-          </template>
         </el-table-column>
         <el-table-column
           prop="putTime"
@@ -374,7 +405,14 @@
           align="center"
           label="责任部门">
           <template slot-scope="scope">
-            <span>{{ zrbmMap[scope.row.zrbm] }}</span>
+            <span
+              v-for="(item, index) in zrbmOptions"
+              :key="index"
+              :value="item.value"
+              v-if="scope.row.value == item.value"
+            >
+              {{ item.label }}
+            </span>
           </template>
         </el-table-column>
         <el-table-column
@@ -383,9 +421,6 @@
           width="180px"
           align="center"
           label="适用产品线">
-          <template slot-scope="scope">
-            <span>{{ sycpxMap[scope.row.sycpx] }}</span>
-          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -415,7 +450,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="150" label="操作">
+        <el-table-column width="150" align="center" label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -489,6 +524,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
 import stand from "../../../config/pages/attributeCustom/components/stand";
 import { mapGetters } from 'vuex'
 import {interfaceUrl} from "@/sysConfig";
+import {dicTypeData} from "@/api/unqualProcess";
 export default {
   name: 'OtherAddEit',
   components: {
@@ -512,32 +548,12 @@ export default {
     CustomRoleTree
   },
   data () {
-    // let validatePass = (rule, value, callback) => {
-    //   let list = []
-    //   //sarAccessInfoListADMIN  可能不存在
-    //   if (this.sarAccessInfoListADMIN.length > 0) {
-    //     for (let a  = 0; a < this.sarAccessInfoListADMIN.length;a++) {
-    //       list.push(this.sarAccessInfoListADMIN[a].code)
-    //     }
-    //   }
-    //   if (this.sarAccessInfoList.length > 0) {
-    //     for (let b = 0; b < this.sarAccessInfoList.length;b++) {
-    //       list.push(this.sarAccessInfoList[b].code)
-    //     }
-    //   }
-    //   for (let c = 0; c < list.length; c++) {
-    //     if (value === list[c]) {
-    //       callback(new Error('此标准号已存在'))
-    //     }
-    //   }
-    // }
     return {
       textStatusMap: {},
       typeApplicableMap: {},
       nylxMap: {},
       zrbmMap: {},
       sycpxMap: {},
-      zrbmOptions: [],
       selectSearch : [],
       // 新增、编辑 基础信息字段
       sarAccessEO: {
@@ -568,11 +584,18 @@ export default {
         ]
       },
       disabledFlag: false,
+      showSelectBox: true,
+      /** ****************************/
+      zrbmOptions: [], // 责任部门
+      categoryOptions: [], // 能源类型
+      energyKindOptions: [], // 能源种类list
+      sycpxOptions: [], // 适用产品线
+      applyArcticOptions: [], // 基础车型 适用车型list
+      /** ******************************/
+      textStatusOptions: [], // 文本状态
       regionOptions: [], // 基础信息 区域list
       drawerCountryOptions: [], // 基础信息 国家list
       applyOptions: [], //基础信息适用领域list
-      applyArcticOptions: [], // 基础车型 适用车型list
-      energyKindOptions: [], // 能源种类list
       accessSarTypeOptions: [], // 要求类型list
       standSortOptions: [], // 标准类别
       standStateOptions: [], // 标准状态
@@ -814,6 +837,20 @@ export default {
       uuid: '',
     }
   },
+  created() {
+    this.selectLawsStands()
+    dicTypeData().then(res => {
+      // 责任部门数据字典
+      this.zrbmOptions = res.data.ZRBMCLASS
+      // 能源类型数据字典
+      this.energyKindOptions = res.data.ENERGYTYPES
+      // this.categoryOptions = res.data.NYLXCLASS // 能源类型
+      // 适用车型数据字典
+      this.applyArcticOptions = res.data.PRODUCTTYPE
+      // 适用产品线数据字典
+      this.sycpxOptions = res.data.SYCPXCLASS
+    })
+  },
   methods: {
     // 高级检索
     selectMoreBtn () {
@@ -1241,19 +1278,7 @@ export default {
         _this: this
       }, res =>{
         this.sarAccessInfoSearchList = res.data.list
-        this.sarAccessInfoSearchList.forEach(item => {
+        this.drawerTotal = res.data.list.length
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
-            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
-            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
-            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
-            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
-            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
-            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
-            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
-            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
-          })
-          console.log(this.sarAccessInfoSearchList)
       }, e => {
 
       })
@@ -1265,7 +1290,68 @@ export default {
     // 数据搜索 table select事件
     sarAccessInfoSearchSelect (val) {
       this.selectedAccInfoSearchList = val
-      console.log(val)
+      this.selectedAccInfoSearchList.forEach(item => {
+        this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+        this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+        this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+        this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+        this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+        this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+        this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+        this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+        this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+        this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+      })
+      this.selectedAccInfoSearchList.forEach(item => {
+        // 责任部门转换
+        if (item.zrbm !== null || item.zrbm !== "") {
+          let k = (item.zrbm || "").split(',')
+          for (let i in this.zrbmOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.zrbmOptions[i].value === k[m]) {
+                k[m]  = this.zrbmOptions[i].label
+              }
+              item.zrbm = k.join(',')
+            }
+          }
+        }
+        // 能源类型转换
+        if (item.nylx !== null) {
+          let k = (item.nylx || "").split(',')
+          for (let i in this.categoryOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.categoryOptions[i].value === k[m]) {
+                k[m]  = this.categoryOptions[i].label
+              }
+              item.nylx = k.join(',')
+            }
+          }
+        }
+        // 适用车型转换
+        if (item.typeApplicable !== null) {
+          let k = (item.typeApplicable || "").split(',')
+          for (let i in this.energyKindOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.energyKindOptions[i].value === k[m]) {
+                k[m]  = this.energyKindOptions[i].label
+              }
+              item.typeApplicable = k.join(',')
+            }
+          }
+        }
+        // s适用产品线转换
+        if (item.sycpx !== null) {
+          let k = (item.sycpx || "").split(',')
+          for (let i in this.sycpxOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.sycpxOptions[i].value === k[m]) {
+                k[m]  = this.sycpxOptions[i].label
+              }
+              item.sycpx = k.join(',')
+            }
+          }
+        }
+      })
     },
     // 数据搜索 清单类型 table select事件
     accessSarTypeSelect (selectData) {
@@ -1780,7 +1866,7 @@ export default {
       this.ROLELIST = res.data.ROLELIST
       this.GXHBQOptions = res.data.GXHBQXX
       this.askNatureOptions = res.data.ACCESSTYPE
-      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.zrbmOptions = res.data.ZRBMCLASS || [] // 责任部门
       this.categoryOptions = res.data.NYLXCLASS // 能源类型
       this.textStatusOptions = res.data.WBZTCLASS
       this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -65,7 +65,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="标准名称" class="search-item">
+            <el-form-item label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item">
               <el-input
                 v-model="sarAccessInfoSearch.standName"
                 placeholder="请输入"
@@ -92,21 +92,6 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="国家/地区" class="search-item" v-show="isListType">
-              <el-select
-                v-model="sarAccessInfoSearch.countryArea"
-                placeholder="请选择"
-                filterable
-              >
-                <el-option
-                  v-for="item in drawerCountryOptions"
-                  :value="item.value"
-                  :key="item.value"
-                  :label="item.label"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
             <el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
               <el-input
                 v-model="sarAccessInfoSearch.detailedListName"
@@ -130,7 +115,11 @@
                 @click="clearSearchLaws">清空</el-button>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
+              <el-button type="primary" v-if="showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
+                <i class="iconfont">&#xe7a5;</i>
+                高级查询
+              </el-button>
+              <el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
                 <i class="iconfont">&#xe7a5;</i>
                 高级查询
               </el-button>
@@ -138,6 +127,58 @@
           </el-form>
         </div>
       </div>
+      <div class="showSelectBox" v-if="!showSelectBox">
+        <el-form  :model="sarAccessInfoSearch" class="label-input-form" label-width="70px" v-if="!disabledFlag" inline>
+          <el-form-item label="文本状态"  v-show="!isListType">
+            <el-select
+              v-model="sarAccessInfoSearch.textStatus"
+              placeholder="请选择"
+              filterable
+              size="small"
+            >
+              <el-option
+                v-for="item in textStatusOptions"
+                :value="item.value"
+                :key="item.value"
+                :label="item.label"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="发布日期"  v-show="!isListType">
+            <el-date-picker
+              v-model="sarAccessInfoSearch.issueTime"
+              type="date"
+              value-format="yyyy-MM-DD"
+              size="small"
+              placeholder="选择发布日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="项目名称"  v-show="isListType">
+            <el-input
+              size="small"
+              v-model="sarAccessInfoSearch.standSystem"
+              placeholder="请输入"
+              :maxlength="100"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="更新人"  v-show="isListType">
+            <el-input
+              v-model="sarAccessInfoSearch.standName"
+              placeholder="请输入"
+              :maxlength="100"
+              size="small"/>
+          </el-form-item>
+          <el-form-item label="更新时间"  v-show="isListType">
+            <el-date-picker
+              v-model="sarAccessInfoSearch.modifyTime"
+              type="date"
+              size="small"
+              value-format="yyyy-MM-DD"
+              placeholder="选择更新日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-form>
+      </div>
       <div class="action-bar">
         <el-button
           class="common-button-default"
@@ -326,18 +367,12 @@
           align="center"
           width="180px"
           label="适用车型">
-          <template slot-scope="scope">
-            <span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
-          </template>
         </el-table-column>
         <el-table-column
           prop="nylx"
           align="center"
           width="180px"
           label="能源类型">
-          <template slot-scope="scope">
-            <span>{{ nylxMap[scope.row.nylx] }}</span>
-          </template>
         </el-table-column>
         <el-table-column
           prop="putTime"
@@ -373,9 +408,6 @@
           width="210px"
           align="center"
           label="责任部门">
-          <template slot-scope="scope">
-            <span>{{ zrbmMap[scope.row.zrbm] }}</span>
-          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -383,9 +415,6 @@
           width="180px"
           align="center"
           label="适用产品线">
-          <template slot-scope="scope">
-            <span>{{ sycpxMap[scope.row.sycpx] }}</span>
-          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -415,7 +444,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="150" label="操作">
+        <el-table-column width="150" align="center" label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -489,6 +518,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
 import stand from "../../../config/pages/attributeCustom/components/stand";
 import { mapGetters } from 'vuex'
 import {interfaceUrl} from "@/sysConfig";
+import {dicTypeData} from "@/api/unqualProcess";
 export default {
   name: 'OtherAddEit',
   components: {
@@ -512,32 +542,12 @@ export default {
     CustomRoleTree
   },
   data () {
-    // let validatePass = (rule, value, callback) => {
-    //   let list = []
-    //   //sarAccessInfoListADMIN  可能不存在
-    //   if (this.sarAccessInfoListADMIN.length > 0) {
-    //     for (let a  = 0; a < this.sarAccessInfoListADMIN.length;a++) {
-    //       list.push(this.sarAccessInfoListADMIN[a].code)
-    //     }
-    //   }
-    //   if (this.sarAccessInfoList.length > 0) {
-    //     for (let b = 0; b < this.sarAccessInfoList.length;b++) {
-    //       list.push(this.sarAccessInfoList[b].code)
-    //     }
-    //   }
-    //   for (let c = 0; c < list.length; c++) {
-    //     if (value === list[c]) {
-    //       callback(new Error('此标准号已存在'))
-    //     }
-    //   }
-    // }
     return {
       textStatusMap: {},
       typeApplicableMap: {},
       nylxMap: {},
       zrbmMap: {},
       sycpxMap: {},
-      zrbmOptions: [],
       selectSearch : [],
       // 新增、编辑 基础信息字段
       sarAccessEO: {
@@ -569,15 +579,21 @@ export default {
         ]
       },
       disabledFlag: false,
+      /** ****************************/
+      zrbmOptions: [], // 责任部门
+      categoryOptions: [], // 能源类型
+      energyKindOptions: [], // 能源种类list
+      sycpxOptions: [], // 适用产品线
+      applyArcticOptions: [], // 基础车型 适用车型list
+      /** ******************************/
       regionOptions: [], // 基础信息 区域list
       drawerCountryOptions: [], // 基础信息 国家list
       applyOptions: [], //基础信息适用领域list
-      applyArcticOptions: [], // 基础车型 适用车型list
-      energyKindOptions: [], // 能源种类list
       accessSarTypeOptions: [], // 要求类型list
       standSortOptions: [], // 标准类别
       standStateOptions: [], // 标准状态
       GXHBQOptions: [], // 标签list
+      textStatusOptions: [], // 文本状态
       askNatureOptions: [], // 监管类型list
       ROLELIST: [], // 项目评估角色
       // 数据搜索 数据来源list
@@ -605,6 +621,7 @@ export default {
       },
       moreSearchBtn: true, // 多属性搜索按钮 状态
       showTableFlag: true, // 显示添加列表 状态
+      showSelectBox: true, // 显示高级查询 状态
       sarAccessInfoSearchList: [], // 数据搜索 table列表数据
       importmodalFlag: false, // 导入model 状态
       searching: false,
@@ -815,9 +832,26 @@ export default {
       uuid: '',
     }
   },
+  created() {
+    this.selectLawsStands()
+    dicTypeData().then(res => {
+      // 责任部门数据字典
+      this.zrbmOptions = res.data.ZRBMCLASS
+      // 能源类型数据字典
+      this.energyKindOptions = res.data.ENERGYTYPES
+      // this.categoryOptions = res.data.NYLXCLASS // 能源类型
+      // 适用车型数据字典
+      this.applyArcticOptions = res.data.PRODUCTTYPE
+      // 适用产品线数据字典
+      this.sycpxOptions = res.data.SYCPXCLASS
+    })
+  },
   methods: {
     // 高级检索
     selectMoreBtn () {
+      this.showSelectBox = !this.showSelectBox
+      this.showTableFlag = false
+      this.selectLawsStands()
     },
     // 法规维护人树
     getDept () {
@@ -1242,19 +1276,7 @@ export default {
         _this: this
       }, res =>{
         this.sarAccessInfoSearchList = res.data.list
-        this.sarAccessInfoSearchList.forEach(item => {
+        this.drawerTotal = res.data.list.length
-          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
-          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
-          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
-          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
-          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
-          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
-          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
-          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
-          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
-        })
-        console.log(this.sarAccessInfoSearchList)
       }, e => {
 
       })
@@ -1266,7 +1288,68 @@ export default {
     // 数据搜索 table select事件
     sarAccessInfoSearchSelect (val) {
       this.selectedAccInfoSearchList = val
-      console.log(val)
+      this.selectedAccInfoSearchList.forEach(item => {
+        this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+        this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+        this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+        this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+        this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+        this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+        this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+        this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+        this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+        this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+      })
+      this.selectedAccInfoSearchList.forEach(item => {
+        // 责任部门转换
+        if (item.zrbm !== null || item.zrbm !== "") {
+          let k = (item.zrbm || "").split(',')
+          for (let i in this.zrbmOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.zrbmOptions[i].value === k[m]) {
+                k[m]  = this.zrbmOptions[i].label
+              }
+              item.zrbm = k.join(',')
+            }
+          }
+        }
+        // 能源类型转换
+        if (item.nylx !== null) {
+          let k = (item.nylx || "").split(',')
+          for (let i in this.categoryOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.categoryOptions[i].value === k[m]) {
+                k[m]  = this.categoryOptions[i].label
+              }
+              item.nylx = k.join(',')
+            }
+          }
+        }
+        // 适用车型转换
+        if (item.typeApplicable !== null) {
+          let k = (item.typeApplicable || "").split(',')
+          for (let i in this.energyKindOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.energyKindOptions[i].value === k[m]) {
+                k[m]  = this.energyKindOptions[i].label
+              }
+              item.typeApplicable = k.join(',')
+            }
+          }
+        }
+        // s适用产品线转换
+        if (item.sycpx !== null) {
+          let k = (item.sycpx || "").split(',')
+          for (let i in this.sycpxOptions) {
+            for (let m = 0; m< k.length; m++) {
+              if (this.sycpxOptions[i].value === k[m]) {
+                k[m]  = this.sycpxOptions[i].label
+              }
+              item.sycpx = k.join(',')
+            }
+          }
+        }
+      })
     },
     // 数据搜索 清单类型 table select事件
     accessSarTypeSelect (selectData) {

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -3,6 +3,10 @@
   <div id="domesticStandardDatabase" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class">
     <div class="tree-content" :class="{ 'tree-closed': sideClose }">
       <div class="tree">
+        <el-input
+            placeholder="输入国内标准法规"
+            v-model="filterText">
+        </el-input>
         <el-tree
                 ref="tree"
                 node-key="id"
@@ -11,6 +15,7 @@
                 :data="treeList"
                 highlight-current
                 @node-click="treeClick"
+                :filter-node-method="filterNode"
                 default-expand-all
                 :expand-on-click-node="false">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
@@ -439,6 +444,7 @@
                     <custom-input-for-standards
                       :key="field.attrField"
                       :config="field"
+                      :class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"
                       v-model="sarStandardsInfoEO[field.attrField]"
                       :disabled="formdisableflag"
                     ></custom-input-for-standards>
@@ -449,7 +455,7 @@
                               label-width="150px"
                               class="add-form-item"
                         >
-                          <template slot="label">乘用车VPPS编码</template>
+                          <template slot="label">关联模块--乘用车VPPS编码</template>
                           <el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
                       </el-form-item>
                     </template>
@@ -459,7 +465,7 @@
                                 label-width="150px"
                                 class="add-form-item"
                         >
-                            <template slot="label">卡车VPPS编码</template>
+                            <template slot="label">关联模块--卡车VPPS编码</template>
                             <el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
                         </el-form-item>
                        </template>
@@ -1286,6 +1292,7 @@ export default {
   },
   data () {
     return {
+      filterText: '', // 国内法规过滤
       props: {
         label: 'menuName',
         children: 'children'
@@ -1295,7 +1302,8 @@ export default {
         children: 'children',
         label: 'menuName'
       },
-      id: '',
+      id: '', // 收藏数据的id
+      collectId: '', // 收藏id
       modalShowFlag1: false, // drawer开关
       modalShowFlag2: false, // drawer开关
       modalShowFlag3: false, // drawer开关
@@ -1942,7 +1950,17 @@ export default {
       textStatusMap: {} // 文本状态id与name对应
     }
   },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
   methods: {
+    // 国内标签过滤
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.menuName.indexOf(value) !== -1;
+    },
       choiceZRR1 (type, title, id) {
           this.drawerTitle = title
           this.modalShowFlag1 = true
@@ -2264,6 +2282,7 @@ export default {
     // 编辑标准属性
     selectStandardPro (item, state) {
       this.id = item.id
+      this.collectId = item.collectId
       this.addOrUPdateFlag = 2
       this.modalshowtitle = '编辑国内标准'
       this.modalshowflag = true
@@ -2272,8 +2291,10 @@ export default {
         Promise.all([this.queryDisplayLocation()]).then((values) => {
           const [displayLocation] = values
           console.log(this.formFieldList, 'assssssssssss')
+          console.log(item, 'itemitemitemitem')
           const formFieldList = this.formFieldList
             this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
+          console.log(item.attrInfoCaseMap, 'gggg大大大滴滴答答')
           if(this.sarStandardsInfoEO.standSystem){
               this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
           }
@@ -2284,10 +2305,9 @@ export default {
           }
           Object.keys(item.attrInfoMap || {}).forEach((key) => {
             if (item.attrInfoMap[key]) {
-              this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key])
+              this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key] === '[]' ? '' : item.attrInfoMap[key])
             }
           })
-
           const dynamicFormField = this.sarStandardsInfoEO
           this.sarStandardsInfoEO.EOPSSRQ = this.$moment(this.sarStandardsInfoEO.EOPSSRQ).isValid() ? this.$moment(this.sarStandardsInfoEO.EOPSSRQ) : this.sarStandardsInfoEO.EOPSSRQ
           this.sarStandardsInfoEO['id'] = item.id
@@ -3102,7 +3122,7 @@ export default {
                 const value = nowstandinfo[item.attrField]
                 // 时间格式处理
                 if (item.attrType === 'DATE_PICKER' && value) {
-                  nowstandinfo[item.attrField] = this.$dateFormat(this.sarStandardsInfoEO[item.attrField], 'yyyy-MM-dd hh:mm:ss')
+                  nowstandinfo[item.attrField] = this.sarStandardsInfoEO[item.attrField]
                 }
                 // 数组处理
                 if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
@@ -3113,6 +3133,7 @@ export default {
                 sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
               })
               nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
+              console.log(nowstandinfo, '提交参数')
               this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, {
                 _this: this
               }, res => {
@@ -3120,8 +3141,10 @@ export default {
                 if (res.ok) {
                   this.personCollect.collectType = 'INLAND_STAND'
                   this.personCollect.id = this.id
+                  this.personCollect.collectResId = this.collectId
+                  this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + '(编号:'+this.sarStandardsInfoEO.standSort + this.sarStandardsInfoEO.standNumber + this.sarStandardsInfoEO.standYear +')'
                   this.personCollect.userId = this.$store.getters.userInfo.userId
-                  this.$http.get('person/personCollect/updatePersonCollect', this.personCollect, {
+                  this.$http.putData('person/personCollect/updatePersonCollect', this.personCollect, {
                     _this: this,
                     loading: 'loading'
                   }, res => {
@@ -3200,6 +3223,7 @@ export default {
         formData.collectMenuId = undefined
       }
       formData.standType = 'INLAND'
+      formData.userId = this.$store.getters.userInfo.userId
       this.SarExportSearchEo = formData
       this.loading = true
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
@@ -3246,6 +3270,7 @@ export default {
       }
       this.sarConfigStandSearch.page = this.configPage
       // this.sarConfigStandSearch.pageSize = this.configRows
+      this.sarConfigStandSearch.userId = this.$store.getters.userInfo.userId
       this.sarConfigStandSearch.pageSize = this.$store.getters.userInfo.configContent
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarConfigStandSearch, {
         _this: this,
@@ -3410,6 +3435,7 @@ export default {
         this.quoteIdList1 = []
         this.replaceStandNumForm.quoteIdList = ''
       }
+      this.replaceStandNumForm.userId = this.$store.getters.userInfo.userId
       // if (this.sarStandardsInfoEO.replaceStandNumId !== null && this.sarStandardsInfoEO.replaceStandNumId !== '') {
       //   this.replaceStandNumForm.quoteIdList = this.sarStandardsInfoEO.replaceStandNumId.toString()
       //   (this.replaceStandNumForm.quoteIdList)
@@ -3646,6 +3672,7 @@ export default {
       if (this.sarStandardsInfoEO.lawsExplainQuote !== null && this.sarStandardsInfoEO.lawsExplainQuote !== '') {
         this.lawsExplainQuoteForm.quoteIdList = this.sarStandardsInfoEO.lawsExplainQuote.toString()
       }
+      this.sarStandardsInfoEO.userId = this.$store.getters.userInfo.userId
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.lawsExplainQuoteForm, {
         _this: this,
         loading: 'lawsExplainQuoteFormLoading'

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -3,6 +3,10 @@
   <div id="foreignStandardsAndRegulations" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class">
     <div class="tree-content" :class="{ 'tree-closed': sideClose }">
       <div class="tree">
+        <el-input
+            placeholder="输入海外标准法规"
+            v-model="filterText">
+        </el-input>
         <el-tree
                 ref="tree"
                 node-key="id"
@@ -11,6 +15,7 @@
                 :data="treeList"
                 highlight-current
                 @node-click="treeClick"
+                :filter-node-method="filterNode"
                 default-expand-all
                 :expand-on-click-node="false">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
@@ -510,7 +515,7 @@
                             label-width="150px"
                             class="add-form-item"
                     >
-                      <template slot="label">乘用车VPPS编码</template>
+                      <template slot="label">关联模块--乘用车VPPS编码</template>
                       <el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
                     </el-form-item>
                   </template>
@@ -520,7 +525,7 @@
                             label-width="150px"
                             class="add-form-item"
                     >
-                      <template slot="label">卡车VPPS编码</template>
+                      <template slot="label">关联模块--卡车VPPS编码</template>
                       <el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
                     </el-form-item>
                   </template>
@@ -1741,14 +1746,23 @@ export default {
       displayLocation: [],
       orgData: [],
       delLoading: false,
-      standState: ''
+      standState: '',
+      filterText: ''
     }
   },
   props: {
   },
   watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val);
+    }
   },
   methods: {
+    // 海外标签过滤
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.menuName.indexOf(value) !== -1;
+    },
     choiceZRR2 (type, title, id) {
       this.drawerTitle = title
       this.modalShowFlag2 = true
@@ -2048,7 +2062,7 @@ export default {
         Promise.all([this.queryDisplayLocation()]).then((values) => {
           const [displayLocation] = values
           const formFieldList = this.formFieldList
-            console.log(formFieldList)
+            console.log(formFieldList, 'AAAAAAAAAAAAAAAAAAAAA')
           this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
           this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
           this.sarStandardsInfoEO.standSort = item.standSort

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -30,11 +30,11 @@
         </div>
       </el-card>
       <div class="action-bar">
-        <el-button plain class="common-button-primary" v-btn-permission="'2c4366e07a5b707bf3d3f4985fb82662'" size="mini" @click="addList">调取</el-button>
+        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="addList">调取</el-button>
-        <el-button plain class="common-button-primary" v-btn-permission="'63d9a5a8f7b6a4095511394a60013eac'" size="mini" @click="deleteList">批量删除</el-button>
+        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除</el-button>
         <el-button class="common-button-default export-button"
                    size="mini" @click="exportStandard"
-                   v-btn-permission="'ec6b73db0edd6a379d3ea90af3849861'"
+                   v-btn-permission="''"
                    title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
                    icon="export"
         >导出</el-button>

src/router/index.js

@@ -249,6 +249,15 @@ const routes = [
           title: '标准清单发布/更新流程'
         }
       },
+      {
+        path: '/bzqdfbStep1-1',
+        name: 'bzqdfbStep1-1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准清单发布/更新流程'
+        }
+      },
       {
         path: '/bzqdfbStep2',
         name: 'bzqdfbStep2',
@@ -393,6 +402,60 @@ const routes = [
           title: '项目合规评估流程-项目'
         }
       },
+      {
+        path: '/xmpg2Step7',
+        name: 'xmpg2Step7',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step7.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目合规评估流程-项目'
+        }
+      },
+      {
+        path: '/xmpg2Step8',
+        name: 'xmpg2Step8',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step8.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目合规评估流程-项目'
+        }
+      },
+      {
+        path: '/xmpg2Step9',
+        name: 'xmpg2Step9',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step9.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目合规评估流程-项目'
+        }
+      },
+      {
+        path: '/xmpg2Step10',
+        name: 'xmpg2Step10',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step10.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目合规评估流程-项目'
+        }
+      },
+      {
+        path: '/xmpg2Step11',
+        name: 'xmpg2Step11',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step11.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目合规评估流程-项目'
+        }
+      },
+      {
+        path: '/xmpg2Step12',
+        name: 'xmpg2Step12',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step12.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目合规评估流程-项目'
+        }
+      },
       {
         path: '/wfhxzgStep1',
         name: 'wfhxzgStep1',