布局法规意见收集

jero-web/src/common/lang/en-us.js

@@ -985,6 +985,14 @@ module.exports = {
   primaryCoverageEn:'Primary coverage (En)',
   workProgressCn:'NIO Work progress (Cn)',
   workProgressEn:'NIO Work progress (En)',
+  initiatingProcess:'Initiating Process',
+  collectResults:'Collect results',
+  dateOfInitiation:'Date of initiation',
+  closingDate:'Closing date',
+  viewProcess:'View process',
+  evaluationResults:'Evaluation results',
+  Assessor:'Assessor',
+  collectionOfRegulatoryOpinions:'Collection Of Regulatory Opinions',
   link:'Link',
 //  上报库
   Enable: 'Enable',

jero-web/src/common/lang/zh-cn.js

@@ -990,6 +990,14 @@ module.exports = {
   primaryCoverageEn: '主要内容(英文)',
   workProgressCn: 'NIO工作进展(中文)',
   workProgressEn: 'NIO工作进展(英文)',
+  initiatingProcess: '发起流程',
+  collectResults: '收集结果',
+  dateOfInitiation: '发起日期',
+  closingDate: '截止日期',
+  viewProcess: '查看流程',
+  evaluationResults: '评估结果',
+  Assessor:'评估人',
+  collectionOfRegulatoryOpinions:'法规意见收集',
   link: '链接',
 //  上报库
   Enable: '启用',

jero-web/src/components/layouts/TabLayout.vue

@@ -92,6 +92,8 @@
           this.$route.path == '/virtualListDetails' ||
           this.$route.path == '/taskListProcess' ||
           this.$route.path == '/ProjectDetails' ||
+          this.$route.path == '/regulatoryInitiatingProcess' ||
+          this.$route.path == '/regulatoryProcessReview' ||
           this.$route.path == '/handshakeProcess' ||
           this.$route.path == '/projectStatusAndProgress' ||
           this.$route.path == '/TaskPlanList' ||

jero-web/src/config/router.config.js

@@ -337,6 +337,11 @@ export const constantRouterMap = [
     name: 'ProjectDetails',
     component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/ProjectDetails/index')
   },
+  {
+    path: '/regulatoryInitiatingProcess',
+    name: 'initiatingProcess',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess')
+  },
   // {
   //   path: '/ParameterItemCollection',
   //   name: 'ParameterItemCollection',
@@ -357,6 +362,11 @@ export const constantRouterMap = [
     name: 'handshakeProcess',
     component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/handshakeProcess/index')
   },
+  {
+    path: '/regulatoryProcessReview',
+    name: 'regulatoryProcessReview',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/regulatoryProcess/index')
+  },
   {
     path: '/historicalVersion',
     name: 'historicalVersion',

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue

@@ -0,0 +1,335 @@
+<template>
+  <div id="examineBox">
+    <headerProcess
+      :title="title"
+    />
+    <div class="detail-box">
+      <div class="detail-content" style="padding: 20px">
+        <div class="table-page-search-wrapper">
+          <search ref="searchRef"
+                  :flag="'1'"
+                  :url="url"/>
+        </div>
+        <a-table
+          ref="table"
+          size="middle"
+          :loading="loading"
+          :pagination="false"
+          :scroll="{x: '100%'}"
+          rowKey="id"
+          :data-source="dataSource"
+          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+          :columns="columns"
+        >
+        </a-table>
+        <div class="page" v-if="dataSource && dataSource.length > 0">
+          <a-pagination
+            :show-total="total => $t('total')+` ${total} `+$t('strip')"
+            show-quick-jumper
+            show-size-changer
+            :page-size.sync="pageSize"
+            :total="total"
+            @change="pageOnChange"
+            @showSizeChange="SizeChange"
+          />
+        </div>
+        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="closingDate">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+$t('closingDate')"
+                                 @change="dateChange('closingDate')"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 format="YYYY-MM-DD"
+                                 v-model="formInline['closingDate']"
+                                 style="width: 100%"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('Assessor')">{{$t('Assessor')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="dreUserIdName">
+                  <PersonnelSelection class="box-input"
+                                      :personneQuery="formInline"
+                                      :query="{db_field_name:'dreUserId',db_field_txt:$t('Assessor')}"
+                                      :isInput="true"
+                                      :isSingleChoice="true"
+                                      @change="PersonnelSelectionChange"
+                                      v-model="formInline.dreUserIdName"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('taskDescription')">{{$t('taskDescription')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="standard">
+                  <a-textarea :placeholder="$t('pleaseEnter')+$t('taskDescription')"
+                              v-model="formInline.approvalOpinion"
+                              :rows="4"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="approvalFile">
+                  <a-button type="primary" class="button-text"
+                            @click="clickButtonToUpload('approvalFile')">
+                    {{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' ||
+                    formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                    }}
+                  </a-button>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+        </a-form-model>
+        <footerProcess
+          @submit="submit"
+          :isSubmit="true"
+        />
+      </div>
+    </div>
+    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
+  </div>
+</template>
+
+<script>
+  import headerProcess from '../../../processCenter/components/headerProcess'
+  import search from '@/components/search/index'
+  import uploadFile from '@/components/uploadFile/file'
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import footerProcess from '../../../processCenter/components/footerProcess'
+  import { getAction, postAction } from '@/api/manage'
+  import moment from 'moment'
+
+  export default {
+    name: 'initiatingProcess',
+    components: {
+      headerProcess,
+      search,
+      uploadFile,
+      footerProcess,
+      PersonnelSelection
+    },
+    data() {
+      return {
+        title: this.$t('regulatoryEngineer') + this.$t('initiatingProcess'),
+        //url传参严格按照当前命名
+        url: {
+          seachList: 'document/bussDocumentLibraryEO/queryCondition'   //搜索字段
+        },
+        loading: false,
+        dataSource: [],
+        selectedRowKeys: [],
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        formInline: {},
+        rules: {},
+        columns: [
+          {
+            title: this.$t('standard'),
+            align: 'center',
+            dataIndex: 'serial_number',
+            width: 170,
+            scopedSlots: { customRender: 'serial_number' }
+          },
+          {
+            title: this.$t('title'),
+            align: 'center',
+            dataIndex: 'title',
+            width: 170,
+            scopedSlots: { customRender: 'titleName' }
+          },
+          {
+            title: this.$t('status'),
+            align: 'center',
+            width: 140,
+            ellipsis: true,
+            dataIndex: 'state'
+          },
+          {
+            title: this.$t('zoneOfApplication'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'region'
+          },
+          {
+            title: this.$t('technicalField'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'technology_territory'
+          },
+          {
+            title: this.$t('vehicleInProductionDate'),
+            align: 'center',
+            ellipsis: true,
+            width: 210,
+            dataIndex: 'implement_time'
+          },
+          {
+            title: this.$t('ImplementationDate'),
+            align: 'center',
+            ellipsis: true,
+            width: 210,
+            dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1'
+          }
+        ]
+      }
+    },
+    mounted() {
+      document.title = this.$t('regulatoryEngineer') + this.$t('initiatingProcess')
+    },
+    methods: {
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      clickButtonToUpload(item) {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.uploadName = item
+        getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.formInline[this.uploadName] = attIdList.join(',')
+        this.formInline = { ...this.formInline }
+      },
+      PersonnelSelectionChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      },
+      dateChange(item) {
+        this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
+      },
+      submit() {
+
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .detail-box {
+    padding: 67px 0 0 0;
+    background: #ffffff;
+    height: 100%;
+    overflow: auto;
+  }
+
+  #examineBox {
+    display: flex;
+    flex-direction: column;
+    background: #fff;
+    position: relative;
+    height: 100%;
+    overflow-y: auto;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 88px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 48px;
+    color: #000F16;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+    margin-bottom: 12px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-top: 20px;
+  }
+
+  .button-text {
+    height: 38px;
+    width: calc(100% - 100px);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+</style>

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue

@@ -0,0 +1,253 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standard')">
+                <span>{{$t('standard')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serialNumber"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('title')">
+                <span>{{$t('title')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('technicalField')">
+                <span>{{$t('technicalField')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('technicalField')"
+                       v-model="queryParam.technicalField"></j-input>
+            </div>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('collectResults')">
+                  <span>{{$t('collectResults')}}</span>
+                </div>
+                <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('collectResults')"
+                         v-model="queryParam.collectResults"></j-input>
+              </div>
+            </a-col>
+          </template>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                   <a @click="handleToggleSearch" style="margin-left: 8px">
+                        {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                         <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                 </a>
+               </a-col>
+      </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <div @click="initiatingProcessClick" class="operator-text">
+        <a-icon type="apartment"/>
+        {{$t('initiatingProcess')}}
+      </div>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%'}"
+        rowKey="id"
+        :data-source="dataSource"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :columns="columns"
+      >
+         <span slot="operation" slot-scope="text,record">
+           <a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>
+           <a class="text-operation" @click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
+        </span>
+      </a-table>
+      <div class="page" v-if="dataSource && dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          @change="pageOnChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+  </a-card>
+</template>
+
+<script>
+  export default {
+    name: 'index',
+    data() {
+      return {
+        //url传参严格按照当前命名
+        url: {
+          deleteBatch: ''
+        },
+        loading: false,
+        toggleSearchStatus: false,
+        dataSource: [],
+        selectedRowKeys: [],
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        queryParam: {},
+        columns: [
+          {
+            title: this.$t('standard'),
+            align: 'center',
+            dataIndex: 'serialNumber',
+            width: 170
+          },
+          {
+            title: this.$t('title'),
+            align: 'center',
+            dataIndex: 'title',
+            width: 170
+          },
+          {
+            title: this.$t('technicalField'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'technology_territory'
+          },
+          {
+            title: this.$t('collectResults'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'collectResults'
+          },
+          {
+            title: this.$t('dateOfInitiation'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'dateOfInitiation'
+          },
+          {
+            title: this.$t('closingDate'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'closingDate'
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 180,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ]
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      initiatingProcessClick() {
+        // let newUrl = this.$router.resolve({
+        //   path: '/regulatoryInitiatingProcess'
+        // })
+        let newUrl = this.$router.resolve({
+          path: '/regulatoryProcessReview'
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      viewProcessClick() {
+
+      },
+      evaluationResultsClick() {
+
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+</style>

jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue

@@ -0,0 +1,31 @@
+<template>
+  <div id="examineBox">
+    <headerProcess
+      :title="title"
+    />
+    <div class="detail-box">
+      <div class="detail-content" style="padding: 20px">
+
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import headerProcess from '../../components/headerProcess'
+  export default {
+    name: 'index',
+    components:{
+      headerProcess
+    },
+    data(){
+       return{
+         title:this.$t('collectionOfRegulatoryOpinions'),
+       }
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

jero-web/src/views/regulatoryEarlyWarning/index.vue

@@ -195,11 +195,14 @@
       clearSelected() {
 
       },
-      pageOnChange() {
+      pageOnChange(page) {
-
+        this.pageNo = page
+        this.getList()
       },
-      SizeChange() {
+      SizeChange(pageSize) {
-
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
       },
       getList() {