WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangzhijiang
2023-03-09 22:24:00 +08:00
parent 1567786485 bed9482353
commit b01a1bf69f
4 changed files with 341 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1430,4 +1430,5 @@ module.exports = {
confirmreturn:'Confirm return ?',
onlyDataSelected:'Only data with process status of task to be confirmed, result to be submitted and review to be returned can be selected',
youCannotStatusListToBeReleasedAndApproved:'You cannot select data whose process status is list to be released and approved',
batchmodify:'Whether to batch modify',
}
jero-web/src/common/lang/zh-cn.js
+2
View File
@@ -1524,6 +1524,7 @@ module.exports = {
confirmReturnForApproval:'确认退回审批？',
onlyDataStatusResultReviewedCanBeSelected:'只能选择流程状态为结果待审查的数据',
confirmResetProcess:'确认重置流程?',
confirmUrging:'确认催办',
statusthetasistobeconfirmed:'只有清单待校核状态或任务确认状态为待确认时才可以进行撤回',
confirmreturn:'确认退回？',
confirmUrging:'确认催办?',
@@ -1531,4 +1532,5 @@ module.exports = {
onlyListCheckedCanRecalled:'只能撤回流程状态为清单待校核的数据',
onlyDataSelected:'只能选择流程状态为任务待确认、结果待提交、审查退回的数据',
youCannotStatusListToBeReleasedAndApproved:'不能选择流程状态为清单待发布、审查通过的数据',
batchmodify:'是否批量修改',
}
jero-web/src/views/projectManagement/components/batSetting.vue
+238 -86
View File
@@ -10,21 +10,6 @@
>
<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="title-text-text"
:title="$t('implementationCategory')">{{$t('implementationCategory')}}</span>
</div>
<a-form-model-item class="itemModel">
<j-dict-select-tag class="box-input" v-model="formInline.implementType"
@input="handleInput('implementType')"
:placeholder="$t('PleaseSelect')+$t('implementationCategory')"
:type="'select'"
:triggerChange="false" dictCode="implement_type"/>
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
@@ -43,22 +28,6 @@
</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('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
</div>
<a-form-model-item class="itemModel-multi" prop="region">
<j-multi-select-tag class="box-input" v-model="formInline.region"
:placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
:type="'select'"
:triggerChange="false" :dictCode="'region'"/>
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
@@ -96,93 +65,253 @@
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('vehicleInProductionDate')">{{$t('vehicleInProductionDate')}}</span>
:title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
</div>
<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"
style="width: 100%"/>
<a-form-model-item class="itemModel" prop="designDutyId">
<PersonnelSelection :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"
:isSingleChoice="true"
:personneQuery="formInline"
v-if="visible"
@change="PersonnelSelectionChange"
v-model="formInline.engineeringInterfacePersonName"/>
<!-- <j-dict-select-tag class="box-input" v-model="formInline.designDuty"-->
<!-- :disabled="formInline.roleCode == 0 ? false : true"-->
<!-- @input="handleInput('designDuty')"-->
<!-- :placeholder="$t('PleaseSelect')+$t('personLiable')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>-->
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<a-col :span="12" v-if="this.code != '1'">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('ImplementationDate')">{{$t('ImplementationDate')}}</span>
<span class="title-text-text"
:title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
</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"
v-model="formInline.xin1Che1Xing2Shi2Shi1Ri4Qi1"
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="title-text-text" :title="$t('deadlineForConfirmationOfDesignCompliance')">
{{$t('deadlineForConfirmationOfDesignCompliance')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-date-picker class="box-input"
: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%"/>
<a-form-model-item class="itemModel" prop="designDutyId">
<PersonnelSelection :query="{db_field_name:'regulatoryEngineer',db_field_txt:$t('regulatoryEngineer')}"
:isSingleChoice="true"
:personneQuery="formInline"
v-if="visible"
@change="PersonnelSelectionChange"
v-model="formInline.regulatoryEngineerName"/>
<!-- <j-dict-select-tag class="box-input" v-model="formInline.designDuty"-->
<!-- :disabled="formInline.roleCode == 0 ? false : true"-->
<!-- @input="handleInput('designDuty')"-->
<!-- :placeholder="$t('PleaseSelect')+$t('personLiable')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>-->
</a-form-model-item>
</div>
</a-col>
</a-row>
<div class="header-text">
&nbsp;{{$t('confirmationOfDesignConformity')}}
</div>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('prehomoConfirmationDeadline')">
{{$t('prehomoConfirmationDeadline')}}</span>
<span class="title-text-text"
:title="$t('personLiable')">{{$t('personLiable')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-date-picker class="box-input"
: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%"/>
<a-form-model-item class="itemModel" prop="designDutyId">
<PersonnelSelection :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}"
:isSingleChoice="true"
:personneQuery="formInline"
v-if="visible"
@change="PersonnelSelectionChange"
v-model="formInline.dutyPersonName"/>
<!-- <j-dict-select-tag class="box-input" v-model="formInline.designDuty"-->
<!-- :disabled="formInline.roleCode == 0 ? false : true"-->
<!-- @input="handleInput('designDuty')"-->
<!-- :placeholder="$t('PleaseSelect')+$t('personLiable')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>-->
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('verificationComplianceConfirmationDeadline')">
{{$t('verificationComplianceConfirmationDeadline')}}</span>
<span class="title-text-text"
:title="$t('cutoffTime')">{{$t('cutoffTime')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-form-model-item class="itemModel" :prop="'verifyDueDate'">
<a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+$t('verificationComplianceConfirmationDeadline')"
: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%"/>
</a-form-model-item>
</div>
</a-col>
<!-- <a-col :span="12">-->
<!-- <div class="box-title-text">-->
<!-- <div class="title-text">-->
<!-- <span class="title-text-text"-->
<!-- :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
<!-- </div>-->
<!-- <a-form-model-item class="itemModel" prop="designInitiatorId">-->
<!-- <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
<!-- :disabled="formInline.roleCodeIndex == 0 ? false : true"-->
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
<!-- class="box-input"-->
<!-- allowClear-->
<!-- v-model="formInline.designInitiatorId">-->
<!-- <a-select-option v-for="(item, key) in designInitiatorList"-->
<!-- :key="key"-->
<!-- :value="item.value">-->
<!-- <span style="display: inline-block;width: 100%" :title=" item.name ">-->
<!-- {{ item.name }}-->
<!-- </span>-->
<!-- </a-select-option>-->
<!-- </a-select>-->
<!-- &lt;!&ndash; <j-dict-select-tag class="box-input" v-model="formInline.designInitiator"&ndash;&gt;-->
<!-- &lt;!&ndash; :disabled="formInline.roleCode == 0 ? false : true"&ndash;&gt;-->
<!-- &lt;!&ndash; @input="handleInput('designInitiator')"&ndash;&gt;-->
<!-- &lt;!&ndash; :placeholder="$t('PleaseSelect')+$t('Sponsor')"&ndash;&gt;-->
<!-- &lt;!&ndash; :type="'select'"&ndash;&gt;-->
<!-- &lt;!&ndash; :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>&ndash;&gt;-->
<!-- </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('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
</div>
<a-form-model-item class="itemModel" prop="typeOfDeliverables">
<a-tree-select
tree-node-filter-prop="title"
v-model="formInline.designDeliverableType"
:maxTagCount="1"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
class="box-input"
style="width: 100%"
:tree-data="DeliverableTreeList"
tree-checkable
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
/>
<!-- <j-dict-select-tag class="box-input" v-model="formInline.designDeliverableType"-->
<!-- @input="handleInput('designDeliverableType')"-->
<!-- :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'deliverable_template'"/>-->
</a-form-model-item>
</div>
</a-col>
</a-row>
<div class="header-text">
&nbsp;{{$t('verificationAndConformityconfirmation')}}
</div>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('personLiable')">{{$t('personLiable')}}</span>
</div>
<a-form-model-item class="itemModel" prop="verifyDutyId">
<PersonnelSelection :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}"
:isSingleChoice="true"
:personneQuery="formInline"
v-if="visible"
@change="PersonnelSelectionChange"
v-model="formInline.dutyPersonName"/>
<!-- <j-dict-select-tag class="box-input" v-model="formInline.verifyDuty"-->
<!-- :disabled="formInline.roleCode == 0 ? false : true"-->
<!-- @input="handleInput('verifyDuty')"-->
<!-- :placeholder="$t('PleaseSelect')+$t('personLiable')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>-->
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('cutoffTime')">{{$t('cutoffTime')}}</span>
</div>
<a-form-model-item class="itemModel" :prop="'verifyDueDate'">
<a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+$t('cutoffTime')"
@change="dateChange({db_field_name:'verifyDueDate'})"
format="YYYY-MM-DD"
:getCalendarContainer="(trigger) => trigger.parentNode"
v-model="formInline.verifyDueDate"
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="title-text-text"-->
<!-- :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
<!-- </div>-->
<!-- <a-form-model-item class="itemModel" prop="verifyInitiatorId">-->
<!-- <a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
<!-- class="box-input"-->
<!-- allowClear-->
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
<!-- :disabled="formInline.roleCodeIndex == 0 ? false : true"-->
<!-- v-model="formInline.verifyInitiatorId">-->
<!-- <a-select-option v-for="(item, key) in verifyInitiatorList"-->
<!-- :key="key"-->
<!-- :value="item.value">-->
<!-- <span style="display: inline-block;width: 100%" :title=" item.name ">-->
<!-- {{ item.name }}-->
<!-- </span>-->
<!-- </a-select-option>-->
<!-- </a-select>-->
<!-- &lt;!&ndash; <j-dict-select-tag class="box-input" v-model="formInline.verifyInitiator"&ndash;&gt;-->
<!-- &lt;!&ndash; :disabled="formInline.roleCode == 0 ? false : true"&ndash;&gt;-->
<!-- &lt;!&ndash; @input="handleInput('verifyInitiator')"&ndash;&gt;-->
<!-- &lt;!&ndash; :placeholder="$t('PleaseSelect')+$t('Sponsor')"&ndash;&gt;-->
<!-- &lt;!&ndash; :type="'select'"&ndash;&gt;-->
<!-- &lt;!&ndash; :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>&ndash;&gt;-->
<!-- </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('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
</div>
<a-form-model-item class="itemModel" prop="verifyDeliverableType">
<a-tree-select
tree-node-filter-prop="title"
v-model="formInline.verifyDeliverableType"
:maxTagCount="1"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
class="box-input"
style="width: 100%"
:tree-data="DeliverableTreeList"
tree-checkable
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
/>
<!-- <j-dict-select-tag class="box-input" v-model="formInline.verifyDeliverableType"-->
<!-- :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyDeliverableType ? true : false"-->
<!-- @input="handleInput('verifyDeliverableType')"-->
<!-- :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'deliverable_template'"/>-->
</a-form-model-item>
</div>
</a-col>
</a-row>
</a-form-model>
</a-modal>
@@ -190,25 +319,39 @@
<script>
import { getAction, postAction } from '@/api/manage'
import PersonnelSelection from '@/components/PersonnelSelection/index'
import moment from 'moment'
export default {
name: 'batSetting',
props: ['url'],
components: {
PersonnelSelection
},
data() {
return {
visible: false,
confirmLoading: false,
designDutyList: [],
DeliverableTreeList: [],
formInline: {},
rules: {},
ids: []
ids: [],
code:'',
}
},
mounted() {
},
methods: {
edit(data) {
PersonnelSelectionChange(value, id) {
this.formInline[value] = id
this.formInline = { ...this.formInline }
},
edit(data,code) {
this.visible = true
this.getDeliverableTree()
this.code = code
console.log(this.code)
this.$nextTick(() => {
this.ids = data || []
this.formInline = {}
@@ -221,6 +364,15 @@
this.handleOkOne()
}
},
getDeliverableTree() {
getAction('/sys/category/getDeliverableTree', {}).then((res) => {
if (res.success) {
this.DeliverableTreeList = res.result
} else {
this.DeliverableTreeList = []
}
})
},
handleOkOne() {
let ids = JSON.parse(JSON.stringify(this.ids))
let query = {
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+100 -49
View File
@@ -97,20 +97,24 @@
<!-- v-if="(isRoleSwitching && !isDisplay) || (!isDisplay && roleSwitchingList.length > 1) || isDisplay"-->
<div class="table-operator"
style="overflow:hidden;margin-bottom: 20px">
<div style="float: left;margin-bottom: 0px;margin-left: 20px" v-if="isDisplay">
<div @click="transferClick" class="operator-text">
<div style="float: left;margin-bottom: 0px;margin-left: 20px">
<!-- 调取-->
<div @click="transferClick" class="operator-text" v-if="this.formInlineRoleSwitching.roleSwitchingCode == '0'">
<a-icon type="profile" />
{{ $t('Transfer') }}
</div>
<div class="operator-text" @click="bringInRelevantPersonnelClick">
<!-- 带入相关人员-->
<div class="operator-text" @click="bringInRelevantPersonnelClick" v-if="this.formInlineRoleSwitching.roleSwitchingCode == '0'">
<a-icon type="user" />
{{ $t('bringInRelevantPersonnel') }}
</div>
<div class="operator-text" @click="batSettingClick">
<!-- 批量设置-->
<div class="operator-text" @click="batSettingClick" v-if="this.formInlineRoleSwitching.roleSwitchingCode == '0' || this.formInlineRoleSwitching.roleSwitchingCode == '1'">
<a-icon type="setting" />
{{ $t('BatchSetting') }}
</div>
<a-popconfirm :visible="customizevisible" overlayClassName="popconfirmmize" placement="bottomRight">
<!-- 列表设置-->
<a-popconfirm :visible="customizevisible" overlayClassName="popconfirmmize" placement="bottomRight" v-if="this.formInlineRoleSwitching.roleSwitchingCode == '0' || this.formInlineRoleSwitching.roleSwitchingCode == '1'">
<template slot="title" id="popconfirmmize">
<div style="height:320px;overflow:scroll;overflow-x: auto;">
<a-checkbox
@@ -137,38 +141,47 @@
<a-icon type="setting" />
{{ $t('customize') }}
</div>
</a-popconfirm>
<a-popconfirm overlayClassName="popconfirm" placement="bottomRight">
</a-popconfirm v-if="this.formInlineRoleSwitching.roleSwitchingCode == '0' || this.formInlineRoleSwitching.roleSwitchingCode == '1'">
<!-- 更多-->
<a-popconfirm overlayClassName="popconfirm" placement="bottomRight" v-if="this.formInlineRoleSwitching.roleSwitchingCode == '0'">
<template slot="title" id="popconfirm">
<div style="height:320px;overflow:scroll;overflow-x: auto;">
<!-- 添加-->
<div @click="handleAdd" class="operator-text-title">
<a-icon type="plus" />
{{ $t('add') }}
</div>
<!-- 复制-->
<div @click="copyClick" class="operator-text-title">
<a-icon type="copy" />
{{ $t('copy') }}
</div>
<!-- 批量删除-->
<div @click="handleDel" class="operator-text-title">
<a-icon type="delete" />
{{ $t('BatchDelete') }}
</div>
<!-- 模板下载-->
<div @click="handleModule" class="operator-text-title">
<a-icon type="download" />
{{ $t('templateDownload') }}
</div>
<!-- 导入-->
<div class="operator-text-title">
<ImportFile :url="url" :projectLibraryId=$route.query.id :isTrue="true" :accept="'.zip'"
@getList="getPersonnelList" />
</div>
<!-- 导出-->
<div @click="handleExport" v-has="'projectLawsInventory:exportData'" class="operator-text-title">
<a-icon type="export" :rotate="-90" />
{{ $t('export') }}
</div>
<!-- 定版-->
<div class="operator-text-title" @click="fixedPlateClick">
<a-icon type="pushpin" />
{{ $t('fixedPlate') }}
</div>
<!-- 生成合规报告-->
<div class="operator-text-title" @click="ExportReportClick">
<a-icon type="export" :rotate="-90" />
{{ $t('compliancereport') }}
@@ -181,6 +194,7 @@
<!-- <a-icon type="setting" />-->
<!-- {{ $t('batchSettingPersonnel') }}-->
<!-- </div>-->
<!-- 流程重置-->
<div class="operator-text-title" @click="alterationClick">
<a-icon type="file-search" />
{{ $t('processReset') }}
@@ -196,47 +210,43 @@
<!-- {{ $t('initiateTaskConfirmation') }}-->
<!-- </div>-->
</div>
<div style="float: right;margin-top: 1px;;margin-right: 20px" v-if="isDisplay">
<div style="float: right;margin-top: 1px;;margin-right: 20px">
<!-- <div class="operator-text" @click="customizeClick">-->
<!-- <a-icon type="setting"/>-->
<!-- {{ $t('customize') }}-->
<!-- </div>-->
<div class="operator-text" @click="initiateListConfirmationcClick('清单')">
<a-icon type="solution" />
{{ $t('release') }}
</div>
<div class="operator-text" @click="withdrawnClick">
<a-icon type="rollback" />
{{ $t('withdraw') }}
</div>
<div class="operator-text" @click="questionClick">
<a-icon type="sound" />
{{ $t('question') }}
</div>
<!-- <div class="operator-text"-->
<!-- v-if="roleSwitchingList.length > 1"-->
<!-- @click="roleSwitchingClick">-->
<!-- <a-icon type="select" />-->
<!-- {{ $t('roleSwitching') }}-->
<!-- </div>-->
</div>
<div v-if="!isDisplay" style="float: right;margin-top: 1px;margin-bottom: 0px;margin-right: 20px">
<div @click="handleExport" v-has="'projectLawsInventory:exportData'"
v-if="isRoleSwitching || formInlineRoleSwitching.roleSwitchingCode == '12'"
v-if="this.formInlineRoleSwitching.roleSwitchingCode == '1' || this.formInlineRoleSwitching.roleSwitchingCode == '2' || this.formInlineRoleSwitching.roleSwitchingCode == '30' || this.formInlineRoleSwitching.roleSwitchingCode == '31'"
class="operator-text">
<a-icon type="export" :rotate="-90" />
{{ $t('export') }}
</div>
<div class="operator-text" @click="submitClick(0)" v-if="isRoleSwitching">
<!-- 发布-->
<div class="operator-text" @click="initiateListConfirmationcClick('清单')" v-if="this.formInlineRoleSwitching.roleSwitchingCode == '0'">
<a-icon type="solution" />
{{ $t('release') }}
</div>
<!-- 撤回-->
<div class="operator-text" @click="withdrawnClick" v-if="this.formInlineRoleSwitching.roleSwitchingCode == '0'">
<a-icon type="rollback" />
{{ $t('withdraw') }}
</div>
<!-- 发起任务-->
<div class="operator-text" @click="submitClick(0)" v-if="this.formInlineRoleSwitching.roleSwitchingCode == '1'">
<a-icon type="check-circle" />
{{ $t('submit') }}
{{ $t('initiateTask') }}
</div>
<div class="operator-text" @click="submitClick(1)" v-if="isRoleSwitching">
<!-- 退回-->
<div class="operator-text" @click="submitClick(1)" v-if="this.formInlineRoleSwitching.roleSwitchingCode == '1'">
<a-icon type="close-circle" />
{{ $t('overrule') }}
{{ $t('sendBack') }}
</div>
<!-- 催办-->
<div class="operator-text" @click="questionClick" v-if="this.formInlineRoleSwitching.roleSwitchingCode == '0' || this.formInlineRoleSwitching.roleSwitchingCode == '1' || this.formInlineRoleSwitching.roleSwitchingCode == '30'">
<a-icon type="sound" />
{{ $t('question') }}
</div>
<!-- <div class="operator-text"-->
<!-- v-if="roleSwitchingList.length > 1"-->
<!-- @click="roleSwitchingClick">-->
@@ -1603,8 +1613,9 @@ export default {
this.$refs.transferListRef.transferModel()
},
batSettingClick() {
let code = this.formInlineRoleSwitching.roleSwitchingCode
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)))
this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)),code)
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
@@ -1652,7 +1663,47 @@ export default {
},
// 撤回
withdrawnClick(){
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
let isTrue
for (let i = 0; i < this.dataSource.length; i++) {
for (let j = 0; j < selectedRowKeys.length; j++) {
if (this.dataSource[i].id == selectedRowKeys[j]) {
if (this.dataSource[i].taskAffirmStatus == 'List to confirm' ||
this.dataSource[i].inventoryAffirmStatus == 'List to confirm') {
isTrue = true
} else {
isTrue = false
this.$message.warning(this.$t('statusthetasistobeconfirmed'))
return
}
}
}
}
if (isTrue) {
let _this = this
this.$confirm({
content: _this.$t('confirmWithdraw'),
onOk() {
let query = {
ids: selectedRowKeys.join(','),
projectLibraryId: _this.$route.query.id
}
postAction('project/projectLawsInventoryEO/expediting', query).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.selectedRowKeys = []
_this.getList()
} else {
_this.$message.warning(_this.$t('operationFailed'))
}
})
}
})
}
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
},
questionClick() {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
@@ -1722,19 +1773,19 @@ export default {
for (let i = 0; i < this.dataSource.length; i++) {
for (let j = 0; j < selectedRowKeys.length; j++) {
if (this.dataSource[i].id == selectedRowKeys[j]) {
if (this.dataSource[i].taskAffirmStatus == 'Accepted' ||
(this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Accepted') ||
(this.dataSource[i].inventoryAffirmStatus == 'Rejected' && this.dataSource[i].taskAffirmStatus == 'Accepted') ||
(this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Rejected') ||
(this.dataSource[i].inventoryAffirmStatus == 'Rejected' && this.dataSource[i].taskAffirmStatus == 'Rejected') ||
(this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Not started') ||
(this.dataSource[i].inventoryAffirmStatus == 'Rejected' && this.dataSource[i].taskAffirmStatus == 'Not started')) {
// if (this.dataSource[i].taskAffirmStatus == 'Accepted' ||
// (this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Accepted') ||
// (this.dataSource[i].inventoryAffirmStatus == 'Rejected' && this.dataSource[i].taskAffirmStatus == 'Accepted') ||
// (this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Rejected') ||
// (this.dataSource[i].inventoryAffirmStatus == 'Rejected' && this.dataSource[i].taskAffirmStatus == 'Rejected') ||
// (this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Not started') ||
// (this.dataSource[i].inventoryAffirmStatus == 'Rejected' && this.dataSource[i].taskAffirmStatus == 'Not started')) {
isTrue = true
} else {
isTrue = false
this.$message.warning(this.$t('theTaskConfirmationStatusCannot'))
return
}
// } else {
// isTrue = false
// this.$message.warning(this.$t('theTaskConfirmationStatusCannot'))
// return
// }
}
}
}
@@ -2652,7 +2703,7 @@ export default {
let _this = this
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
this.$confirm({
content: num == 0 ? _this.$t('confirmSubmit') : _this.$t('confirmOverrule'),
content: num == 0 ? _this.$t('confirmLaunchTask') : _this.$t('confirmreturn'),
onOk() {
if (num == 0) {
let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))