From 705d9b9c727bc4d5769253e65b0799530d2f555f Mon Sep 17 00:00:00 2001
From: youyuzihan <youyuzihan@gmail.com>
Date: Wed, 23 Jun 2021 14:28:31 +0800
Subject: [PATCH 1/6] =?UTF-8?q?update:=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../localProductsOrProjectLibrary/index.vue   | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index c2080cfa8..6b5880360 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -14,7 +14,7 @@
           </el-form-item>
           <el-form-item label="项目名称" class="search-item">
             <el-input
-              v-model="localProTableSearch.productName"
+              v-model="projectLibrarySearch.projectName"
               placeholder="根据项目名称查找"
               :maxlength="100"
               clearable
@@ -22,7 +22,7 @@
           </el-form-item>
           <el-form-item label="项目分类" class="search-item">
             <el-select
-              v-model="localProTableSearch.productType"
+              v-model="projectLibrarySearch.projectSort"
               placeholder="请选择项目类别"
             >
               <el-option
@@ -34,7 +34,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="项目状态" class="search-item search-item-last">
-            <el-select v-model="localProTableSearch.productBrand" placeholder="请选择项目状态" clearable>
+            <el-select v-model="projectLibrarySearch.projectStatus" placeholder="请选择项目状态" clearable>
               <el-option
                 v-for="opr in xmztOptions"
                 :key="opr.value"
@@ -249,6 +249,13 @@ export default {
       ifMaintaince:"Maintenance",
 
       deptUser: [],
+      //查询3类
+      projectLibrarySearch: {
+        projectName: '',
+        projectSort: '',
+        projectStatus: '',
+
+      },
       // 查询条件
       localProTableSearch: {
         page: 1,
@@ -1085,17 +1092,21 @@ export default {
     },
     // 条件分页查询
     getLocalProductTableBtn () {
-      this.localProTableSearch.page = 1
-      this.localProTableSearch.advanceSearchVOStr = ''
+      this.projectLibrarySearch.page = 1
+
       this.getLocalProductTable()
     },
     // 查询本地产品
     getLocalProductTable () {
       this.localProTableSearch.prodectCode = this.ifMaintaince
-      console.log(this.localProTableSearch.prodectCode)
+      // console.log(this.localProTableSearch.prodectCode)
       this.localProTableSearch.dataType = this.insideTabsActiveName
       this.SarExportSearchEo = this.localProTableSearch
-      this.$http.get('sarStandProjectLibrary/queryProject', this.localProTableSearch, {
+      this.$http.get('sarStandProjectLibrary/queryProject',{
+        projectName: this.projectLibrarySearch.projectName,
+        projectClassification: this.projectLibrarySearch.projectSort,
+        projectStatus: this.projectLibrarySearch.projectStatus
+      },{
         _this: this, loading: 'loading'
       }, res => {
         // console.log(res.data)

From a2185c7badeef156f730ef08c2f3e929b404f3b7 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 23 Jun 2021 15:26:27 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=E7=99=BB=E5=BD=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 89a3e872e..b0a620407 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -91,7 +91,7 @@ export default {
             let userInfo2 = decodeURIComponent(userInfoStr)
             let userInfoObj = JSON.parse(userInfo2)
             this.setToken(userInfoObj.usid) // vuex存储token
-            this.getByUserInfoCode().then((userInfo) => {
+            this.getByUserInfoCode(userInfoObj.usid).then((userInfo) => {
               if (userInfo !== '' && userInfo !== null) {
                 userInfo.workNum = userInfoObj.workNum
                 if (userInfo.userPic !== null) {
@@ -237,9 +237,9 @@ export default {
         })
     },
     // 获取用户信息
-    getByUserInfoCode () {
+    getByUserInfoCode (userId) {
       return new Promise((resolve, reject) => {
-        this.$http.get('person/userInfo/getByUserInfoCode', {
+        this.$http.get('person/userInfo/getByUserInfoCode?userId='+ userId, {
         }, {
           _this: this,
           prefix: '/foton'

From 8b317d092790fb0862c321f92cf1b2000946be5d Mon Sep 17 00:00:00 2001
From: yf <428080876@qq.com>
Date: Wed, 23 Jun 2021 15:29:02 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step3.vue         | 152 ++++++++++++++--
 .../pages/creatProcess/bzrk/step4.vue         | 168 ++++++++++++++++--
 .../tabComponents/processCenter/index.vue     |   4 +-
 3 files changed, 292 insertions(+), 32 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 17a7e98ea..79c453670 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -3,11 +3,12 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准入库流程</template>
-      <template slot="proNode">经理人审批</template>
+      <template slot="proNode">责任人会签</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+<!--      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>-->
     </div>
     <div class="content" v-if="active === '1'">
       <div style="flex: auto; overflow: auto;">
@@ -45,6 +46,7 @@
                       disabled
                       v-model="form.standYear"
                       type="year"
+                      value-format="yyy"
                       placeholder="请选择标准年份">
                   </el-date-picker>
                 </el-form-item>
@@ -519,16 +521,16 @@
         <el-collapse accordion>
           <el-collapse-item title="意见填写">
             <div style="margin: 10px 0;">
-              <el-select v-model="approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">
-                <el-option label="驳回" value="1"></el-option>
-                <el-option label="通过" value="0"></el-option>
-              </el-select>
+<!--              <el-select v-model="approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
+<!--                <el-option label="驳回" value="1"></el-option>-->
+<!--                <el-option label="通过" value="0"></el-option>-->
+<!--              </el-select>-->
               <el-input
                   type="textarea"
                   :rows="3"
                   resize="none"
                   placeholder="请输入意见"
-                  v-model="textarea">
+                  v-model="commentText">
               </el-input>
             </div>
           </el-collapse-item>
@@ -581,6 +583,75 @@
         </el-timeline>
       </div>
     </div>
+    <div class="content" v-if="active === '3'">
+      <div class="flow-list">
+        <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"
+              sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+              prop="assignee"
+              label="任务受理人"
+              align="center"
+              sortable="custom"
+          >
+          </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-save
         show-submit
@@ -602,8 +673,14 @@ export default {
   name: "bzrkStep3",
   data () {
     return {
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      detailData: [],
+      userId:this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
       approvalOpinion: '', // 通过/驳回
-      textarea: '', // 意见
+      commentText: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
       active: '1', // 默认显示
@@ -668,6 +745,11 @@ export default {
         glwj: '', // 关联文件
         xglc: '', // 相关流程
         chjl: '', // 参会记录
+        //流程信息
+        prcNum:'',
+        commentText:'',
+        prcName:'',
+        standType: '',
       }, // 标准信息
       standSortOptions: [], // 标准类别
       standNatureOptions: [], // 标准性质
@@ -688,6 +770,9 @@ export default {
       user3: '',
       user4: '',
       user5: '',
+      // 流程路由信息
+      prcNum : this.$route.query.prcNum,
+      prcName : this.$route.query.prcName,
     }
   },
   components: {
@@ -695,20 +780,50 @@ export default {
     ProcessFooter,
     ProcessTitle
   },
+  computed: {
+    listNoDataText () {
+      return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+    },
+  },
   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 => {})
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
-          taskIds: this.$route.query.taskIds,
-          pId: this.$route.query.prcId
+          taskIds: this.taskIds,
+          pId: this.pId
         }).then(res => {
           if (res) {
-            this.form = JSON.parse(res.mesg)
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
           }
         }).catch(e => {
         })
       })
     },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.form = JSON.parse(JSON.stringify(item))
+        this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+        this.form.prcNum = this.prcNum
+        this.form.prcName = this.prcName
+        this.form['id'] = item.id
+      })
+    },
     closeDrawer() {
       this.ListModel = false
     },
@@ -728,8 +843,22 @@ export default {
     },
     handleSave() {},
     handleSubmit() {
+      this.form.commentText = this.commentText
+      this.form.approvalOpinion = this.approvalOpinion
       const json = JSON.stringify(this.form);
       console.log(json)
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.taskIds,
+        userId : this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        console.log(res);
+        // if (res.success) {
+        //   this.processCreateStand(json)
+        // }
+      })
       // this.$http.post('lawss/activiti/completeTask', {
       //     taskIds: res.data,
       //     userId : this.$store.getters.userInfo.userId,
@@ -767,6 +896,7 @@ export default {
     },
   },
   mounted () {
+    this.processTable()
     this.getData()
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 67d7ba459..4f01e999f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -3,11 +3,12 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准入库流程</template>
-      <template slot="proNode">经理人审批</template>
+      <template slot="proNode">申请人修订</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+<!--      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>-->
     </div>
     <div class="content" v-if="active === '1'">
       <div style="flex: auto; overflow: auto;">
@@ -45,6 +46,7 @@
                       disabled
                       v-model="form.standYear"
                       type="year"
+                      value-format="yyy"
                       placeholder="请选择标准年份">
                   </el-date-picker>
                 </el-form-item>
@@ -516,23 +518,23 @@
         </el-form>
       </div>
       <div>
-<!--        <el-collapse accordion>-->
-<!--          <el-collapse-item title="意见填写">-->
-<!--            <div style="margin: 10px 0;">-->
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
 <!--              <el-select v-model="approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
 <!--                <el-option label="驳回" value="1"></el-option>-->
 <!--                <el-option label="通过" value="0"></el-option>-->
 <!--              </el-select>-->
-<!--              <el-input-->
-<!--                  type="textarea"-->
-<!--                  :rows="3"-->
-<!--                  resize="none"-->
-<!--                  placeholder="请输入意见"-->
-<!--                  v-model="textarea">-->
-<!--              </el-input>-->
-<!--            </div>-->
-<!--          </el-collapse-item>-->
-<!--        </el-collapse>-->
+              <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-if="active === '2'">
@@ -581,6 +583,75 @@
         </el-timeline>
       </div>
     </div>
+    <div class="content" v-if="active === '3'">
+      <div class="flow-list">
+        <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"
+              sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+              prop="assignee"
+              label="任务受理人"
+              align="center"
+              sortable="custom"
+          >
+          </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-save
         show-submit
@@ -602,8 +673,14 @@ export default {
   name: "bzrkStep4",
   data () {
     return {
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      detailData: [],
+      userId:this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
       approvalOpinion: '', // 通过/驳回
-      textarea: '', // 意见
+      commentText: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
       active: '1', // 默认显示
@@ -668,6 +745,11 @@ export default {
         glwj: '', // 关联文件
         xglc: '', // 相关流程
         chjl: '', // 参会记录
+        //流程信息
+        prcNum:'',
+        commentText:'',
+        prcName:'',
+        standType: '',
       }, // 标准信息
       standSortOptions: [], // 标准类别
       standNatureOptions: [], // 标准性质
@@ -688,6 +770,9 @@ export default {
       user3: '',
       user4: '',
       user5: '',
+      // 流程路由信息
+      prcNum : this.$route.query.prcNum,
+      prcName : this.$route.query.prcName,
     }
   },
   components: {
@@ -695,20 +780,50 @@ export default {
     ProcessFooter,
     ProcessTitle
   },
+  computed: {
+    listNoDataText () {
+      return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+    },
+  },
   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 => {})
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
-          taskIds: this.$route.query.taskIds,
-          pId: this.$route.query.prcId
+          taskIds: this.taskIds,
+          pId: this.pId
         }).then(res => {
           if (res) {
-            this.form = JSON.parse(res.mesg)
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
           }
         }).catch(e => {
         })
       })
     },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.form = JSON.parse(JSON.stringify(item))
+        this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+        this.form.prcNum = this.prcNum
+        this.form.prcName = this.prcName
+        this.form['id'] = item.id
+      })
+    },
     closeDrawer() {
       this.ListModel = false
     },
@@ -728,8 +843,22 @@ export default {
     },
     handleSave() {},
     handleSubmit() {
+      this.form.commentText = this.commentText
+      this.form.approvalOpinion = this.approvalOpinion
       const json = JSON.stringify(this.form);
       console.log(json)
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.taskIds,
+        userId : this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        console.log(res);
+        if (res.success) {
+          this.processCreateStand(json)
+        }
+      })
       // this.$http.post('lawss/activiti/completeTask', {
       //     taskIds: res.data,
       //     userId : this.$store.getters.userInfo.userId,
@@ -767,6 +896,7 @@ export default {
     },
   },
   mounted () {
+    this.processTable()
     this.getData()
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 349d54a99..95a5dce6e 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -233,7 +233,7 @@ export default {
             })
           }else if (row.taskInfo === '责任人会签'){
             this.$router.push({
-              name: 'step3',
+              name: 'bzrkStep3',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,
@@ -244,7 +244,7 @@ export default {
             })
           }else if (row.taskInfo === '申请人修订'){
             this.$router.push({
-              name: 'step4',
+              name: 'bzrkStep4',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,

From 58fe433ef17c8b6c288c54ce05bd43775c9ee59e Mon Sep 17 00:00:00 2001
From: youyuzihan <youyuzihan@gmail.com>
Date: Wed, 23 Jun 2021 15:43:24 +0800
Subject: [PATCH 4/6] =?UTF-8?q?update:=E8=B7=B3=E8=BD=AC=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../localProductsOrProjectLibrary/index.vue   | 35 ++++++++++++++--
 .../pages/details.vue                         | 40 +++++++++++--------
 2 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 6b5880360..f55f7c7cc 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -115,9 +115,9 @@
                 prop="projectName"
                 align="center"
                 label="项目名称">
-<!--          <template slot-scope="scope">-->
-<!--           <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.productName }}</a>&ndash;&gt;-->
-<!--          </template>-->
+          <template slot-scope="scope">
+           <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.projectName }}</a>
+          </template>
         </el-table-column>
         <el-table-column
                 show-overflow-tooltip
@@ -313,6 +313,31 @@ export default {
           value: '2'
         }
       ],
+      //9宫格列表
+      localProLib:{
+        //  产品平台
+        projectPlatfor: '',
+        //  项目编号
+        projectNumber: '',
+        //  项目名称
+        projectName: '',
+        //  项目分类
+        projectClassification: '',
+        //  项目状态
+        projectStatus: '',
+        //  项目群
+        projectGroup: '',
+        //  项目开始日期
+        projectStartDate: '',
+        //  项目完成日期
+        projectEndDate: '',
+        //  当前节点
+        currentNode: '',
+        //  项目级别
+        projectLevel: '',
+        //  项目经理
+        projectManager: '',
+      },
       localProEO: {
         // 项目相关人员
         userEOList: [],
@@ -1192,7 +1217,9 @@ export default {
             })
             return
         }
-        this.$http.get('lawss/sarProductInfo/validUserPermission', {productId: row.id}, {
+        this.$http.get('sarStandProjectLibrary/queryById', {
+          id: row.id
+        }, {
             _this: this, loading: 'loading'
         }, res => {
             if (res.data) {
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 29f0c4948..4783a3960 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -4,28 +4,28 @@
       <div class="back" title="返回" @click="back">
         <i class="el-icon-back"></i>
       </div>
-      <div class="title">{{localProEO.productSet}} 《{{localProEO.productName}}》 详情</div>
+      <div class="title">车型《{{localProEO.projectName}}》 详情</div>
     </div>
     <div class="contaiiner">
       <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.flatform}}</span></el-col>
-          <el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.productNo }}</span></el-col>
-          <el-col :span="5" :push="2">项目名称: <span class="valueColor">{{ localProEO.productName }}</span></el-col>
+          <el-col :span="5">产品平台: <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">车型系列:<span class="valueColor">{{ localProEO.productSet }}</span></el-col>-->
-          <el-col :span="4" :push="3">项目分类:<span class="valueColor">{{ localProEO.productTypeShow }}</span></el-col>
+          <el-col :span="4" :push="3">项目分类:<span class="valueColor">{{ localProEO.projectClassification }}</span></el-col>
         </el-row>
         <el-row style="margin-top: 10px">
-          <el-col :span="5">项目状态: <span class="valueColor">{{ localProEO.productBrandShow }} </span></el-col>
-          <el-col :span="5" :push="1">项目群: <span class="valueColor">{{ localProEO.productBrandShow }} </span></el-col>
-          <el-col :span="5" :push="2">当前节点: <span class="valueColor">{{ localProEO.productBrandShow }} </span></el-col>
-          <el-col :span="4" :push="3">项目级别: <span class="valueColor">{{ localProEO.productBrandShow }} </span></el-col>
+          <el-col :span="5">项目状态: <span class="valueColor">{{ localProEO.projectStatus }} </span></el-col>
+          <el-col :span="5" :push="1">项目群: <span class="valueColor">{{ localProEO.projectGroup }} </span></el-col>
+          <el-col :span="5" :push="2">当前节点: <span class="valueColor">{{ localProEO.currentNode }} </span></el-col>
+          <el-col :span="4" :push="3">项目级别: <span class="valueColor">{{ localProEO.projectLevel }} </span></el-col>
         </el-row>
         <el-row style="margin-top: 10px">
-          <el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.productNo }} </span></el-col>
-          <el-col :span="5" :push="1"> 项目计划开始时间: <span class="valueColor">{{ localProEO.baseCartype}}</span></el-col>
-          <el-col :span="5" :push="2">项目计划完成时间: <span class="valueColor">{{  }} </span></el-col>
+          <el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.projectManager }} </span></el-col>
+          <el-col :span="5" :push="1"> 项目计划开始时间: <span class="valueColor">{{ localProEO.projectStartDate}}</span></el-col>
+          <el-col :span="5" :push="2">项目计划完成时间: <span class="valueColor">{{localProEO.projectEndDate  }} </span></el-col>
         </el-row>
         </div>
       </el-card>
@@ -45,8 +45,8 @@
                    icon="export"
         >导出</el-button>
       </div>
-      <el-tabs type="border-card">
-        <el-tab-pane :label="localProEO.productName" class="details-panel-tabs-item">
+<!--      <el-tabs type="border-card">-->
+<!--        <el-tab-pane :label="localProEO.productName" class="details-panel-tabs-item">-->
           <div class="table-wrapper">
             <el-table
                     :data="data"
@@ -202,8 +202,8 @@
                     @pageSizeChange="pageSizeChangeLaws"></pagination>
           </div>
           <loading :loading="loading">数据获取中</loading>
-        </el-tab-pane>
-      </el-tabs>
+<!--        </el-tab-pane>-->
+<!--      </el-tabs>-->
     </div>
     <!-- 调取弹窗 -->
     <el-drawer
@@ -235,8 +235,13 @@ export default {
   },
   data () {
     return {
+      page: 1,
+      total: 0,
+      loading: false,
+      data: [],
       Height: 0,
       localProEO: {},
+      localProLib:{},
       takeingFlag: false,
       exportModelFlag: false,
       exportName: ''
@@ -276,6 +281,9 @@ export default {
     exportProducdata() {},
     deleteStandLawsForProduct() {},
     selectStandLawsForProduct() {},
+    pageChangeLaws() {},
+    pageSizeChangeLaws() {},
+    standSelectChange() {},//选项值发生改变
 
   },
   computed: {

From 261651d76e29905ed002ffa292583cdcce53a33e Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 23 Jun 2021 16:34:33 +0800
Subject: [PATCH 5/6] =?UTF-8?q?feat:=20=E5=85=A5=E5=BA=93=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=20=E5=8F=8A=20=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step3.vue         |  23 +-
 .../pages/creatProcess/bzrk/step4.vue         |  80 +-
 .../pages/creatProcess/bzrk/step5.vue         | 961 ++++++++++++++++++
 .../pages/processDetail/index.vue             | 116 +--
 src/router/index.js                           |   9 +
 5 files changed, 1012 insertions(+), 177 deletions(-)
 create mode 100644 src/pages/processCenter/pages/creatProcess/bzrk/step5.vue

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 79c453670..21b579ecc 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -854,23 +854,12 @@ export default {
       }, {
         _this: this
       }, res => {
-        console.log(res);
-        // if (res.success) {
-        //   this.processCreateStand(json)
-        // }
+        if (res.success) {
+          this.$message.success(res.data)
+        }else {
+          this.$message.warning(res.data)
+        }
       })
-      // this.$http.post('lawss/activiti/completeTask', {
-      //     taskIds: res.data,
-      //     userId : this.$store.getters.userInfo.userId,
-      //     json: json
-      // }, {
-      //     _this: this
-      // }, res => {
-      //     console.log(res);
-      //     if (res.ok) {
-      //         this.processCreateStand(json)
-      //     }
-      // })
     },
 
     /**
@@ -883,7 +872,7 @@ export default {
       _formData.append('infoJson', json)
       processCreateStand(_formData).then(res => {
         if (res.result === '操作成功' || res.data === '入库成功') {
-          this.$message.success(res.data)
+          this.$message.success(res.message)
           setTimeout(() => {
             this.$router.push({
               name: 'ProcessCenter'
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 4f01e999f..1643f0845 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -25,13 +25,13 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="类型" prop="standInData" class="add-form-item form-item-disabled">
-                  <el-radio-group v-model="form.standInData" disabled>
+                  <el-radio-group v-model="form.standInData">
                     <el-radio label="0">国内标准入库</el-radio>
                     <el-radio label="1">海外标准入库</el-radio>
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
+                  <el-select v-model="form.standSort" placeholder="请选择标准类别">
                     <el-option
                         v-for="item in standSortOptions"
                         placeholder="请选择"
@@ -43,7 +43,6 @@
                 </el-form-item>
                 <el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
                   <el-date-picker
-                      disabled
                       v-model="form.standYear"
                       type="year"
                       value-format="yyy"
@@ -52,7 +51,6 @@
                 </el-form-item>
                 <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
                   <el-input
-                      disabled
                       v-model="form.standName"
                       placeholder="请输入标准中文名称"
                       clearable
@@ -60,14 +58,13 @@
                 </el-form-item>
                 <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
                   <el-input
-                      disabled
                       v-model="form.standEnName"
                       placeholder="请输入标准英文名称"
                       clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
-                  <el-radio-group v-model="form.signFlag" disabled>
+                  <el-radio-group v-model="form.signFlag">
                     <el-radio label="1">是</el-radio>
                     <el-radio label="2">否</el-radio>
                   </el-radio-group>
@@ -76,14 +73,13 @@
               <el-col :span="12">
                 <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
                   <el-input
-                      disabled
                       v-model="form.standNumber"
                       placeholder="请输入标准编号"
                       clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
+                  <el-select v-model="form.standNature" placeholder="请选择标准性质">
                     <el-option
                         v-for="item in standNatureOptions"
                         placeholder="请选择"
@@ -94,7 +90,7 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.textStatus" placeholder="请选择文本状态" disabled>
+                  <el-select v-model="form.textStatus" placeholder="请选择文本状态">
                     <el-option
                         v-for="item in standStateOptions"
                         placeholder="请选择"
@@ -106,20 +102,19 @@
                 </el-form-item>
                 <el-form-item label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
                   <el-date-picker
-                      disabled
                       v-model="form.issueTime"
                       type="date"
                       placeholder="请选择标准发布日期">
                   </el-date-picker>
                 </el-form-item>
                 <el-form-item label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
-                  <el-radio-group v-model="form.isRelateAccess" disabled>
+                  <el-radio-group v-model="form.isRelateAccess">
                     <el-radio label="1">是</el-radio>
                     <el-radio label="2">否</el-radio>
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.standSystem" placeholder="请选择标准体系" disabled>
+                  <el-select v-model="form.standSystem" placeholder="请选择标准体系">
                     <el-option
                         v-for="item in standSystemOptions"
                         placeholder="请选择"
@@ -131,7 +126,6 @@
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                   <el-input
-                      disabled
                       v-model="form.gxhbq"
                       placeholder="请输入标签"
                       clearable
@@ -148,7 +142,6 @@
               <el-col :span="12">
                 <el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">
                   <el-date-picker
-                      disabled
                       v-model="form.ssrq"
                       type="date"
                       placeholder="请选择标准实施日期(标准文本)">
@@ -156,7 +149,6 @@
                 </el-form-item>
                 <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
                   <el-date-picker
-                      disabled
                       v-model="form.xcxssrq"
                       type="date"
                       placeholder="请选择新车型实施日期(标准文本">
@@ -164,7 +156,6 @@
                 </el-form-item>
                 <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
                   <el-date-picker
-                      disabled
                       v-model="form.zccssrq"
                       type="date"
                       placeholder="请选择在产车实施日期(标准文本)">
@@ -174,7 +165,6 @@
               <el-col :span="12">
                 <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">
                   <el-date-picker
-                      disabled
                       v-model="form.ssrqgj"
                       type="date"
                       placeholder="请选择实施日期(国际)">
@@ -182,7 +172,6 @@
                 </el-form-item>
                 <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
                   <el-date-picker
-                      disabled
                       v-model="form.xcxssrqgj"
                       type="date"
                       placeholder="请选择新车型实施日期(国家)">
@@ -190,7 +179,6 @@
                 </el-form-item>
                 <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
                   <el-date-picker
-                      disabled
                       v-model="form.zccssrqgj"
                       type="date"
                       placeholder="请选择在产车实施日期(国家)">
@@ -289,7 +277,7 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple disabled>
+                  <el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple>
                     <el-option
                         v-for="item in zrbmOptions"
                         placeholder="请选择"
@@ -300,7 +288,7 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.cllx" placeholder="请选择适用车型" multiple disabled>
+                  <el-select v-model="form.cllx" placeholder="请选择适用车型" multiple>
                     <el-option
                         v-for="item in applyArcticOptions"
                         placeholder="请选择"
@@ -311,7 +299,7 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.nylx" placeholder="请选择适用车型" multiple disabled>
+                  <el-select v-model="form.nylx" placeholder="请选择适用车型" multiple>
                     <el-option
                         v-for="item in categoryOptions"
                         placeholder="请选择"
@@ -322,26 +310,25 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.cycvppsbm" placeholder="请选择乘用车VPPS编码" multiple disabled>
+                  <el-select v-model="form.cycvppsbm" placeholder="请选择乘用车VPPS编码" multiple>
                     <el-option label="乘用车VPPS编码1" value="1"></el-option>
                     <el-option label="乘用车VPPS编码2" value="2"></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.kccvppsbm" placeholder="请选择卡车VPPS编码" multiple disabled>
+                  <el-select v-model="form.kccvppsbm" placeholder="请选择卡车VPPS编码" multiple>
                     <el-option label="卡车VPPS编码1" value="1"></el-option>
                     <el-option label="卡车VPPS编码2" value="2"></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.dybxh" placeholder="请选择模块结构单元变型号" multiple disabled>
+                  <el-select v-model="form.dybxh" placeholder="请选择模块结构单元变型号" multiple>
                     <el-option label="模块结构单元变型号1" value="1"></el-option>
                     <el-option label="模块结构单元变型号2" value="2"></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                   <el-input
-                      disabled
                       v-model="form.gkdw"
                       placeholder="请输入归口管理部门"
                       clearable
@@ -349,14 +336,13 @@
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="fbjg" class="add-form-item form-item-disabled">
                   <el-input
-                      disabled
                       v-model="form.fbjg"
                       placeholder="请选择起草单位"
                       clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
+                  <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple>
                     <el-option
                         v-for="item in txlbOptions"
                         placeholder="请选择"
@@ -369,7 +355,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.sycpx" placeholder="请选择适用车型" multiple disabled>
+                  <el-select v-model="form.sycpx" placeholder="请选择适用车型" multiple>
                     <el-option
                         v-for="item in sycpxOptions"
                         placeholder="请选择"
@@ -380,7 +366,7 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.syrz" placeholder="请选择适用认证" multiple disabled>
+                  <el-select v-model="form.syrz" placeholder="请选择适用认证" multiple>
                     <el-option
                         v-for="item in applyAuthOptions"
                         placeholder="请选择"
@@ -391,7 +377,7 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple disabled>
+                  <el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>
                     <el-option
                         v-for="item in zrgcsOptions"
                         placeholder="请选择"
@@ -404,32 +390,29 @@
                 <el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
                   <el-input
                       v-model="form.cycvppscn"
-                      disabled
                       clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="关联模块--卡车vpps中文名称" prop="kccvppscn" class="add-form-item form-item-disabled">
                   <el-input
                       v-model="form.kccvppscn"
-                      disabled
                       clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
                   <el-input
                       v-model="form.dymc"
-                      disabled
                       clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>
+                  <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
                     <el-option label="署名人1" value="1"></el-option>
                     <el-option label="署名人2" value="2"></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.cysd" placeholder="请选择我司参与深度" disabled>
+                  <el-select v-model="form.cysd" placeholder="请选择我司参与深度">
                     <el-option
                         v-for="item in cysdOptions"
                         placeholder="请选择"
@@ -450,21 +433,19 @@
               <el-col :span="12">
                 <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
                   <el-input
-                      disabled
                       v-model="form.dtbjh"
                       placeholder="请输入代替标准号"
                       clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled>
+                  <el-select v-model="form.cbcd" placeholder="请选择采标程度">
                     <el-option label="采标程度1" value="1"></el-option>
                     <el-option label="采标程度2" value="2"></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">
                   <el-input
-                      disabled
                       v-model="form.xglc"
                       placeholder="请输入相关流程"
                       clearable
@@ -482,7 +463,6 @@
               <el-col :span="12">
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
                   <el-input
-                      disabled
                       v-model="form.yybj"
                       placeholder="请输入引用标准"
                       clearable
@@ -490,7 +470,6 @@
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
                   <el-input
-                      disabled
                       v-model="form.cbbh"
                       placeholder="请输入采标编号"
                       clearable
@@ -498,7 +477,6 @@
                 </el-form-item>
                 <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">
                   <el-input
-                      disabled
                       v-model="form.byybj"
                       placeholder="请输入被引用标准"
                       clearable
@@ -506,7 +484,6 @@
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">
                   <el-input
-                      disabled
                       v-model="form.chjl"
                       placeholder="请输入参会记录"
                       clearable
@@ -854,23 +831,12 @@ export default {
       }, {
         _this: this
       }, res => {
-        console.log(res);
         if (res.success) {
-          this.processCreateStand(json)
+          this.$message.success(res.data)
+        }else {
+          this.$message.warning(res.data)
         }
       })
-      // this.$http.post('lawss/activiti/completeTask', {
-      //     taskIds: res.data,
-      //     userId : this.$store.getters.userInfo.userId,
-      //     json: json
-      // }, {
-      //     _this: this
-      // }, res => {
-      //     console.log(res);
-      //     if (res.ok) {
-      //         this.processCreateStand(json)
-      //     }
-      // })
     },
 
     /**
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
new file mode 100644
index 000000000..a48901ce0
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
@@ -0,0 +1,961 @@
+<template>
+    <div class="bzrkStep2">
+        <!--        标准入库流程-->
+        <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 class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div>-->
+        </div>
+        <div class="content" v-if="active === '1'">
+            <div style="flex: auto; overflow: auto;">
+                <el-form
+                        ref="qbkwForm"
+                        :model="form"
+                        class="label-input-form"
+                        label-width="210px"
+                >
+                    <ProcessTitle>
+                        <template slot="title">基础信息</template>
+                    </ProcessTitle>
+                    <div class="prc-content-border">
+                        <el-row :gutter="24">
+                            <el-col :span="12">
+                                <el-form-item label="类型" prop="standInData" class="add-form-item form-item-disabled">
+                                    <el-radio-group v-model="form.standInData" disabled>
+                                        <el-radio label="0">国内标准入库</el-radio>
+                                        <el-radio label="1">海外标准入库</el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                                <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
+                                        <el-option
+                                                v-for="item in standSortOptions"
+                                                placeholder="请选择"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            disabled
+                                            v-model="form.standYear"
+                                            type="year"
+                                            placeholder="请选择标准年份"
+                                            value-format="yyyy">
+                                    </el-date-picker>
+                                </el-form-item>
+                                <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.standName"
+                                            placeholder="请输入标准中文名称"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.standEnName"
+                                            placeholder="请输入标准英文名称"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
+                                    <el-radio-group v-model="form.signFlag" disabled>
+                                        <el-radio label="1">是</el-radio>
+                                        <el-radio label="2">否</el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.standNumber"
+                                            placeholder="请输入标准编号"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
+                                        <el-option
+                                                v-for="item in standNatureOptions"
+                                                placeholder="请选择"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.textStatus" placeholder="请选择文本状态" disabled>
+                                        <el-option
+                                                v-for="item in standStateOptions"
+                                                placeholder="请选择"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            disabled
+                                            v-model="form.issueTime"
+                                            type="date"
+                                            placeholder="请选择标准发布日期">
+                                    </el-date-picker>
+                                </el-form-item>
+                                <el-form-item label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
+                                    <el-radio-group v-model="form.isRelateAccess" disabled>
+                                        <el-radio label="1">是</el-radio>
+                                        <el-radio label="2">否</el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.standSystem" placeholder="请选择标准体系" disabled>
+                                        <el-option
+                                                v-for="item in standSystemOptions"
+                                                placeholder="请选择"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.gxhbq"
+                                            placeholder="请输入标签"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                    <ProcessTitle>
+                        <template slot="title">实施日期</template>
+                    </ProcessTitle>
+                    <div class="prc-content-border">
+                        <el-row :gutter="24">
+                            <el-col :span="12">
+                                <el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            disabled
+                                            v-model="form.ssrq"
+                                            type="date"
+                                            placeholder="请选择标准实施日期(标准文本)">
+                                    </el-date-picker>
+                                </el-form-item>
+                                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            disabled
+                                            v-model="form.xcxssrq"
+                                            type="date"
+                                            placeholder="请选择新车型实施日期(标准文本">
+                                    </el-date-picker>
+                                </el-form-item>
+                                <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            disabled
+                                            v-model="form.zccssrq"
+                                            type="date"
+                                            placeholder="请选择在产车实施日期(标准文本)">
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            disabled
+                                            v-model="form.ssrqgj"
+                                            type="date"
+                                            placeholder="请选择实施日期(国际)">
+                                    </el-date-picker>
+                                </el-form-item>
+                                <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            disabled
+                                            v-model="form.xcxssrqgj"
+                                            type="date"
+                                            placeholder="请选择新车型实施日期(国家)">
+                                    </el-date-picker>
+                                </el-form-item>
+                                <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            disabled
+                                            v-model="form.zccssrqgj"
+                                            type="date"
+                                            placeholder="请选择在产车实施日期(国家)">
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                    <ProcessTitle>
+                        <template slot="title">文本信息</template>
+                    </ProcessTitle>
+                    <div class="prc-content-border">
+                        <el-row :gutter="24">
+                            <el-col :span="12">
+                                <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled">
+                                    <div v-if="form.xgd">
+                                        {{ form.xgd }}
+                                    </div>
+                                    <div v-else>
+                                        - -
+                                    </div>
+                                </el-form-item>
+                                <el-form-item label="发布稿" prop="fbgbjbd" class="add-form-item form-item-disabled">
+                                    <div v-if="form.fbgbjbd">
+                                        {{ form.fbgbjbd }}
+                                    </div>
+                                    <div v-else>
+                                      - -
+                                    </div>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
+                                    <div v-if="form.zbjbd">
+                                        {{ form.zbjbd }}
+                                    </div>
+                                    <div v-else>
+                                       - -
+                                    </div>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
+                                    <div v-if="form.bpg">
+                                        {{ form.bpg }}
+                                    </div>
+                                    <div v-else>
+                                       - -
+                                    </div>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
+                                    <div v-if="form.ssg">
+                                        {{ form.ssg }}
+                                    </div>
+                                    <div v-else>
+                                      - -
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwj" class="add-form-item form-item-disabled">
+                                    <div v-if="form.kwj">
+                                        {{ form.kwj }}
+                                    </div>
+                                    <div v-else>
+                                      - -
+                                    </div>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled">
+                                    <div v-if="form.zqyjg">
+                                        {{ form.zqyjg }}
+                                    </div>
+                                    <div v-else>
+                                      - -
+                                    </div>
+                                </el-form-item>
+                                <el-form-item label="草案" prop="ca" class="add-form-item form-item-disabled">
+                                    <div v-if="form.ca">
+                                        {{ form.ca }}
+                                    </div>
+                                    <div v-else>
+                                       - -
+                                    </div>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwj" class="add-form-item form-item-disabled">
+                                    <div v-if="form.jdwj">
+                                        {{ form.jdwj }}
+                                    </div>
+                                    <div v-else>
+                                       - -
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                    <ProcessTitle>
+                        <template slot="title">适用范围</template>
+                    </ProcessTitle>
+                    <div class="prc-content-border">
+                        <el-row :gutter="24">
+                            <el-col :span="12">
+                                <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple disabled>
+                                        <el-option
+                                                v-for="item in zrbmOptions"
+                                                placeholder="请选择"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.cllx" placeholder="请选择适用车型" multiple disabled>
+                                        <el-option
+                                                v-for="item in applyArcticOptions"
+                                                placeholder="请选择"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.nylx" placeholder="请选择适用车型" multiple disabled>
+                                        <el-option
+                                                v-for="item in categoryOptions"
+                                                placeholder="请选择"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.cycvppsbm" placeholder="请选择乘用车VPPS编码" multiple disabled>
+                                        <el-option label="乘用车VPPS编码1" value="1"></el-option>
+                                        <el-option label="乘用车VPPS编码2" value="2"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.kccvppsbm" placeholder="请选择卡车VPPS编码" multiple disabled>
+                                        <el-option label="卡车VPPS编码1" value="1"></el-option>
+                                        <el-option label="卡车VPPS编码2" value="2"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.dybxh" placeholder="请选择模块结构单元变型号" multiple disabled>
+                                        <el-option label="模块结构单元变型号1" value="1"></el-option>
+                                        <el-option label="模块结构单元变型号2" value="2"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.gkdw"
+                                            placeholder="请输入归口管理部门"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="fbjg" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.fbjg"
+                                            placeholder="请选择起草单位"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
+                                        <el-option
+                                                v-for="item in txlbOptions"
+                                                placeholder="请选择"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.sycpx" placeholder="请选择适用车型" multiple disabled>
+                                        <el-option
+                                                v-for="item in sycpxOptions"
+                                                placeholder="请选择"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.syrz" placeholder="请选择适用认证" multiple disabled>
+                                        <el-option
+                                                v-for="item in applyAuthOptions"
+                                                placeholder="请选择"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple disabled>
+                                        <el-option
+                                                v-for="item in zrgcsOptions"
+                                                placeholder="请选择"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="form.cycvppscn"
+                                            disabled
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="关联模块--卡车vpps中文名称" prop="kccvppscn" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="form.kccvppscn"
+                                            disabled
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="form.dymc"
+                                            disabled
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>
+                                        <el-option label="署名人1" value="1"></el-option>
+                                        <el-option label="署名人2" value="2"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.cysd" placeholder="请选择我司参与深度" disabled>
+                                        <el-option
+                                                v-for="item in cysdOptions"
+                                                placeholder="请选择"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                    <ProcessTitle>
+                        <template slot="title">关联信息</template>
+                    </ProcessTitle>
+                    <div class="prc-content-border">
+                        <el-row :gutter="24">
+                            <el-col :span="12">
+                                <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.dtbjh"
+                                            placeholder="请输入代替标准号"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled>
+                                        <el-option label="采标程度1" value="1"></el-option>
+                                        <el-option label="采标程度2" value="2"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.xglc"
+                                            placeholder="请输入相关流程"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="关联文件" prop="glwj" class="add-form-item form-item-disabled">
+                                    <div v-if="form.glwj">
+                                        {{ form.glwj }}
+                                    </div>
+                                    <div v-else>
+                                       - -
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.yybj"
+                                            placeholder="请输入引用标准"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.cbbh"
+                                            placeholder="请输入采标编号"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.byybj"
+                                            placeholder="请输入被引用标准"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.chjl"
+                                            placeholder="请输入参会记录"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-form>
+            </div>
+            <div>
+<!--                <el-collapse accordion>-->
+<!--                    <el-collapse-item title="意见填写">-->
+<!--                        <div style="margin: 10px 0;">-->
+<!--                            <el-select v-model="approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
+<!--                                <el-option label="驳回" value="1"></el-option>-->
+<!--                                <el-option label="通过" value="0"></el-option>-->
+<!--                            </el-select>-->
+<!--                            <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-if="active === '2'">
+            <div class="block" style="padding-top: 20px;">
+                <el-timeline>
+                    <el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
+                        <el-card>
+                            <h4>流程发起人</h4>
+                            <div style="margin-top: 10px;width: 300px;">
+                                <el-input v-model="user1" placeholder="流程发起人"></el-input>
+                            </div>
+                        </el-card>
+                    </el-timeline-item>
+                    <el-timeline-item timestamp="选择责任人" placement="top" :color="user2 ? '#66b1ff' : ''">
+                        <el-card>
+                            <h4>责任人</h4>
+                            <div style="margin-top: 10px;width: 300px;">
+                                <el-input v-model="user2" placeholder="选择责任人">
+                                </el-input></div>
+                        </el-card>
+                    </el-timeline-item>
+                    <el-timeline-item timestamp="填写意见" placement="top" :color="user3 ? '#66b1ff' : ''">
+                        <el-card>
+                            <h4>责任人</h4>
+                            <div style="margin-top: 10px;width: 300px;">
+                                <el-input v-model="user3" placeholder="责任人"></el-input>
+                            </div>
+                        </el-card>
+                    </el-timeline-item>
+                    <el-timeline-item timestamp="意见汇总并发起会签" placement="top" :color="user4 ? '#66b1ff' : ''">
+                        <el-card>
+                            <h4>标准法规工程师</h4>
+                            <div style="margin-top: 10px;width: 300px;">
+                                <el-input v-model="user4" placeholder="标准法规工程师"></el-input>
+                            </div>
+                        </el-card>
+                    </el-timeline-item>
+                    <el-timeline-item timestamp="审核" placement="top" :color="user5 ? '#66b1ff' : ''">
+                        <el-card>
+                            <h4>责任对接人，标准法规部部门负责人</h4>
+                            <div style="margin-top: 10px;width: 300px;">
+                                <el-input v-model="user5" placeholder="责任对接人，标准法规部部门负责人"></el-input>
+                            </div>
+                        </el-card>
+                    </el-timeline-item>
+                </el-timeline>
+            </div>
+        </div>
+        <div class="content" v-if="active === '3'">
+          <div class="flow-list">
+            <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"
+                  sortable="custom"
+              >
+              </el-table-column>
+              <el-table-column
+                  prop="assignee"
+                  label="任务受理人"
+                  align="center"
+                  sortable="custom"
+              >
+              </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-save-->
+<!--                show-submit-->
+<!--                :submitLoading="isSubmit"-->
+<!--                :saveLoading="saveLoading"-->
+<!--                @save="handleSave"-->
+<!--                @submit="handleSubmit"-->
+<!--        >-->
+<!--        </ProcessFooter>-->
+    </div>
+</template>
+
+<script>
+    import ProcessHeader from '../../components/ProcessHeader'
+    import ProcessFooter from '../../components/ProcessFooter'
+    import ProcessTitle from '../../components/ProcessTitle'
+    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+    export default {
+        name: "bzrkStep5",
+        data () {
+            return {
+              // 当前流程类型(1待办/2已办)
+              processType: 1,
+                detailData: [],
+                userId:this.$store.getters.userInfo.userId,
+                taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId,
+                approvalOpinion: '', // 通过/驳回
+                commentText: '', // 意见
+                title: '', // 新增编辑抽屉标题
+                ListModel: false, // 新增编辑抽屉开关
+                active: '1', // 默认显示
+                isSubmit: false,
+                saveLoading: false,
+                form: {
+                    // 基础信息
+                    textStatus: '', // 文本状态
+                    standYear: '', // 标准年份
+                    standInData: '0', // 标准类型
+                    standSort: '', // 标准类别
+                    standNumber: '', // 标准编号
+                    standNature: '', // 标准性质
+                    standEnName: '', // 英文名称
+                    standName: '', // 中文名称
+                    signFlag: '1', // 是否需要会签
+                    issueTime: '', // 发布时间
+                    isRelateAccess: '', // 是否纳入认证清单
+                    standSystem: '',// 标准体系
+                    gxhbq: '', // 标签
+                    // 实施日期
+                    ssrq: '', // 实施日期(标准文本)
+                    xcxssrq: '', // 新车型实施日期(标准文本)
+                    zccssrq: '', // 在产车实施日期(标准文本)
+                    ssrqgj: '', // 实施日期(国际)
+                    xcxssrqgj: '', // 新车型实施日期(国际)
+                    zccssrqgj: '', // 在产车实施日期(国际)
+                    // 文本信息
+                    ca: '', // 草案
+                    fbgbjbd: '', // 发布稿
+                    xgd: '', // 修改单
+                    bpg: '', // 报批稿
+                    ssg: '', // 送审稿
+                    zqyjg: '', // 征求意见稿
+                    jdwj: '', // 解读文件
+                    zbjbd: '', // 增补件
+                    kwj: '', // 勘误件
+                    // 适用范围
+                    txlb: '', // 体系类别
+                    gkdw: '', // 归口管理部门
+                    fbjg: '', // 起草单位
+                    wssmr: '', // 我司署名人
+                    cysd: '', // 我司参与深度
+                    cllx: '', // 适用车型
+                    nylx: '',// 能源类型
+                    sycpx: '',// 适用产品线
+                    syrz: '', // 适用认证
+                    zrbm: '', // 责任部门
+                    zrgcs: '', // 责任工程师
+                    cycvppsbm: '', // 关联模块--乘用车VPPS编码
+                    cycvppscn: '', // 关联模块--乘用车vpps中文名称
+                    kccvppsbm: '', // 关联模块--卡车VPPS编码
+                    kccvppscn: '', // 关联模块--卡车vpps中文名称
+                    dybxh: '', // 模块结构单元变型号
+                    dymc: '', // 模块结构单元名称
+                    // 关联信息
+                    dtbjh: '', // 代替标准号
+                    cbbh: '', // 采标编号
+                    cbcd: '', // 采标程度
+                    yybj: '', // 引用标准
+                    byybj: '', // 被引用标准
+                    glwj: '', // 关联文件
+                    xglc: '', // 相关流程
+                    chjl: '', // 参会记录
+                    //流程信息
+                    prcNum:'',
+                    commentText:'',
+                    prcName:'',
+                    standType: '',
+                }, // 标准信息
+                standSortOptions: [], // 标准类别
+                standNatureOptions: [], // 标准性质
+                standStateOptions: [], // 文本状态
+                standSystemOptions: [], // 标准体系
+                applyArcticOptions: [], // 适用车型
+                categoryOptions: [], // 能源类型
+                applyAuthOptions: [], // 适用认证
+                cysdOptions: [], // 我司参与深度
+                sycpxOptions: [], // 适用产品线
+                zrbmOptions: [], // 责任部门
+                zrgcsOptions: [], // 责任工程师
+                txlbOptions: [], // 体系类别
+                data: [], // 标准列表数据
+                ListForm: {}, // 新增数据
+                user1: '',
+                user2: '',
+                user3: '',
+                user4: '',
+                user5: '',
+                // 流程路由信息
+                prcNum : this.$route.query.prcNum,
+                prcName : this.$route.query.prcName,
+            }
+        },
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle
+        },
+      computed: {
+        listNoDataText () {
+          return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+        },
+      },
+        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 => {})
+          },
+            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.form = JSON.parse(JSON.stringify(item))
+                    this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+                    this.form.prcNum = this.prcNum
+                    this.form.prcName = this.prcName
+                    this.form['id'] = item.id
+                })
+            },
+            closeDrawer() {
+                this.ListModel = false
+            },
+            OkDrawer() {
+                this.ListModel = false
+                var item = {
+                    remarks: '123'
+                }
+                this.data.push(item)
+            },
+            addList() {
+                this.title = '新增标准'
+                this.ListModel = true
+            },
+            handleTabs(name) {
+                this.active = name
+            },
+            handleSave() {},
+            handleSubmit() {
+                this.form.commentText = this.commentText
+                this.form.approvalOpinion = this.approvalOpinion
+                const json = JSON.stringify(this.form);
+                console.log(json)
+                this.$http.post('lawss/activiti/completeTask', {
+                    taskIds: this.taskIds,
+                    userId : this.userId,
+                    json: json
+                }, {
+                    _this: this
+                }, res => {
+                    console.log(res);
+                    if (res.success) {
+                        this.processCreateStand(json)
+                    }
+                })
+            },
+
+            /**
+             * @description: 流程入库
+             * @date: 2020-11-18 21:47:58
+             * @auth: chenxiaoxi
+             */
+            processCreateStand(json) {
+                const _formData = new FormData()
+                _formData.append('infoJson', json)
+                processCreateStand(_formData).then(res => {
+                    if (res.result === '操作成功' || res.data === '入库成功') {
+                        this.$message.success(res.data)
+                        setTimeout(() => {
+                            this.$router.push({
+                                name: 'ProcessCenter'
+                            })
+                        }, 100)
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
+        },
+        mounted () {
+            this.getData()
+          this.processTable()
+            this.$http.get('sys/dictype/getDicTypeListCode', '', {
+                _this: this
+            }, res => {
+                this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+                this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+                this.standStateOptions = res.data.WBZTCLASS // 文本状态
+                this.standSystemOptions = res.data.BZTXCLASS // 标准体系
+                this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+                this.categoryOptions = res.data.NYLXCLASS // 能源类型
+                this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+                this.cysdOptions = res.data.WSCYSD // 我司参与深度
+                this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+                this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+                this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+                this.txlbOptions = res.data.TXLBCLASS // 体系类别
+            })
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/style';
+    .bzrkStep2 {
+        /deep/.el-drawer__container {
+            .prc-content-border {
+                border: none;
+                padding: 0 20px 0;
+            }
+        }
+        position: relative;
+        height: 100%;
+        .headerTabs {
+            height: 52px;
+            display: flex;
+            align-items: center;
+            position: absolute;
+            top: 0;
+            right: 10px;
+            .headerTabsItem {
+                border: 1px solid #c1c1c1;
+                padding: 0 5px;
+                height: 30px;
+                line-height: 30px;
+                cursor: pointer;
+            }
+            .active {
+                border: 1px solid #E6A23C;
+                color: #fff;
+                background: #E6A23C;
+            }
+        }
+        .content {
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            height: calc(~'100% - 103px');
+            overflow: auto;
+            .tableTitle {
+                margin-bottom: 10px;
+                height: 30px;
+                line-height: 30px;
+                position: relative;
+                font-size: 13px;
+                font-weight: bold;
+                .tableButton {
+                    position: absolute;
+                    right: 0;
+                    top: 0;
+                }
+            }
+        }
+    }
+</style>
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 60d5e7e98..f9a21868b 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -100,8 +100,7 @@
             label="审批意见"
             align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.comment === '0' ? '同意' : scope.row.comment === '1' ? '不同意' : scope.row.comment === '3' ? '退回' : scope.row.comment === '4' ? '确认' :
-                (scope.row.comment === '2' ? scope.row.commentText : '')}}</span>
+            <span>{{ scope.row.commentText }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -198,113 +197,24 @@ export default {
         this.setHandleInfo((JSON.stringify(row)))
         this.setPrcLastDetail((JSON.stringify(row)))
         // 根据type判断跳转具体流程页面
-        switch (prcType) {
-          case '1': // 法规入库及评估流程
-            this.toProcessDetail('RuKuStep5')
-            break
-          case '2': // 法规技术评估流程
-            this.$router.push({
-              name: 'handle3',
-              query: {
-                taskIds: row.taskIds,
-                prcId: row.executionId,
-                prcNum: row.prcNum,
-                prcName: row.prcName,
-                prcType: row.prcType,
-                prcOver: '1'
-              }
-            })
-            break
-          case '3': // 项目评估流程
-            this.toProcessDetail('XmpgSetp6')
-            break
-          case '4': // 企标制修订流程
-            this.toProcessDetail('qbzxdStep5')
-            break
-          case '5': // 未符合项跟踪流程
-            this.toProcessDetail('zgStep9')
-            break
-          case '6': // 企标制修订申请流程
-            this.toProcessDetail('QbzxdsqStep3')
-            break
-          case '7': // 企标废止流程
-            this.toProcessDetail('qbfzStep6')
-            break
-          case '8': // 企标延期制修订审批流程
-            this.toProcessDetail('QbyqzxdspStep2')
-            break
-          case '9': // 标准采购申请流程
-            this.$router.push({
-              name: 'bzcgStep1-3',
-              query: {
-                taskIds: row.taskIds,
-                prcId: row.executionId,
-                prcNum: row.prcNum,
-                prcName: row.prcName,
-                prcType: row.prcType
-              }
-            })
-            break
-          case '10': // 会前申请流程
-            this.toProcessDetail('HqsqStep2')
-            break
-          case '11': // 企标制修订评估流程
-            if (row.taskInfo === 'FO审批') {
-              this.toProcessDetail('QbzxdpgStep2')
-            } else {
-              this.toProcessDetail('QbzxdpgStep4')
-            }
-            break
-          case '12': // 企标勘误流程
-            this.toProcessDetail('QbkwStep3')
-            break
-          case '13': // 行政管理要求评估流程
-            this.$router.push({
-              name: 'ZcjspgStep4',
-              query: {
-                pId: row.processInstanceId
-              }
-            })
-            break
-          case '14': // 政策入库及评估流程
-            this.toProcessDetail('zcrk&jspgStep3')
-            break
-          case '15': // 标准翻译申请流程
-            this.$router.push({
-              name: 'bzfyStep1-3',
-              query: {
-                taskIds: row.taskIds,
-                prcId: row.executionId,
-                prcNum: row.prcNum,
-                prcName: row.prcName,
-                prcType: row.prcType
-              }
-            })
-            break
-          case '16': // 会后流程
-            if (row.name === '参会人申请') {
-              this.toProcessDetail('HhglStep1')
-            } else {
-              this.toProcessDetail('HhglStep2')
-            }
-            break
-          case '17': // 企标备案流程
-            this.toProcessDetail('QbbaStep7')
-            break
-          case '18': // 标准清单申请流程
-            this.toProcessDetail('bzqdStep3')
-            break
-          case '19': // 企标复审流程
-            this.toProcessDetail('qbfsStep2')
-            break
+        if (prcType === '1') {
+          // 标准入库流程数据
+          this.toProcessDetail('bzrkStep5',row)
         }
       } else {
         this.$message.warning('当前流程未全部办理完成，无法查看')
       }
     },
-    toProcessDetail(componentName) {
+    toProcessDetail(componentName,row) {
       this.$router.push({
-        name: componentName
+        name: componentName,
+        query: {
+          taskIds: row.id,
+          prcId: row.processInstanceId,
+          prcNum: row.prcNum,
+          prcName: row.prcName,
+          prcType: row.prcType
+        }
       })
     },
     // table行选择事件
diff --git a/src/router/index.js b/src/router/index.js
index 0872bd5bc..b7839c6b3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -267,6 +267,15 @@ const routes = [
           title: '标准入库流程'
         }
       },
+      {
+        path: '/bzrkStep5',
+        name: 'bzrkStep5',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzrk/step5.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准入库流程'
+        }
+      },
       {
         path: '/bzrkStep2',
         name: 'bzrkStep2',

From f9ff9eaee6ba60ce15b016e9c87221bd077d94c3 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 23 Jun 2021 16:44:24 +0800
Subject: [PATCH 6/6] =?UTF-8?q?feat:=20=E5=85=A5=E5=BA=93=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/bzrk/step3.vue | 4 ++--
 src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 663aee630..efdff8dea 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -766,7 +766,7 @@
             },
             handleSubmit() {
                 var json = this.form
-                json.zrUserId = this.$store.getters.userInfo.userId
+                json.zrUserId = this.$store.getters.userInfo.userId+',5UM3769REUPLPRTRJ54R'
                 json.jlUserId = this.$store.getters.userInfo.userId
                 json.commentText = this.commentText
                 json.applyUpdUserId = this.$store.getters.userInfo.userId
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 21b579ecc..4107bd216 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -855,9 +855,9 @@ export default {
         _this: this
       }, res => {
         if (res.success) {
-          this.$message.success(res.data)
+            this.$message.success(res.message)
         }else {
-          this.$message.warning(res.data)
+            this.$message.success(res.message)
         }
       })
     },
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 1643f0845..e970a22cc 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -832,9 +832,9 @@ export default {
         _this: this
       }, res => {
         if (res.success) {
-          this.$message.success(res.data)
+          this.$message.success(res.message)
         }else {
-          this.$message.warning(res.data)
+          this.$message.success(res.message)
         }
       })
     },