对接设计符合性确认
This commit is contained in:
qq787203167
@@ -44,6 +44,7 @@
|
||||
<a-form-model-item class="itemModel" :prop="item.db_field_name">
|
||||
<a-date-picker class="box-input" v-model="formInline[item.db_field_name]"
|
||||
@change="dateChange(item)"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
format="YYYY-MM-DD"
|
||||
:disabled="disabled"
|
||||
style="width: 100%"/>
|
||||
|
||||
@@ -44,6 +44,7 @@
|
||||
<a-form-model-item class="itemModel" :prop="item.db_field_name">
|
||||
<a-date-picker class="box-input" v-model="formInline[item.db_field_name]"
|
||||
@change="dateChange(item)"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
format="YYYY-MM-DD"
|
||||
:disabled="disabled"
|
||||
style="width: 100%"/>
|
||||
|
||||
@@ -75,6 +75,7 @@
|
||||
<a-date-picker class="box-input"
|
||||
:placeholder="$t('PleaseSelect')+item.db_field_txt"
|
||||
@change="dateChange(item)"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
format="YYYY-MM-DD"
|
||||
v-model="formInline[item.db_field_name]"
|
||||
:disabled="disabled"
|
||||
|
||||
@@ -81,6 +81,7 @@
|
||||
<a-date-picker class="box-input"
|
||||
:placeholder="$t('PleaseSelect')+item.db_field_txt"
|
||||
@change="dateChange(item)"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
format="YYYY-MM-DD"
|
||||
v-model="formInline[item.db_field_name]"
|
||||
:disabled="disabled"
|
||||
|
||||
@@ -92,6 +92,7 @@
|
||||
<a-date-picker class="box-input"
|
||||
@change="dateChange(item)"
|
||||
format="YYYY-MM-DD"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
v-model="formInline[item.db_field_name]"
|
||||
:disabled="disabled"
|
||||
style="width: 100%"/>
|
||||
|
||||
@@ -131,6 +131,7 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('ImplementationDate')"
|
||||
@change="dateChange({db_field_name:'xin1Che1Xing2Shi2Shi1Ri4Qi1'})"
|
||||
format="YYYY-MM-DD"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
v-model="formInline.xin1Che1Xing2Shi2Shi1Ri4Qi1"
|
||||
:disabled="false"
|
||||
style="width: 100%"/>
|
||||
@@ -150,6 +151,7 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('vehicleInProductionDate')"
|
||||
@change="dateChange({db_field_name:'implementTime'})"
|
||||
format="YYYY-MM-DD"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
v-model="formInline.implementTime"
|
||||
:disabled="false"
|
||||
style="width: 100%"/>
|
||||
|
||||
@@ -127,6 +127,7 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('ImplementationDate')"
|
||||
@change="dateChange({db_field_name:'xin1Che1Xing2Shi2Shi1Ri4Qi1'})"
|
||||
format="YYYY-MM-DD"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
v-model="formInline.xin1Che1Xing2Shi2Shi1Ri4Qi1"
|
||||
:disabled="false"
|
||||
style="width: 100%"/>
|
||||
@@ -146,6 +147,7 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('vehicleInProductionDate')"
|
||||
@change="dateChange({db_field_name:'implementTime'})"
|
||||
format="YYYY-MM-DD"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
v-model="formInline.implementTime"
|
||||
:disabled="false"
|
||||
style="width: 100%"/>
|
||||
|
||||
@@ -67,12 +67,6 @@
|
||||
|
||||
export default {
|
||||
name: 'circulationHistory',
|
||||
props: {
|
||||
url: {
|
||||
type: String,
|
||||
default: '/workFlow/get_list_by_instance'
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dataSource: [],
|
||||
@@ -147,9 +141,8 @@
|
||||
getList() {
|
||||
let query = {
|
||||
prcNum: this.$route.query.prcNum,
|
||||
prcId: this.$route.query.actiProcInstId
|
||||
}
|
||||
getAction(this.url, query).then((res) => {
|
||||
getAction('/workFlow/get_list_by_instance', query).then((res) => {
|
||||
this.dataSource = res
|
||||
})
|
||||
},
|
||||
|
||||
@@ -10,11 +10,12 @@
|
||||
<a-col :span="24">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="Required">*</span>
|
||||
<span class="Required" v-if="$route.query.TaskKey == 'zrrclrw'">*</span>
|
||||
<span class="title-text-text" :title="$t('reviewResults')">{{$t('reviewResults')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="reviewResult">
|
||||
<a-form-model-item class="itemModel" :prop="$route.query.TaskKey == 'fqrsh'?'':'reviewResult'">
|
||||
<a-radio-group style="margin-top: 2px"
|
||||
:disabled="$route.query.TaskKey == 'fqrsh'?true:false"
|
||||
class="box-input"
|
||||
v-model="formInline.reviewResult">
|
||||
<a-radio value="conformity">
|
||||
@@ -80,7 +81,7 @@
|
||||
mounted() {
|
||||
if (this.queryBy) {
|
||||
this.formInline.reviewResult = this.queryBy.reviewResult || undefined
|
||||
this.formInline.approvalOpinion = this.queryBy.approvalOpinion || ''
|
||||
// this.formInline.approvalOpinion = this.queryBy.approvalOpinion || ''
|
||||
this.formInline = { ...this.formInline }
|
||||
}
|
||||
},
|
||||
|
||||
@@ -0,0 +1,110 @@
|
||||
<template>
|
||||
<div class="box">
|
||||
<div class="box-text">
|
||||
<div class="header-text">
|
||||
{{$t('circulationHistory')}}
|
||||
</div>
|
||||
</div>
|
||||
<div style="width: 100%">
|
||||
<a-table
|
||||
ref="table"
|
||||
:loading="loading"
|
||||
:pagination="false"
|
||||
:scroll="{x: true}"
|
||||
:data-source="dataSource"
|
||||
:columns="columns"
|
||||
>
|
||||
<span slot="approvalResult" slot-scope="text,result">
|
||||
{{approvalResult[text]}}
|
||||
</span>
|
||||
</a-table>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getAction, postAction, downloadFile } from '@/api/manage'
|
||||
import moment from 'moment'
|
||||
import { Base64 } from 'js-base64'
|
||||
|
||||
export default {
|
||||
name: 'circulationHistory',
|
||||
data() {
|
||||
return {
|
||||
dataSource: [],
|
||||
loading: false,
|
||||
approvalResult: {
|
||||
0: this.$t('agree'),
|
||||
1: this.$t('disagree'),
|
||||
2: this.$t('terminationProcess'),
|
||||
3: this.$t('issue')
|
||||
},
|
||||
columns: [
|
||||
{
|
||||
title: this.$t('result'),
|
||||
dataIndex: 'approvalResult',
|
||||
align: 'center',
|
||||
scopedSlots: { customRender: 'approvalResult' }
|
||||
},
|
||||
{
|
||||
title: this.$t('opinion'),
|
||||
dataIndex: 'approvalOpinion',
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
title: this.$t('operationNode'),
|
||||
dataIndex: 'name',
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
title: this.$t('Operator'),
|
||||
dataIndex: 'assignee',
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
title: this.$t('operationTime'),
|
||||
dataIndex: 'createTime',
|
||||
align: 'center',
|
||||
customRender: function(t, r, index) {
|
||||
return moment(t).format('YYYY-MM-DD HH:mm:ss')
|
||||
}
|
||||
}
|
||||
],
|
||||
downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download'
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
getList() {
|
||||
let query = {
|
||||
prcId: this.$route.query.actiProcInstId
|
||||
}
|
||||
getAction('/workFlow/queryProcessHistoryByPrcId', query).then((res) => {
|
||||
this.dataSource = res
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="less">
|
||||
.box {
|
||||
padding: 0 24px 24px 24px;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.box-text {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
height: 60px;
|
||||
line-height: 40px;
|
||||
|
||||
.header-text {
|
||||
font-size: 16px;
|
||||
font-weight: 400;
|
||||
color: #000F16;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -34,8 +34,7 @@
|
||||
v-if="(isDisplay && $route.query.TaskKey == 'zrrclrw') ||
|
||||
(isDisplay && $route.query.TaskKey == 'fqrsh')"
|
||||
/>
|
||||
<circulationHistory v-if="isDisplay"
|
||||
:url="'/workFlow/queryProcessHistoryByPrcId'"/>
|
||||
<circulationHistory v-if="isDisplay"/>
|
||||
</div>
|
||||
</div>
|
||||
<JLoading :loading="loading">{{textLoading}}</JLoading>
|
||||
@@ -47,10 +46,10 @@
|
||||
import projectInformation from '../../components/projectInformation'
|
||||
import standardContent from '../../components/standardContent'
|
||||
import standardContentListTable from '../../components/standardContentList'
|
||||
import circulationHistory from '../../components/circulationHistory'
|
||||
import circulationHistory from '../../components/taskCirculationHistory'
|
||||
import engineeringConfirmation from '../../components/engineeringConfirmation'
|
||||
import reviewedByThePersonInCharge from '../../components/reviewedByThePersonInCharge'
|
||||
import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
|
||||
import { getAction, postAction, deleteAction, downloadFile, putAction } from '@/api/manage'
|
||||
import { mapGetters } from 'vuex'
|
||||
|
||||
export default {
|
||||
@@ -193,7 +192,9 @@
|
||||
},
|
||||
isAdopt() {
|
||||
if (this.$route.query.TaskKey == 'fqrsh') {
|
||||
return true
|
||||
if (this.queryBy.reviewResult == 'conformity' || this.queryBy.reviewResult == 'uninvolved') {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
},
|
||||
@@ -274,7 +275,7 @@
|
||||
id: this.$route.query.primaryKeyId,
|
||||
status: 'haveDone'
|
||||
}
|
||||
postAction(this.url.edit, query).then((res) => {
|
||||
putAction(this.url.edit, query).then((res) => {
|
||||
if (res.success) {
|
||||
|
||||
}
|
||||
|
||||
@@ -78,6 +78,7 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('deadlineForConfirmationOfDesignCompliance')"
|
||||
@change="dateChange({db_field_name:'designDueDate'})"
|
||||
format="YYYY-MM-DD"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
v-model="formInline.designDueDate"
|
||||
:disabled="false"
|
||||
style="width: 100%"/>
|
||||
@@ -95,6 +96,7 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('prehomoConfirmationDeadline')"
|
||||
@change="dateChange({db_field_name:'prehomoDueDate'})"
|
||||
format="YYYY-MM-DD"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
v-model="formInline.prehomoDueDate"
|
||||
:disabled="false"
|
||||
style="width: 100%"/>
|
||||
@@ -112,6 +114,7 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('verificationComplianceConfirmationDeadline')"
|
||||
@change="dateChange({db_field_name:'verifyDueDate'})"
|
||||
format="YYYY-MM-DD"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
v-model="formInline.verifyDueDate"
|
||||
:disabled="false"
|
||||
style="width: 100%"/>
|
||||
|
||||
@@ -108,6 +108,7 @@
|
||||
<a-form-model-item class="itemModel" :prop="'implementTime'">
|
||||
<a-date-picker class="box-input"
|
||||
:placeholder="$t('PleaseSelect')+$t('vehicleInProductionDate')"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
@change="dateChange({db_field_name:'implementTime'})"
|
||||
format="YYYY-MM-DD"
|
||||
v-model="formInline.implementTime"
|
||||
@@ -123,6 +124,7 @@
|
||||
</div>
|
||||
<a-form-model-item class="itemModel">
|
||||
<a-date-picker class="box-input"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
:placeholder="$t('PleaseSelect')+$t('ImplementationDate')"
|
||||
@change="dateChange({db_field_name:'xin1Che1Xing2Shi2Shi1Ri4Qi1'})"
|
||||
format="YYYY-MM-DD"
|
||||
@@ -391,6 +393,7 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('cutoffTime')"
|
||||
@change="dateChange({db_field_name:'designDueDate'})"
|
||||
format="YYYY-MM-DD"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
v-model="formInline.designDueDate"
|
||||
:disabled="false"
|
||||
style="width: 100%"/>
|
||||
@@ -505,6 +508,7 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('cutoffTime')"
|
||||
@change="dateChange({db_field_name:'prehomoDueDate'})"
|
||||
format="YYYY-MM-DD"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
v-model="formInline.prehomoDueDate"
|
||||
:disabled="disabled"
|
||||
style="width: 100%"/>
|
||||
@@ -617,6 +621,7 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('cutoffTime')"
|
||||
@change="dateChange({db_field_name:'verifyDueDate'})"
|
||||
format="YYYY-MM-DD"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
v-model="formInline.verifyDueDate"
|
||||
:disabled="false"
|
||||
style="width: 100%"/>
|
||||
|
||||
@@ -145,7 +145,7 @@
|
||||
@click="deleteLib(record)">
|
||||
{{ $t('deleteLib') }}
|
||||
</a>
|
||||
<!-- <a class="text-operation" @click="resultReportedClick(record)">{{$t('resultReported')}}</a>-->
|
||||
<!-- <a class="text-operation" @click="resultReportedClick(record)">{{$t('resultReported')}}</a>-->
|
||||
<a @click="addProcess(record)">发起</a>
|
||||
</span>
|
||||
<span slot="titleName" slot-scope="text,record" :title="text">
|
||||
@@ -213,6 +213,7 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('TaskCutOffTime')"
|
||||
@change="dateChange({db_field_name:'inventoryAffirmDueDate'})"
|
||||
format="YYYY-MM-DD"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
v-model="formInline.inventoryAffirmDueDate"
|
||||
style="width: 100%"/>
|
||||
</a-form-model-item>
|
||||
@@ -221,6 +222,7 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('TaskCutOffTime')"
|
||||
@change="dateChange({db_field_name:'taskAffirmDueDate'})"
|
||||
format="YYYY-MM-DD"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
v-model="formInline.taskAffirmDueDate"
|
||||
style="width: 100%"/>
|
||||
</a-form-model-item>
|
||||
@@ -1115,6 +1117,7 @@
|
||||
},
|
||||
|
||||
completeTaskDesign(value, taskId) {
|
||||
value.reviewResult = 'launch'
|
||||
let query = {
|
||||
userid: this.userInfo().id,
|
||||
taskId: taskId,
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('confirmationOfRegulationsList')"
|
||||
@change="dateChange({db_field_name:'listConfirmation'})"
|
||||
format="YYYY-MM-DD"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
v-model="formInline.listConfirmation"
|
||||
:disabled="false"
|
||||
style="width: 100%"/>
|
||||
@@ -40,6 +41,7 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('regulatoryTaskConfirmation')"
|
||||
@change="dateChange({db_field_name:'legalTaskConfirmation'})"
|
||||
format="YYYY-MM-DD"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
v-model="formInline.legalTaskConfirmation"
|
||||
:disabled="false"
|
||||
style="width: 100%"/>
|
||||
@@ -58,6 +60,7 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('confirmationOfDesignConformity')"
|
||||
@change="dateChange({db_field_name:'designDeadline'})"
|
||||
format="YYYY-MM-DD"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
v-model="formInline.designDeadline"
|
||||
:disabled="false"
|
||||
style="width: 100%"/>
|
||||
@@ -76,6 +79,7 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('PrehomoConfirmation')"
|
||||
@change="dateChange({db_field_name:'prehomoDeadline'})"
|
||||
format="YYYY-MM-DD"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
v-model="formInline.prehomoDeadline"
|
||||
:disabled="false"
|
||||
style="width: 100%"/>
|
||||
@@ -94,6 +98,7 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('certificationStart')"
|
||||
@change="dateChange({db_field_name:'attestationStartTime'})"
|
||||
format="YYYY-MM-DD"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
v-model="formInline.attestationStartTime"
|
||||
:disabled="false"
|
||||
style="width: 100%"/>
|
||||
@@ -112,6 +117,7 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('certificationEnd')"
|
||||
@change="dateChange({db_field_name:'attestationEndTime'})"
|
||||
format="YYYY-MM-DD"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
v-model="formInline.attestationEndTime"
|
||||
:disabled="false"
|
||||
style="width: 100%"/>
|
||||
@@ -130,6 +136,7 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('verificationConfirmationDeadline')"
|
||||
@change="dateChange({db_field_name:'verifyDeadline'})"
|
||||
format="YYYY-MM-DD"
|
||||
:getCalendarContainer="(trigger) => trigger.parentNode"
|
||||
v-model="formInline.verifyDeadline"
|
||||
:disabled="false"
|
||||
style="width: 100%"/>
|
||||
|
||||
Reference in New Issue
Block a user