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

src/components/CustomFormComponents/File.vue

@@ -255,7 +255,7 @@ export default {
     uploadSuccess(res, file, fileList) {
       if (res.ok) {
         // this.value += res.data.id + ','
-        this.$emit('input', this.value + res.data.id + ',')
+        this.$emit('input', this.value ? this.value + ',' : this.value+ res.data.id + ',')
         this.$emit('success')
         this.$message({
           message: '文件上传成功',

src/pages/config/pages/mechanismManage/index.vue

@@ -312,7 +312,7 @@ export default {
   }
   .tree-content {
     background: #fff;
-    width: 16%;
+    width: 300px;
     position: relative;
     .tree {
       width: 95%;

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

@@ -87,6 +87,7 @@ export default {
               }
             })
           }
+          break
         case '2':
           if (row.taskInfo === '责任对接人选择责任人') {
             this.$router.push({
@@ -110,9 +111,166 @@ export default {
                 prcType: row.prcType
               }
             })
+          } else if (row.taskInfo === '责任对接人审批') {
+            this.$router.push({
+              name: 'bzdyStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '标准法规工程师调研汇总'){
+            this.$router.push({
+              name: 'bzdyStep5',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '责任人会签'){
+            this.$router.push({
+              name: 'bzdyStep6',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '部长+对接人审核') {
+            this.$router.push({
+              name: 'bzdyStep7',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo.indexOf('工程研究总院院长') == 0 ) {
+            this.$router.push({
+              name: 'bzdyStep9',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else {
+            this.$router.push({
+              name: 'bzdyStep8',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
           break;
-          //标准清单更新/发布流程
+        case '3':
+          if (row.taskInfo === '责任对接人选择责任人') {
+            this.$router.push({
+              name: 'bzzqyjStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '责任人填写征求意见'){
+            this.$router.push({
+              name: 'bzzqyjStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '责任对接人审批') {
+            this.$router.push({
+              name: 'bzzqyjStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '标准法规工程师汇总填写处理意见') {
+            this.$router.push({
+              name: 'bzzqyjStep5',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '责任人会签') {
+            this.$router.push({
+              name: 'bzzqyjStep6',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '部长+对接人审核') {
+            this.$router.push({
+              name: 'bzzqyjStep7',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo.indexOf('技术委员会相关专委会主任') == 0 ) {
+            this.$router.push({
+              name: 'bzzqyjStep8',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else {
+            this.$router.push({
+              name: 'bzzqyjStep9',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+              //标准清单更新/发布流程
         case'4' :
           if (row.taskInfo === '进行会签，填写意见') {
             this.$router.push({
@@ -148,8 +306,8 @@ export default {
               }
             })
           }
-          break;
+          break
-          //项目合规评估流程
+              //项目合规评估流程
         case '5' :
           if(row.taskInfo === '标准法规部业务经理审批'){
             this.$router.push({
@@ -162,8 +320,293 @@ export default {
                 prcType: row.prcType
               }
             })
+          }else if(row.taskInfo === '标准评估任务下发'){
+            this.$router.push({
+              name: 'xmpgStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '合规性评估'){
+            this.$router.push({
+              name: 'xmpgStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '分发责任人审核'){
+            this.$router.push({
+              name: 'xmpgStep5',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '汇总审核'){
+            this.$router.push({
+              name: 'xmpgStep6',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '标准法规部领导审核'){
+            this.$router.push({
+              name: 'xmpgStep7',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+              //项目评估流程-项目
+        case '6':
+          if(row.taskInfo === '标准法规部业务经理审批'){
+            this.$router.push({
+              name: 'xmpg2Step2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '工程经理转办'){
+            this.$router.push({
+              name: 'xmpg2Step3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '架构经理任务分发') {
+            this.$router.push({
+              name: 'xmpg2Step4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '分发责任人下发') {
+            this.$router.push({
+              name: 'xmpg2Step5',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '合规性评估') {
+            this.$router.push({
+              name: 'xmpg2Step6',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '分发负责人审批') {
+            this.$router.push({
+              name: 'xmpg2Step7',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '架构经理审批') {
+            this.$router.push({
+              name: 'xmpg2Step8',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '工程经理审批') {
+            this.$router.push({
+              name: 'xmpg2Step9',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '标准法规部经理审批') {
+            this.$router.push({
+              name: 'xmpg2Step10',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '汇总审批') {
+            this.$router.push({
+              name: 'xmpg2Step11',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '标准法规部部长审批') {
+            this.$router.push({
+              name: 'xmpg2Step12',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+              //未符合项整改流程
+        case '8' :
+          if(row.taskInfo === '下发至标准法规工程师'){
+            this.$router.push({
+              name: 'wfhxzgStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '确认+选择责任人') {
+            this.$router.push({
+              name: 'wfhxzgStep3',
+              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
+              }
+            })
+          }else {
+            this.$router.push({
+              name: 'wfhxzgStep5',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+        case '9':
+          if (row.taskInfo === '选择执行人') {
+            this.$router.push({
+              name: 'bzjdStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '填写解读分析') {
+            this.$router.push({
+              name: 'bzjdStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '责任人审核') {
+            this.$router.push({
+              name: 'bzjdStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '工程师审核') {
+            this.$router.push({
+              name: 'bzjdStep5',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '部长审批') {
+            this.$router.push({
+              name: 'bzjdStep6',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
-
       }
     },
   },

src/pages/localTool/standAutoSplit/index.vue

@@ -51,20 +51,12 @@
                 prop="showNumber"
                 label="标准号/政策号"
                 align="center">
-              <template slot-scope="scope">
-                <div v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNumSplit }}</div>
-                <div v-else>{{ scope.row.showNumber }}</div>
-              </template>
             </el-table-column>
             <el-table-column
                 prop="standName"
                 label="标准名称/政策名称"
                 show-overflow-tooltip
                 align="center">
-              <template slot-scope="scope">
-                <span v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNameSplit }}</span>
-                <span v-else>{{ scope.row.standName }}</span>
-              </template>
             </el-table-column>
             <el-table-column
                 prop="fileTypeShow"
@@ -77,20 +69,14 @@
                 show-overflow-tooltip
                 align="center">
             </el-table-column>
-            <el-table-column
-                prop="splitStatus"
-                label="拆分状态"
-                align="center">
-              <template slot-scope="scope">
-                <div>{{ scope.row.splitStatus == '0' ? '编辑中' : (scope.row.splitStatus == '1' ? '审核中' : '已完成' +
-                    '') }}</div>
-              </template>
-            </el-table-column>
             <el-table-column
                 prop="creationTime"
                 label="拆分时间"
                 sortable
                 align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.creationTime ? $moment(scope.row.creationTime).format('YYYY-MM-DD') : '' }}</span>
+              </template>
             </el-table-column>
             <el-table-column
                 prop="result"
@@ -102,28 +88,12 @@
                 <el-tag type="danger" size="small" v-else>失败</el-tag>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="50" fixed="right">
+            <el-table-column label="操作" align="center" width="50">
               <template slot-scope="scope">
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="''">查看</el-dropdown-item>
-<!--                    <el-dropdown-item-->
-<!--                        v-if="scope.row.collectBtn"-->
-<!--                        :command="[scope.row, '收藏']"-->
-<!--                        v-btn-permission="''"-->
-<!--                    >-->
-<!--                      收藏-->
-<!--                    </el-dropdown-item>-->
-<!--                    <el-dropdown-item-->
-<!--                        v-else-->
-<!--                        :command="[scope.row, '取消收藏']"-->
-<!--                        v-btn-permission="''"-->
-<!--                    >-->
-<!--                      取消收藏-->
-<!--                    </el-dropdown-item>-->
-<!--                    <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="''">分享</el-dropdown-item>-->
-<!--                    <el-dropdown-item :command="[scope.row, '关联']">关联</el-dropdown-item>-->
                     <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>

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

@@ -2245,15 +2245,7 @@ export default {
       })
     },
     jurisdictionCheck() {
-      if (this.jurisdiction === '0') {
+      return true
-        this.$message.warning('审核中，不可操作')
-        return false
-      } else if (this.jurisdiction === '1') {
-        this.$message.warning('编辑中，不可操作')
-        return false
-      } else {
-        return true
-      }
     }
   },
   props: {},

src/pages/localTool/standardRecognition/index.vue

@@ -291,158 +291,158 @@ export default {
           label: "关联文件",
         },
       ],
-      // standRecoColumn: [
+/*      standRecoColumn: [
-      //   {
+        {
-      //     type: 'selection',
+          type: 'selection',
-      //     width: 60,
+          width: 60,
-      //     align: 'center'
+          align: 'center'
-      //   },
+        },
-      //   {
+        {
-      //     title: '序号',
+          title: '序号',
-      //     type: 'index',
+          type: 'index',
-      //     align: 'center'
+          align: 'center'
-      //   },
+        },
-      //   {
+        {
-      //     title: '资料类型',
+          title: '资料类型',
-      //     key: 'fileType',
+          key: 'fileType',
-      //     align: 'center',
+          align: 'center',
-      //     render: (h, params) => {
+          render: (h, params) => {
-      //       let texts
+            let texts
-      //       if (params.row.fileType === '1') {
+            if (params.row.fileType === '1') {
-      //         texts = '国内标准法规'
+              texts = '国内标准法规'
-      //       } else if (params.row.fileType === '2') {
+            } else if (params.row.fileType === '2') {
-      //         texts = '海外标准法规'
+              texts = '海外标准法规'
-      //       } else if (params.row.fileType === '3') {
+            } else if (params.row.fileType === '3') {
-      //         texts = '政策'
+              texts = '政策'
-      //       } else if (params.row.fileType === '4') {
+            } else if (params.row.fileType === '4') {
-      //         texts = '企业标准'
+              texts = '企业标准'
-      //       } else {
+            } else {
-      //         texts = '标准'
+              texts = '标准'
-      //       }
+            }
-      //       return h('div', {
+            return h('div', {
-      //         class: {
+              class: {
-      //           'text-overflow-hidden': true
+                'text-overflow-hidden': true
-      //         },
+              },
-      //         attrs: {
+              attrs: {
-      //           title: texts
+                title: texts
-      //         }
+              }
-      //       }, texts)
+            }, texts)
-      //     }
+          }
-      //   },
+        },
-      //   {
+        {
-      //     title: '标准号/政策号',
+          title: '标准号/政策号',
-      //     key: 'standNumber',
+          key: 'standNumber',
-      //     align: 'center'
+          align: 'center'
-      //   },
+        },
-      //   {
+        {
-      //     title: '标准名称/政策名称',
+          title: '标准名称/政策名称',
-      //     key: 'standName',
+          key: 'standName',
-      //     align: 'center'
+          align: 'center'
-      //   },
+        },
-      //   {
+        {
-      //     title: '文本状态',
+          title: '文本状态',
-      //     key: 'fileStatus',
+          key: 'fileStatus',
-      //     align: 'center',
+          align: 'center',
-      //     render: (h, params) => {
+          render: (h, params) => {
-      //       let texts
+            let texts
-      //       if (params.row.fileType === 'STAND_FILE') {
+            if (params.row.fileType === 'STAND_FILE') {
-      //         texts = '标准文本'
+              texts = '标准文本'
-      //       } else if (params.row.fileType === 'DRAFT_FILE') {
+            } else if (params.row.fileType === 'DRAFT_FILE') {
-      //         texts = '草案'
+              texts = '草案'
-      //       } else if (params.row.fileType === 'OPINION_FILE') {
+            } else if (params.row.fileType === 'OPINION_FILE') {
-      //         texts = '征求意见稿'
+              texts = '征求意见稿'
-      //       } else if (params.row.fileType === 'SENT_SCREEN_FILE') {
+            } else if (params.row.fileType === 'SENT_SCREEN_FILE') {
-      //         texts = '送审稿'
+              texts = '送审稿'
-      //       } else if (params.row.fileType === 'APPROVAL_FILE') {
+            } else if (params.row.fileType === 'APPROVAL_FILE') {
-      //         texts = '报批稿'
+              texts = '报批稿'
-      //       } else if (params.row.fileType === 'RELEVANCE_FILE') {
+            } else if (params.row.fileType === 'RELEVANCE_FILE') {
-      //         texts = '关联文件'
+              texts = '关联文件'
-      //       }
+            }
-      //       return h('div', {
+            return h('div', {
-      //         class: {
+              class: {
-      //           'text-overflow-hidden': true
+                'text-overflow-hidden': true
-      //         },
+              },
-      //         attrs: {
+              attrs: {
-      //           title: texts
+                title: texts
-      //         }
+              }
-      //       }, texts)
+            }, texts)
-      //     }
+          }
-      //   },
+        },
-      //   {
+        {
-      //     title: '转换结果',
+          title: '转换结果',
-      //     key: 'resultContent',
+          key: 'resultContent',
-      //     align: 'center'
+          align: 'center'
-      //   },
+        },
-      //   {
+        {
-      //     title: '消耗时间',
+          title: '消耗时间',
-      //     key: 'spendTime',
+          key: 'spendTime',
-      //     align: 'center'
+          align: 'center'
-      //   },
+        },
-      //   {
+        {
-      //     title: '操作',
+          title: '操作',
-      //     key: 'action',
+          key: 'action',
-      //     width: 200,
+          width: 200,
-      //     align: 'center',
+          align: 'center',
-      //     render: (h, params) => {
+          render: (h, params) => {
-      //       return h('div', [
+            return h('div', [
-      //         h('Button', {
+              h('Button', {
-      //           props: {
+                props: {
-      //             type: 'primary',
+                  type: 'primary',
-      //             size: 'small'
+                  size: 'small'
-      //           },
+                },
-      //           style: {
+                style: {
-      //             marginRight: '5px'
+                  marginRight: '5px'
-      //           },
+                },
-      //           on: {
+                on: {
-      //             click: () => {
+                  click: () => {
-      //               this.downloadFile(params.row)
+                    this.downloadFile(params.row)
-      //             }
+                  }
-      //           }
+                }
-      //         }, '获取文件'),
+              }, '获取文件'),
-      //         h('Button', {
+              h('Button', {
-      //           props: {
+                props: {
-      //             type: 'warning',
+                  type: 'warning',
-      //             size: 'small'
+                  size: 'small'
-      //           },
+                },
-      //           style: {
+                style: {
-      //             marginRight: '5px'
+                  marginRight: '5px'
-      //           },
+                },
-      //           on: {
+                on: {
-      //             click: () => {
+                  click: () => {
-      //               this.editOcrRecord(params.row)
+                    this.editOcrRecord(params.row)
-      //             }
+                  }
-      //           }
+                }
-      //         }, '编辑'),
+              }, '编辑'),
-      //         h('Dropdown', {
+              h('Dropdown', {
-      //           props: {
+                props: {
-      //             trigger: 'click'
+                  trigger: 'click'
-      //           },
+                },
-      //           on: {
+                on: {
-      //             'on-click': (value) => {}
+                  'on-click': (value) => {}
-      //           }
+                }
-      //         }, [
+              }, [
-      //           h('Button', {
+                h('Button', {
-      //             props: {
+                  props: {
-      //               type: 'primary',
+                    type: 'primary',
-      //               size: 'small'
+                    size: 'small'
-      //             }
+                  }
-      //           }, '更多'),
+                }, '更多'),
-      //           h('DropdownMenu', {
+                h('DropdownMenu', {
-      //             slot: 'list'
+                  slot: 'list'
-      //           },
+                },
-      //           this.dropdownItems.map(function (type) {
+                this.dropdownItems.map(function (type) {
-      //             return h('DropdownItem', {
+                  return h('DropdownItem', {
-      //               props: {
+                    props: {
-      //                 name: type.val
+                      name: type.val
-      //               }
+                    }
-      //             }, type.val)
+                  }, type.val)
-      //           })
+                })
-      //           )
+                )
-      //         ])
+              ])
-      //       ])
+            ])
-      //     }
+          }
-      //   }
+        }
-      // ],
+      ],*/
       modalType: "",
       standRecoList: [],
       selectTableData: [],
@@ -759,7 +759,7 @@ export default {
         (res) => {
           if (res.ok) {
             this.standRecoList = res.data.list;
-            this.total = res.data.count;
+            this.total = res.data.list.length;
           }
         },
         e => {}

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

@@ -103,7 +103,6 @@
           </el-table-column>
           <el-table-column
             prop="code"
-            fixed="left"
             width="180px"
             align="center"
             label="标准号">
@@ -128,20 +127,20 @@
             label="发布日期">
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="XCXSSRQ"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="zccssrqgj"
+            prop="ZCCSSRQ"
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -150,6 +149,9 @@
             align="center"
             width="120px"
             label="文本状态">
+            <template slot-scope="scope">
+              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
           </el-table-column>
         </el-table>
       </div>
@@ -324,26 +326,13 @@
               }}</span>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="applicationScope"
-                label="适用领域"
-                align="center">
-                <template slot-scope="scope">
-            <span
-              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
-              }}</span>
-                </template>
-              </el-table-column>
               <el-table-column
                 prop="updateTime"
                 label="更新时间"
                 sortable
                 align="center">
                 <template slot-scope="scope">
-                  <div>
+                  <span>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : "" }}</span>
-                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
-                    }}
-                  </div>
                 </template>
               </el-table-column>
               <el-table-column
@@ -569,7 +558,7 @@
                     class="common-button-primary"
                     size="small"
                     v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
-                    @click="addList">
+                    @click="getStandData">
                     查询
                   </el-button>
                 </el-form-item>
@@ -601,7 +590,6 @@
               </el-table-column>
               <el-table-column
                 prop="code"
-                fixed="left"
                 align="center"
                 label="标准号">
                 <template slot-scope="scope">
@@ -624,22 +612,25 @@
                 prop="issueTime"
                 align="center"
                 label="发布日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+                </template>
               </el-table-column>
               <el-table-column
-                prop="xcxssrqgj"
+                prop="XCXSSRQ"
                 align="center"
                 label="新车型实施日期">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
                 </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
-                prop="zccssrqgj"
+                prop="ZCCSSRQ"
                 align="center"
                 label="在产车实施日期">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -647,6 +638,9 @@
                 prop="textStatus"
                 align="center"
                 label="文本状态">
+                <template slot-scope="scope">
+                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                </template>
               </el-table-column>
             </el-table>
           </div>
@@ -758,7 +752,7 @@ export default {
         directorUser: "",
         dockUserName: "",
         ministerUserName: "",
-        directorUserName: "",
+        directorUserName: ""
       },
       formRules: {
         listType: [
@@ -807,26 +801,26 @@ export default {
       listForm: {
         listType: "", //区分是哪个清单
         listName: "", //清单名称
-        // applyRegion: "", //适用区域
         descriptionList: "", //清单说明
         fileId: "",
         model: "", // 上传模板
         modelName: "",
         standId: "", //选择的清单的id
         signFlag: "1",  //是否会签  1为会签 2为不会签
-        inforlist: "", //用来存放标准列表的标准id
+        inforlist: " ", //用来存放标准列表的标准id
         dataList: [{
           code: "", //标准号
           standName: "", //标准名称
           issueTime: "", //发布日期
-          xcxssrqgj: "", //新车型实施日期
+          XCXSSRQ: "", //新车型实施日期
-          zccssrqgj: "", //在产车实施日期
+          ZCCSSRQ: "", //在产车实施日期
           textStatus: "", //文本状态
           id: ""
         }]
       },
       choiceForm: {}, //选择标准清单列表
       // countryOptions: [], //适用区域下拉框数据
+      standStateOptions: [],
       standardTypeOptions: [
         {
           value: "INLAND",
@@ -844,7 +838,8 @@ export default {
       user3: "",
       user4: "",
       user5: "",
-      standMap: new Map()
+      standMap: new Map(),
+      textStatusMap: {}// 文本状态id与name对应
     };
   },
   methods: {
@@ -974,10 +969,9 @@ export default {
         standType: "",
         standNumber: ""
       };
-      this.addList();
+      this.getStandData();
     },
-    //点击添加事件
+    getStandData() {
-    addList() {
       this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
         standType: this.standardSearch.standType,
         standNumber: this.standardSearch.standNumber,
@@ -988,12 +982,21 @@ export default {
       }, res => {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
-          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
-          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
-        })
+        });
         this.totalNo = res.data.count;
       }, e => {
       });
+    },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label);
+      });
+    },
+    //点击添加事件
+    addList() {
       this.standModel = true;
     },
     // 点击批量删除事件
@@ -1032,7 +1035,7 @@ export default {
       _formData.append("createUserName", this.$store.getters.userInfo.userName);
       _formData.append("prcType", "4");
       _formData.append("json", JSON.stringify({
-        form: this.form,
+        form: this.listForm,
         roleForm: this.roleForm,
         commentText: this.commentText
       }));
@@ -1049,38 +1052,37 @@ export default {
       if (this.dataList.length < 1) {
         this.$message.warning("标准不能为空");
       } else {
-        var json = Object.assign(this.listForm, this.roleForm)
+        var json = Object.assign(this.listForm, this.roleForm);
-        console.log(json);
+        this.$refs["qdfbForm"].validate((valid) => {
-        // this.$refs["qdfbForm"].validate((valid) => {
+          if (valid) {
-        //   if (valid) {
+            this.$refs["Form"].validate((valid) => {
-        //     this.$refs["Form"].validate((valid) => {
+              if (valid) {
-        //       if (valid) {
+                this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
-        //         this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
+                  _this: this
-        //           _this: this
+                }, res => {
-        //         }, res => {
+                  if (res.ok) {
-        //           if (res.ok) {
+                    this.$http.post("lawss/activiti/completeTask", {
-        //             this.$http.post("lawss/activiti/completeTask", {
+                      taskIds: res.data,
-        //               taskIds: res.data,
+                      userId: this.$store.getters.userInfo.userId,
-        //               userId: this.$store.getters.userInfo.userId,
+                      json: JSON.stringify(json)
-        //               json: JSON.stringify(json)
+                    }, {
-        //             }, {
+                      _this: this
-        //               _this: this
+                    }, res => {
-        //             }, res => {
+                      if (res.success) {
-        //               if (res.success) {
+                        this.$message.success(res.message);
-        //                 this.$message.success(res.message);
+                        this.$router.push("/processCenter");
-        //                 this.$router.push("/processCenter");
+                      }
-        //               }
+                    });
-        //             });
+                  }
-        //           }
+                });
-        //         });
+              } else {
-        //       } else {
+                return this.$message.warning("请完善人员信息");
-        //         return this.$message.warning("请完善人员信息");
+              }
-        //       }
+            });
-        //     });
+          } else {
-        //   } else {
+            return this.$message.warning("请完善基础信息");
-        //     return this.$message.warning("请完善基础信息");
+          }
-        //   }
+        });
-        // });
       }
     },
     // 删除上传的文件
@@ -1101,16 +1103,24 @@ export default {
     uploadBackSuccess(res, file, fileList) {
       if (res.ok) {
         let middle = [];
-        // let fids = [];
         fileList.forEach(item => {
           middle.push(item.name);
-          // fids.push(item.response.data.attId)
         });
         this.fileListName = middle;
         this.fileIds.push(file.response.data.id);
-        // this.listForm.fileId = this.listForm.fileId + ',' + fids.join(',')
+        // this.listForm.fileName =  this.fileListName.join(',');
-        // this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
+        // this.listForm.fileId = this.fileIds.join(',');
-        // this.$message.success('上传成功')
+        // if (this.listForm.fileName === null || this.listForm.fileName === undefined) {
+        //   this.listForm.fileName = this.fileListName.join(",");
+        // } else {
+        //   this.listForm.fileName = this.listForm.fileName + "," + this.fileListName.join(",");
+        // }
+        // if (this.listForm.fileId === null || this.listForm.fileId === undefined) {
+        //   this.listForm.fileId = this.fileIds.join(",");
+        // } else {
+        //   this.listForm.fileId = this.listForm.fileId + "," + this.fileIds.join(",");
+        // }
+        this.$message.success("上传成功");
       } else {
         this.$message.error(res.message);
         fileList.pop();
@@ -1173,6 +1183,7 @@ export default {
       var index1 = filename.lastIndexOf(".");
       var index2 = filename.length;
       var fileSuffix = filename.substring(index1, index2);
+      // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
       if (fileSuffix === ".PDF" || fileSuffix === ".DOC" || fileSuffix === ".DOCX" || fileSuffix === ".PPT"
         || fileSuffix === ".PPTX" || fileSuffix === ".XLS" || fileSuffix === ".XLSX"
@@ -1209,29 +1220,32 @@ export default {
     },
     //添加标准确定事件
     okStand() {
-      let _this = this;
       if (this.standList.length < 1) {
-        _this.$message.warning("请选择需要添加进清单的数据");
+        this.$message.warning("请选择需要添加进清单的数据");
       } else {
-        let exits = []
+        let exits = [];
-        _this.standList.map(item => {
+        this.standList.map(item => {
           let newStand = false;
-          for (let itemKey of _this.dataList) {
+          for (let itemKey of this.dataList) {
             if (item.id == itemKey.id) {
               newStand = true;
               break;
             }
           }
           if (newStand) {
-            _this.$message.warning("请勿重复添加数据");
+            this.$message.warning("请勿重复添加数据");
           } else {
-            _this.dataList.push(item);
+            this.dataList.push(item);
-            exits.push(item.id)
+            exits.push(item.id);
           }
         });
-        this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',')
+        if (this.listForm.inforlist === null || this.listForm.inforlist === undefined || this.listForm.inforlist === "") {
+          this.listForm.inforlist = exits.join(",");
+        } else {
+          this.listForm.inforlist = this.listForm.inforlist + "," + exits.join(",");
+        }
         this.standardData = [];
-        _this.standModel = false;
+        this.standModel = false;
       }
     },
     //选择清单确定事件
@@ -1247,25 +1261,35 @@ export default {
         }
         this.listForm.standId = bringData[0].id;
         this.listForm.listName = bringData[0].detailedListName;
-        this.listForm.applyRegion = bringData[0].applicationScope;
         this.listForm.descriptionList = bringData[0].remark;
-        this.listForm.fileId = bringData[0].fileId;
+        this.listForm.fileId = bringData[0].fileIds;
+        this.listForm.fileName = bringData[0].fileName;
         this.ListModel = false;
-        this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { id: bringData[0].id }, {
+        this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
-          _this: this
+          { id: bringData[0].id, page: this.page, Size: this.pageSize }, {
-        }, res => {
+            _this: this
-          if (res.data == null) {
+          }, res => {
-            res.data = [];
+            if (res.data == null) {
-          }
+              res.data = [];
-          this.dataList = res.data;
+            }
-          this.listForm.dataList = res.data;
+            this.dataList = res.data;
-          let formId = [];
+            this.dataList.forEach(item => {
-          this.dataList.map(item => {
+              if (item.xcxssrqgj === null){
-            formId.push(item.id);
+                this.$set(item, "XCXSSRQ", '');
+                this.$set(item, "ZCCSSRQ", '');
+              }else{
+                this.$set(item, "XCXSSRQ", item.xcxssrqgj);
+                this.$set(item, "ZCCSSRQ", item.zccssrqgj);
+              }
+            })
+            this.listForm.dataList = res.data;
+            let formId = [];
+            this.dataList.map(item => {
+              formId.push(item.id);
+            });
+            this.listForm.inforlist = formId.join(",");
+          }, e => {
           });
-          this.listForm.inforlist = formId.join(",");
-        }, e => {
-        });
       } else if (this.selectedList.length > 1) {
         this.$message.warning("只能选择一条数据进行带入");
       } else {
@@ -1320,11 +1344,11 @@ export default {
     },
     pageChangeNo(page) {
       this.pageNo = page;
-      this.addList();
+      this.getStandData();
     },
     pageSizeChangeNo(pageSize) {
       this.pageSizeNo = this.$store.getters.userInfo.configContent;
-      this.addList();
+      this.getStandData();
 
     }
   },
@@ -1336,10 +1360,13 @@ export default {
       _this: this
     }, res => {
       this.countryOptions = res.data.COUNTRY;
+      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+      this.setMap(this.standStateOptions);
     });
     this.selectionList();
     this.selectSign();
     this.getTree();
+    this.getStandData();
     for (let i = 0; i < this.dataList.length; i++) {
       this.standMap.set(this.dataList[i].id, this.dataList[i]);
     }
@@ -1359,6 +1386,40 @@ export default {
     }
   }
 
+  .fileClass {
+    cursor: pointer;
+  }
+
+  .fileClass:hover {
+    color: #0c91e5;
+  }
+
+  p {
+    & > a {
+      cursor: pointer;
+    }
+
+    & > i {
+      display: inline-block;
+      margin-left: 3px;
+      width: 18px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      cursor: pointer;
+    }
+
+    .icon-download {
+      background-image: url("~assets/images/shangqi/img/download.png");
+    }
+
+    .icon-download2 {
+      background-image: url("~assets/images/shangqi/img/download2.png");
+    }
+  }
+
   .choiceBtn {
     .el-button--primary {
       width: 150px;

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

@@ -125,22 +125,25 @@
             prop="issueTime"
             align="center"
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="XCXSSRQ"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="zccssrqgj"
+            prop="ZCCSSRQ"
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -149,6 +152,9 @@
             align="center"
             width="120px"
             label="文本状态">
+            <template slot-scope="scope">
+              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
           </el-table-column>
         </el-table>
       </div>
@@ -329,7 +335,7 @@
                 sortable
                 align="center">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : "" }}</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -390,27 +396,14 @@
               }}</span>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="applicationScope"
-                label="适用领域"
-                align="center">
-                <template slot-scope="scope">
-            <span
-              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
-              }}</span>
-                </template>
-              </el-table-column>
               <el-table-column
                 prop="updateTime"
                 label="更新时间"
                 sortable
                 align="center">
-                <template slot-scope="scope">
+                  <template slot-scope="scope">
-                  <div>
+                    <span>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : "" }}</span>
-                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-D hh:mm:ss") : scope.row.updateTime
+                  </template>
-                    }}
-                  </div>
-                </template>
               </el-table-column>
               <el-table-column
                 prop="updatePeople"
@@ -470,26 +463,13 @@
               }}</span>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="applicationScope"
-                label="适用领域"
-                align="center">
-                <template slot-scope="scope">
-            <span
-              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
-              }}</span>
-                </template>
-              </el-table-column>
               <el-table-column
                 prop="updateTime"
                 label="更新时间"
                 sortable
                 align="center">
                 <template slot-scope="scope">
-                  <div>
+                  <span>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : "" }}</span>
-                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
-                    }}
-                  </div>
                 </template>
               </el-table-column>
               <el-table-column
@@ -555,7 +535,7 @@
                     class="common-button-primary"
                     size="small"
                     v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
-                    @click="addList">
+                    @click="getStandData">
                     查询
                   </el-button>
                 </el-form-item>
@@ -610,24 +590,24 @@
                 align="center"
                 label="发布日期">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
                 </template>
               </el-table-column>
               <el-table-column
-                prop="xcxssrqgj"
+                prop="XCXSSRQ"
                 align="center"
                 label="新车型实施日期">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
                 </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
-                prop="zccssrqgj"
+                prop="ZCCSSRQ"
                 align="center"
                 label="在产车实施日期">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -635,6 +615,9 @@
                 prop="textStatus"
                 align="center"
                 label="文本状态">
+                <template slot-scope="scope">
+                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                </template>
               </el-table-column>
             </el-table>
           </div>
@@ -746,7 +729,7 @@ export default {
         directorUser: "",
         dockUserName: "",
         ministerUserName: "",
-        directorUserName: "",
+        directorUserName: ""
       },
       formRules: {
         listType: [
@@ -806,14 +789,15 @@ export default {
           code: "", //标准号
           standName: "", //标准名称
           issueTime: "", //发布日期
-          xcxssrqgj: "", //新车型实施日期
+          XCXSSRQ: "", //新车型实施日期
-          zccssrqgj: "", //在产车实施日期
+          ZCCSSRQ: "", //在产车实施日期
           textStatus: "", //文本状态
           id: ""
         }]
       },
       choiceForm: {}, //选择标准清单列表
       // countryOptions: [], //适用区域下拉框数据
+      standStateOptions: [],
       standardTypeOptions: [
         {
           value: "INLAND",
@@ -831,7 +815,8 @@ export default {
       user3: "",
       user4: "",
       user5: "",
-      standMap: new Map()
+      standMap: new Map(),
+      textStatusMap: {}// 文本状态id与name对应
     };
   },
   methods: {
@@ -949,10 +934,9 @@ export default {
         standType: "",
         standNumber: ""
       };
-      this.addList();
+      this.getStandData();
     },
-    //点击添加事件
+    getStandData() {
-    addList() {
       this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
         standType: this.standardSearch.standType,
         standNumber: this.standardSearch.standNumber,
@@ -963,12 +947,26 @@ export default {
       }, res => {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
-          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          if(item.attrInfoMap === null){
-          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+              this.$set(item, "ZCCSSRQ", '');
+              this.$set(item, "XCXSSRQ", '');
+          }else{
+              this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
+              this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
+          }
         })
         this.totalNo = res.data.count;
       }, e => {
       });
+    },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label);
+      });
+    },
+    //点击添加事件
+    addList() {
       this.standModel = true;
     },
     // 点击批量删除事件
@@ -1024,8 +1022,7 @@ export default {
       if (this.dataList.length < 1) {
         this.$message.warning("标准不能为空");
       } else {
-        var json = Object.assign(this.listForm, this.roleForm)
+        var json = Object.assign(this.listForm, this.roleForm);
-        console.log(json);
         this.$refs["qdfbForm"].validate((valid) => {
           if (valid) {
             this.$refs["Form"].validate((valid) => {
@@ -1066,10 +1063,8 @@ export default {
         middle.push(item.name);
         files.push(item.response.data.id);
       });
-      this.listForm.fileName = middle.join(',');
+      this.fileListName = middle;
-      this.listForm.fileId = files.join(',');
+      this.fileIds = files;
-      // this.fileListName = middle;
-      // this.fileIds = files;
     },
     fileUpload() {
       this.fileMadel = true;
@@ -1083,17 +1078,18 @@ export default {
         });
         this.fileListName = middle;
         this.fileIds.push(file.response.data.id);
-        if(this.listForm.fileName === null || this.listForm.fileName === undefined){
+        // this.listForm.fileName =  this.fileListName.join(',');
-          this.listForm.fileName = this.fileListName.join(',')
+        // this.listForm.fileId = this.fileIds.join(',');
+        if (this.listForm.fileName === null || this.listForm.fileName === undefined) {
+          this.listForm.fileName = this.fileListName.join(",");
         } else {
-          this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(',');
+          this.listForm.fileName = this.listForm.fileName + "," + this.fileListName.join(",");
         }
-        if(this.listForm.fileId === null || this.listForm.fileId === undefined){
+        if (this.listForm.fileId === null || this.listForm.fileId === undefined) {
-          this.listForm.fileId = this.fileIds.join(',')
+          this.listForm.fileId = this.fileIds.join(",");
-        }else {
+        } else {
-          this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',')
+          this.listForm.fileId = this.listForm.fileId + "," + this.fileIds.join(",");
         }
-        console.log(this.listForm);
         this.$message.success("上传成功");
       } else {
         this.$message.error(res.message);
@@ -1103,6 +1099,7 @@ export default {
     // 相关附件 上传之前钩子
     beforeUpload(file) {
       var filename = file.name;
+      // this.listForm.fileName = this.listForm.fileName + ',' + file.name
       var index1 = filename.lastIndexOf(".");
       var index2 = filename.length;
       var fileSuffix = filename.substring(index1, index2);
@@ -1196,7 +1193,7 @@ export default {
       if (this.standList.length < 1) {
         this.$message.warning("请选择需要添加进清单的数据");
       } else {
-        let exits = []
+        let exits = [];
         this.standList.map(item => {
           let newStand = false;
           for (let itemKey of this.dataList) {
@@ -1209,13 +1206,13 @@ export default {
             this.$message.warning("请勿重复添加数据");
           } else {
             this.dataList.push(item);
-            exits.push(item.id)
+            exits.push(item.id);
           }
         });
-        if(this.listForm.inforlist === null || this.listForm.inforlist === undefined){
+        if (this.listForm.inforlist === null || this.listForm.inforlist === undefined || this.listForm.inforlist === "") {
-          this.listForm.inforlist = exits.join(',')
+          this.listForm.inforlist = exits.join(",");
         } else {
-          this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',')
+          this.listForm.inforlist = this.listForm.inforlist + "," + exits.join(",");
         }
         this.standardData = [];
         this.standModel = false;
@@ -1236,7 +1233,11 @@ export default {
         this.listForm.listName = bringData[0].detailedListName;
         this.listForm.descriptionList = bringData[0].remark;
         this.listForm.fileId = bringData[0].fileIds;
-        this.listForm.fileName = bringData[0].fileName;
+        if(bringData[0].fileName === null ){
+          this.listForm.fileName = ''
+        } else {
+          this.listForm.fileName = bringData[0].fileName;
+        }
         this.ListModel = false;
         this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
           { id: bringData[0].id, page: this.page, Size: this.pageSize }, {
@@ -1246,6 +1247,15 @@ export default {
               res.data = [];
             }
             this.dataList = res.data;
+            this.dataList.forEach(item => {
+              if (item.xcxssrqgj === null){
+                this.$set(item, "XCXSSRQ", '');
+                this.$set(item, "ZCCSSRQ", '');
+              }else{
+                this.$set(item, "XCXSSRQ", item.xcxssrqgj);
+                this.$set(item, "ZCCSSRQ", item.zccssrqgj);
+              }
+            })
             this.listForm.dataList = res.data;
             let formId = [];
             this.dataList.map(item => {
@@ -1308,11 +1318,11 @@ export default {
     },
     pageChangeNo(page) {
       this.pageNo = page;
-      this.addList();
+      this.getStandData();
     },
     pageSizeChangeNo(pageSize) {
       this.pageSizeNo = this.$store.getters.userInfo.configContent;
-      this.addList();
+      this.getStandData();
 
     }
   },
@@ -1323,10 +1333,13 @@ export default {
       _this: this
     }, res => {
       this.countryOptions = res.data.COUNTRY;
+      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+      this.setMap(this.standStateOptions);
     });
     this.selectionList();
     this.selectSign();
     this.getTree();
+    this.getStandData();
     for (let i = 0; i < this.dataList.length; i++) {
       this.standMap.set(this.dataList[i].id, this.dataList[i]);
     }
@@ -1345,12 +1358,15 @@ export default {
       padding: 0 20px 0;
     }
   }
+
   .fileClass {
     cursor: pointer;
   }
-  .fileClass:hover{
+
+  .fileClass:hover {
     color: #0c91e5;
   }
+
   p {
     & > a {
       cursor: pointer;
@@ -1367,6 +1383,7 @@ export default {
       vertical-align: sub;
       cursor: pointer;
     }
+
     .icon-download {
       background-image: url("~assets/images/shangqi/img/download.png");
     }
@@ -1375,6 +1392,7 @@ export default {
       background-image: url("~assets/images/shangqi/img/download2.png");
     }
   }
+
   .choiceBtn {
     .el-button--primary {
       width: 150px;

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

@@ -37,18 +37,19 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
+              <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
-                <div class="file-box" v-if="listForm.model">
+                <div class="file-box" v-if="fileList.length > 0">
-                  <p> {{ listForm.modelName }}
+                  <p v-for="item in fileList"
+                  :key="item.id"> {{ item.name }}
                     <i
                       title="下载"
-                      @click="downloadFile(listForm.model)"
+                      @click="downloadFile(item.id)"
                       class="icon-download"
                       v-btn-permission="''"
                     />
                     <i
                       title="下载带水印"
-                      @click="downloadFileByWater(listForm.model,listForm.modelName)"
+                      @click="downloadFileByWater(item.id, item.name)"
                       class="icon-download2"
                       v-btn-permission="''"
                     />
@@ -78,8 +79,11 @@
             width="180px"
             label="标准号">
             <template slot-scope="scope">
-              <p v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p>
+              <a v-if="scope.row.standYear" class="table-jump"
-              <p v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
+                 @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
+                }}-{{ scope.row.standYear }}</a>
+              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                {{ scope.row.standNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -94,21 +98,30 @@
             label="发布日期">
           </el-table-column>
           <el-table-column
-            prop="xcxssrq"
+            prop="XCXSSRQ"
             sortable
             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
             show-overflow-tooltip
-            prop="zccssrq"
+            prop="ZCCSSRQ"
             sortable
             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
             show-overflow-tooltip
             prop="textStatus"
             width="120px"
             label="文本状态">
+            <template slot-scope="scope">
+              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
           </el-table-column>
         </el-table>
       </div>
@@ -236,6 +249,7 @@ export default {
       selectedList: [],  //选择清单的选择框
       selectList: [], //选择标准的选择框
       bringData: [],
+      fileList:[],
       fileIds: "",
       commentText: "", //填写会签意见
       page: 1,
@@ -267,7 +281,8 @@ export default {
       user3: "",
       user4: "",
       user5: "",
-      standMap: new Map()
+      standMap: new Map(),
+      textStatusMap: {}// 文本状态id与name对应
     };
   },
   methods: {
@@ -312,15 +327,14 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
+        console.log(this.listForm.fileName);
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
-        this.listForm.dataList = item.dataList;
         this.dataList = item.dataList;
-        this.listForm.applyUpdUserId = item.applyUpdUserId;
         this.listForm.jlUserId = item.jlUserId;
         this.listForm.zrUserId = item.zrUserId;
-        this.fileIds = item.fileId
+        this.fileIds = item.fileId;
         this.getFileInfo();
       });
     },
@@ -331,11 +345,15 @@ export default {
       }, {
         _this: this
       }, res => {
-        console.log(res);
         this.$nextTick(() => {
           res.data.map(item => {
-           this.listForm.modelName = item.oldFileName
+            // 赋值要回显的上传文件内容
-            this.listForm.model = item.id
+            this.fileList.push({
+              name: item.oldFileName,
+              uid: item.uid,
+              status: item.status,
+              id: item.id
+            });
           });
         });
       }, e => {
@@ -369,8 +387,8 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
-        this.$message.warning('请填写会签意见')
+        this.$message.warning("请填写会签意见");
       }
       this.listForm.commentText = this.commentText;
       this.listForm.approvalOpinion = "";
@@ -412,7 +430,24 @@ export default {
     pageSizeChange(pageSize) {
       this.pageSize = this.$store.getters.userInfo.configContent;
       this.searchData();
+    },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label);
+      });
+    },
+// 点击查看
+handlePreview(item) {
+  let routeUrl = this.$router.resolve({
+    name: "OtherStandardDetails",
+    params: {
+      id: item.id,
+      pageType: "INLAND_STAND"
     }
+  });
+  window.open(routeUrl.href, "_blank");
+},
   },
   computed: {
     listNoDataText() {
@@ -421,9 +456,17 @@ export default {
   },
   watch: {},
   mounted() {
+//从数据库中查询下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+      _this: this
+    }, res => {
+      this.countryOptions = res.data.COUNTRY;
+      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+      this.setMap(this.standStateOptions);
+    });
     this.processTable();
     this.getData();
-  }
+  },
 };
 </script>
 
@@ -437,12 +480,15 @@ export default {
       padding: 0 20px 0;
     }
   }
+
   .fileClass {
     cursor: pointer;
   }
-  .fileClass:hover{
+
+  .fileClass:hover {
     color: #0c91e5;
   }
+
   p {
     & > a {
       cursor: pointer;
@@ -459,6 +505,7 @@ export default {
       vertical-align: sub;
       cursor: pointer;
     }
+
     .icon-download {
       background-image: url("~assets/images/shangqi/img/download.png");
     }

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

@@ -100,12 +100,14 @@
           </el-table-column>
           <el-table-column
             prop="code"
-            fixed="left"
             width="180px"
             label="标准号">
             <template slot-scope="scope">
-              <p v-if="scope.row.standYear" >{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p>
+              <a v-if="scope.row.standYear" class="table-jump"
-              <p v-else >{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
+                 @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
+                }}-{{ scope.row.standYear }}</a>
+              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                {{ scope.row.standNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -120,21 +122,30 @@
             label="发布日期">
           </el-table-column>
           <el-table-column
-            prop="xcxssrq"
+            prop="XCXSSRQ"
             sortable
             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
             show-overflow-tooltip
-            prop="zccssrq"
+            prop="ZCCSSRQ"
             sortable
             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
             show-overflow-tooltip
             prop="textStatus"
             width="120px"
             label="文本状态">
+            <template slot-scope="scope">
+              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
           </el-table-column>
         </el-table>
       </div>
@@ -216,6 +227,52 @@
       <div class="demo-drawer-content">
         <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <div class="left">
+              <el-form :modal="standardSearch" :inline="true" class="label-input-form"
+                       style="margin-left:10px">
+                <el-form-item label="类型" class="search-item search-item-last">
+                  <el-select
+                    @change="typeChange"
+                    v-model="standardSearch.standType"
+                    placeholder="请选择"
+                    filterable
+                  >
+                    <el-option
+                      v-for="item in standardTypeOptions"
+                      :value="item.value"
+                      :key="item.value"
+                      :label="item.label"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="标准号/标准名称" class="search-item search-item-last">
+                  <el-input
+                    v-model="standardSearch.standNumber"
+                    placeholder="请输入标准号或标准名称"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    :loading="searching"
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
+                    @click="getStandData">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                    @click="clearStandSearch">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
             <el-table
               :data="standardData"
               tooltip-effect="dark"
@@ -234,38 +291,57 @@
               </el-table-column>
               <el-table-column
                 prop="code"
-                fixed="left"
+                align="center"
                 label="标准号">
                 <template slot-scope="scope">
                   <a v-if="scope.row.standYear" class="table-jump"
-                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
+                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                      scope.row.standNumber
                     }}-{{ scope.row.standYear }}</a>
-                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
+                      scope.row.standSortShow }}
                     {{ scope.row.standNumber }}</a>
                 </template>
               </el-table-column>
               <el-table-column
                 prop="standName"
+                align="center"
                 label="标准名称"
               >
               </el-table-column>
               <el-table-column
                 prop="issueTime"
+                align="center"
                 label="发布日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+                </template>
               </el-table-column>
               <el-table-column
-                prop="xcxssrq"
+                prop="XCXSSRQ"
+                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
                 show-overflow-tooltip
-                prop="zccssrq"
+                prop="ZCCSSRQ"
+                align="center"
                 label="在产车实施日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
+                </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
                 prop="textStatus"
+                align="center"
                 label="文本状态">
+                <template slot-scope="scope">
+                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                </template>
               </el-table-column>
             </el-table>
           </div>
@@ -315,6 +391,26 @@ export default {
       standList: [], //新添加的标准
       // 当前流程类型(1待办/2已办)
       processType: 1,
+      searching: false,
+      standardTypeOptions: [
+        {
+          value: "INLAND",
+          label: "国内标准法规",
+          item: "INLAND"
+        },
+        {
+          value: "FOREIGN",
+          label: "海外标准法规",
+          item: "FOREIGN"
+        }
+      ],
+      //查询添加标准相关数据
+      standardSearch: {
+        standType: "",
+        standNumber: "",
+        pageNo: 1,
+        pageSizeNo: this.$store.getters.userInfo.configContent
+      },
       loading: false,
       userId:this.$store.getters.userInfo.userId,
       taskIds: this.$route.query.taskIds,
@@ -363,7 +459,8 @@ export default {
       user3: "",
       user4: "",
       user5: "",
-      standMap: new Map()
+      standMap: new Map(),
+      textStatusMap: {}// 文本状态id与name对应
     };
   },
   methods: {
@@ -383,6 +480,9 @@ export default {
     handleTabs(name) {
       this.active = name;
     },
+    typeChange(type) {
+      this.standardSearch.standType = type;
+    },
     // 点击查看
     handlePreview(item) {
       let routeUrl = this.$router.resolve({
@@ -394,15 +494,38 @@ export default {
       });
       window.open(routeUrl.href, "_blank");
     },
-    //点击添加事件
+    clearStandSearch() {
-    addList() {
+      this.standardSearch = {
-      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
+        standType: "",
+        standNumber: ""
+      };
+      this.getStandData();
+    },
+    getStandData() {
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+        standType: this.standardSearch.standType,
+        standNumber: this.standardSearch.standNumber,
+        page: this.pageNo,
+        pageSize: this.pageSizeNo
+      }, {
         _this: this
       }, res => {
         this.standardData = res.data.list;
-        this.totalNo = res.data.pageCount
+        this.standardData.forEach(item => {
+          if(item.attrInfoMap === null){
+            this.$set(item, "ZCCSSRQ", '');
+            this.$set(item, "XCXSSRQ", '');
+          }else{
+            this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
+            this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
+          }
+        })
+        this.totalNo = res.data.count;
       }, e => {
       });
+    },
+    //点击添加事件
+    addList() {
       this.standModel = true;
     },
     //添加标准select的改变
@@ -565,6 +688,12 @@ export default {
       this.addList()
 
     },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label);
+      });
+    },
   },
   computed: {
     listNoDataText () {
@@ -572,8 +701,17 @@ export default {
     }
   },
   mounted() {
-    this.getData()
+    //从数据库中查询下拉框数据
-    this.processTable()
+    this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+      _this: this
+    }, res => {
+      this.countryOptions = res.data.COUNTRY;
+      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+      this.setMap(this.standStateOptions);
+    });
+    this.getData();
+    this.processTable();
+    this.getStandData();
   },
 };
 </script>

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

@@ -74,12 +74,16 @@
               fontWeight: 'bold', height: '48px'}">
                     <el-table-column
                             prop="code"
-                            fixed="left"
                             width="180px"
                             label="标准号">
                       <template slot-scope="scope">
-                        <p v-if="scope.row.standYear" >{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p>
+                        <a v-if="scope.row.standYear" class="table-jump"
-                        <p v-else >{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
+                           @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                            scope.row.standNumber
+                          }}-{{ scope.row.standYear }}</a>
+                        <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
+                            scope.row.standSortShow }}
+                          {{ scope.row.standNumber }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column
@@ -94,21 +98,30 @@
                             label="发布日期">
                     </el-table-column>
                     <el-table-column
-                            prop="xcxssrq"
+                            prop="XCXSSRQ"
                             sortable
                             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
                             show-overflow-tooltip
-                            prop="zccssrq"
+                            prop="ZCCSSRQ"
                             sortable
                             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
                             show-overflow-tooltip
                             prop="textStatus"
                             width="120px"
                             label="文本状态">
+                      <template slot-scope="scope">
+                        <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                      </template>
                     </el-table-column>
                 </el-table>
             </div>
@@ -272,7 +285,8 @@
                 user3: "",
                 user4: "",
                 user5: "",
-                standMap: new Map()
+                standMap: new Map(),
+              textStatusMap: {}// 文本状态id与name对应
             };
         },
         methods: {
@@ -296,6 +310,17 @@
             choiceShow() {
                 this.ListModel = true;
             },
+          // 点击查看
+          handlePreview(item) {
+            let routeUrl = this.$router.resolve({
+              name: "OtherStandardDetails",
+              params: {
+                id: item.id,
+                pageType: "INLAND_STAND"
+              }
+            });
+            window.open(routeUrl.href, "_blank");
+          },
             //保存事件
             handleSave() {
 
@@ -415,7 +440,13 @@
             pageSizeChange(pageSize) {
                 this.pageSize = this.$store.getters.userInfo.configContent;
                 this.searchData();
-            }
+            },
+          // 将文本状态的id与name对应
+          setMap(data) {
+            data.forEach(item => {
+              this.$set(this.textStatusMap, item.value, item.label);
+            });
+          },
         },
         computed: {
             listNoDataText() {
@@ -423,6 +454,14 @@
             }
         },
         mounted() {
+          //从数据库中查询下拉框数据
+          this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+            _this: this
+          }, res => {
+            this.countryOptions = res.data.COUNTRY;
+            this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+            this.setMap(this.standStateOptions);
+          });
             this.getData()
             this.processTable()
         },

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

@@ -638,8 +638,13 @@
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                                     <el-select :popper-append-to-body="false" v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
-                                        <el-option label="署名人1" value="1"></el-option>
+                                      <el-option
-                                        <el-option label="署名人2" value="2"></el-option>
+                                          v-for="item in wssmrOptions"
+                                          placeholder="请选择"
+                                          :key="item.value"
+                                          :value="item.value"
+                                          :label="item.label"
+                                      ></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">
@@ -711,6 +716,20 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
+                                <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
+                                  <el-input
+                                      v-model="form.bfbdtbzh"
+                                      placeholder="请输入部分代替标准号"
+                                      clearable
+                                  ></el-input>
+                                  <el-button
+                                      type="primary"
+                                      class="common-button-primary"
+                                      size="mini"
+                                      style="position:absolute;top: 10px;right: 0;"
+                                      @click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"
+                                  >{{'手动查找'}}</el-button>
+                                </el-form-item>
                                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.yybj"
@@ -843,6 +862,7 @@
             <el-upload
                     multiple
                     drag
+                    :file-list="fileList"
                     :action="fileUrl"
                     ref="importfile"
                     name="file"
@@ -1162,6 +1182,7 @@
         },
         data () {
             return {
+              fileList: [],
               filterText:'',
               textStatusMap: {}, // 文本状态id与name对应
                 standardDrawer: false,
@@ -1330,6 +1351,7 @@
                     cbbh: '', // 采标编号
                     cbcd: '', // 采标程度
                     yybj: '', // 引用标准
+                    bfbdtbzh: '', // 部分代替标准号
                     byybj: '', // 被引用标准
                     glwj: '', // 关联文件
                     xglc: '', // 相关流程
@@ -1873,6 +1895,8 @@
                     this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'cbbh'){
                     this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
+                }else if(this.replaceLawType === 'bfbdtbzh'){
+                    this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
                 }else {
                     this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
                 }
@@ -1967,10 +1991,11 @@
             importFileSuccess (response, file,fileList) {
               // 上传成功后判断是否是两条数据是的话替换掉旧数据
               if (fileList.length > 1) {
-                fileList.splice(0, 1)
+                this.fileList = fileList.splice(0, 1)
               }
                 if (response.ok) {
                     this.fileMadel = false
+                    this.fileList = []
                     if(this.fileType === 'fbgbjbd'){
                         this.form.fbgbjbd = response.data.id;
                         this.form.fbgbjbdName = response.data.name;

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

@@ -473,7 +473,15 @@
                               </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
+                              <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
+                                <el-input
+                                    disabled
+                                    v-model="form.bfbdtbzh"
+                                    placeholder="请输入部分代替标准号"
+                                    clearable
+                                ></el-input>
+                              </el-form-item>
+                              <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
                                             v-model="form.yybj"
@@ -749,6 +757,7 @@
                     zqyjg: '', // 征求意见稿
                     jdwj: '', // 解读文件
                     zbjbd: '', // 增补件
+                  bfbdtbzh: '', // 增补件
                     kwj: '', // 勘误件
                     caName: '', // 草案
                     fbgbjbdName: '', // 发布稿
@@ -876,8 +885,11 @@
             }
           },
           getRule(){
-            if (this.formTongGuo.approvalOpinion !== '1') {
+            if (this.formTongGuo.approvalOpinion === '0') {
+              this.rules.commentText.required = false
               this.$refs.formTongGuo.clearValidate('commentText')
+            } else {
+              this.rules.commentText.required = true
             }
           },
             popoverHide (checkedIds, checkedData) {

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

@@ -466,6 +466,14 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
+                <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
+                  <el-input
+                      disabled
+                      v-model="form.bfbdtbzh"
+                      placeholder="请输入部分代替标准号"
+                      clearable
+                  ></el-input>
+                </el-form-item>
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
                   <el-input
                       disabled

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

@@ -695,6 +695,21 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
+                <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
+                  <el-input
+                      v-model="form.bfbdtbzh"
+                      placeholder="请输入部分代替标准号"
+                      clearable
+                  ></el-input>
+                  <el-button
+                      type="primary"
+                      class="common-button-primary"
+                      size="mini"
+                      style="position:absolute;top: 10px;right: 0;"
+                      @click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"
+                  >{{'手动查找'}}</el-button>
+                </el-form-item>
+
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
                   <el-input
                       v-model="form.yybj"
@@ -1173,6 +1188,7 @@ export default {
         kwj: '', // 勘误件
         caName: '', // 草案
         fbgbjbdName: '', // 发布稿
+        bfbdtbzh: '', // 发布稿
         xgdName: '', // 修改单
         bpgName: '', // 报批稿
         ssgName: '', // 送审稿
@@ -1411,6 +1427,8 @@ export default {
         this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
       }else if(this.replaceLawType === 'cbbh'){
         this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
+      }else if(this.replaceLawType === 'bfbdtbzh'){
+        this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
       } else {
         this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
       }

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

@@ -93,23 +93,23 @@
           <el-table-column
             prop="distributePerson"
             label="分发责任人">
-<!--                        <template slot-scope="scope">-->
+            <template slot-scope="scope">
-<!--                          <el-input v-model="scope.row.distributePerson" v-show="false"></el-input>-->
+              <el-input
-<!--                          <el-input-->
+                v-model="scope.row.distributePerson"
-<!--                            v-model="dataList.distributePerson"-->
+                placeholder="请选择分发负责人"
-<!--                            placeholder="请选择分发责任人"-->
+                readonly
-<!--                            @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"-->
+                @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"
-<!--                            readonly-->
+                v-if="!scope.row.distributePerson"></el-input>
-<!--                            v-if="dataList[scope.$index].distributePerson==null"-->
+              <span v-else>{{ scope.row.distributePerson }}</span>
-<!--                          />-->
-<!--                        </template>-->
-            <template slot-scope="scope,text" v-if="showColumn">
-              <div>
-                <div @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">
-                  {{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson }}
-                </div>
-              </div>
             </template>
+<!--            <template slot-scope="scope,text" v-if="showColumn">-->
+<!--              <div>-->
+<!--                <div  @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">-->
+<!--                  {{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson-->
+<!--                  }}-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </template>-->
           </el-table-column>
         </el-table>
       </div>
@@ -409,8 +409,8 @@ export default {
         label: "name"
       },
       roleForm: {
-        startUserName: this.$store.getters.userInfo.userName,
+        prcCreateUserName: this.$store.getters.userInfo.userName,
-        startUser: this.$store.getters.userInfo.id,
+        prcCreateUser: this.$store.getters.userInfo.userId,
         qualityEngineer: "",
         certifiedEngineer: "",
         qualityEngineerName: "",
@@ -446,6 +446,7 @@ export default {
       ListModel: false, //选择拆分标准抽屉状态
       treeData: [], // 人员数据
       selectList: [], //选择标准的选择框
+      currentIndex: -1, // 当前操作行索引
       isSubmit: false,
       saveLoading: false,
       selectedList: [],  //拆分标准的选择框
@@ -521,18 +522,29 @@ export default {
         this.listForm.certifiedEngineer = data[0].id;
         this.listForm.certifiedEngineerName = data[0].name;
       } else if (this.type === "distributePerson") {
-        // this.dataList.distributePerson = data[0].id;
+        // 如果有勾选,则视为批量选择责任人
-        // this.dataList.distributePersonName = data[0].name;
+        if (this.selectList.length) {
-        this.listForm.dataList[this.dsadadadsada].distributePersonId = data[0].id;
+          this.dataList.forEach((item, index) => {
-        this.listForm.dataList[this.dsadadadsada].distributePerson = data[0].name;
+            if (this.selectList.includes(item.productLine)) {
-        this.showColumn = false;
+              const newItem = JSON.parse(JSON.stringify(item))
-        this.$nextTick(() => {
+              newItem.distributePersonId = data[0].id
-          this.showColumn = true;
+              newItem.distributePerson = data[0].name
-        });
+              this.$set(this.dataList, index, newItem)
+            }
+          })
+        } else {
+          const newItem = JSON.parse(JSON.stringify(this.dataList[this.currentIndex]))
+          newItem.distributePersonId = data[0].id
+          newItem.distributePerson = data[0].name
+          this.$set(this.dataList, this.currentIndex, newItem)
+          this.listForm.dataList[this.currentIndex].distributePersonId = data[0].id;
+          this.listForm.dataList[this.currentIndex].distributePerson = data[0].name;
+          this.currentIndex = -1
+        }
       }
       this.modalshowflag = false;
     },
-    cancleUserInfo() {
+    cancelUserInfo() {
       this.modalshowflag = false;
     },
     //tab发生变化
@@ -561,7 +573,9 @@ export default {
     //点击添加事件
     addList() {
       this.standModel = true;
-      this.$refs.projectTable.clearSelection();
+      this.$nextTick(() => {
+        this.$refs.projectTable.clearSelection();
+      })
     },
     // 点击批量删除事件
     deleteList() {
@@ -652,6 +666,7 @@ export default {
           this.$message.warning("请选择分发责任人");
         } else {
           var json = Object.assign(this.listForm, this.roleForm);
+          console.log(json);
           this.$refs["listForm"].validate((valid) => {
             if (valid) {
               this.$refs["roleForm"].validate((valid) => {
@@ -742,7 +757,7 @@ export default {
     },
     choiceZRR(scope, type, title, id) {
       if (scope != null) {
-        this.dsadadadsada = scope.$index;
+        this.currentIndex = scope.$index;
       }
       this.nodeList = [];
       this.nodeList.push(id);
@@ -809,6 +824,14 @@ export default {
     }
   },
   computed: {},
+  watch: {
+    dataList: {
+      deep: true,
+      handler (val) {
+        console.log('dataList update', val)
+      }
+    }
+  },
   mounted() {
     this.getTree();
     this.getProductData();

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

@@ -324,37 +324,38 @@ export default {
         this.listForm.breakdownList = item.breakdownList
       })
     },
-
-
     //驳回事件
     beforeBack () {
-      this.listForm.passFlag = '1'
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-      this.handleSubmit()
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.passFlag = '1'
+        this.handleSubmit()
+      }
     },
     //提交事件
     handleSubmit() {
-      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
+        this.$message.warning('请填写审批意见')
-      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+      }else{
-      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
+        this.listForm.commentText = this.commentText
-      this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
-      this.listForm.standId = this.listForm.standId;
+        this.$http.post('lawss/activiti/completeTask', {
-      this.listForm.breakdownList = this.listForm.breakdownList
+          taskIds: this.taskIds,
-      const json = JSON.stringify(this.listForm);
+          userId: this.userId,
-      this.$http.post('lawss/activiti/completeTask', {
+          json: json,
-        taskIds: this.taskIds,
+        }, {
-        userId: this.userId,
+          _this: this
-        json: json,
+        }, res => {
-      }, {
+          if (res.success) {
-        _this: this
+            this.$message.success(res.message)
-      }, res => {
+            this.$router.push('/processCenter')
-        if (res.success) {
+          }
-          this.$message.success(res.message)
+        }, e => {
-          this.$router.push('/processCenter')
+
-        }
+        });
-      }, e => {
+      }
 
-      });
     },
     //标准表格选择框改变
     selectStandChange(data) {

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

@@ -46,7 +46,6 @@
                 row-key="standId"
                 height="70%"
                 border
-                @selection-change="selectStandChange"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
         >
@@ -175,6 +174,12 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
+            <el-table-column
+                    prop="workPeople"
+                    align="center"
+                    width="200"
+                    label="责任人">
+            </el-table-column>
         </el-table>
       </div>
       <div>
@@ -387,6 +392,7 @@ export default {
         this.listForm.bzFlag = "1";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
+        console.log(json)
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,

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

@@ -46,7 +46,6 @@
                 row-key="standId"
                 height="70%"
                 border
-                @selection-change="selectStandChange"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
         >
@@ -175,6 +174,12 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
+            <el-table-column
+                    prop="workPeople"
+                    align="center"
+                    width="200"
+                    label="责任人">
+            </el-table-column>
         </el-table>
       </div>
       <div>
@@ -335,6 +340,7 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
+            console.log(res.mesg)
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);

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

@@ -46,7 +46,6 @@
                 row-key="standId"
                 height="70%"
                 border
-                @selection-change="selectStandChange"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
         >
@@ -175,6 +174,12 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
+            <el-table-column
+                    prop="workPeople"
+                    align="center"
+                    width="200"
+                    label="责任人">
+            </el-table-column>
         </el-table>
       </div>
       <div>

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

@@ -312,42 +312,50 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      this.listForm.BZFlag = "2";
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-      this.listForm.commentText = this.commentText;
+        this.$message.warning('审批意见不能为空')
-      const json = JSON.stringify(this.listForm);
+      }else{
-      this.$http.post("lawss/activiti/completeTask", {
+        this.listForm.BZFlag = "2";
-        taskIds: this.taskIds,
+        this.listForm.commentText = this.commentText;
-        userId: this.userId,
+        const json = JSON.stringify(this.listForm);
-        json: json
+        this.$http.post("lawss/activiti/completeTask", {
-      }, {
+          taskIds: this.taskIds,
-        _this: this
+          userId: this.userId,
-      }, res => {
+          json: json
-        if (res.success) {
+        }, {
-          this.$message.success(res.message);
+          _this: this
-          this.$router.push("/processCenter");
+        }, res => {
-        }
+          if (res.success) {
-      }, e => {
+            this.$message.success(res.message);
-      });
+            this.$router.push("/processCenter");
+          }
+        }, e => {
+        });
+      }
     },
     //提交事件
     handleSubmit() {
-      this.listForm.BZFlag = "1";
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-      this.listForm.commentText = this.commentText;
+        this.$message.warning('审批意见不能为空')
-      const json = JSON.stringify(this.listForm);
+      }else{
-      this.$http.post("lawss/activiti/completeTask", {
+        this.listForm.BZFlag = "1";
-        taskIds: this.taskIds,
+        this.listForm.commentText = this.commentText;
-        userId: this.userId,
+        const json = JSON.stringify(this.listForm);
-        json: json
+        this.$http.post("lawss/activiti/completeTask", {
-      }, {
+          taskIds: this.taskIds,
-        _this: this
+          userId: this.userId,
-      }, res => {
+          json: json
-        if (res.success) {
+        }, {
-          this.$message.success(res.message);
+          _this: this
-          this.$router.push("/processCenter");
+        }, res => {
-        }
+          if (res.success) {
-      }, e => {
+            this.$message.success(res.message);
-      });
+            this.$router.push("/processCenter");
-    }
+          }
+        }, e => {
+        });
+      }
+      }
   },
   computed: {
     listNoDataText() {

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

@@ -46,7 +46,6 @@
                         row-key="standId"
                         height="70%"
                         border
-                        @selection-change="selectStandChange"
                         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
                 >
@@ -175,6 +174,12 @@
                             </el-table-column>
                         </el-table-column>
                     </el-table-column>
+                    <el-table-column
+                            prop="workPeople"
+                            align="center"
+                            width="200"
+                            label="责任人">
+                    </el-table-column>
                 </el-table>
             </div>
             <div>
@@ -335,6 +340,7 @@
                         taskIds: this.taskIds,
                         pId: this.pId
                     }).then(res => {
+                        console.log(res.mesg)
                         if (res) {
                             const processForm = JSON.parse(res.mesg);
                             this.getFormFieldList(processForm);

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

@@ -46,7 +46,6 @@
                 row-key="standId"
                 height="70%"
                 border
-                @selection-change="selectStandChange"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
         >
@@ -175,6 +174,12 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
+            <el-table-column
+                    prop="workPeople"
+                    align="center"
+                    width="200"
+                    label="责任人">
+            </el-table-column>
         </el-table>
       </div>
       <div>

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

@@ -46,7 +46,6 @@
                 row-key="standId"
                 height="70%"
                 border
-                @selection-change="selectStandChange"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
         >
@@ -175,6 +174,12 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
+            <el-table-column
+                    prop="workPeople"
+                    align="center"
+                    width="200"
+                    label="责任人">
+            </el-table-column>
         </el-table>
       </div>
       <div>

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

@@ -4,7 +4,7 @@
     <div v-if="bzfggllc">
       <el-divider content-position="left"><h2>标准法规管理流程</h2></el-divider>
       <div class="process-box">
-        <el-col :span="size ? 6 : 8">
+        <el-col :span="size ? 6 : 8" v-btn-permission="'9adff72ab464793564c5d1de20b45620'">
           <el-card shadow="hover">
             <div class="card-box" @click="handleCreateProcess('1')">
               <div class="card-top">
@@ -22,7 +22,7 @@
             </div>
           </el-card>
         </el-col>
-        <el-col :span="size ? 6 : 8">
+        <el-col :span="size ? 6 : 8" v-btn-permission="'f4eeb9ed48eac5686a456a5582508d9c'">
           <el-card shadow="hover">
           <div class="card-box" @click="handleCreateProcess('2')">
             <div class="card-top">
@@ -40,7 +40,7 @@
           </div>
           </el-card>
         </el-col>
-        <el-col :span="size ? 6 : 8">
+        <el-col :span="size ? 6 : 8" v-btn-permission="'fc25b770ad3752cdec52f3bd7b35a6a1'">
           <el-card shadow="hover">
           <div class="card-box" @click="handleCreateProcess('3')">
             <div class="card-top">
@@ -58,7 +58,7 @@
           </div>
           </el-card>
         </el-col>
-        <el-col :span="size ? 6 : 8">
+        <el-col :span="size ? 6 : 8" v-btn-permission="'2d0f99ba961c551b1d8cad8ad5223731'">
           <el-card shadow="hover">
           <div class="card-box" @click="handleCreateProcess('6')">
             <div class="card-top">
@@ -76,7 +76,7 @@
           </div>
           </el-card>
         </el-col>
-        <el-col :span="size ? 6 : 8">
+        <el-col :span="size ? 6 : 8" v-btn-permission="'90c7bae6308595f053c6f6f90167e493'">
           <el-card shadow="hover">
           <div class="card-box" @click="handleCreateProcess('7')">
             <div class="card-top">
@@ -94,7 +94,7 @@
           </div>
           </el-card>
         </el-col>
-        <el-col :span="size ? 6 : 8">
+        <el-col :span="size ? 6 : 8" v-btn-permission="'a151f5e2ee44f8df81e201b8696fca31'">
           <el-card shadow="hover">
           <div class="card-box" @click="handleCreateProcess('8')">
             <div class="card-top">
@@ -112,7 +112,7 @@
           </div>
           </el-card>
         </el-col>
-        <el-col :span="size ? 6 : 8">
+        <el-col :span="size ? 6 : 8" v-btn-permission="'2564bd61852551b99e0fe3d49a89b288'">
           <el-card shadow="hover">
           <div class="card-box" @click="handleCreateProcess('9')">
             <div class="card-top">
@@ -130,7 +130,7 @@
           </div>
           </el-card>
         </el-col>
-        <el-col :span="size ? 6 : 8">
+        <el-col :span="size ? 6 : 8" v-btn-permission="'7751d25f72d0a6515e4110ae41837db8'">
           <el-card shadow="hover">
           <div class="card-box" @click="handleCreateProcess('10')">
             <div class="card-top">
@@ -281,7 +281,8 @@ export default {
      * @returns {boolean}
      */
     bzfggllc() {
-      return true
+      const idArray = ['2564bd61852551b99e0fe3d49a89b288', '2d0f99ba961c551b1d8cad8ad5223731', '7751d25f72d0a6515e4110ae41837db8', '90c7bae6308595f053c6f6f90167e493', '9adff72ab464793564c5d1de20b45620', 'a151f5e2ee44f8df81e201b8696fca31', 'f4eeb9ed48eac5686a456a5582508d9c', 'fc25b770ad3752cdec52f3bd7b35a6a1']
+      return this.checkPermission(idArray)
     },
     /**
      * 政策管理流程

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

@@ -205,10 +205,18 @@ export default {
           this.toProcessDetail('bzqdfbStep4',row)
         }else if (prcType === '5'){
           //标准项目合规评估 标准维度
-          this.toProcessDetail('xmpgStep7',row)
+          if(row.taskInfo === '标准法规部部长审批'){
+            this.toProcessDetail('xmpgStep7',row)
+          }else{
+            this.toProcessDetail('xmpgStep2',row)
+          }
         }else if(prcType === '6'){
           //标准项目合规评估 项目维度
-          this.toProcessDetail('xmpg2Step12',row)
+          if(row.taskInfo === '标准法规部领导审核'){
+            this.toProcessDetail('xmpg2Step12',row)
+          }else{
+            this.toProcessDetail('xmpg2Step2',row)
+          }
         }
       } else {
         this.$message.warning('当前流程未全部办理完成，无法查看')

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

@@ -216,7 +216,6 @@ export default {
     dealWith (row) { // 办理
       this.setHandleInfo(JSON.stringify(row))
       const prcType = row.prcType
-      console.log(prcType);
       switch(prcType) {
         case '1':
           if (row.taskInfo === '标准法规业务经理审批') {

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue

@@ -267,16 +267,16 @@ export default {
     },
     pageChange(page) {
       this.sarSarAccessEOSearch.page = page;
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     pageSizeChange(pageSize) {
       this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     clearSearch() {
       this.sarSarAccessEOSearch.countryArea = ''
       this.sarSarAccessEOSearch.detailedListName = ''
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     // 新增相关
     openModal(row, optType) {

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue

@@ -283,16 +283,16 @@ export default {
     },
     pageChange(page) {
       this.sarSarAccessEOSearch.page = page;
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     pageSizeChange(pageSize) {
       this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     clearSearch() {
       this.sarSarAccessEOSearch.detailedList = ''
       this.sarSarAccessEOSearch.detailedListName = ''
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     // 新增相关
     openModal(row, optType) {

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue

@@ -283,17 +283,17 @@ export default {
     },
     pageChange(page) {
       this.sarSarAccessEOSearch.page = page;
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     pageSizeChange(pageSize) {
       this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     //清空
     clearSearch() {
       this.sarSarAccessEOSearch.projectName = ''
       this.sarSarAccessEOSearch.detailedListName = ''
-      this.searchSarAccess()
+      // this.searchSarAccess()
 
     },
     // 新增相关

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

@@ -298,9 +298,6 @@
           align="center"
           width="210px"
           label="标准实施日期">
-          <template slot-scope="scope">
-            <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
-          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -310,7 +307,9 @@
           align="center"
           label="在产车实施日期">
           <template slot-scope="scope">
-            <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            <span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
+            </span>
+            <span v-else>{{ scope.row.zccssrqgj.slice(0,10) }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -320,7 +319,9 @@
           width="210px"
           label="新车型实施日期">
           <template slot-scope="scope">
-            <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            <span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
+            </span>
+            <span v-else>{{ scope.row.xcxssrqgj.slice(0,10) }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -873,7 +874,6 @@ export default {
     }
   },
   created() {
-    this.selectLawsStands()
     dicTypeData().then(res => {
       // 责任部门数据字典
       this.zrbmOptions = res.data.ZRBMCLASS
@@ -889,6 +889,7 @@ export default {
   methods: {
     // 高级检索
     selectMoreBtn () {
+      this.selectLawsStands()
       this.showSelectBox = !this.showSelectBox
       this.showTableFlag = false
       if (!this.showSelectBox) {
@@ -985,6 +986,7 @@ export default {
     },
     // 点击显示隐藏数据列表 按钮事件
     isShowTable () {
+      this.selectLawsStands()
       this.showTableFlag = !this.showTableFlag
       this.selectedAccInfoSearchList = [] // 清空
     },
@@ -1171,10 +1173,10 @@ export default {
               return items.id == item.id
             })
           if(addList > -1){
-              this.$message.warning('请勿添加重复数据')
               // this.$refs.accessTypeSelect.clearSelection()
               this.$refs.entryTable.clearSelection()
               this.$refs.searchTable.clearSelection()
+            this.$message.warning('请勿添加重复数据')
             } else{
               this.sarAccessInfoList.push(item)
               // this.$refs.accessTypeSelect.clearSelection()
@@ -1292,25 +1294,31 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj ===null || this.sarAccessInfoList[i].xcxssrqgj === null)  {
+            if (this.sarAccessInfoList[i].putTime === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime)
+              rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
             }else {
               rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
             }
+           if (this.sarAccessInfoList[i].xcxssrqgj === null) {
+             rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
+           }else {
+             rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
+           }
+           if (this.sarAccessInfoList[i].zccssrqgj === null) {
+             rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
+           }else {
+             rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+           }
           }
           rowlist = rowlist.join(',')
           rowlist1 = rowlist1.join(',')
           rowlist2 = rowlist2.join(',')
           rowlist3 = rowlist3.join(',')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
-          sarAccessEO.inforlist = JSON.stringify(rowlist)
+          sarAccessEO.inforlist = rowlist
-          sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
+          sarAccessEO.inforlist1 = rowlist1
-          sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
+          sarAccessEO.inforlist2 = rowlist2
-          sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
+          sarAccessEO.inforlist3 = rowlist3
           sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
           // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
           // 判断是否有附件
@@ -1391,8 +1399,8 @@ export default {
             this.$set(item, 'kccvppsbm', '')
             this.$set(item, 'kccvppscn', '')
           }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1433,8 +1441,8 @@ export default {
             this.$set(item, 'kccvppsbm', '')
             this.$set(item, 'kccvppscn', '')
           }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1469,8 +1477,8 @@ export default {
           this.$set(item, 'kccvppsbm', '')
           this.$set(item, 'kccvppscn', '')
         }else {
-          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
-          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
           this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
           this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
           this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1571,7 +1579,7 @@ export default {
         for (var accessInfo in exportList) {
           accIdAndrestype.push(exportList[accessInfo].id)
         }
-        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
         window.open(exportURL)
         this.$message.success('导出信息成功')
       }
@@ -1984,7 +1992,7 @@ export default {
       }, {
         _this: this
       }, res => {
-        this.sarAccessInfoList = res.data
+        this.sarAccessInfoList = res.data.records
         this.sarAccessInfoList.forEach(item => {
           if (item.standYear === null) {
             item.standNumber = item.standSortShow + ' ' + item.standNumber
@@ -2003,8 +2011,8 @@ export default {
             this.$set(item, 'kccvppsbm', '')
             this.$set(item, 'kccvppscn', '')
           }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)

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

@@ -223,24 +223,12 @@
             align="center"
             width="180px"
             label="适用车型">
-            <template slot-scope="scope">
-              <span v-if="scope.row.typeApplicable !== null && scope.row.typeApplicable.indexOf(',')  > 0">
-              {{ scope.row.typeApplicable }}
-              </span>
-              <span v-else>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="nylx"
             align="center"
             width="180px"
             label="能源类型">
-            <template slot-scope="scope">
-              <span v-if="scope.row.nylx !== null && scope.row.nylx.indexOf(',')  > 0">
-              {{ scope.row.nylx }}
-              </span>
-              <span v-else>{{ nylxMap[scope.row.nylx] }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="putTime"
@@ -282,12 +270,6 @@
             width="210px"
             align="center"
             label="责任部门">
-            <template slot-scope="scope">
-              <span v-if="scope.row.zrbm !== null && scope.row.zrbm.indexOf(',')  > 0">
-              {{ scope.row.zrbm }}
-              </span>
-              <span v-else>{{ zrbmMap[scope.row.zrbm] }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -295,12 +277,6 @@
             width="180px"
             align="center"
             label="适用产品线">
-            <template slot-scope="scope">
-              <span v-if="scope.row.sycpx !== null && scope.row.sycpx.indexOf(',')  > 0">
-              {{ scope.row.sycpx }}
-              </span>
-              <span>{{ sycpxMap[scope.row.sycpx] }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -405,7 +381,7 @@ export default {
       heightShow: true,
       dataLoading: false,
       standardForm: {
-
+        zrbm: '',
         standNumber: "",
         standName: "",
         responseUnit: "",
@@ -413,6 +389,10 @@ export default {
         Size: this.$store.getters.userInfo.configContent
       },
       standardFormList: {
+        zrbm: '',
+        typeApplicable: '',
+        nylx: '',
+        sycpx: '',
         standNumber: '',
         standName: '',
         responseUnit: '',
@@ -490,7 +470,8 @@ export default {
       }, {
         _this: this
       }, res => {
-        this.standinfoList = res.data;
+        this.standinfoList = res.data.records;
+        this.standardFormTotal = res.data.total
         this.standinfoList.forEach(item => {
           if (item.standYear === null) {
             item.standNumber = item.standSortShow + ' ' + item.standNumber
@@ -498,7 +479,6 @@ export default {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
         })
-        this.total = res.data.total;
       }, e => {
 
       });
@@ -517,8 +497,14 @@ export default {
     },
     // 重置搜索
     resetSelect() {
+      this.standardForm.zrbm = ''
       this.standardForm.standName = ''
       this.standardForm.responseUnit = ''
+      this.standardFormList.standName = ''
+      this.standardFormList.typeApplicable = ''
+      this.standardFormList.nylx = ''
+      this.standardFormList.zrbm = ''
+      this.standardFormList.sycpx = ''
       this.selectInfobyAccid()
     },
     exportStandard() {

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

@@ -290,9 +290,11 @@
           width="210px"
           align="center"
           label="在产车实施日期">
-            <template slot-scope="scope">
+          <template slot-scope="scope">
-                <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            <span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
-            </template>
+            </span>
+            <span v-else>{{ scope.row.zccssrqgj.slice(0,10) }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="xcxssrqgj"
@@ -300,9 +302,11 @@
           align="center"
           width="210px"
           label="新车型实施日期">
-            <template slot-scope="scope">
+          <template slot-scope="scope">
-                <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            <span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
-            </template>
+            </span>
+            <span v-else>{{ scope.row.xcxssrqgj.slice(0,10) }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -851,7 +855,6 @@ export default {
     }
   },
   created() {
-    this.selectLawsStands()
     dicTypeData().then(res => {
       // 责任部门数据字典
       this.zrbmOptions = res.data.ZRBMCLASS
@@ -944,11 +947,13 @@ export default {
       return true
     },
     moreSearch () {
+      this.selectLawsStands()
       this.moreSearchShow = !this.moreSearchShow
       this.moreSearchBtn = !this.moreSearchBtn
     },
     // 点击显示隐藏数据列表 按钮事件
     isShowTable () {
+      this.selectLawsStands()
       this.showTableFlag = !this.showTableFlag
       this.selectedAccInfoSearchList = [] // 清空
     },
@@ -1137,10 +1142,10 @@ export default {
               return items.id == item.id
             })
           if(addList > -1){
-            this.$message.warning('请勿添加重复数据')
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
+            this.$message.warning('请勿添加重复数据')
           } else{
             this.sarAccessInfoList.push(item)
             // this.$refs.accessTypeSelect.clearSelection()
@@ -1258,25 +1263,31 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === null)  {
+            if (this.sarAccessInfoList[i].putTime === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime)
+              rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
             }else {
               rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+            }
+            if (this.sarAccessInfoList[i].xcxssrqgj === null) {
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
+            }else {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
             }
+            if (this.sarAccessInfoList[i].zccssrqgj === null) {
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
+            }else {
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+            }
           }
           rowlist = rowlist.join(',')
           rowlist1 = rowlist1.join(',')
           rowlist2 = rowlist2.join(',')
           rowlist3 = rowlist3.join(',')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
-          sarAccessEO.inforlist = JSON.stringify(rowlist)
+          sarAccessEO.inforlist = rowlist
-          sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
+          sarAccessEO.inforlist1 = rowlist1
-          sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
+          sarAccessEO.inforlist2 = rowlist2
-          sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
+          sarAccessEO.inforlist3 = rowlist3
           // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
           // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
           // 判断是否有附件
@@ -1315,7 +1326,6 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
-                this.$message.success('编辑成功')
                 this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
@@ -1357,8 +1367,8 @@ export default {
             this.$set(item, 'kccvppsbm', '')
             this.$set(item, 'kccvppscn', '')
           }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1400,8 +1410,8 @@ export default {
             this.$set(item, 'kccvppsbm', '')
             this.$set(item, 'kccvppscn', '')
           }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1436,8 +1446,8 @@ export default {
           this.$set(item, 'kccvppsbm', '')
           this.$set(item, 'kccvppscn', '')
         }else {
-          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
-          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
           this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
           this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
           this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1538,7 +1548,7 @@ export default {
         for (var accessInfo in exportList) {
           accIdAndrestype.push(exportList[accessInfo].id)
         }
-        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
         window.open(exportURL)
         // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
         this.$message.success('导出信息成功')
@@ -1953,7 +1963,7 @@ export default {
       }, {
         _this: this
       }, res => {
-        this.sarAccessInfoList = res.data
+        this.sarAccessInfoList = res.data.records
         this.sarAccessInfoList.forEach(item => {
           if (item.standYear === null) {
             item.standNumber = item.standSortShow + ' ' + item.standNumber
@@ -1972,8 +1982,8 @@ export default {
             this.$set(item, 'kccvppsbm', '')
             this.$set(item, 'kccvppscn', '')
           }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)

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

@@ -291,7 +291,9 @@
           align="center"
           label="在产车实施日期">
           <template slot-scope="scope">
-            <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            <span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
+            </span>
+            <span v-else>{{ scope.row.zccssrqgj.slice(0,10) }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -301,7 +303,9 @@
           width="210px"
           label="新车型实施日期">
           <template slot-scope="scope">
-            <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            <span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
+            </span>
+            <span v-else>{{ scope.row.xcxssrqgj.slice(0,10) }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -851,7 +855,6 @@ export default {
     }
   },
   created() {
-    this.selectLawsStands()
     dicTypeData().then(res => {
       // 责任部门数据字典
       this.zrbmOptions = res.data.ZRBMCLASS
@@ -944,11 +947,13 @@ export default {
       return true
     },
     moreSearch () {
+      this.selectLawsStands()
       this.moreSearchShow = !this.moreSearchShow
       this.moreSearchBtn = !this.moreSearchBtn
     },
     // 点击显示隐藏数据列表 按钮事件
     isShowTable () {
+      this.selectLawsStands()
       this.showTableFlag = !this.showTableFlag
       this.selectedAccInfoSearchList = [] // 清空
     },
@@ -1136,10 +1141,10 @@ export default {
               return items.id == item.id
             })
           if(addList > -1){
-            this.$message.warning('请勿添加重复数据')
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
+            this.$message.warning('请勿添加重复数据')
           } else{
             this.sarAccessInfoList.push(item)
             // this.$refs.accessTypeSelect.clearSelection()
@@ -1257,25 +1262,31 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj ===null || this.sarAccessInfoList[i].xcxssrqgj === null)  {
+            if (this.sarAccessInfoList[i].putTime === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime)
+              rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
             }else {
               rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+            }
+            if (this.sarAccessInfoList[i].xcxssrqgj === null) {
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
+            }else {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
             }
+            if (this.sarAccessInfoList[i].zccssrqgj === null) {
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
+            }else {
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+            }
           }
           rowlist = rowlist.join(',')
           rowlist1 = rowlist1.join(',')
           rowlist2 = rowlist2.join(',')
           rowlist3 = rowlist3.join(',')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
-          sarAccessEO.inforlist = JSON.stringify(rowlist)
+          sarAccessEO.inforlist = rowlist
-          sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
+          sarAccessEO.inforlist1 = rowlist1
-          sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
+          sarAccessEO.inforlist2 = rowlist2
-          sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
+          sarAccessEO.inforlist3 = rowlist3
           // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
           // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
           // 判断是否有附件
@@ -1314,7 +1325,6 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
-                this.$message.success('编辑成功')
                 this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
@@ -1356,8 +1366,8 @@ export default {
             this.$set(item, 'kccvppsbm', '')
             this.$set(item, 'kccvppscn', '')
           }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1399,8 +1409,8 @@ export default {
             this.$set(item, 'kccvppsbm', '')
             this.$set(item, 'kccvppscn', '')
           }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1435,8 +1445,8 @@ export default {
           this.$set(item, 'kccvppsbm', '')
           this.$set(item, 'kccvppscn', '')
         }else {
-          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
-          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
           this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
           this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
           this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1537,7 +1547,7 @@ export default {
         for (var accessInfo in exportList) {
           accIdAndrestype.push(exportList[accessInfo].id)
         }
-        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
         window.open(exportURL)
         // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
         this.$message.success('导出信息成功')
@@ -1954,7 +1964,7 @@ export default {
       }, {
         _this: this
       }, res => {
-        this.sarAccessInfoList = res.data
+        this.sarAccessInfoList = res.data.records
         this.sarAccessInfoList.forEach(item => {
           if (item.standYear === null) {
             item.standNumber = item.standSortShow + ' ' + item.standNumber
@@ -1975,8 +1985,8 @@ export default {
             this.$set(item, 'kccvppsbm', '')
             this.$set(item, 'kccvppscn', '')
           }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -4,7 +4,7 @@
     <div class="tree-content" :class="{ 'tree-closed': sideClose }">
       <div class="tree">
         <el-input
-            placeholder="输入海外标准法规"
+            placeholder="输入树状图体系"
             v-model="filterText">
         </el-input>
         <el-tree

src/sysConfig/index.js

@@ -6,7 +6,7 @@
 // 服务器地址
 // const devIp = '10.96.10.171'
 // const devInterfacePORT = '9999'
-const devIp = '192.168.1.145'
+const devIp = '10.96.170.156'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'