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

src/api/phone.js

@@ -0,0 +1,9 @@
+import axios from "@/common/axiosV2";
+
+export function phoneUser(params) {
+  return axios({
+    url: "api/sys/user/getUserByPhone",
+    method: "get",
+    params
+  });
+}

src/components/index.js

@@ -27,6 +27,8 @@ import SQTree from './SQTree'
 import OrgTable from './OrgTable'
 import MySelect from './mySelect'
 
+import phoneRole from './phoneRole'
+
 const install = function (Vue) {
   Vue.component('loading', Loading)
   Vue.component('navMenu', NavMenu)
@@ -52,6 +54,7 @@ const install = function (Vue) {
   Vue.component('RoleTree', RoleTree)
   Vue.component('MechanismTree', MechanismTree)
   Vue.component('MySelect', MySelect)
+  Vue.component('phoneRole', phoneRole)
 }
 
 export default {

src/components/phoneRole/index.vue

@@ -0,0 +1,250 @@
+<template>
+  <div class="phoneRole phoneBox">
+    <van-action-sheet
+      v-model="isShowPhone2"
+      :title="roleTitle"
+    >
+      <el-form
+        ref="phoneForm"
+        class="label-input-form"
+        :inline="true"
+        :model="phoneForm"
+        @submit.native.prevent
+      >
+        <el-form-item class="form-item-disabled" style="margin: 10px;">
+          <el-input
+            size="small"
+            clearable
+            v-model="phoneForm.name"
+            placeholder="请输入姓名"
+          ></el-input>
+        </el-form-item>
+        <el-form-item class="form-item-disabled" style="margin: 10px;">
+          <el-button type="primary" size="small" @click="queryPhone">查询</el-button>
+        </el-form-item>
+      </el-form>
+      <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+          :immediate-check="false"
+          :offset="300"
+        >
+          <van-checkbox-group v-if="!checkMore" v-model="result" :max="1">
+            <van-cell-group>
+              <van-cell
+                v-for="(item, index) in roleList"
+                clickable
+                :key="index"
+                :title="item.userName"
+                @click="toggle(index)"
+              >
+                <template #right-icon>
+                  <van-checkbox :name="item" ref="checkbox"/>
+                </template>
+              </van-cell>
+            </van-cell-group>
+          </van-checkbox-group>
+          <van-checkbox-group v-if="checkMore" v-model="result">
+            <van-cell-group>
+              <van-cell
+                v-for="(item, index) in roleList"
+                clickable
+                :key="index"
+                :title="item.userName"
+                @click="toggle(index)"
+              >
+                <template #right-icon>
+                  <van-checkbox :name="item" ref="checkbox"/>
+                </template>
+              </van-cell>
+            </van-cell-group>
+          </van-checkbox-group>
+        </van-list>
+      </van-pull-refresh>
+      <div class="phoneBtn">
+        <van-button type="default" @click="roleClear">取消</van-button>
+        <van-button type="info" @click="roleSumit">确认</van-button>
+      </div>
+    </van-action-sheet>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue';
+import {ActionSheet, Checkbox, CheckboxGroup, Cell, CellGroup, Button, List, PullRefresh} from 'vant';
+import {phoneUser} from '@/api/phone'
+
+Vue.use(ActionSheet, Checkbox, CheckboxGroup, Cell, CellGroup, Button, List, PullRefresh);
+
+export default {
+  name: "phoneRole",
+  props: {
+    isShowPhone: {
+      type: Boolean,
+      default: false,
+    },
+    checkMore: {
+      type: Boolean,
+      default: false,
+    },
+    roleTitle: {
+      type: String,
+    },
+    resultList: { // 回显
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      filterText: '',
+      isShowPhone2: false,
+      result: [],
+      phoneForm: {
+        name: '',
+        page: 1
+      },
+      roleList: [],
+      loading: false,
+      finished: false,
+      refreshing: false,
+      total: '',
+    }
+  },
+  watch: {
+    isShowPhone(val) {
+      this.isShowPhone2 = val
+      if (val) {
+        this.result = this.resultList
+      }
+    },
+    isShowPhone2(val) {
+      this.$emit('update:isShowPhone', val)
+    },
+    resultList (val) {
+      this.result = val
+    },
+    result() {
+      this.$emit('resultList', this.result)
+    }
+  },
+  mounted() {
+    this.getPhoneData()
+  },
+  methods: {
+    /** 查询 */
+    queryPhone() {
+      this.getPhoneData()
+    },
+    /** 获取人员数据 */
+    async getPhoneData() {
+      this.phoneForm.page = 1
+      this.roleList = []
+      phoneUser(this.phoneForm).then(res => {
+        if (res.ok) {
+          this.roleList = res.data
+          this.total = this.roleList[0].total
+          this.loading = false
+          if (this.total === this.roleList.length) {
+            this.finished = true
+          } else {
+            this.finished = false
+          }
+          this.refreshing = false
+          this.loading = false
+        }
+      })
+    },
+    toggle(index) {
+      if (!this.checkMore) {
+        this.result = []
+        this.$refs.checkbox[index].toggle();
+      } else {
+        this.$refs.checkbox[index].toggle();
+      }
+
+    },
+    roleSumit() {
+      this.$emit('checkedRole', this.result)
+      this.isShowPhone2 = false
+    },
+    roleClear() {
+      this.result = []
+      this.isShowPhone2 = false
+    },
+
+    // 下滑加载数据
+    onLoad() {
+      phoneUser(this.phoneForm).then(res => {
+        this.roleList = this.roleList.concat(res.data)
+        this.total = this.roleList[0].total
+        this.loading = false
+        if (this.roleList.length < this.total) {
+          this.phoneForm.page ++
+          this.loading = false
+        } else {
+          this.finished = true
+          this.loading = true
+        }
+      })
+    },
+    // 下拉刷新
+    onRefresh() {
+      this.getPhoneData()
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/phone';
+
+.phoneRole {
+
+
+  .van-action-sheet {
+    height: 100%;
+    max-height: 100%;
+  }
+
+  .van-action-sheet__cancel {
+    border-radius: 5px;
+    background-color: #0c91e5;
+    color: #fff;
+  }
+
+  .van-action-sheet__content {
+    overflow-y: hidden;
+  }
+
+  .van-list {
+    //min-height: 9rem;
+    height: 9.5rem;
+    overflow-y: auto;
+  }
+
+  .van-popup--bottom.van-popup--round {
+    border-radius: 0;
+  }
+
+  .phoneBtn {
+    padding: 5px;
+
+    .van-button--info {
+      width: 49%;
+      float: right;
+    }
+
+    .van-button--default {
+      width: 49%;
+      float: left;
+    }
+  }
+}
+
+</style>

src/pages/config/pages/attributeCustom/components/buss.vue

@@ -77,7 +77,7 @@
 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'18f50c76137df9b3112d07942b0d517f'">编辑</el-dropdown-item>
-                  <el-dropdown-item :disabled="scope.row.isEdit==='1'"  v-btn-permission="'eca5a9d90a5de7bf86c349cd0e73b1cf'" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                  <el-dropdown-item :disabled="scope.row.isEdit==='1'"  v-btn-permission="'c157be4e073787ea6c4a04bd39686c2d'" :command="[scope.row, '删除']">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>

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

@@ -24,7 +24,7 @@
                   <el-collapse-transition>
                     <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
-                            <el-col :span="12">
+                            <el-col :span="24">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.title"
@@ -236,7 +236,7 @@
                     :action="fileUrl"
                     ref="importfile"
                     name="file"
-                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
                     :before-upload="beginImportFile"
                     :on-success="importFileSuccess2"
                     :on-remove="importFileRemove2"
@@ -255,7 +255,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import { saveTaskFirst, queryTaskFirst, getBusStandFileByAttId } from 'api/process'
+    import { saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel } from 'api/process'
 
     export default {
         name: "bzdyStep1-1",
@@ -290,9 +290,9 @@
                     date: [
                         { type: 'date', required: true, message: '请选择完成时间', trigger: 'change' }
                     ],
-                    modelNameList: [
+                    // modelNameList: [
-                        { required: true, message: '请上传调研结果', trigger: 'change' },
+                    //     { required: true, message: '请上传调研结果', trigger: 'change' },
-                    ]
+                    // ]
                 },
                 roleForm: {
                     startUserName: this.$store.getters.userInfo.userName,
@@ -442,7 +442,7 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
                     return true
                 } else {
                     this.spinShow = false
@@ -575,6 +575,12 @@
                                         }, {}, res => {
                                             if (res.success) {
                                                 this.$message.success('流程发起成功')
+                                                let taskId = {
+                                                    id: this.$route.query.bpnId
+                                                }
+                                                taskDel(taskId).then(res=>{
+                                                    return res
+                                                })
                                                 this.$router.push('/processCenter')
                                             }
                                             this.isSubmit = false

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

@@ -237,7 +237,7 @@
               :action="fileUrl"
               ref="importfile"
               name="file"
-              accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+              accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
               :before-upload="beginImportFile"
               :on-success="importFileSuccess2"
               :on-remove="importFileRemove2"
@@ -257,12 +257,13 @@ import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
 import { saveTaskFirst } from 'api/process'
-import { getBusStandFileByAttId } from 'api/process'
+import { getBusStandFileByAttId,taskDel } from 'api/process'
 
 export default {
   name: "bzdyStep1",
   data() {
     return {
+      bpnId: '',
       foldFormFlag: false,
       fileMadel2: false,
       commentText: '',
@@ -434,10 +435,10 @@ export default {
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX') {
+      if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
         return true
       } else {
-        this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
+        this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')
         return false
       }
       // 判断文件上传大小
@@ -571,6 +572,14 @@ export default {
                   }, {}, res => {
                     if (res.success) {
                       this.$message.success('流程发起成功')
+                      if (this.bpnId !== '') {
+                        let taskId = {
+                          id: this.bpnId
+                        }
+                        taskDel(taskId).then(res=>{
+                          return res
+                        })
+                      }
                       this.$router.push('/processCenter')
                     }
                     this.isSubmit = false
@@ -590,7 +599,9 @@ export default {
       })
     }
   },
-  mounted () {},
+  mounted () {
+    this.bpnId = this.$route.query.bpnId
+  },
 }
 </script>
 

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

@@ -230,7 +230,7 @@
                     :action="fileUrl"
                     ref="importfile"
                     name="file"
-                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
                     :before-upload="beginImportFile"
                     :on-success="importFileSuccess"
                     :show-file-list="true"
@@ -408,11 +408,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')
                     return false
                 }
                 // 判断文件上传大小

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

@@ -209,7 +209,7 @@
                     :action="fileUrl"
                     ref="importfile"
                     name="file"
-                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
                     :before-upload="beginImportFile"
                     :on-success="importFileSuccess"
                     :show-file-list="true"
@@ -320,11 +320,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')
                     return false
                 }
                 // 判断文件上传大小

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

@@ -199,7 +199,7 @@
                     :action="fileUrl"
                     ref="importfile"
                     name="file"
-                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
                     :before-upload="beginImportFile"
                     :on-success="importFileSuccess"
                     :show-file-list="false"
@@ -311,11 +311,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')
                     return false
                 }
                 // 判断文件上传大小

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

@@ -199,7 +199,7 @@
                     :action="fileUrl"
                     ref="importfile"
                     name="file"
-                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
                     :before-upload="beginImportFile"
                     :on-success="importFileSuccess"
                     :show-file-list="false"
@@ -311,11 +311,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')
                     return false
                 }
                 // 判断文件上传大小

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

@@ -199,7 +199,7 @@
                     :action="fileUrl"
                     ref="importfile"
                     name="file"
-                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
                     :before-upload="beginImportFile"
                     :on-success="importFileSuccess"
                     :show-file-list="false"
@@ -311,11 +311,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')
                     return false
                 }
                 // 判断文件上传大小

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

@@ -199,7 +199,7 @@
                     :action="fileUrl"
                     ref="importfile"
                     name="file"
-                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
                     :before-upload="beginImportFile"
                     :on-success="importFileSuccess"
                     :show-file-list="false"
@@ -311,11 +311,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')
                     return false
                 }
                 // 判断文件上传大小

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue

@@ -163,7 +163,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -171,7 +171,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue

@@ -252,7 +252,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -260,7 +260,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue

@@ -178,7 +178,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -186,7 +186,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue

@@ -217,7 +217,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -225,7 +225,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue

@@ -180,7 +180,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -188,7 +188,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue

@@ -183,7 +183,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -191,7 +191,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue

@@ -166,7 +166,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -174,7 +174,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -79,7 +79,7 @@
                   <el-date-picker
                     v-model="ch_pageData.meetingStartTime"
                     type="date"
-                    value-format="yyyy-MM-dd HH:mm:ss"
+                    value-format="yyyy-MM-dd"
                     placeholder="选择日期时间"
                     align="right">
                   </el-date-picker>

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue

@@ -162,7 +162,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -170,7 +170,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue

@@ -217,7 +217,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -225,7 +225,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue

@@ -168,7 +168,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -176,7 +176,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue

@@ -186,7 +186,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -194,7 +194,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue

@@ -168,7 +168,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -176,7 +176,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue

@@ -171,7 +171,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -179,7 +179,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -1,6 +1,6 @@
 <template>
     <div class="bzjdStep1-1">
-        <!--    标准征求意见流程-->
+        <!--    标准解读流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准解读流程</template>
             <template slot="proNode">发起流程</template>
@@ -20,120 +20,64 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                  <el-collapse-transition>
+                    <el-collapse-transition>
-                  <div class="prc-content-border" v-if="foldFormFlag === false">
+                        <div class="prc-content-border" v-if="foldFormFlag === false">
-                        <el-row :gutter="24">
+                            <el-row :gutter="24">
-                            <el-col :span="24">
+                                <el-col :span="24">
-                                <el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
+                                    <el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
-                                    <div class="addButton">
+                                        <div class="addButton">
-                                        <el-button  size="small" type="primary" @click="addZqyjList">导入</el-button>
+                                            <el-button size="small" type="primary" @click="addZqyjList">导入</el-button>
-                                    </div>
+                                        </div>
-                                </el-form-item>
+                                    </el-form-item>
-                                <el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled">
+                                    <el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled">
-                                    <el-input
+                                        <el-input
-                                            disabled
+                                                disabled
-                                            v-model="form.itemsNum"
+                                                v-model="form.itemsNum"
-                                            placeholder="请输入标准编号"
+                                                placeholder="请输入标准编号"
-                                            clearable
+                                                clearable
-                                    ></el-input>
+                                        ></el-input>
-                                </el-form-item>
+                                    </el-form-item>
-                                <el-form-item label="标准名称/政策名称" prop="itemsName" class="add-form-item form-item-disabled">
+                                    <el-form-item label="标准名称/政策名称" prop="itemsName" class="add-form-item form-item-disabled">
-                                    <el-input
+                                        <el-input
-                                            disabled
+                                                disabled
-                                            v-model="form.itemsName"
+                                                v-model="form.itemsName"
-                                            placeholder="请输入标准名称"
+                                                placeholder="请输入标准名称"
-                                            clearable
+                                                clearable
-                                    ></el-input>
+                                        ></el-input>
-                                </el-form-item>
+                                    </el-form-item>
-                                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                    <el-form-item label="对比拆分数据" class="add-form-item form-item-disabled">
-                                    <el-input
+                                        <div class="addButton">
-                                            disabled
+                                            <el-button size="small" :disabled="!form.itemsNum" type="primary" @click="addDbList">导入</el-button>
-                                            v-model="form.itemsNum1"
+                                        </div>
-                                            clearable
+                                    </el-form-item>
-                                    ></el-input>
+                                    <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
-                                </el-form-item>
+                                        <el-input
-                                <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                                disabled
-                                    <el-input
+                                                v-model="form.itemsNum1"
-                                            disabled
+                                                clearable
-                                            v-model="form.itemsNum1"
+                                        ></el-input>
-                                            clearable
+                                    </el-form-item>
-                                    ></el-input>
+                                    <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled">
-                                </el-form-item>
+                                        <el-input
-                                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                                disabled
-                                    <el-input
+                                                v-model="form.itemsName1"
-                                            disabled
+                                                clearable
-                                            v-model="form.itemsName1"
+                                        ></el-input>
-                                            clearable
+                                    </el-form-item>
-                                    ></el-input>
+                                    <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
-                                </el-form-item>
+                                        <el-date-picker
-                                <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                                v-model="form.endTime"
-                                    <el-input
+                                                type="date"
-                                            disabled
+                                                placeholder="请选择截止日期"
-                                            v-model="form.itemsName1"
+                                                value-format="yyyy-MM-dd">
-                                            clearable
+                                        </el-date-picker>
-                                    ></el-input>
+                                    </el-form-item>
-                                </el-form-item>
+                                </el-col>
-                            </el-col>
+                            </el-row>
-                        </el-row>
+                        </div>
-                    </div>
+                    </el-collapse-transition>
-                  </el-collapse-transition>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
-                  <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
-                  <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
-                  <div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
-                    <el-row :gutter="24">
-                      <el-col :span="24">
-                        <el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
-                          <div class="addButton">
-                            <el-button  size="small" type="primary" @click="addZqyjList">导入</el-button>
-                          </div>
-                        </el-form-item>
-                        <el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled">
-                          <el-input
-                              disabled
-                              v-model="form.itemsNum"
-                              placeholder="请输入标准编号"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="标准名称/政策名称" prop="itemsName" class="add-form-item form-item-disabled">
-                          <el-input
-                              disabled
-                              v-model="form.itemsName"
-                              placeholder="请输入标准名称"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsNum1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsNum1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsName1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsName1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                  </div>
                 </el-form>
             </div>
             <ProcessTitle>
@@ -426,6 +370,49 @@
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>
         </el-dialog>
+        <el-drawer
+                title="对比拆分数据库"
+                :visible.sync="listModel3"
+                size="900px"
+                custom-class="demo-drawer"
+        >
+            <div class="standardForComments">
+                <div class="content content2">
+                    <div class="table-wrap">
+                        <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
+                            <el-table
+                                    ref="selection"
+                                    :data="standInfoList3"
+                                    tooltip-effect="dark"
+                                    style="width: 100%;padding:0 0 20px 0;"
+                                    height="100%"
+                                    border
+                                    @selection-change="handleSelection3"
+                                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                                <el-table-column type="selection" width="55" align="center"/>
+                                <el-table-column
+                                        prop="oldStandNum"
+                                        label="标准号/政策号"
+                                        width="170"
+                                        align="center">
+                                </el-table-column>
+                                <el-table-column
+                                        prop="oldStandName"
+                                        label="标准名称/政策名称"
+                                        show-overflow-tooltip
+                                        align="center">
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                    </div>
+                </div>
+                <loading :loading="spinShow3">数据加载中……</loading>
+                <div class="demo-drawer-footer">
+                    <el-button size="mini" @click="closeDrawer3">取消</el-button>
+                    <el-button type="primary" size="mini" @click="enterDrawer3">导入</el-button>
+                </div>
+            </div>
+        </el-drawer>
     </div>
 </template>
 
@@ -434,11 +421,15 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import { saveTaskFirst, queryTaskFirst } from 'api/process'
+    import { saveTaskFirst, queryTaskFirst,taskDel } from 'api/process'
     export default {
         name: "bzjdStep1-1",
         data() {
             return {
+                listModel3: false,
+                standInfoList3: [],
+                spinShow3: false,
+                selectedList3: [],
                 //折叠的标志，true为折叠，false为不折叠
                 foldFormFlag: false,
                 itermsConditionsFlag: false,
@@ -535,6 +526,51 @@
             ProcessTitle
         },
         methods: {
+            handleSelection3 (data) {
+                this.selectedList3 = [];
+                for (let i = 0; i < data.length; i++) {
+                    this.selectedList3.push(data[i].id);
+                }
+            },
+            getDbList () {
+                this.$http.get('lawss/sarStandCompareHis/page', {
+                    page: 1,
+                    pageSize: 9999,
+                    newNumOrName: this.form.itemsNum
+                }, {
+                    _this: this
+                }, res => {
+                    this.standInfoList3 = res.data.list
+                    console.log(res);
+                }, e => {
+                })
+            },
+            addDbList () {
+                this.listModel3 = true
+            },
+            closeDrawer3 () {
+                this.listModel3 = false
+            },
+            enterDrawer3 () {
+                if (this.selectedList3.length === 1) {
+                    let deposit = new Map();
+                    this.standInfoList3.forEach(item => {
+                        deposit.set(item.id, item);
+                    });
+                    let bringData = [];
+                    for (let i = 0; i < this.selectedList3.length; i++) {
+                        bringData.push(deposit.get(this.selectedList3[i]));
+                    }
+                    this.form.itemsNum1 = bringData[0].oldStandNum
+                    this.form.itemsName1 = bringData[0].oldStandName
+                    this.form.oldNumber = bringData[0].oldStandId
+                    this.listModel3 = false
+                } else if (this.selectedList3.length > 1) {
+                    this.$message.warning("只能选择一条数据进行导入");
+                } else {
+                    this.$message.warning("请选择一条数据进行导入");
+                }
+            },
             //折叠/展开基础信息方法
             foldForm() {
               this.foldFormFlag = !this.foldFormFlag
@@ -679,20 +715,14 @@
                     }
                     this.form.itemsNum = bringData[0].showNumber
                     this.form.itemsName = bringData[0].standName
-                    // if (bringData[0].splitStatus === '0') {
-                    //     this.form.itemsNum = bringData[0].standNumSplit
-                    //     this.form.itemsName = bringData[0].standNameSplit
-                    // } else {
-                    //     this.form.itemsNum = bringData[0].showNumber
-                    //     this.form.itemsName = bringData[0].standName
-                    // }
                     this.form.standId = bringData[0].standId
                     this.sarType = bringData[0].standType
                     this.standId = bringData[0].standId
                     this.statusId = bringData[0].id
                     this.form.statusId = bringData[0].id
                     this.listModel = false;
-                    this.listModel2 = true
+                    this.listModel3 = true
+                    this.getDbList()
                     this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
                         infoId: bringData[0].id,
                         page: 1,
@@ -857,6 +887,12 @@
                                             }, {}, res => {
                                                 if (res.success) {
                                                     this.$message.success('流程发起成功')
+                                                    let taskId = {
+                                                        id: this.$route.query.bpnId
+                                                    }
+                                                    taskDel(taskId).then(res=>{
+                                                        return res
+                                                    })
                                                     this.$router.push('/processCenter')
                                                 }
                                             })
@@ -927,6 +963,9 @@
             height: calc(~'100% - 107px');
             overflow: auto;
         }
+        .content2 {
+            height: calc(~'100% - 57px') !important;
+        }
         .standardForComments {
             height: 100%;
             background: #fff;

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

@@ -46,28 +46,19 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                <el-form-item label="对比拆分数据" class="add-form-item form-item-disabled">
+                  <div class="addButton">
+                    <el-button size="small" :disabled="!form.itemsNum" type="primary" @click="addDbList">导入</el-button>
+                  </div>
+                </el-form-item>
+                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.itemsNum1"
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model="form.itemsNum1"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
-                  <el-input
-                    disabled
-                    v-model="form.itemsName1"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
                   <el-input
                     disabled
                     v-model="form.itemsName1"
@@ -88,63 +79,6 @@
           </el-collapse-transition>
           <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
           <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
-          <el-collapse-transition>
-          <div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
-            <el-row :gutter="24">
-              <el-col :span="24">
-                <el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
-                  <div class="addButton">
-                    <el-button size="small" type="primary" @click="addZqyjList">导入</el-button>
-                  </div>
-                </el-form-item>
-                <el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled">
-                  <el-input
-                      disabled
-                      v-model="form.itemsNum"
-                      placeholder="请输入标准编号"
-                      clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="标准名称/政策名称" prop="itemsName" class="add-form-item form-item-disabled">
-                  <el-input
-                      disabled
-                      v-model="form.itemsName"
-                      placeholder="请输入标准名称"
-                      clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
-                  <el-input
-                      disabled
-                      v-model="form.itemsNum1"
-                      clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
-                  <el-input
-                      disabled
-                      v-model="form.itemsNum1"
-                      clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
-                  <el-input
-                      disabled
-                      v-model="form.itemsName1"
-                      clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
-                  <el-input
-                      disabled
-                      v-model="form.itemsName1"
-                      clearable
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </div>
-          </el-collapse-transition>
         </el-form>
       </div>
       <ProcessTitle>
@@ -446,6 +380,49 @@
       @checkedRole="saveUserInfo"
       :nodeList="nodeList"
     ></Role-tree>
+    <el-drawer
+            title="对比拆分数据库"
+            :visible.sync="listModel3"
+            size="900px"
+            custom-class="demo-drawer"
+    >
+      <div class="standardForComments">
+        <div class="content content2">
+          <div class="table-wrap">
+            <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
+              <el-table
+                      ref="selection"
+                      :data="standInfoList3"
+                      tooltip-effect="dark"
+                      style="width: 100%;padding:0 0 20px 0;"
+                      height="100%"
+                      border
+                      @selection-change="handleSelection3"
+                      :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                <el-table-column type="selection" width="55" align="center"/>
+                <el-table-column
+                        prop="oldStandNum"
+                        label="标准号/政策号"
+                        width="170"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="oldStandName"
+                        label="标准名称/政策名称"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
+              </el-table>
+            </div>
+          </div>
+        </div>
+        <loading :loading="spinShow3">数据加载中……</loading>
+        <div class="demo-drawer-footer">
+          <el-button size="mini" @click="closeDrawer3">取消</el-button>
+          <el-button type="primary" size="mini" @click="enterDrawer3">导入</el-button>
+        </div>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
@@ -454,12 +431,18 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {saveTaskFirst} from 'api/process'
+import {saveTaskFirst, taskDel} from 'api/process'
 
 export default {
   name: "bzjdStep1",
   data() {
     return {
+      bpnId: '',
+      listModel3: false,
+      standInfoList3: [],
+      spinShow3: false,
+      selectedList3: [],
+
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
       itermsConditionsFlag: false,
@@ -562,6 +545,50 @@ export default {
     ProcessTitle
   },
   methods: {
+    handleSelection3 (data) {
+      this.selectedList3 = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectedList3.push(data[i].id);
+      }
+    },
+    getDbList () {
+      this.$http.get('lawss/sarStandCompareHis/page', {
+        page: 1,
+        pageSize: 9999,
+        newNumOrName: this.form.itemsNum
+      }, {
+        _this: this
+      }, res => {
+        this.standInfoList3 = res.data.list
+      }, e => {
+      })
+    },
+    addDbList () {
+      this.listModel3 = true
+    },
+    closeDrawer3 () {
+      this.listModel3 = false
+    },
+    enterDrawer3 () {
+      if (this.selectedList3.length === 1) {
+        let deposit = new Map();
+        this.standInfoList3.forEach(item => {
+          deposit.set(item.id, item);
+        });
+        let bringData = [];
+        for (let i = 0; i < this.selectedList3.length; i++) {
+          bringData.push(deposit.get(this.selectedList3[i]));
+        }
+        this.form.itemsNum1 = bringData[0].oldStandNum
+        this.form.itemsName1 = bringData[0].oldStandName
+        this.form.oldNumber = bringData[0].id
+        this.listModel3 = false
+      } else if (this.selectedList3.length > 1) {
+        this.$message.warning("只能选择一条数据进行导入");
+      } else {
+        this.$message.warning("请选择一条数据进行导入");
+      }
+    },
     //折叠/展开基础信息方法
     foldForm() {
       this.foldFormFlag = !this.foldFormFlag
@@ -582,14 +609,6 @@ export default {
         }
       })
       window.open(routeUrl.href, '_blank')
-      // this.$store.commit('setDetailMap', this.$route.path)
-      // this.$router.push({
-      //     name: 'ItemSplitInfo',
-      //     query: {
-      //         infoId: row.id,
-      //         result: row.result,
-      //     }
-      // })
     },
     setMap(data) {
       data.forEach(item => {
@@ -651,7 +670,6 @@ export default {
             item.ZCCSSRQ = item.attrInfoMap.ZCCSSRQ
           }
         })
-
         this.total2 = res.data.count
         this.$http.get('sys/dictype/getDicTypeListCode', '', {
           _this: this
@@ -711,13 +729,6 @@ export default {
         }
         this.form.itemsNum = bringData[0].showNumber
         this.form.itemsName = bringData[0].standName
-        // if (bringData[0].splitStatus === '0') {
-        //     this.form.itemsNum = bringData[0].standNumSplit
-        //     this.form.itemsName = bringData[0].standNameSplit
-        // } else {
-        //     this.form.itemsNum = bringData[0].showNumber
-        //     this.form.itemsName = bringData[0].standName
-        // }
         this.form.standId = bringData[0].standId
         this.sarType = bringData[0].standType
         this.standId = bringData[0].standId
@@ -725,7 +736,8 @@ export default {
         this.form.statusId = bringData[0].id
         this.form.fileType = bringData[0].fileType
         this.listModel = false;
-        this.listModel2 = true
+        this.listModel3 = true
+        this.getDbList()
         this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
           infoId: bringData[0].id,
           page: 1,
@@ -767,13 +779,6 @@ export default {
         for (let i = 0; i < this.selectedList2.length; i++) {
           bringData.push(deposit.get(this.selectedList2[i]));
         }
-        // if (bringData[0].splitStatus === '0') {
-        //     this.form.itemsNum1 = bringData[0].standNumSplit
-        //     this.form.itemsName1 = bringData[0].standNameSplit
-        // } else {
-        //     this.form.itemsNum1 = bringData[0].showNumber
-        //     this.form.itemsName1 = bringData[0].standName
-        // }
         if (bringData[0].standYear) {
           this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear
         } else {
@@ -897,6 +902,14 @@ export default {
                     }, {}, res => {
                       if (res.success) {
                         this.$message.success('流程发起成功')
+                        if (this.bpnId !== '') {
+                          let taskId = {
+                            id: this.bpnId
+                          }
+                          taskDel(taskId).then(res=>{
+                            return res
+                          })
+                        }
                         this.$router.push('/processCenter')
                       }
                     })
@@ -972,6 +985,9 @@ export default {
     height: calc(~'100% - 107px');
     overflow: auto;
   }
+  .content2 {
+    height: calc(~'100% - 57px') !important;
+  }
 
   .standardForComments {
     height: 100%;

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

@@ -40,28 +40,14 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
                                             v-model="form.itemsNum1"
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.itemsNum1"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
-                                    <el-input
-                                            disabled
-                                            v-model="form.itemsName1"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
                                     <el-input
                                             disabled
                                             v-model="form.itemsName1"
@@ -74,56 +60,6 @@
                   </el-collapse-transition>
                   <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
                   <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
-                  <div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
-                    <el-row :gutter="24">
-                      <el-col :span="24">
-                        <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
-                          <el-input
-                              disabled
-                              v-model="form.itemsNum"
-                              placeholder="请输入标准编号"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                          <el-input
-                              disabled
-                              v-model="form.itemsName"
-                              placeholder="请输入标准名称"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsNum1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsNum1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsName1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsName1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                  </div>
                 </el-form>
             </div>
             <ProcessTitle>

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

@@ -40,28 +40,14 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
                                             v-model="form.itemsNum1"
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.itemsNum1"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
-                                    <el-input
-                                            disabled
-                                            v-model="form.itemsName1"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
                                     <el-input
                                             disabled
                                             v-model="form.itemsName1"
@@ -74,56 +60,6 @@
                   </el-collapse-transition>
                   <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
                   <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
-                  <div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
-                    <el-row :gutter="24">
-                      <el-col :span="24">
-                        <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
-                          <el-input
-                              disabled
-                              v-model="form.itemsNum"
-                              placeholder="请输入标准编号"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                          <el-input
-                              disabled
-                              v-model="form.itemsName"
-                              placeholder="请输入标准名称"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsNum1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsNum1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsName1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsName1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                  </div>
                 </el-form>
             </div>
             <ProcessTitle>
@@ -131,6 +67,7 @@
             </ProcessTitle>
             <div class="action-bar">
                 <el-button type="primary" :disabled="acceptShow" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button>
+                <el-button type="primary" v-if="form.itemsNum1" class="common-button-primary add-button" size="mini" @click="checkBD">查看比对</el-button>
             </div>
             <el-table border
                       ref="selection"
@@ -488,6 +425,29 @@
             </div>
         </el-dialog>
         <loading :loading="loading">加载中...</loading>
+        <el-dialog
+                title="查看比对内容"
+                :visible.sync="BDmodel"
+                size="1100px">
+            <div style="height: 600px;overflow: auto;display: flex;">
+                <div>
+                    <div v-for="(item1, index1) in leftData" :key="item1.id" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px;">
+                        <div style="line-height: 20px;">
+                            <span style="margin-right: 5px;">{{ item1.itemsNum }}</span><span v-html="item1.itemsName"></span>
+                            <div style="margin-top: 5px;" v-html="item1.itemsText"></div>
+                        </div>
+                    </div>
+                </div>
+                <div>
+                    <div v-for="(item2, index2) in rightData" :key="item2.id" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px;">
+                        <div style="line-height: 20px;">
+                            <span style="margin-right: 5px;">{{ item2.itemsNum }}</span><span v-html="item2.itemsName"></span>
+                            <div style="margin-top: 5px;" v-html="item2.itemsText"></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
@@ -503,6 +463,11 @@
         name: "bzjdStep3",
         data() {
             return {
+                BDmodel: false,
+                oldNumber: '',
+                leftData: [],
+                rightData: [],
+
                 modalshowflag2: false,
                 itemId: '',
                 drawerModal: false,
@@ -571,6 +536,30 @@
             ProcessTitle
         },
         methods: {
+            getBDList () {
+                this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
+                    standHisId: this.oldNumber,
+                    leftOrRight: 'LEFT'
+                }, {
+                    _this: this
+                }, res => {
+                    this.leftData = res.data
+                }, e => {
+                })
+                this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
+                    standHisId: this.oldNumber,
+                    leftOrRight: 'RIGHT'
+                }, {
+                    _this: this
+                }, res => {
+                    this.rightData = res.data
+                }, e => {
+                })
+            },
+            checkBD () {
+                this.BDmodel = true
+                this.getBDList()
+            },
             itemEdit (row) {
                 this.itemId = row.id
                 this.modalshowflag2 = true
@@ -819,6 +808,7 @@
                             this.form.itemsName1 = data.itemsName1 || ''
                             this.form.itemsNum1 = data.itemsNum1 || ''
                         }
+                        this.oldNumber = data.oldNumber || ''
                         this.sarType = data.standInData || data.sarType
                         this.json = data
                         let itemList
@@ -839,8 +829,6 @@
                             item.itemsTitle = item.itermsConditions
                             item.applyArctic = item.applyArctic || []
                         })
-
-
                         this.itemList = itemList
                         this.loading = false
                     }).catch(e => {
@@ -872,6 +860,9 @@
                 padding: 0 20px 0;
             }
         }
+        .myText {
+            line-height: 20px;
+        }
         .myDataPick {
             /deep/.el-form-item__content {
                 margin-left: 0px !important;

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

@@ -40,28 +40,14 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
                                             v-model="form.itemsNum1"
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.itemsNum1"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
-                                    <el-input
-                                            disabled
-                                            v-model="form.itemsName1"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
                                     <el-input
                                             disabled
                                             v-model="form.itemsName1"
@@ -74,56 +60,6 @@
                   </el-collapse-transition>
                   <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
                   <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
-                  <div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
-                    <el-row :gutter="24">
-                      <el-col :span="24">
-                        <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
-                          <el-input
-                              disabled
-                              v-model="form.itemsNum"
-                              placeholder="请输入标准编号"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                          <el-input
-                              disabled
-                              v-model="form.itemsName"
-                              placeholder="请输入标准名称"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsNum1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsNum1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsName1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsName1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                  </div>
                 </el-form>
             </div>
             <ProcessTitle>

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

@@ -40,28 +40,14 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
                                             v-model="form.itemsNum1"
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.itemsNum1"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
-                                    <el-input
-                                            disabled
-                                            v-model="form.itemsName1"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
                                     <el-input
                                             disabled
                                             v-model="form.itemsName1"
@@ -74,56 +60,6 @@
                   </el-collapse-transition>
                   <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
                   <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
-                  <div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
-                    <el-row :gutter="24">
-                      <el-col :span="24">
-                        <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
-                          <el-input
-                              disabled
-                              v-model="form.itemsNum"
-                              placeholder="请输入标准编号"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                          <el-input
-                              disabled
-                              v-model="form.itemsName"
-                              placeholder="请输入标准名称"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsNum1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsNum1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsName1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsName1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                  </div>
                 </el-form>
             </div>
             <ProcessTitle>

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

@@ -40,28 +40,14 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
                                             v-model="form.itemsNum1"
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.itemsNum1"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
-                                    <el-input
-                                            disabled
-                                            v-model="form.itemsName1"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
                                     <el-input
                                             disabled
                                             v-model="form.itemsName1"
@@ -74,56 +60,6 @@
                   </el-collapse-transition>
                   <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
                   <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
-                  <div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
-                    <el-row :gutter="24">
-                      <el-col :span="24">
-                        <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
-                          <el-input
-                              disabled
-                              v-model="form.itemsNum"
-                              placeholder="请输入标准编号"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                          <el-input
-                              disabled
-                              v-model="form.itemsName"
-                              placeholder="请输入标准名称"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsNum1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsNum1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsName1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                        <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
-                          <el-input
-                              disabled
-                              v-model="form.itemsName1"
-                              clearable
-                          ></el-input>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                  </div>
                 </el-form>
             </div>
             <ProcessTitle>

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

@@ -177,7 +177,7 @@
             label="创建时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -185,7 +185,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -173,7 +173,7 @@
             label="创建时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -181,7 +181,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -173,7 +173,7 @@
             label="创建时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -181,7 +181,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -192,7 +192,7 @@
             label="创建时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -200,7 +200,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -174,7 +174,7 @@
             label="创建时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -182,7 +182,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -327,7 +327,7 @@
               :action="fileUrl"
               ref="importfile"
               name="file"
-              accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+              accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
               :before-upload="beginImportFile"
               :on-success="importFileSuccess"
               :on-remove="importFileRemove"
@@ -347,7 +347,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {saveTaskFirst, queryTaskFirst} from 'api/process'
+import {saveTaskFirst, queryTaskFirst,taskDel} from 'api/process'
 
 export default {
   name: "bzzqyjStep1-1",
@@ -476,10 +476,10 @@ export default {
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+      if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
         return true
       } else {
-        this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
+        this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')
         return false
       }
       // 判断文件上传大小
@@ -771,6 +771,12 @@ export default {
                   }, {}, res => {
                     if (res.success) {
                       this.$message.success('流程发起成功')
+                      let taskId = {
+                        id: this.$route.query.bpnId
+                      }
+                      taskDel(taskId).then(res=>{
+                        return res
+                      })
                       this.$router.push('/processCenter')
                     }
                   })

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

@@ -51,7 +51,7 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                    <div class="fileClass" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
                       {{ item.fileName }}
                     </div>
                   </div>
@@ -342,7 +342,7 @@
               :action="fileUrl"
               ref="importfile"
               name="file"
-              accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+              accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
               :before-upload="beginImportFile"
               :on-success="importFileSuccess"
               :on-remove="importFileRemove"
@@ -362,12 +362,13 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {saveTaskFirst} from 'api/process'
+import {saveTaskFirst, taskDel} from 'api/process'
 
 export default {
   name: "bzzqyjStep1",
   data() {
     return {
+      bpnId: '',
       fileUrl: 'api/att/attFile/upload',
       fileMadel: false,
       OCRoptions: [],
@@ -489,10 +490,10 @@ export default {
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+      if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
         return true
       } else {
-        this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
+        this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')
         return false
       }
       // 判断文件上传大小
@@ -557,7 +558,7 @@ export default {
     updataFj(item) {
       let id
       let type = item.fileName.split('.')
-      if (type[1] === 'pdf') {
+      if (type[1] === 'pdf' || type[1] === 'PDF') {
         id = item.attId
       } else {
         id = item.oriAttId
@@ -653,7 +654,7 @@ export default {
     sarStandCompareHis() {
       this.spinShow = true
       var formData = this.standCommonlySearch
-      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1', formData, {
         _this: this
       }, res => {
         this.standInfoList = res.data.list
@@ -792,6 +793,14 @@ export default {
                   }, {}, res => {
                     if (res.success) {
                       this.$message.success('流程发起成功')
+                      if (this.bpnId !== '') {
+                        let taskId = {
+                          id: this.bpnId
+                        }
+                        taskDel(taskId).then(res=>{
+                          return res
+                        })
+                      }
                       this.$router.push('/processCenter')
                       this.isSubmit = false
                     } else {

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

@@ -255,14 +255,7 @@ export default {
       })
     },
     updataFj (item) {
-      let id
+      window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
-      let type = item.fileName.split('.')
-      if (type[1] === 'pdf') {
-        id = item.attId
-      } else {
-        id = item.oriAttId
-      }
-      window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get("lawss/activiti/get_list_by_instance", {

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

@@ -464,14 +464,7 @@
                 })
             },
             updataFj(item) {
-                let id
+                window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
-                let type = item.fileName.split('.')
-                if (type[1] === 'pdf') {
-                    id = item.attId
-                } else {
-                    id = item.oriAttId
-                }
-                window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
             },
             getHistoryData() {
                 this.$http.get('lawss/activiti/get_list_by_instance', {

src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue

@@ -365,14 +365,7 @@
                 })
             },
             updataFj(item) {
-                let id
+                window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
-                let type = item.fileName.split('.')
-                if (type[1] === 'pdf') {
-                    id = item.attId
-                } else {
-                    id = item.oriAttId
-                }
-                window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
             },
             getHistoryData() {
                 this.$http.get('lawss/activiti/get_list_by_instance', {

src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue

@@ -357,14 +357,7 @@
                 })
             },
             updataFj(item) {
-                let id
+                window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
-                let type = item.fileName.split('.')
-                if (type[1] === 'pdf') {
-                    id = item.attId
-                } else {
-                    id = item.oriAttId
-                }
-                window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
             },
             getHistoryData() {
                 this.$http.get('lawss/activiti/get_list_by_instance', {

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

@@ -550,14 +550,7 @@ export default {
           })
       },
     updataFj(item) {
-      let id
+      window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
-      let type = item.fileName.split('.')
-      if (type[1] === 'pdf') {
-        id = item.attId
-      } else {
-        id = item.oriAttId
-      }
-      window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get('lawss/activiti/get_list_by_instance', {

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

@@ -473,14 +473,7 @@
         })
       },
       updataFj(item) {
-        let id
+        window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
-        let type = item.fileName.split('.')
-        if (type[1] === 'pdf') {
-          id = item.attId
-        } else {
-          id = item.oriAttId
-        }
-        window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
       },
       getHistoryData() {
         this.$http.get("lawss/activiti/get_list_by_instance", {

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

@@ -364,14 +364,7 @@ export default {
           })
       },
     updataFj(item) {
-      let id
+      window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
-      let type = item.fileName.split('.')
-      if (type[1] === 'pdf') {
-        id = item.attId
-      } else {
-        id = item.oriAttId
-      }
-      window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
@@ -481,7 +474,6 @@ export default {
           this.form.cid = data.cid || data.form.cid;
           this.form.endTime = data.endTime || data.form.endTime;
           this.form.cname = data.cname || data.form.cname;
-
           this.oldData = JSON.parse(JSON.stringify(data.info))
           var arr = []
           data.info.forEach(item => {

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

@@ -361,14 +361,7 @@ export default {
           })
       },
     updataFj(item) {
-      let id
+      window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
-      let type = item.fileName.split('.')
-      if (type[1] === 'pdf') {
-        id = item.attId
-      } else {
-        id = item.oriAttId
-      }
-      window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get('lawss/activiti/get_list_by_instance', {

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

@@ -361,14 +361,7 @@ export default {
           })
       },
     updataFj(item) {
-      let id
+      window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
-      let type = item.fileName.split('.')
-      if (type[1] === 'pdf') {
-        id = item.attId
-      } else {
-        id = item.oriAttId
-      }
-      window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get('lawss/activiti/get_list_by_instance', {

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

@@ -361,14 +361,7 @@ export default {
           })
       },
     updataFj(item) {
-      let id
+      window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
-      let type = item.fileName.split('.')
-      if (type[1] === 'pdf') {
-        id = item.attId
-      } else {
-        id = item.oriAttId
-      }
-      window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get("lawss/activiti/get_list_by_instance", {

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

@@ -226,7 +226,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -234,7 +234,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -188,7 +188,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -196,7 +196,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -188,7 +188,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -196,7 +196,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -188,7 +188,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -196,7 +196,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -272,7 +272,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -280,7 +280,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -247,7 +247,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -255,7 +255,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -247,7 +247,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -255,7 +255,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue

@@ -224,7 +224,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -232,7 +232,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -180,7 +180,7 @@
           sortable="custom"
           align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -188,7 +188,7 @@
           label="完成时间"
           align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column

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

@@ -189,7 +189,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -197,7 +197,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -224,7 +224,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -232,7 +232,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue

@@ -194,7 +194,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -202,7 +202,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -150,7 +150,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -158,7 +158,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -159,7 +159,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -167,7 +167,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -194,7 +194,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -202,7 +202,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -194,7 +194,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -202,7 +202,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -194,7 +194,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -202,7 +202,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -194,7 +194,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -202,7 +202,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue

@@ -97,7 +97,7 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
-              <div v-if="qbfsForm.unit.length > 0">
+              <div v-if="qbfsForm.unit">
                 <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
                   <el-input
                     readonly
@@ -306,6 +306,12 @@ export default {
       }
     }
   },
+  mounted(){
+    console.log(this.qbfsForm);
+    if(!this.qbfsForm.passFlag){
+      this.qbfsForm = {}
+    }
+  },
   methods: {
     validateForm () {
       let flag = null

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue

@@ -105,7 +105,7 @@
              </el-date-picker>
            </el-form-item>
            <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
-             <div v-if="qbfsForm.unit.length > 0">
+             <div v-if="qbfsForm.unit">
                <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
                  <el-input
                    readonly
@@ -328,6 +328,11 @@ export default {
       }
     }
   },
+  mounted(){
+    if(!this.qbfsForm.passFlag){
+      this.qbfsForm = {}
+    }
+  },
   methods: {
     validateForm () {
       let flag = null

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue

@@ -64,32 +64,11 @@
           placeholder="请选择计划标准发布时间">
         </el-date-picker>
       </el-form-item>
-<!--      <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" >-->
-<!--        <div style="display: flex;justify-content: space-between;align-items: center;">-->
-<!--            <el-input-->
-<!--              clearable-->
-<!--              v-model="qbfsForm.unit"-->
-<!--              placeholder="选择或输入起草单位">-->
-<!--            </el-input>-->
-<!--          <div>-->
-<!--            <el-button-->
-<!--              size="mini"-->
-<!--              type="primary"-->
-<!--              @click="QCDWClick"-->
-<!--              class="common-button-primary">手动查找</el-button>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--      </el-form-item>-->
       <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
-        <el-select v-model="qbfsForm.unit" filterable multiple  clearable>
+        <el-input v-model="qbfsForm.unitId" style="display: none;"></el-input>
-          <el-option
+        <el-input v-model="qbfsForm.unit" placeholder="请选择起草责任单位"
-            v-for="item in qcdwOptions"
+                  @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unitId)">
-            placeholder="请选择起草责任单位"
+        </el-input>
-            :key="item.value"
-            :value="item.label"
-            :label="item.label"
-          ></el-option>
-        </el-select>
       </el-form-item>
       <el-form-item label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
         <el-input
@@ -119,45 +98,30 @@
       @checkedRole="checkedRole"
       :nodeList="nodeList"
     ></Role-tree>
-    <el-dialog
+    <Mechanism-tree
-      :visible.sync="QCDWmodal"
+      is-title="选择起草责任单位"
-      width="500px"
+      :is-visible.sync="modalshowflagZRBM"
-      title="选择起草部门"
+      :nodeList="nodeListZRBM"
-      destroy-on-close
+      @checkedRole="drawerCheckZRBM"
-      :close-on-click-modal="false"
+    />
-      @closed="QCDWmodal = false">
-      <el-select v-model="QCDWValue" multiple filterable placeholder="请选择" style="width: 100%;">
-        <el-option
-          v-for="item in qcdwOptions"
-          :key="item.value"
-          :label="item.label"
-          :value="item.label">
-        </el-option>
-      </el-select>
-      <div slot="footer" class="demo-drawer-footer">
-        <el-button size="mini" type="primary" class="common-button-default" icon="el-icon-check"
-                   @click="QCDWOK">确认
-        </el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import ProcessTitle from "process/components/ProcessTitle";
-
+import MechanismTree from '@/components/mechanismTree'
 
 export default {
   name: "establish",
   components: {
-    ProcessTitle
+    ProcessTitle,
+    MechanismTree
   },
   props: ['message'],
   data(){
     return {
-      QCDWmodal: false,
+      modalshowflagZRBM: false,
-      QCDWValue: [],
+      nodeListZRBM: [],
-      QCDWList: [],
       drawerTitle2: '',
       drawerTitle: '',
       roleType: '',
@@ -169,6 +133,7 @@ export default {
       qbfsForm: {
         type: '5',
         unit: '', // 单位
+        unitId: '',
         esName: '', // 企标名称
         planStatus: '', // 计划状态
         reviseStatus: '', // 制修订状态
@@ -224,10 +189,13 @@ export default {
       deep: true,
       handler(val) {
         this.qbfsForm = val
-      }
+      },
-    }
+    },
   },
   mounted(){
+    if(!this.qbfsForm.passFlag){
+      this.qbfsForm = {}
+    }
     //查询下拉框数据
      this.$http.get('sys/dictype/getDicTypeListCode', '',{
        _this: this
@@ -237,19 +205,28 @@ export default {
      })
   },
   methods: {
-    QCDWOK () {
+    choiceZRBM(type, title, id) {
-      let arr1 = []
+      this.nodeListZRBM = []
-      if (this.qbfsForm.unit.length > 0) {
+      this.nodeListZRBM.push(id)
-        let str = this.qbfsForm.unit.replace(/，/g, ',')
+      this.drawerTitle = title
-        arr1 = str.split(',')
+      this.modalshowflagZRBM = true
-      }
-      let arr2 = arr1.concat(this.QCDWValue)
-      this.qbfsForm.unit = Array.from(new Set(arr2)).join(',')
-      this.QCDWmodal = false
     },
-    QCDWClick () {
+    drawerCheckZRBM(data) {
-      this.QCDWValue = []
+      let idList = ''
-      this.QCDWmodal = true
+      let nameList = ''
+      data.forEach(item => {
+        if (nameList.length) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.name
+      })
+      this.$set(this.qbfsForm, 'unitId', idList)
+      this.$set(this.qbfsForm, 'unit', nameList)
+      if(this.qbfsForm.unit){
+        this.$refs.qbfsForm.validateField('unit')
+      }
     },
     choiceZRR() {
       this.nodeList = [];

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -82,32 +82,20 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
-              <el-select v-model="qbfsForm.unit" filterable multiple  clearable>
+              <el-input v-model="qbfsForm.unitId" style="display: none;"></el-input>
-                <el-option
+              <el-input v-model="qbfsForm.unit" placeholder="请选择起草责任单位"
-                  v-for="item in qcdwOptions"
+                        @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unitId)">
-                  placeholder="请选择起草责任单位"
+              </el-input>
-                  :key="item.value"
+<!--              <el-select v-model="qbfsForm.unit" filterable multiple  clearable>-->
-                  :value="item.label"
+<!--                <el-option-->
-                  :label="item.label"
+<!--                  v-for="item in qcdwOptions"-->
-                ></el-option>
+<!--                  placeholder="请选择起草责任单位"-->
-              </el-select>
+<!--                  :key="item.value"-->
+<!--                  :value="item.label"-->
+<!--                  :label="item.label"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
             </el-form-item>
-<!--            <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" >-->
-<!--              <div style="display: flex;justify-content: space-between;align-items: center;">-->
-<!--                  <el-input-->
-<!--                    clearable-->
-<!--                    v-model="qbfsForm.unit"-->
-<!--                    placeholder="选择或输入起草单位">-->
-<!--                  </el-input>-->
-<!--                <div>-->
-<!--                  <el-button-->
-<!--                    size="mini"-->
-<!--                    type="primary"-->
-<!--                    @click="QCDWClick"-->
-<!--                    class="common-button-primary">手动查找</el-button>-->
-<!--                </div>-->
-<!--              </div>-->
-<!--            </el-form-item>-->
           </el-col>
           <el-col :span="12">
             <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
@@ -287,6 +275,12 @@
       @checkedRole="checkedRole2"
       :nodeList="nodeList2"
     ></Role-tree>
+    <Mechanism-tree
+      is-title="选择起草责任单位"
+      :is-visible.sync="modalshowflagZRBM"
+      :nodeList="nodeListZRBM"
+      @checkedRole="drawerCheckZRBM"
+    />
     <Role-tree
       check-box
       :is-title="drawerTitle"
@@ -294,44 +288,24 @@
       @checkedRole="checkedRole"
       :nodeList="nodeList"
     ></Role-tree>
-    <el-dialog
-      :visible.sync="QCDWmodal"
-      width="500px"
-      title="选择起草部门"
-      destroy-on-close
-      :close-on-click-modal="false"
-      @closed="QCDWmodal = false">
-      <el-select v-model="QCDWValue" multiple filterable placeholder="请选择" style="width: 100%;">
-        <el-option
-          v-for="item in qcdwOptions"
-          :key="item.value"
-          :label="item.label"
-          :value="item.label">
-        </el-option>
-      </el-select>
-      <div slot="footer" class="demo-drawer-footer">
-        <el-button size="mini" type="primary" class="common-button-default" icon="el-icon-check"
-                   @click="QCDWOK">确认
-        </el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import ProcessTitle from "process/components/ProcessTitle";
+import MechanismTree from '@/components/mechanismTree'
 
 export default {
   name: "merge",
   components: {
-    ProcessTitle
+    ProcessTitle,
+    MechanismTree
   },
   props: ['message'],
   data(){
     return {
-      QCDWmodal: false,
+      modalshowflagZRBM: false,
-      QCDWValue: [],
+      nodeListZRBM: [],
-      QCDWList: [],
       drawerTitle2: '',
       drawerTitle: '',
       type: '',
@@ -430,6 +404,9 @@ export default {
     }
   },
   mounted() {
+    if(!this.qbfsForm.passFlag){
+      this.qbfsForm = {}
+    }
     //查询下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
@@ -450,19 +427,28 @@ export default {
     }
   },
   methods: {
-    QCDWOK () {
+    choiceZRBM(type, title, id) {
-      let arr1 = []
+      this.nodeListZRBM = []
-      if (this.qbfsForm.unit !== undefined) {
+      this.nodeListZRBM.push(id)
-        let str = this.qbfsForm.unit.replace(/，/g, ',')
+      this.drawerTitle = title
-        arr1 = str.split(',')
+      this.modalshowflagZRBM = true
-      }
-      let arr2 = arr1.concat(this.QCDWValue)
-      this.qbfsForm.unit = Array.from(new Set(arr2)).join(',')
-      this.QCDWmodal = false
     },
-    QCDWClick () {
+    drawerCheckZRBM(data) {
-      this.QCDWValue = []
+      let idList = ''
-      this.QCDWmodal = true
+      let nameList = ''
+      data.forEach(item => {
+        if (nameList.length) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.name
+      })
+      this.$set(this.qbfsForm, 'unitId', idList)
+      this.$set(this.qbfsForm, 'unit', nameList)
+      if(this.qbfsForm.unit){
+        this.$refs.qbfsForm.validateField('unit')
+      }
     },
     choiceZRR() {
       this.nodeList = [];

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue

@@ -96,7 +96,7 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
-             <div v-if="qbfsForm.unit.length > 0">
+             <div v-if="qbfsForm.unit">
                <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
                  <el-input
                    readonly
@@ -316,6 +316,11 @@ export default {
       }
     }
   },
+  mounted(){
+    if(!this.qbfsForm.passFlag){
+      this.qbfsForm = {}
+    }
+  },
   methods: {
     validateForm () {
       let flag = null

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue

@@ -203,7 +203,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -211,7 +211,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -270,7 +270,8 @@ export default {
   },
   data() {
     return {
-      comFlag: 0,
+      toggleType: '1',
+      comFlag: 1,
       active: "1",
       commentText: "",
       comName: "merge",
@@ -405,15 +406,15 @@ export default {
     toggleComName(name) {
       this.comName = name;
       if(this.comName === 'merge'){
-        this.$refs["childForm"].qbfsForm.type = '1'
+        this.toggleType = '1'
       }else if(this.comName === 'delay'){
-        this.$refs["childForm"].qbfsForm.type = '2'
+        this.toggleType = '2'
       }else if(this.comName === 'cancel'){
-        this.$refs["childForm"].qbfsForm.type = '3'
+        this.toggleType = '3'
       }else if(this.comName === 'rename'){
-        this.$refs["childForm"].qbfsForm.type = '4'
+        this.toggleType = '4'
       }else if(this.comName === 'establish'){
-        this.$refs["childForm"].qbfsForm.type = '5'
+        this.toggleType = '5'
       }
     },
     //流程保存
@@ -438,29 +439,32 @@ export default {
         this.saveLoading = false
       })
     },
-    repeatName(){
+    // repeatName(){
-      let qbzxdFrom = this.$refs["childForm"].qbfsForm;
+    //   let qbzxdFrom = this.$refs["childForm"].qbfsForm;
-      this.$http.get('esRevisePlan/es-revise-plan/getDataByName', {esName: qbzxdFrom.esName, id : qbzxdFrom.esId}, {
+    //   this.$http.get('esRevisePlan/es-revise-plan/getDataByName', {esName: qbzxdFrom.esName, id : qbzxdFrom.esId}, {
-        _this: this
+    //     _this: this
-      }, res => {
+    //   }, res => {
-        let dataList = res.data
+    //     if(qbzxdFrom.type === '1'){
-        dataList.forEach(item => {
+    //       let dataList = res.data
-          if(item.esName === qbzxdFrom.esName1 || item.esName === qbzxdFrom.esName2){
+    //       dataList.forEach(item => {
-            this.comFlag++
+    //         if(item.esName === qbzxdFrom.esName1 || item.esName === qbzxdFrom.esName2){
-          }else{
+    //           this.comFlag = 1
-            this.comFlag = 0
+    //         }
-          }
+    //       })
-        })
+    //     }else if(qbzxdFrom.type === '5'){
-      })
+    //       if(!res.data.length){
-    },
+    //         this.comFlag = 1
+    //       }
+    //     }
+    //   })
+    // },
     //流程提交
     handleSubmit() {
-      if(this.$refs["childForm"].qbfsForm.type === undefined){
+      if(!this.$refs["childForm"].qbfsForm.type){
-        this.$refs["childForm"].qbfsForm.type = '1'
+        this.$refs["childForm"].qbfsForm.type = this.toggleType
       }
-      this.repeatName()
+      if(this.comFlag === 0){
-      if(this.comFlag   === '0'){
+          this.$message.warning('企标名称已存在,请更改!')
-          this.$message.warning('请更改企标名称')
       }else {
           if (this.$route.query.prcNum === undefined) {
             let flag = this.$refs["childForm"].validateForm();
@@ -468,9 +472,10 @@ export default {
             if (flag) {
               this.$refs["roleForm"].validate((valid) => {
                 if (valid) {
-                  this.isSubmit = true;
+                  // this.isSubmit = true;
                   var json = Object.assign(qbzxdFrom, this.roleForm);
                   console.log(json);
+                  return
                   this.$http.get("lawss/activiti/startProcess", { type: "25" }, {
                     _this: this
                   }, res => {

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

@@ -203,7 +203,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -211,7 +211,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -202,7 +202,7 @@
           sortable="custom"
           align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -210,7 +210,7 @@
           label="完成时间"
           align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column

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

@@ -203,7 +203,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -211,7 +211,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -203,7 +203,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -211,7 +211,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue

@@ -109,7 +109,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -117,7 +117,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -109,7 +109,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -117,7 +117,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -109,7 +109,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -117,7 +117,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -109,7 +109,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -117,7 +117,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -109,7 +109,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -117,7 +117,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -179,7 +179,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -187,7 +187,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -119,7 +119,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -127,7 +127,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -185,7 +185,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -193,7 +193,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue

@@ -164,7 +164,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -172,7 +172,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -98,7 +98,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -106,7 +106,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -219,7 +219,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -227,7 +227,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -308,7 +308,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -316,7 +316,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -219,7 +219,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -227,7 +227,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -274,7 +274,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -282,7 +282,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -365,7 +365,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -373,7 +373,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -307,7 +307,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -315,7 +315,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -307,7 +307,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -315,7 +315,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -307,7 +307,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -315,7 +315,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -210,7 +210,7 @@
             label="创建时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -218,7 +218,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -169,7 +169,7 @@
             label="创建时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -177,7 +177,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -256,7 +256,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -264,7 +264,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column