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

src/components/CustomFormComponents/File.vue

@@ -43,6 +43,7 @@
             :class="{'disabled': disabled}"
             multiple
             drag
+
             :show-file-list="showUploadlist"
             :on-success="uploadSuccess"
             :before-upload="beforeUpload"

src/components/navMenu/index.vue

@@ -88,6 +88,16 @@ export default {
               path: '/domesticStandardsAndRegulations',
               menuId: '3e3657498664beaa0dc1de1ecb3ae0da'
             },
+            {
+              title: '零部件编号申请',
+              path: '/partCodeApply',
+              menuId: ''
+            },
+            {
+              title: '标准法规工作组数据统计',
+              path: '/dataStatisComments',
+              menuId: ''
+            },
             {
               title: '海外标准法规',
               path: '/foreignStandardsAndRegulations',

src/pages/details/otherStandardDetails/index.vue

@@ -376,12 +376,12 @@
                                 <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                             </template>
                         </p>
-                        <!--                <el-button-->
+                                        <el-button
-                        <!--                  v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
+                                          v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"
-                        <!--                  @click="showItemsModel(child.attrField)"-->
+                                          @click="showItemsModel(child.attrField)"
-                        <!--                  class="decomposition-btn"-->
+                                          class="decomposition-btn"
-                        <!--                  icon="icon-separate"-->
+                                          icon="icon-separate"
-                        <!--                >标准分解单</el-button>-->
+                                        >标准分解单</el-button>
                     </div>
                 </div>
 

src/pages/localTool/standAutoSplit/index.vue

@@ -186,12 +186,20 @@
               prop="standNumber"
               label="标准号/政策号"
               align="center">
+            <template slot-scope="scope">
+              <a class="table-jump"
+                 @click="handlePreview1(scope.row)">{{ scope.row.standNumber }}</a>
+            </template>
           </el-table-column>
           <el-table-column
               prop="standName"
               label="标准名称/政策名称"
               align="center"
           >
+            <template slot-scope="scope">
+              <a class="table-jump"
+                 @click="handlePreview1(scope.row)">{{ scope.row.standName }}</a>
+            </template>
           </el-table-column>
           <el-table-column
               prop="standFileClassifyShow"
@@ -819,6 +827,17 @@ export default {
       })
       window.open(routeUrl.href, '_blank')
     },
+    //拆分页点击查看详情
+    handlePreview1(item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.standId,
+          pageType: item.sarType + '_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
     // 查询政策和标准
     getSearch () {
       if (this.conditionForm.standType === 'FOREIGN2') {

src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -39,7 +39,7 @@
           <div class="action-bar">
             <el-button v-btn-permission="'SRE2ZRX3MJSSH5YYLRGH'"  size="mini" @click="importItemInfo" ><i class="iconfont">&#xe6de;</i>导入</el-button>
             <el-button v-btn-permission="''"   size="mini" @click="exportItemInfo"><i class="iconfont">&#xe6e9;</i>导出</el-button>
-            <el-button v-btn-permission="''"   size="mini" @click="judgebatchDeleteItem"><i class="iconfont">&#xe61b;</i>删除</el-button>
+<!--            <el-button v-btn-permission="''"   size="mini" @click="judgebatchDeleteItem"><i class="iconfont">&#xe61b;</i>删除</el-button>-->
             <el-button v-btn-permission="'QULWGFSB3NMP84REU7BP'"   size="mini" @click="uploadImportModal"><i class="iconfont">&#xe825;</i>模板下载</el-button>
             <el-button v-btn-permission="''"   size="mini" @click="batchCopy">批量复制</el-button>
             <el-button v-btn-permission="'TE39XUT4KRTPZGQH5KLF'"   size="mini" @click="combineItems">合并条款</el-button>

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

@@ -397,7 +397,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, saveinboundTask } from "api/process";
+import { inboundLiaisonDetail,  saveTaskForPub } from "api/process";
 
 export default {
   name: "bzqdfbStep3",
@@ -693,16 +693,24 @@ export default {
     getFormFieldList (item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item))
-        this.listForm.prcNum = this.prcNum
+        if(item.form === undefined){
-        this.listForm.prcName = this.prcName
+          this.listForm.prcNum = this.prcNum
-        this.listForm['id'] = item.id
+          this.listForm.prcName = this.prcName
-        this.listForm.dataList = item.dataList
+          this.listForm['id'] = item.id
-        this.dataList = item.dataList
+          this.listForm.dataList = item.dataList
-        this.listForm.applyUpdUserId = item.applyUpdUserId
+          this.dataList = item.dataList
-        this.listForm.jlUserId = item.jlUserId
+          this.listForm.applyUpdUserId = item.applyUpdUserId
-        this.listForm.zrUserId = item.zrUserId
+          this.listForm.jlUserId = item.jlUserId
-        this.fileIds = item.fileId;
+          this.listForm.zrUserId = item.zrUserId
-        this.getFileInfo();
+          this.fileIds = item.fileId;
+          this.getFileInfo();
+         } else {
+          this.listForm = item.form
+          this.dataList = item.form.dataList
+          this.listForm.dataList = item.form.dataList
+          this.fileIds = item.form.fileId;
+          this.getFileInfo();
+        }
       })
     },
     //保存事件
@@ -713,23 +721,19 @@ export default {
       _formData.append("createUser", this.$store.getters.userInfo.userId);
       _formData.append("createUserName", this.$store.getters.userInfo.userName);
       _formData.append("prcType", "4");
+      _formData.append('taskIds', this.taskIds)
       _formData.append("json", JSON.stringify({
-        taskInfo: '根据会签意见修订',
         form: this.listForm,
-        roleForm: this.roleForm,
-        prcNum: this.$route.query.prcNum,
-        taskIds: this.$route.query.taskIds,
-        pId: this.$route.query.prcId,
         commentText: this.commentText
       }));
-      saveinboundTask(_formData).then(res => {
+
-        this.saveLoading = false;
+      // saveTaskForPub(_formData).then(res => {
-        this.$message.success("保存成功");
+      //   this.saveLoading = false;
-        this.$router.push('/processCenter')
+      //   this.$message.success("保存成功");
-        this.bpnId = res.result;
+      //   this.bpnId = res.result;
-      }).catch(e => {
+      // }).catch(e => {
-        this.saveLoading = false;
+      //   this.saveLoading = false;
-      });
+      // });
     },
     //提交事件
     handleSubmit() {

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

@@ -406,7 +406,6 @@ export default {
     },
     // 保存按钮
     handleSave() {
-      this.isSubmit = true
       let zqa = new Map();
       for (let lastDataListElement of this.dataList) {
         let a = zqa.get(lastDataListElement.dutyPeopleInfoId)

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

@@ -232,6 +232,7 @@ import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
 import {uploadFile} from '@/api/unqualProcess.js';
 import {inboundLiaisonDetail, completeTask, saveTaskForPub} from "@/api/process"
+import listOfCountries from "@/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries";
 
 export default {
   name: "wfhxzgStep4",
@@ -307,11 +308,11 @@ export default {
     },
     getFormFieldList (item) {
       this.$nextTick(() => {
-        let listJSON = JSON.parse(JSON.stringify(item.responUserInfo.info))
+        let listJSON = JSON.parse(JSON.stringify(item.responUserList))
         if (listJSON.length !== undefined) {
-          this.dataList = listJSON
+          this.dataList = listJSON[0].standardInfoList
         } else {
-          this.dataList = [listJSON]
+          this.dataList = [listJSON][0].standardInfoList
         }
         this.dataList.forEach(item => {
           if (item.fileText.length !== 0) {
@@ -427,8 +428,8 @@ export default {
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
         // roleForm: this.roleForm,
-        responUserInfo: {
+        responUserList: {
-          info: this.dataList.splice(-1, 1)
+          standardInfoList: this.dataList
         },
         commentText: this.commentText
       }))

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

@@ -537,7 +537,7 @@ export default {
         this.commentText = mes.commentText;
         this.dataList = mes.form.dataList;
         this.dataList.forEach(item => {
-         if(!item.projectLine){
+         if(!item.productLine){
            this.dataList = null
          }
         })
@@ -760,8 +760,10 @@ export default {
     //选择拆分标准确定事件
     OkDrawer() {
       if (this.selectedList.length == 1) {
-        this.listForm.standNumber = this.selectedList[0].standNumber;
+        this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ;
         this.listForm.standName = this.selectedList[0].standName;
+        this.listForm.standType = this.selectedList[0].standType;
+        this.listForm.standId = this.selectedList[0].id;
         this.listForm.id = this.selectedList[0].id;
         this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
           ids: this.listForm.id,

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

@@ -470,6 +470,7 @@ export default {
       listForm: {
         standNumber: "", //标准编号
         standName: "",//标准名称
+        standType: "", //标准类型
         XCXSSRQ: "", //新车型实施日期
         ZCCSSRQ: "", //在产车实施日期
         certifiedEngineer: "", //认证工程师
@@ -732,8 +733,10 @@ export default {
     //选择拆分标准确定事件
     OkDrawer() {
       if (this.selectedList.length === 1) {
-        this.listForm.standNumber = this.selectedList[0].standSortShow + '-' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ;
+        this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ;
         this.listForm.standName = this.selectedList[0].standName;
+        this.listForm.standType = this.selectedList[0].standType;
+        this.listForm.standId = this.selectedList[0].id;
         this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj
         this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj
         this.listForm.id = this.selectedList[0].id;

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

@@ -64,7 +64,7 @@
           style="width: 100%"
           border
           @selection-change="selectStandChange"
-          :height="sarProStateTableHeight"
+          height="56%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
           <el-table-column

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

@@ -64,7 +64,7 @@
           style="width: 100%"
           border
           @selection-change="selectStandChange"
-          :height="sarProStateTableHeight"
+          height="55%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
           <el-table-column

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

@@ -64,7 +64,7 @@
           style="width: 100%"
           border
           @selection-change="selectStandChange"
-          :height="sarProStateTableHeight"
+          height="55%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
           <el-table-column

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

@@ -64,7 +64,7 @@
           style="width: 100%"
           border
           @selection-change="selectStandChange"
-          :height="sarProStateTableHeight"
+          height="55%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
           <el-table-column

src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue

@@ -375,6 +375,7 @@ 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/xmpg2/step1-2.vue

@@ -1,13 +1,463 @@
 <template>
-
+  <div class="xmpg2-step2">
+    <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="请输入项目编号"
+                  disabled
+                  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="请输入项目名称"
+                  disabled
+                  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
+            align="center"
+            width="200px"
+            label="标准号"
+          >
+            <template slot-scope="scope">
+              <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="standName"
+            align="center"
+            label="中文名称"
+            width="180px"
+          >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="standEnName"
+            label="英文名称"
+            align="center"
+            width="180px"
+          >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="190px"
+            align="center"
+            sortable
+            label="标准实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrq"
+            width="190px"
+            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"
+            align="center"
+            sortable
+            width="190px"
+            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="zrbm"
+            label="责任部门"
+            align="center"
+            width="180px"
+          >
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="kccvppsbm"
+            width="180px"
+            align="center"
+            label="卡车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="kccvppscn"
+            width="180px"
+            align="center"
+            label="卡车vpps中文名称">
+          </el-table-column>
+          <el-table-column
+            prop="cycvppsbm"
+            width="180px"
+            align="center"
+            label="乘用车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            prop="cycvppscn"
+            width="180px"
+            align="center"
+            label="乘用车vpps中文名称">
+          </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>
+  </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: "step1-2"
+  name: "xmpg2Step1-2",
+  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;
+    },
+    // 点击查看
+    handlePreview (item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.standId,
+          pageType: 'INLAND_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
+    //获取数据
+    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() {
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('审批意见不能为空')
+      }else{
+        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.isSubmit = true
+      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");
+        }
+        this.isSubmit = false
+      }, e => {
+      });
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+  }
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
 
+.xmpg2-step2 {
+  /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/step4.vue

@@ -370,7 +370,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,

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

@@ -64,7 +64,7 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="standEnName"
+            prop="standNumber"
             label="标准号"
           >
             <template slot-scope="scope">
@@ -333,6 +333,8 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.dataList = item.dataList;
+        console.log(this.dataList);
+        // this.dataList.standNumber = item.dataList.standSort + '\xa0\xa0' +item.dataList.standSort + '-' + item.dataList.standYear
         let children = [];
         item.breakdownList.forEach(
           item => {

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

@@ -400,7 +400,6 @@ export default {
   methods: {
     // 点击查看
     handlePreview(item) {
-      console.log(item)
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
@@ -471,13 +470,11 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
-        console.log(this.listForm)
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         // this.listForm.dataList = item.dataList;
         this.dataList = this.listForm.dataList;
-        console.log(this.dataList)
       });
     },
     //保存事件

src/pages/processCenter/pages/processDetail/index.vue

@@ -178,9 +178,10 @@ export default {
       let row = {...this.detailData[index]}
       row.taskIds = row.id
       row.taskInfo = row.name
-      console.log(row.name)
       row.tabsName = this.$route.query.tabsName
       let prcType = this.detailData[index].prcType // 流程类型
+      console.log(prcType)
+      console.log(row.taskInfo);
       // 判断当前流程是否已全部办理完成
       this.detailData.map(item => {
         if (!item.endTime) {
@@ -213,7 +214,7 @@ export default {
           }
         }else if(prcType === '6'){
           //标准项目合规评估 项目维度
-          if(row.taskInfo === '标准法规部领导审核'){
+          if(row.taskInfo === '标准法规部部长审批'){
             this.toProcessDetail('xmpg2Step1-12',row)
           }else{
             this.toProcessDetail('xmpg2Step1-2',row)

src/pages/regulatoryRepository/dataStatis/index.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "dataStatisComments"
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -10,10 +10,16 @@
       <el-card class="contaiinerCard" style="margin: 5px">
         <div style="padding: 20px">
           <el-row style="margin-top: 10px">
-            <el-col :span="5">产品平台: <span class="valueColor">{{ localProEO.projectPlatfor }}</span></el-col>
+            <el-col :span="5">产品平台1: <span class="valueColor">{{ localProEO.projectPlatfor }}</span></el-col>
             <el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col>
-            <el-col :span="5" :push="2">项目名称: <span class="valueColor">{{ localProEO.projectName }}</span></el-col>
+            <el-col :span="5" :push="2">
-            <!--          <el-col :span="5" :push="2">车型系列:<span class="valueColor">{{ localProEO.productSet }}</span></el-col>-->
+              <el-tooltip class="item" effect="dark" :content="localProEO.projectName" placement="top">
+                <div slot="content" class="toolip-content" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">{{ localProEO.projectName }}</div>
+                <div v-else></div>
+                <div class="check-item-value" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">项目名称: <span class="valueColor">{{localProEO.projectName && localProEO.projectName.substring(0,15)+"..." }}</span></div>
+                <div class="check-item-value" v-else>项目名称: <span class="valueColor">{{localProEO.projectName}}</span></div>
+              </el-tooltip>
+            </el-col>
             <el-col :span="4" :push="3">项目分类:<span class="valueColor">{{ localProEO.projectClassification }}</span>
             </el-col>
           </el-row>
@@ -449,7 +455,7 @@ export default {
           let deleteTagList = []
           this.selectList1.forEach(item => {
             //项目id-标准id,项目id-标准id
-            deleteTagList.push( this.proId + '-' + item )
+            deleteTagList.push(this.proId + '-' + item)
           })
           this.id = deleteTagList.join(',')
           this.$http.post('sarStandProjectLibrary/deleteByIds', {
@@ -726,6 +732,7 @@ export default {
         this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
         this.setMap(this.zrbmMap, res.data.ZRBMCLASS)
         this.setMap(this.textStatusMap, res.data.WBZTCLASS)
+        console.log(this.getLocalPro)
         this.showLocalProductData(this.getLocalPro)
       }, e => {
       })

src/pages/regulatoryRepository/partCodeApply/index.vue

@@ -0,0 +1,86 @@
+<template>
+  <!--零部件编号申请 总体区域-->
+  <div class="partCodeApply" id="partCodeApply">
+    <!--搜索区域-->
+    <div class="search-area">
+      <div class="content-top">
+        <el-form inline class="label-input-form">
+          <el-form-item label="子组号" class="search-item">
+            <el-input placeholder="根据子组号查询" clearable :maxlength="100">
+
+            </el-input>
+          </el-form-item>
+          <el-form-item label="分组号" class="search-item">
+            <el-input placeholder="根据分组号查询" clearable :maxlength="100">
+
+            </el-input>
+          </el-form-item>
+          <el-form-item label="零件分类号" class="search-item">
+            <el-input placeholder="根据零件分类号查询" clearable :maxlength="100">
+
+            </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" size="mini" class="common-button-primary">
+              查询
+            </el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button size="mini" class="common-button-default">
+              清空
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <!--操作区域-->
+    <div class="operation_area">
+      <div class="content-center">
+        <el-button type="primary" size="mini" class="common-button-primary">
+          <i class="iconfont">&#xe6e9;</i>
+          导出
+        </el-button>
+        <el-button type="primary" size="mini" class="common-button-primary">
+          <i class="iconfont">&#xe611;</i>
+          删除
+        </el-button>
+      </div>
+    </div>
+    <!--表格区域-->
+    <div class="table_area">
+      <div class="container">
+        <loading :loading="loading"></loading>
+        <div class="table-wrap">
+          <div class="inner-wrap">
+            <el-table>
+              <el-table-column type="selection" align="center"></el-table-column>
+              <el-table-column label="序号"></el-table-column>
+              <el-table-column label="子组号"></el-table-column>
+              <el-table-column label="子组结构号"></el-table-column>
+              <el-table-column label="子组结构名称"></el-table-column>
+              <el-table-column label="分组代号"></el-table-column>
+              <el-table-column label="零部件分类名称"></el-table-column>
+              <el-table-column label="零部件分类代号"></el-table-column>
+              <el-table-column label="备注"></el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "partCodeApply",
+  data() {
+    return {
+      loading: false
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/pages/searchCenter/pages/standardSearch.vue

@@ -103,8 +103,8 @@
                                                 align="center"
                                                 :label="$t('m.issueTime')">
                                             <template slot-scope="scope">
-                                                <div v-if="scope.row.issue_time !== null && scope.row.issue_time !== undefined">
+                                                <div v-if="scope.row.issueTime !== null && scope.row.issueTime !== undefined">
-                                                    {{ dateFormat2(scope.row.issue_time) }}
+                                                    {{ dateFormat2(scope.row.issueTime) }}
                                                 </div>
                                                 <div v-else></div>
                                             </template>
@@ -973,7 +973,7 @@
                                     option.title = '监管类型'
                                     option.index = 12
                                     break
-                                case 'CYSDXX':
+                                case 'WSCYSD':
                                     option.title = '我司参与深度'
                                     option.index = 13
                                     break
@@ -1003,6 +1003,7 @@
                             })
                         }
                         this.searchOriginOptions = this.searchOptions
+                        console.log(this.searchOriginOptions)
                         this.saveAllSortOptions = res.data.STANDCLASSIFY
                         this.saveAllFineOptions = res.data.BUSSFINECLASSSHOW
                         this.lawssStateOptions = res.data.LAWSSTATE // 文本状态数组
@@ -1027,20 +1028,20 @@
                             filterOptions.standSort = originOptions.standSort
                             filterOptions.standSort.index = 1
                             //  标准状态
-                            filterOptions.standState = originOptions.standState
+                            // filterOptions.standState = originOptions.standState
-                            filterOptions.standState.title = '标准状态'
+                            // filterOptions.standState.title = '标准状态'
-                            filterOptions.standState.index = 2
+                            // filterOptions.standState.index = 2
                             // 我司参与状态
                             filterOptions.CYSD = originOptions.CYSD
                             filterOptions.CYSD.title = '我司参与深度'
-                            filterOptions.CYSD.index = 3
+                            filterOptions.CYSD.index = 2
                             //  监管类型
-                            filterOptions.ZRLX = originOptions.ZRLX
+                            // filterOptions.ZRLX = originOptions.ZRLX
-                            filterOptions.ZRLX.title = '监管类型'
+                            // filterOptions.ZRLX.title = '监管类型'
-                            filterOptions.ZRLX.index = 4
+                            // filterOptions.ZRLX.index = 4
                             //  适用车辆类型
                             filterOptions.CLLX = originOptions.CLLX
-                            filterOptions.CLLX.index = 5
+                            filterOptions.CLLX.index = 3
                             //  采标程度
                             // filterOptions.CBCD = originOptions.CBCD
                             // filterOptions.CBCD.index = 6
@@ -1322,7 +1323,7 @@
                         return 'bussBigClass'
                     case 'ACCESSTYPE':
                         return 'ZRLX'
-                    case 'CYSDXX':
+                    case 'WSCYSD':
                         return 'CYSD'
                     default:
                         return key

src/router/index.js

@@ -1097,6 +1097,30 @@ const routes = [
           menuId: 'A59EFAQ7AC'
         }
       },
+      //零部件编号申请
+      {
+        path: '/partCodeApply',
+        name: 'partCodeApply',
+        component: () =>
+            import('@/pages/regulatoryRepository/partCodeApply/index'),
+        meta: {
+          requireAuth: true,
+          title: '零部件编号申请',
+          menuId: ''
+        }
+      },
+      //标准法规工作组数据统计
+      {
+        path: '/dataStatisComments',
+        name: 'dataStatisComments',
+        component: () =>
+            import('@/pages/regulatoryRepository/dataStatis/index'),
+        meta: {
+          requireAuth: true,
+          title: '标准法规工作组数据统计',
+          menuId: ''
+        }
+      },
       // 标准征求意见
       {
         path: '/standardForComments',

src/sysConfig/index.js

@@ -6,7 +6,7 @@
 // 服务器地址
 // const devIp = '10.96.10.171'
 // const devInterfacePORT = '9999'
-const devIp = '10.96.170.156'
+const devIp = 'localhost'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -31,7 +31,7 @@ const processPort = '17210'
  *****************************************************************/
 // 生产环境配置
 const prodIp = '62.234.136.153'
-const prodInterfacePORT = '8038'
+const prodInterfacePORT = '8033'
 
 
 // 判断环境