Merge branch 'develop' into 'test'

Develop

See merge request LAWS/laws-system-front-FOTON!140

src/components/roleTree/index.vue

@@ -62,6 +62,7 @@
             </el-tree>
             <div id="roleFormButton" class="demo-drawer-footer">
                 <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
+
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleTreeDrawerCancel">取消</el-button>
             </div>
             <loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>

src/pages/details/otherStandardDetails/index.vue

@@ -602,8 +602,11 @@
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
-              prop="complianceRequire"
               label="符合性状态">
+            <template slot-scope="scope">
+              {{scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-'}}
+
+            </template>
           </el-table-column>
           <el-table-column
               prop="complianceState"
@@ -3079,7 +3082,6 @@ export default {
         justify-content: space-between;
         height: 50px;
         border-bottom: 1px solid #E5E5E5;
-
         .modular-header-title {
           font-size: 18px;
           font-weight: bold;

src/pages/home1/components/todoList/index.vue

@@ -621,19 +621,18 @@ export default {
                 prcType: row.prcType
               }
             })
+          } else if (row.taskInfo === '标准法规部经理审批') {
+            this.$router.push({
+              name: 'xmqdqrStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
-          // else if (row.taskInfo === '上传佐证材料填写信息') {
-          //   this.$router.push({
-          //     name: 'wfhxzgStep4',
-          //     query: {
-          //       taskIds: row.taskIds,
-          //       prcId: row.prcId,
-          //       prcNum: row.prcNum,
-          //       prcName: row.prcName,
-          //       prcType: row.prcType
-          //     }
-          //   })
-          // }
           break
 
       }

src/pages/localTool/standContrast/index.vue

@@ -51,12 +51,14 @@
                 align="center">
               </el-table-column>
               <el-table-column
+                show-overflow-tooltip
                 prop="oldStandNum"
                 label="旧文档文本号"
                 align="center"
               >
               </el-table-column>
               <el-table-column
+               show-overflow-tooltip
                 prop="oldStandName"
                 label="旧文档文本名称"
                 align="center">
@@ -67,11 +69,13 @@
                 align="center">
               </el-table-column>
               <el-table-column
+                show-overflow-tooltip
                 prop="newStandNum"
                 label="新文档文本号"
                 align="center">
               </el-table-column>
               <el-table-column
+                show-overflow-tooltip
                 prop="newStandName"
                 label="新文档文本名称"
                 align="center">

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

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -85,6 +85,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
             </div>
             <el-collapse accordion>
@@ -243,6 +245,7 @@
         name: "bzdyStep1-1",
         data() {
             return {
+                foldFormFlag: false,
                 fileMadel2: false,
                 nodeList: [],
                 nodeList2: [],
@@ -314,6 +317,9 @@
             ProcessTitle
         },
         methods: {
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getData () {
                 queryTaskFirst({
                     bpnId: this.$route.query.bpnId

src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue

@@ -21,7 +21,7 @@
           <ProcessTitle>
             <template slot="title">基础信息</template>
           </ProcessTitle>
-          <div class="prc-content-border">
+          <div class="prc-content-border" v-if="foldFormFlag === false">
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -58,6 +58,8 @@
               </el-col>
             </el-row>
           </div>
+          <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+          <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
         </el-form>
         <ProcessTitle>
           <template slot="title">调研信息</template>
@@ -199,6 +201,7 @@ export default {
   name: "bzdyStep1-9",
   data() {
     return {
+      foldFormFlag: false,
       histortData: [],
       commentText: '',
       tableData: [],
@@ -230,6 +233,9 @@ export default {
     ProcessTitle
   },
   methods: {
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
     getHistoryData () {
       this.$http.get('lawss/activiti/get_list_by_instance', {
         prcNum: this.$route.query.prcNum,

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

@@ -21,7 +21,7 @@
           <ProcessTitle>
             <template slot="title">基础信息</template>
           </ProcessTitle>
-          <div class="prc-content-border">
+          <div class="prc-content-border" v-if="foldFormFlag === false">
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -85,6 +85,8 @@
               </el-col>
             </el-row>
           </div>
+          <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+          <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
         </el-form>
       </div>
       <el-collapse accordion>
@@ -244,6 +246,7 @@ export default {
   name: "bzdyStep1",
   data() {
     return {
+      foldFormFlag: false,
       fileMadel2: false,
       commentText: '',
       nodeList: [],
@@ -316,6 +319,9 @@ export default {
     ProcessTitle
   },
   methods: {
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
     checkedRole2 (data) {
       var idList = ''
       var nameList = ''

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

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -71,6 +71,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
             </div>
             <el-collapse accordion>
@@ -174,6 +176,7 @@
         name: "bzdyStep2",
         data() {
             return {
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 taskIds: this.$route.query.taskIds,
@@ -209,6 +212,9 @@
             ProcessTitle
         },
         methods: {
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,

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

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -60,6 +60,17 @@
                                         - -
                                     </div>
                                 </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
+                    <ProcessTitle>
+                        <template slot="title">调研回执</template>
+                    </ProcessTitle>
+                    <div class="prc-content-border">
+                        <el-row :gutter="24">
+                            <el-col :span="12">
                                 <el-form-item label="调研结果" prop="fileName" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
@@ -80,6 +91,13 @@
                                         </el-button>
                                     </div>
                                 </el-form-item>
+                                <el-form-item label="回执说明" prop="title" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="form.dyhz"
+                                            placeholder="请输入回执说明"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -199,6 +217,7 @@
         name: "bzdyStep3",
         data() {
             return {
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 taskIds: this.$route.query.taskIds,
@@ -207,6 +226,7 @@
                 isSubmit: false,
                 saveLoading: false,
                 form: {
+                    dyhz: '',
                     title: '', // 调研标题
                     date: '', // 完成时间
                     modelList: [],
@@ -232,6 +252,9 @@
             ProcessTitle
         },
         methods: {
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,
@@ -304,6 +327,7 @@
             handleSubmit() {
                 this.$refs['qbkwForm'].validate((valid) => {
                     if (valid) {
+                        this.json.dyhz = this.form.dyhz
                         this.isSubmit = true
                         var json = this.json
                         json.commentText = this.commentText
@@ -341,6 +365,7 @@
                         this.form.responUserListName = data.form.responUserListName
                         this.form.fileName = data.form.fileName || data.fileName || ''
                         this.form.fileId = data.form.fileId || data.fileId || ''
+                        this.form.dyhz = data.form.dyhz || data.dyhz || ''
                     }).catch(e => {
                     })
                 })

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

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -71,6 +71,33 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
+                    <ProcessTitle>
+                        <template slot="title">调研回执</template>
+                    </ProcessTitle>
+                    <div class="prc-content-border">
+                        <el-row :gutter="24">
+                            <el-col :span="12">
+                                <el-form-item label="调研结果" prop="fileName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.file" class="fileClass" @click="updateFile(form.file)">
+                                        {{ form.fileName }}
+                                    </div>
+                                    <div v-else>
+                                        - -
+                                    </div>
+                                </el-form-item>
+                                <el-form-item label="调研回执" prop="dyhz" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.dyhz"
+                                            placeholder="请输入调研回执"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
                 </el-form>
             </div>
             <el-collapse accordion>
@@ -171,6 +198,7 @@
         name: "bzdyStep4",
         data() {
             return {
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 taskIds: this.$route.query.taskIds,
@@ -179,6 +207,7 @@
                 isSubmit: false,
                 saveLoading: false,
                 form: {
+                    dyhz: '',
                     title: '', // 调研标题
                     date: '', // 完成时间
                     modelList: [],
@@ -205,6 +234,9 @@
             ProcessTitle
         },
         methods: {
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,
@@ -264,6 +296,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.dyhz = data.dyhz || data.form.dyhz
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form

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

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -63,6 +63,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
                 <ProcessTitle>
                     <template slot="title">调研信息</template>
@@ -81,6 +83,7 @@
                         <el-table-column
                                 type="index"
                                 width="55"
+                                label="序号"
                                 align="center">
                         </el-table-column>
                         <el-table-column
@@ -89,7 +92,7 @@
                                 align="center">
                         </el-table-column>
                         <el-table-column
-                                label="文件"
+                                label="回执文件"
                                 align="center">
                             <template slot-scope="scope">
                                 <div @click="updateFile(scope.row.fileId)" class="fileClass">
@@ -214,6 +217,7 @@
         name: "bzdyStep5",
         data() {
             return {
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 tableData: [],
@@ -244,6 +248,9 @@
             ProcessTitle
         },
         methods: {
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,

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

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -58,6 +58,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
                 <ProcessTitle>
                     <template slot="title">调研信息</template>
@@ -74,6 +76,7 @@
                             ref="selection"
                     >
                         <el-table-column
+                                label="序号"
                                 type="index"
                                 width="55"
                                 align="center">
@@ -210,6 +213,7 @@
         name: "bzdyStep6",
         data() {
             return {
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 tableData: [],
@@ -241,6 +245,9 @@
             ProcessTitle
         },
         methods: {
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,

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

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -58,6 +58,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
                 <ProcessTitle>
                     <template slot="title">调研信息</template>
@@ -75,6 +77,7 @@
                     >
                         <el-table-column
                                 type="index"
+                                label="序号"
                                 width="55"
                                 align="center">
                         </el-table-column>
@@ -210,6 +213,7 @@
         name: "bzdyStep7",
         data() {
             return {
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 tableData: [],
@@ -241,6 +245,9 @@
             ProcessTitle
         },
         methods: {
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,

src/pages/processCenter/pages/creatProcess/bzdy/step8.vue

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -58,6 +58,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
                 <ProcessTitle>
                     <template slot="title">调研信息</template>
@@ -76,6 +78,7 @@
                         <el-table-column
                                 type="index"
                                 width="55"
+                                label="序号"
                                 align="center">
                         </el-table-column>
                         <el-table-column
@@ -210,6 +213,7 @@
         name: "bzdyStep8",
         data() {
             return {
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 tableData: [],
@@ -241,6 +245,9 @@
             ProcessTitle
         },
         methods: {
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,

src/pages/processCenter/pages/creatProcess/bzdy/step9.vue

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -58,6 +58,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
                 <ProcessTitle>
                     <template slot="title">调研信息</template>
@@ -76,6 +78,7 @@
                         <el-table-column
                                 type="index"
                                 width="55"
+                                label="序号"
                                 align="center">
                         </el-table-column>
                         <el-table-column
@@ -210,6 +213,7 @@
         name: "bzdyStep9",
         data() {
             return {
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 tableData: [],
@@ -241,6 +245,9 @@
             ProcessTitle
         },
         methods: {
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,

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

@@ -454,8 +454,13 @@
                         console.log(data);
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
-                        this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
-                        this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+                        if (data.form) {
+                            this.form.itemsName1 = data.form.itemsName1 || ''
+                            this.form.itemsNum1 = data.form.itemsNum1 || ''
+                        } else {
+                            this.form.itemsName1 = data.itemsName1 || ''
+                            this.form.itemsNum1 = data.itemsNum1 || ''
+                        }
                         this.sarType = data.standInData || data.sarType
                         this.json = data
                         let arr

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

@@ -589,15 +589,23 @@
                                 num6++
                             }
                         }
-                        if (num1 > 0) {
-                            this.$message.warning('请输入核心技术要求')
-                        } else if (num2 > 0) {
-                            if (this.sarType === 'INLAND') {
-                                this.$message.warning('请输入国内标准的差异点')
-                            } else {
-                                this.$message.warning('请输入基于上一版本差异')
+                        if (this.form.itemsNum1) {
+                            if (num1 > 0) {
+                                this.$message.warning('请输入核心技术要求')
+                                return
                             }
-                        } else if (num3 > 0) {
+                        } else {
+                            if (num2 > 0) {
+                                if (this.sarType === 'INLAND') {
+                                    this.$message.warning('请输入国内标准的差异点')
+                                    return
+                                } else {
+                                    this.$message.warning('请输入基于上一版本差异')
+                                    return
+                                }
+                            }
+                        }
+                        if (num3 > 0) {
                             this.$message.warning('请输入符合性要求')
                         } else if (num4 > 0) {
                             this.$message.warning('请输入新车型实施日期')
@@ -634,11 +642,15 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        console.log(data);
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
-                        this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
-                        this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+                        if (data.form) {
+                            this.form.itemsName1 = data.form.itemsName1 || ''
+                            this.form.itemsNum1 = data.form.itemsNum1 || ''
+                        } else {
+                            this.form.itemsName1 = data.itemsName1 || ''
+                            this.form.itemsNum1 = data.itemsNum1 || ''
+                        }
                         this.sarType = data.standInData || data.sarType
                         this.json = data
                         let itemList

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

@@ -438,8 +438,13 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
-                        this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
-                        this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+                        if (data.form) {
+                            this.form.itemsName1 = data.form.itemsName1 || ''
+                            this.form.itemsNum1 = data.form.itemsNum1 || ''
+                        } else {
+                            this.form.itemsName1 = data.itemsName1 || ''
+                            this.form.itemsNum1 = data.itemsNum1 || ''
+                        }
                         this.sarType = data.standInData || data.sarType
                         this.json = data
                         this.itemList = data.itemList

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

@@ -438,8 +438,13 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
-                        this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
-                        this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+                        if (data.form) {
+                            this.form.itemsName1 = data.form.itemsName1 || ''
+                            this.form.itemsNum1 = data.form.itemsNum1 || ''
+                        } else {
+                            this.form.itemsName1 = data.itemsName1 || ''
+                            this.form.itemsNum1 = data.itemsNum1 || ''
+                        }
                         this.sarType = data.standInData || data.sarType
                         this.json = data
                         this.itemList = data.itemList

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

@@ -437,8 +437,13 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
-                        this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
-                        this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+                        if (data.form) {
+                            this.form.itemsName1 = data.form.itemsName1 || ''
+                            this.form.itemsNum1 = data.form.itemsNum1 || ''
+                        } else {
+                            this.form.itemsName1 = data.itemsName1 || ''
+                            this.form.itemsNum1 = data.itemsNum1 || ''
+                        }
                         this.sarType = data.standInData || data.sarType
                         this.json = data
                         this.itemList = data.itemList

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

@@ -370,6 +370,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -334,6 +334,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -333,6 +333,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -333,6 +333,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -318,6 +318,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -316,6 +316,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -318,6 +318,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -271,6 +271,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -444,6 +444,7 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -318,6 +318,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -316,6 +316,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -318,6 +318,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -106,6 +106,19 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
+            <el-timeline-item timestamp="选择审批人" placement="top"
+                              :color="roleForm.approveId ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="approveName" style="margin-bottom: 0">
+                  <h4>审批人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.approveId" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.approveName" placeholder="选择法规部经理"
+                              @click.native="choiceZRR('approveId', '选择法规部经理', roleForm.approveId)"></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
           </el-form>
         </el-timeline>
       </div>
@@ -412,7 +425,9 @@ export default {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.userId,
         confirmId: "",
-        confirmName: ""
+        confirmName: "",
+        approveId: "",
+        approveName: "",
       },
       //表单验证
       formRules: {
@@ -579,6 +594,9 @@ export default {
       if (this.type === "confirmId") {
         this.roleForm.confirmId = data[0].id;
         this.roleForm.confirmName = data[0].name;
+      }else if(this.type === "approveId"){
+        this.roleForm.approveId = data[0].id;
+        this.roleForm.approveName = data[0].name;
       }
       this.modalshowflag = false;
     },

src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue

@@ -2,7 +2,7 @@
   <div class="xmqdqr-step2">
     <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>
@@ -253,7 +253,7 @@ import ProcessTitle from "../../components/ProcessTitle";
 import { inboundLiaisonDetail, queryDetail } from "api/process";
 
 export default {
-  name: "xmqdqrStep1-2",
+  name: "xmqdqrStep1-3",
   components: {
     ProcessTitle,
     ProcessHeader,
@@ -348,44 +348,46 @@ export default {
     },
     //动态表单读取
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         if(item.form === undefined){
           this.qdform = JSON.parse(JSON.stringify(item));
           this.qdform.prcNum = this.prcNum;
           this.qdform.prcName = this.prcName;
           this.qdform["id"] = item.id;
+          this.dataList = item.dataList
           this.projectId = item.projectId
-          this.getStandData();
+          // this.getStandData();
         }else{
           this.qdform = item.form
           this.dataList =item.form.dataList
           this.projectId = item.form.projectId
-          this.getStandData();
+          // this.getStandData();
         }
       });
     },
     //查询清单下的标准
-    getStandData() {
-      this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, {
-        _this: this
-      }, res => {
-        this.dataList = res.data.records;
-        this.dataList.forEach(item => {
-          // 责任部门转换
-          if (item.zrbm !== null || item.zrbm !== "") {
-            let k = (item.zrbm || "").split(",");
-            for (let i in this.zrbmOptions) {
-              for (let m = 0; m < k.length; m++) {
-                if (this.zrbmOptions[i].value === k[m]) {
-                  k[m] = this.zrbmOptions[i].label;
-                }
-                item.zrbm = k.join(",");
-              }
-            }
-          }
-        });
-      });
-    },
+    // getStandData() {
+    //   this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, {
+    //     _this: this
+    //   }, res => {
+    //     this.dataList = res.data.records;
+    //     this.dataList.forEach(item => {
+    //       // 责任部门转换
+    //       if (item.zrbm !== null || item.zrbm !== "") {
+    //         let k = (item.zrbm || "").split(",");
+    //         for (let i in this.zrbmOptions) {
+    //           for (let m = 0; m < k.length; m++) {
+    //             if (this.zrbmOptions[i].value === k[m]) {
+    //               k[m] = this.zrbmOptions[i].label;
+    //             }
+    //             item.zrbm = k.join(",");
+    //           }
+    //         }
+    //       }
+    //     });
+    //   });
+    // },
     //添加标准勾选框数据
     selectStand(data) {
       this.standList = data;

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

@@ -105,6 +105,19 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
+            <el-timeline-item timestamp="选择审批人" placement="top"
+                              :color="roleForm.approveId ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="approveName" style="margin-bottom: 0">
+                  <h4>审批人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.approveId" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.approveName" placeholder="选择法规部经理"
+                              @click.native="choiceZRR('approveId', '选择法规部经理', roleForm.approveId)"></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
           </el-form>
         </el-timeline>
       </div>
@@ -412,7 +425,9 @@ export default {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.userId,
         confirmId: "",
-        confirmName: ""
+        confirmName: "",
+        approveId: "",
+        approveName:"",
       },
       //表单验证
       formRules: {
@@ -430,6 +445,9 @@ export default {
       roleFormRules: {
         confirmName: [
           { required: true, message: "请选择确认人", trigger: "change" }
+        ],
+        approveName: [
+          { required: true, message: "请选择审批人", trigger: "change" }
         ]
       }
     };
@@ -577,6 +595,9 @@ export default {
       if (this.type === "confirmId") {
         this.roleForm.confirmId = data[0].id;
         this.roleForm.confirmName = data[0].name;
+      }else if(this.type === "approveId"){
+        this.roleForm.approveId = data[0].id;
+        this.roleForm.approveName = data[0].name;
       }
       this.modalshowflag = false;
     },

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

@@ -340,7 +340,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                prop="XCXSSRQ"
+                prop="xcxssrqgj"
                 align="center"
                 label="新车型实施日期">
                 <template slot-scope="scope">
@@ -349,7 +349,7 @@
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
-                prop="ZCCSSRQ"
+                prop="zccssrqgj"
                 align="center"
                 label="在产车实施日期">
                 <template slot-scope="scope">
@@ -423,7 +423,9 @@ export default {
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,
+      drawerTitle:'',
       active: "1",
+      nodeList: [],
       loading: false,
       // 当前流程类型(1待办/2已办)
       processType: 1,

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

@@ -0,0 +1,671 @@
+<template>
+  <div class="xmqdqr-step2">
+    <ProcessHeader toggle>
+      <template slot="proName">项目清单确认流程</template>
+      <template slot="proNode">法规部经理审批</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="qdform"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="qdform.projectNumber"
+                  placeholder="请输入项目编号"
+                  disabled
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="qdform.projectName"
+                  placeholder="请输入项目名称"
+                  disabled
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="清单名称" prop="detailedListName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="qdform.detailedListName"
+                  placeholder="请输入清单名称"
+                  disabled
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title style="margin-top:5px; margin-bottom: 5px">
+          <template slot="title">填写信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          ref="selection"
+          height="65%"
+          @selection-change="selectStandChange"
+          style="width: 100%; border:1px solid #ccc"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            align="center"
+            width="200px"
+            label="标准号"
+          >
+            <template slot-scope="scope">
+              <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort
+                }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
+                {{ scope.row.standNumber }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="standName"
+            align="center"
+            label="中文名称"
+            width="180px"
+          >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="standEnName"
+            label="英文名称"
+            align="center"
+            width="180px"
+          >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="190px"
+            align="center"
+            sortable
+            label="标准实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrq"
+            width="190px"
+            align="center"
+            label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zccssrq"
+            align="center"
+            sortable
+            width="190px"
+            label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zrbm"
+            label="责任部门"
+            align="center"
+            width="180px"
+          >
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="kccvppsbm"
+            width="180px"
+            align="center"
+            label="卡车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="kccvppscn"
+            width="180px"
+            align="center"
+            label="卡车vpps中文名称">
+          </el-table-column>
+          <el-table-column
+            prop="cycvppsbm"
+            width="180px"
+            align="center"
+            label="乘用车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            prop="cycvppscn"
+            width="180px"
+            align="center"
+            label="乘用车vpps中文名称">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list" style="height: 100%">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="审批意见"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-back
+      show-transfer
+      show-submit
+      :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @transfer="handleTransfer"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedTransferRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { changeAssigneeNew, inboundLiaisonDetail, queryDetail } from "api/process";
+
+export default {
+  name: "xmqdqrStep3",
+  components: {
+    ProcessTitle,
+    ProcessHeader,
+    ProcessFooter
+  },
+  data() {
+    return {
+      active: "1",
+      loading: false,
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      nodeList: [],
+      drawerTitle: '',
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      isSubmit: false,
+      isTransfer: false,
+      saveLoading: false,
+      projectId: "",
+      detailedId: "",
+      standSortOptions: [],
+      standList: [],
+      projectStand:[],
+      standardData: [],
+      page: 1,
+      pageSize: this.$store.getters.userInfo.configContent,
+      total: 0,
+      //查询清单下标准数据
+      standCommonlySearch: {
+        standSort: "",
+        standNumber: "",
+        standType: "",
+        page: 1,
+        Size: this.$store.getters.userInfo.configContent
+      },
+      //表单的数据
+      qdform: {
+        BZFlag: " ", //1审批通过 其他为驳回
+        projectNumber: "",  //项目编号
+        projectName: "",  //项目名称
+        dataList: [], //项目下的标准数据
+        breakdownList: [] //标准下的分解单数据
+      },
+      dataList: [], //展示的标准数据
+      commentText: "", //审批意见
+      detailData: [],//流程历史数据
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      standMap: new Map(),
+      textStatusMap: {}// 文本状态id与name对应
+    };
+  },
+  methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum () {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res;
+      }, e => {
+      });
+    },
+    //tab改变
+    handleTabs(type) {
+      this.active = type;
+    },
+    // 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
+    //获取数据
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    //动态表单读取
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        if(item.form === undefined){
+          this.qdform = JSON.parse(JSON.stringify(item));
+          this.qdform.prcNum = this.prcNum;
+          this.qdform.prcName = this.prcName;
+          this.dataList = item.dataList
+          this.qdform["id"] = item.id;
+          this.projectId = item.projectId
+          // this.getStandData();
+        }else{
+          this.qdform = item.form
+          this.dataList =item.form.dataList
+          this.projectId = item.form.projectId
+          // this.getStandData();
+        }
+      });
+    },
+    //提交事件
+    handleSubmit() {
+      this.isSubmit = true;
+      this.qdform.passFlag = "0";
+      this.qdform.commentText = this.commentText;
+      this.qdform.dataList = this.dataList
+      const json = JSON.stringify(this.qdform);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false;
+      }, e => {
+      });
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
+    //驳回事件
+    beforeBack() {
+      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
+        this.$message.warning("请填写审批意见");
+      } else {
+        this.qdform.passFlag = "1";
+        this.qdform.commentText = this.commentText;
+        const json = JSON.stringify(this.qdform);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+        }, e => {
+        });
+      }
+    },
+    //添加标准勾选框数据
+    selectStand(data) {
+      this.standList = data;
+    },
+    selectStandChange(data){
+      this.projectStand = data
+    },
+    cancelStand() {
+      this.standModel = false;
+    },
+    //添加标准带入事件
+    okStand() {
+      if(this.standList.length < 1){
+        this.$message.warning('请至少选择一条数据进行添加')
+      }else{
+        this.standList.forEach(item =>{
+          if(item.ssrq === "-"){
+            item.ssrq = ''
+          }
+          if(item.zrbm === '[]'){
+            item.zrbm =''
+          }
+        })
+        this.standList.map(item => {
+          let addIndex
+          addIndex = this.dataList.findIndex(items =>{
+            return items.standId === item.id
+          })
+          if(addIndex > -1){
+            this.$message.warning('请勿重复添加数据')
+          }else{
+            this.dataList.push(item)
+          }
+        })
+
+        this.standModel = false
+      }
+
+    },
+    //添加标准的查询按钮
+    search() {
+      this.getStand();
+    },
+    clearSearch() {
+      this.standCommonlySearch = {
+        standSort: "",
+        standNumber: "",
+        standType: ""
+      };
+      this.getStand();
+    },
+    pageChange(page) {
+      this.page = page;
+      this.getStand();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.getStand();
+    },
+    getStand(data) {
+      this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
+        id: this.detailedId,
+        page: this.page,
+        Size: this.pageSize,
+        ...this.standCommonlySearch
+      }, {
+        _this: this
+      }, res => {
+        if (res.data === null) {
+          this.standardData = "";
+          this.totalDo = "";
+        }
+        this.standardData = res.data.records;
+        this.standardData.forEach(item => {
+          if (item.zccssrqgj === "-") {
+            item.zccssrqgj = "";
+          }
+          if (item.xcxssrqgj === "-") {
+            item.xcxssrq = "";
+          }
+        });
+        this.total = res.data.total;
+      });
+    },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label);
+      });
+    },
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+    // 查询各下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", "", {
+      _this: this,
+      loading: "loading"
+    }, res => {
+      this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
+      this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别
+      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+      this.setMap(this.zrbmMap, res.data.ZRBMCLASS);
+      this.setMap(this.standStateOptions);
+      this.showLocalProductData(this.getLocalPro);
+    }, e => {
+    });
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.xmqdqr-step2 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
+

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

@@ -257,7 +257,7 @@ export default {
           this.toProcessDetail('bzzqyjStep1-9',row)
         }else if(prcType === '10'){
           //项目清单确认
-          this.toProcessDetail('xmqdqrStep1-2',row)
+          this.toProcessDetail('xmqdqrStep1-3',row)
         }
       } else {
         this.$message.warning('当前流程未全部办理完成，无法查看')

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -856,6 +856,17 @@ export default {
                 prcType: row.prcType
               }
             })
+          } else if(row.taskInfo === '标准法规部经理审批'){
+            this.$router.push({
+              name: 'xmqdqrStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
           break
       }

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -182,9 +182,10 @@
             </el-table-column>
             <el-table-column
                 label="标准号"
+                width="130"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: red"
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
                   }}-{{ scope.row.standYear }}</a>
@@ -200,9 +201,10 @@
             <el-table-column
                 prop="standName"
                 label="标准名称"
+                width="210"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: red">{{ scope.row.standName }}</a>
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
                 <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
               </template>
             </el-table-column>
@@ -212,18 +214,18 @@
                 width="110px"
                 label="发布日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: red">{{ formatIssueDate(scope.row.issueTime) }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
                 <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
               </template>
             </el-table-column>
             <el-table-column
                 prop="SSRQ"
                 sortable="custom"
-                width="150px"
+                width="110px"
                 label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: red">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
 
               </template>
@@ -235,7 +237,7 @@
                 width="150px"
                 label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: red">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
               </template>
             </el-table-column>
@@ -245,7 +247,7 @@
                 width="150px"
                 label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: red">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
               </template>
             </el-table-column>
@@ -260,7 +262,7 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: red">{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ textStatusMap[scope.row.textStatus] }}</span>
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -297,7 +297,7 @@
           >
             <template slot-scope="scope">
 <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
-              <a v-if="scope.row.standStatusShow === '作废'" style="color: red" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
               <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
               <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
             </template>
@@ -308,7 +308,7 @@
             label="中文名称"
           >
             <template slot-scope="scope">
-              <a v-if="scope.row.standStatusShow === '作废'" style="color: red" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
               <a v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
               <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
             </template>
@@ -319,7 +319,7 @@
             label="英文名称"
           >
             <template slot-scope="scope">
-              <a v-if="scope.row.standStatusShow === '作废'" style="color: red" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
               <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
               <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
             </template>
@@ -331,7 +331,7 @@
             width="110"
           >
             <template slot-scope="scope">
-              <span v-if="scope.row.standStatusShow === '作废'" style="color: red">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+              <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
               <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
               <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
             </template>
@@ -343,7 +343,7 @@
             width="110"
           >
             <template slot-scope="scope">
-              <span v-if="scope.row.standStatusShow === '作废'" style="color: red">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+              <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
               <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
               <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
             </template>
@@ -357,7 +357,7 @@
             >
 
               <template slot-scope="scope">
-                <span v-if="scope.row.standStatusShow === '作废'" style="color: red">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
                   {{scope.row.standStatusShow}}
                 </span>
                 <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -169,6 +169,7 @@
             </el-table-column>
             <el-table-column
               label="标准号"
+              width="130"
             >
               <template slot-scope="scope">
                 <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
@@ -178,6 +179,7 @@
             <el-table-column
               prop="standName"
               label="标准名称"
+              width="210"
             >
               <template slot-scope="scope">
                 <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -186,7 +188,7 @@
             <el-table-column
               prop="issueTime"
               sortable="custom"
-              width="110px"
+              width="110"
               label="发布日期">
               <template slot-scope="scope">
                 <div>
@@ -199,7 +201,7 @@
             <el-table-column
                 prop="SSRQ"
                 sortable="custom"
-                width="150px"
+                width="110"
                 label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
@@ -210,7 +212,7 @@
             <el-table-column
                 prop="XCXSSRQ"
                 sortable="custom"
-                width="150px"
+                width="150"
                 label="新车型实施日期">
               <template slot-scope="scope">
                 <a>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</a>

src/router/index.js

@@ -557,9 +557,18 @@ const routes = [
         }
       },
       {
-        path: '/xmqdqrStep1-2',
-        name: 'xmqdqrStep1-2',
-        component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue'),
+        path: '/xmqdqrStep1-3',
+        name: 'xmqdqrStep1-3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目清单确认流程'
+        }
+      },
+      {
+        path: '/xmqdqrStep3',
+        name: 'xmqdqrStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue'),
         meta: {
           requireAuth: true,
           title: '项目清单确认流程'