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

修改禅道已知bug

Browse Source
This commit is contained in:
qq787203167
2022-07-07 11:10:13 +08:00
parent 341a360565
commit f90fe16a43
3 changed files with 105 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/App.vue
+3
View File
@@ -142,4 +142,7 @@
.itemModel-multi .ant-form-explain, .ant-form-extra {
margin-top: -10px;
}
.anticon-exclamation-circle{
display: none!important;
}
</style>
jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+9 -8
View File
@@ -95,13 +95,13 @@
<span class="title-text-text"
:title="$t('engineer')">{{$t('engineer')}}</span>
</div>
<a-form-model-item class="itemModel" prop="userName">
<a-form-model-item class="itemModel" prop="userIdName">
<PersonnelSelection
:query="{db_field_name:'userId',db_field_txt:$t('engineer')}"
:personneQuery="formInline"
:distributionEngineerList="distributionEngineerList"
@change="PersonnelSelectionChange"
v-model="formInline.userName"/>
v-model="formInline.userIdName"/>
</a-form-model-item>
</div>
</a-col>
@@ -385,7 +385,7 @@
trigger: 'change'
}
],
userName: [
userIdName: [
{
required: true,
message: this.$t('engineer') + this.$t('cannotEmpty'),
@@ -623,8 +623,9 @@
})
}
this.formInline.userId = userId.join(',')
this.formInline.userName = userName.join(',')
this.formInline.userIdName = userName.join(',')
this.formInline = { ...this.formInline }
console.log(this.formInline)
}
this.loadingTable = false
} else {
@@ -682,7 +683,7 @@
this.formInline[value] = id
this.distributionEngineerList = []
if (id) {
this.formInline.userName.split(',').forEach((res, index) => {
this.formInline.userIdName.split(',').forEach((res, index) => {
this.distributionEngineerList.push({
deliveryInstructions: '',
name: res,
@@ -713,9 +714,9 @@
})
_this.distributionEngineerList.splice(num, 1)
_this.distributionEngineerList = [..._this.distributionEngineerList]
_this.formInline.userName = _this.formInline.userName.split(',')
_this.formInline.userName.splice(num, 1)
_this.formInline.userName = _this.formInline.userName.join(',')
_this.formInline.userIdName = _this.formInline.userIdName.split(',')
_this.formInline.userIdName.splice(num, 1)
_this.formInline.userIdName = _this.formInline.userIdName.join(',')
_this.formInline.userId = _this.formInline.userId.split(',')
_this.formInline.userId.splice(num, 1)
_this.formInline.userId = _this.formInline.userId.join(',')
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+93 -56
View File
@@ -26,11 +26,53 @@
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" style="width: 44px" :title="$t('subtitle')">
<span>{{ $t('subtitle') }}</span>
<div class="title-text" :title="$t('areaOfResponsibility')">
<span>{{ $t('areaOfResponsibility') }}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('subtitle')"
v-model="queryParam.subtitle"></j-input>
<j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
:type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('listConfirmationStatus')">
<span>{{ $t('listConfirmationStatus') }}</span>
</div>
<a-select :placeholder="$t('PleaseSelect')+$t('listConfirmationStatus')"
class="box-input"
allowClear
:getPopupContainer="triggerNode=> triggerNode.parentNode"
v-model="queryParam.inventoryAffirmStatus">
<a-select-option v-for="(item, key) in listOptions"
:key="item.key"
:value="item.value">
<span style="display: inline-block;width: 100%" :title=" item.label ">
{{ item.label}}
</span>
</a-select-option>
</a-select>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('taskAffirmStatus')">
<span>{{ $t('taskAffirmStatus') }}</span>
</div>
<a-select :placeholder="$t('PleaseSelect')+$t('taskAffirmStatus')"
class="box-input"
allowClear
:getPopupContainer="triggerNode=> triggerNode.parentNode"
v-model="queryParam.taskAffirmStatus">
<a-select-option v-for="(item, key) in taskOptions"
:key="item.key"
:value="item.value">
<span style="display: inline-block;width: 100%" :title=" item.label ">
{{ item.label}}
</span>
</a-select-option>
</a-select>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -774,6 +816,11 @@
value: 'correspondingStandard',
text: this.$t('correspondingStandard')
},
{
type: 'string',
value: 'subtitle',
text: this.$t('subtitle')
},
{
type: '',
value: 'implementType',
@@ -837,59 +884,49 @@
valueName: 'engineeringInterfacePersonName',
text: this.$t('engineeringInterfacePerson')
},
],
listOptions:[
{
type: '',
value: 'inventoryAffirmStatus',
text: this.$t('listConfirmationStatus'),
options:[
{
value:'Not started',
key:'Not started',
label:this.$t('notLaunch'),
},
{
value:'List to confirm',
key:'List to confirm',
label:this.$t('toBeConfirmed'),
},
{
value:'Accepted',
key:'Accepted',
label:this.$t('accept'),
},
{
value:'Rejected',
key:'Rejected',
label:this.$t('refuse'),
},
],
value:'Not started',
key:'Not started',
label:this.$t('notLaunch'),
},
{
type: '',
value: 'taskAffirmStatus',
text: this.$t('taskAffirmStatus'),
options:[
{
value:'Not started',
key:'Not started',
label:this.$t('notLaunch'),
},
{
value:'List to confirm',
key:'List to confirm',
label:this.$t('toBeConfirmed'),
},
{
value:'Accepted',
key:'Accepted',
label:this.$t('accept'),
},
{
value:'Rejected',
key:'Rejected',
label:this.$t('refuse'),
},
],
value:'List to confirm',
key:'List to confirm',
label:this.$t('toBeConfirmed'),
},
{
value:'Accepted',
key:'Accepted',
label:this.$t('accept'),
},
{
value:'Rejected',
key:'Rejected',
label:this.$t('refuse'),
},
],
taskOptions:[
{
value:'Not started',
key:'Not started',
label:this.$t('notLaunch'),
},
{
value:'List to confirm',
key:'List to confirm',
label:this.$t('toBeConfirmed'),
},
{
value:'Accepted',
key:'Accepted',
label:this.$t('accept'),
},
{
value:'Rejected',
key:'Rejected',
label:this.$t('refuse'),
},
],
visibleRoleSwitching: false,
@@ -2018,14 +2055,14 @@
}
.title-text {
width: 32px;
width: 92px;
color: #000F16;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
margin-top: 3px;
text-align: left;
text-align: right;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;