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

合并分支 'dev_third_stage' 到 'master'

Browse Source 
Dev third stage

查看合并请求 laws-nio/laws-weilai!39
This commit is contained in:
李雪涛
2022-07-03 12:41:20 +08:00
parent 6c94d5412a d3b8ee15dd
commit 4f64aa951c
63 changed files with 3402 additions and 755 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/AssignedBy/index.vue
+4
View File
@@ -178,6 +178,7 @@ export default {
this.$message.warning(this.$t('OnlyOneSelected'))
} else {
let param = {ids: this.selectedRowKeysArray, paramsManifestId:this.$route.query.id ,projectId: this.$route.query.projectId, dre:this.selectedRowKeysDate[0].username }
this.confirmLoading = true
axios({
url: '/jero-boot/params/collectManifest/updateDreBatch',
method: 'post',
@@ -199,14 +200,17 @@ export default {
_this.$message.success(_this.$t('OperationSuccessful'))
// 填写人
// 获取当前登陆人
this.confirmLoading = false
this.$emit('GetgetLoginUserType')
this.$emit('GetgetTableList')
this.$emit('areaVisibleAssignedbyflag', false)
}else{
this.confirmLoading = false
_this.$message.warning(_this.$t('operationFailed'))
}
})
.catch( (error) =>{
this.confirmLoading = false
console.log(error);
});
}
jero-web/src/components/CollectionType/index.vue
+60 -22
View File
@@ -18,6 +18,7 @@
<!-- 无 -->
<div v-if="item.controlVerify == '1'">
<a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')"
v-model="item.dataValue"/>
@@ -43,7 +44,7 @@
<div v-if="item.controlVerify == '4'">
<a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false"
onkeyup="value=value.replace(/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$/g,'')"
onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
:placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
v-model="item.dataValue"/>
</div>
@@ -95,10 +96,12 @@
</div>
</div>
<!-- 纯下拉单选-->
<div v-if='detailDate.controlType === "2"' class='add_flex'>
<div v-else-if='detailDate.controlType === "2"' class='add_flex'>
<div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
<div v-if='item.type === "pull"'>
<a-select v-model="item.dataValue" class='selectWid' :disabled="item.isLock == '1' ? true: false"
<a-select v-model="item.dataValue"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
class='selectWid' :disabled="item.isLock == '1' ? true: false"
allowClear>
<a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
<span style="display: inline-block;width: 100%" :title=" item.label ">
@@ -110,10 +113,12 @@
</div>
</div>
<!-- 纯下拉多选-->
<div v-if='detailDate.controlType === "3"' class='add_flex'>
<div v-else-if='detailDate.controlType === "3"' class='add_flex'>
<div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1' class='add-width'>
<div v-if='item.type==="pull_more"'>
<a-select v-model="item.dataValue" mode="multiple" class='selectWid'
<a-select v-model="item.dataValue"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
mode="multiple" class='selectWid'
:disabled="item.isLock == '1' ? true: false" allowClear>
<a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
<span style="display: inline-block;width: 100%" :title=" item.label ">
@@ -125,7 +130,7 @@
</div>
</div>
<!-- 纯附件-->
<div v-if='detailDate.controlType === "4"' class='add_flex'>
<div v-else-if='detailDate.controlType === "4"' class='add_flex'>
<div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1' class='add-width'>
<div v-if='item.type==="file"'>
<a-button type="primary" class="button-text inputWid"
@@ -137,10 +142,12 @@
</div>
</div>
<!-- 文本+下拉单选-->
<div v-if='detailDate.controlType === "5"' class='add_flex'>
<div v-else-if='detailDate.controlType === "5"' class='add_flex'>
<div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
<div v-if='item.type==="pull"'>
<a-select v-model="item.dataValue" class='selectWid' :disabled="item.isLock == '1' ? true: false"
<a-select v-model="item.dataValue"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
class='selectWid' :disabled="item.isLock == '1' ? true: false"
allowClear>
<a-select-option v-for="(itemin, key) in item.controlValue" :key="key" :value="itemin.value">
<span style="display: inline-block;width: 100%" :title=" itemin.label ">
@@ -163,6 +170,7 @@
<!-- 无 -->
<div v-if="item.controlVerify == '1'">
<a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')"
v-model="item.dataValue"/>
@@ -170,6 +178,7 @@
<!-- 中文-->
<div v-if="item.controlVerify == '2'">
<a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
@@ -188,7 +197,7 @@
<div v-if="item.controlVerify == '4'">
<a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false"
onkeyup="value=value.replace(/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$/g,'')"
onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
:placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
v-model="item.dataValue"/>
</div>
@@ -240,7 +249,7 @@
</div>
</div>
<!-- 文本+下拉多选-->
<div v-if='detailDate.controlType === "6"' class='add_flex'>
<div v-else-if='detailDate.controlType === "6"' class='add_flex'>
<div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
<div v-if='item.type==="text"'>
<!-- 文本校验 分情况-->
@@ -256,6 +265,7 @@
<!-- 无 -->
<div v-if="item.controlVerify == '1'">
<a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')"
v-model="item.dataValue"/>
@@ -263,6 +273,7 @@
<!-- 中文-->
<div v-if="item.controlVerify == '2'">
<a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
@@ -281,7 +292,7 @@
<div v-if="item.controlVerify == '4'">
<a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false"
onkeyup="value=value.replace(/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$/g,'')"
onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
:placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
v-model="item.dataValue"/>
</div>
@@ -331,7 +342,9 @@
</div>
</div>
<div v-if='item.type==="pull_more"'>
<a-select v-model="item.dataValue" mode="multiple" class='selectWid'
<a-select v-model="item.dataValue"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
mode="multiple" class='selectWid'
:disabled="item.isLock == '1' ? true: false" allowClear>
<a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
<span style="display: inline-block;width: 100%" :title=" item.label ">
@@ -343,7 +356,7 @@
</div>
</div>
<!-- 文本+附件-->
<div v-if='detailDate.controlType === "7"' class='add_flex'>
<div v-else-if='detailDate.controlType === "7"' class='add_flex'>
<div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
<div v-if='item.type==="text"'>
<!-- 文本校验 分情况-->
@@ -359,6 +372,7 @@
<!-- 无 -->
<div v-if="item.controlVerify == '1'">
<a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')"
v-model="item.dataValue"/>
@@ -366,6 +380,7 @@
<!-- 中文-->
<div v-if="item.controlVerify == '2'">
<a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
@@ -384,7 +399,7 @@
<div v-if="item.controlVerify == '4'">
<a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false"
onkeyup="value=value.replace(/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$/g,'')"
onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
:placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
v-model="item.dataValue"/>
</div>
@@ -443,10 +458,12 @@
</div>
</div>
<!-- 下拉单选+附件-->
<div v-if='detailDate.controlType === "8"' class='add_flex'>
<div v-else-if='detailDate.controlType === "8"' class='add_flex'>
<div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
<div v-if='item.type==="pull"'>
<a-select v-model="item.dataValue" class='selectWid' :disabled="item.isLock == '1' ? true: false"
<a-select v-model="item.dataValue"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
class='selectWid' :disabled="item.isLock == '1' ? true: false"
allowClear>
<a-select-option v-for="(itemin, key) in item.controlValue" :key="key" :value="itemin.value">
<span style="display: inline-block;width: 100%" :title=" itemin.label ">
@@ -465,10 +482,12 @@
</div>
</div>
<!-- 下拉多选+附件-->
<div v-if='detailDate.controlType === "9"' class='add_flex'>
<div v-else-if='detailDate.controlType === "9"' class='add_flex'>
<div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
<div v-if='item.type==="pull_more"'>
<a-select v-model="item.dataValue" mode="multiple" class='selectWid'
<a-select v-model="item.dataValue"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
mode="multiple" class='selectWid'
:disabled="item.isLock == '1' ? true: false" allowClear>
<a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
<span style="display: inline-block;width: 100%" :title=" item.label ">
@@ -487,13 +506,15 @@
</div>
</div>
<!-- 文本+下拉单选+附件-->
<div v-if='detailDate.controlType === "10"' class='add_flex'>
<div v-else-if='detailDate.controlType === "10"' class='add_flex'>
<div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
<div v-if='item.type==="pull"'>
<a-select v-model="item.dataValue" class='selectWid' :disabled="item.isLock == '1' ? true: false"
<a-select v-model="item.dataValue"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
class='selectWid' :disabled="item.isLock == '1' ? true: false"
allowClear>
<a-select-option v-for="(itemin, key) in item.controlValue" :key="key" :value="itemin.value">
<span style="display: inline-block;width: 100%" :title=" itemin.label ">
<span style="display: inline-block;width: 100%" class="itemOption" :title=" itemin.label ">
{{ itemin.label }}
</span>
</a-select-option>
@@ -513,6 +534,7 @@
<!-- 无 -->
<div v-if="item.controlVerify == '1'">
<a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')"
v-model="item.dataValue"/>
@@ -521,6 +543,7 @@
<div v-if="item.controlVerify == '2'">
<a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false"
:maxLength="1000"
:placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
v-model="item.dataValue"/>
@@ -538,7 +561,7 @@
<div v-if="item.controlVerify == '4'">
<a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false"
onkeyup="value=value.replace(/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$/g,'')"
onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
:placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
v-model="item.dataValue"/>
</div>
@@ -694,6 +717,13 @@
.ant-table td {
white-space: nowrap;
}
.selectWid .ant-select-selection--multiple {
overflow: auto;
}
.selectWid .ant-select-selection--multiple::-webkit-scrollbar {
display: none; /* Chrome Safari */
}
</style>
<style lang="less" scoped>
.box {
@@ -747,4 +777,12 @@
.ant-select-disabled{
color: rgba(0, 0, 0, 0.65);
}
.itemOption {
display: inline-block;
width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
}
</style>
jero-web/src/components/ParameterLibraryAdd/index.vue
+193 -12
View File
@@ -12,16 +12,44 @@
>
<a-row :gutter='24'>
<a-col :span='9'>
<a-form-model-item ref='region' :label="$t('NiONumber')" prop='region'>
<a-input
v-model='form.nioNumber' :placeholder="$t('pleaseEnter')+$t('NiONumber')" />
</a-form-model-item>
<div class="box-title-text">
<div class="title-text">
<!-- <span class="Required">*</span>-->
<span class="title-text-text" :title="$t('NiONumber')">{{$t('NiONumber')}}</span>
</div>
<a-form-model-item class="itemModel" :prop='region'>
<!-- <a-input class="box-input"-->
<!-- :disabled="disabled"-->
<!-- v-model="formInline[item.db_field_name]"-->
<!-- :placeholder="$t('PleaseEnter')+item.db_field_txt"/>-->
<a-input class="box-input" :title="$t('pleaseEnter')+$t('ParameterName')"
v-model='form.nioNumber' :placeholder="$t('pleaseEnter')+$t('NiONumber')" />
</a-form-model-item>
</div>
<!-- <a-form-model-item ref='region' :label="$t('NiONumber')" prop='region' >-->
<!-- <a-input-->
<!-- v-model='form.nioNumber' :placeholder="$t('pleaseEnter')+$t('NiONumber')" />-->
<!-- </a-form-model-item>-->
</a-col>
<a-col :span='9'>
<a-form-model-item ref='paramsTemplateName' :label="$t('ParameterName')" prop='paramsTemplateName'>
<a-input
v-model='form.paramsName' :placeholder="$t('pleaseEnter')+$t('ParameterName')" />
</a-form-model-item>
<div class="box-title-text">
<div class="title-text">
<!-- <span class="Required">*</span>-->
<span class="title-text-text" :title="$t('ParameterName')">{{$t('ParameterName')}}</span>
</div>
<a-form-model-item class="itemModel" :prop='region'>
<!-- <a-input class="box-input"-->
<!-- :disabled="disabled"-->
<!-- v-model="formInline[item.db_field_name]"-->
<!-- :placeholder="$t('PleaseEnter')+item.db_field_txt"/>-->
<a-input
v-model='form.paramsName' :title="$t('pleaseEnter')+$t('ParameterName')" :placeholder="$t('pleaseEnter')+$t('ParameterName')" />
</a-form-model-item>
</div>
<!-- <a-form-model-item ref='paramsTemplateName' :label="$t('ParameterName')" prop='paramsTemplateName'>-->
<!-- <a-input-->
<!-- v-model='form.paramsName' :placeholder="$t('pleaseEnter')+$t('ParameterName')" />-->
<!-- </a-form-model-item>-->
</a-col>
<a-col :span='6' style='margin-top: 5px'>
<a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
@@ -29,15 +57,32 @@
</a-col>
</a-row>
<a-row :gutter='24'>
<a-col :span='9'>
<a-form-model-item ref='region' :label="$t('areaOfResponsibility')" prop='region'>
<a-form-model-item class='itemModel' prop='region'>
<a-col :span='10'>
<div class="box-title-text">
<div class="title-text">
<!-- <span class="Required">*</span>-->
<span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
</div>
<a-form-model-item class="itemModel" :prop='region'>
<!-- <a-input class="box-input"-->
<!-- :disabled="disabled"-->
<!-- v-model="formInline[item.db_field_name]"-->
<!-- :placeholder="$t('PleaseEnter')+item.db_field_txt"/>-->
<j-dict-select-tag class='box-input' v-model='form.dutyTerritory'
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
:type="'select'"
:title="$t('PleaseSelect')+$t('areaOfResponsibility')"
:triggerChange='false' :dictCode="'duty_territory'" />
</a-form-model-item>
</a-form-model-item>
</div>
<!-- <a-form-model-item ref='region' :label="$t('areaOfResponsibility')" prop='region'>-->
<!-- <a-form-model-item class='itemModel' prop='region'>-->
<!-- <j-dict-select-tag class='box-input' v-model='form.dutyTerritory'-->
<!-- :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
<!-- :type="'select'"-->
<!-- :triggerChange='false' :dictCode="'duty_territory'" />-->
<!-- </a-form-model-item>-->
<!-- </a-form-model-item>-->
</a-col>
<a-col :span='9'>
</a-col>
@@ -291,6 +336,89 @@ export default {
display: flex;
justify-content: center;
}
.box-title-text {
line-height: 1.4;
display: flex;
/*align-items: center;*/
}
.title-text {
width: 114px;
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: 42px;
}
.box-input {
display: inline-block;
height: 38px;
width: 100%;
}
.itemModel {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
height: 40px;
margin-bottom: 24px;
}
.itemModel-text {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
}
.Required {
color: red;
margin-right: 4px;
}
.title-text-text {
margin-top: 9px;
}
.header-text {
font-size: 16px;
font-weight: bold;
margin-left: 15px;
/*border-bottom: 1px #d9d9d9 dashed;*/
height: 30px;
margin-bottom: 30px;
}
.formAdd {
margin-bottom: 40px;
}
.button-text {
height: 38px;
width: calc(100% - 100px);
line-height: 38px;
background: #fff;
border: 1px #00B3BE solid;
color: #00B3BE;
}
.button-text-text {
position: absolute;
right: -10px;
top: -21px;
display: inline-block;
padding: 6px;
border-radius: 50%;
background: red;
text-align: center;
line-height: 6px;
color: #fff;
}
</style>
<style lang='less'>
.area-module {
@@ -304,4 +432,57 @@ export default {
}
}
}
</style>
<style>
.formAdd .ant-form-item-label {
width: 130px;
}
.formAdd .ant-form-item-control-wrapper {
display: inline-block;
width: 100%;
}
/*.formAdd .ant-form-item {*/
/* margin-bottom: 20px;*/
/*}*/
.itemModel .ant-form-item-control-wrapper {
width: 100%;
}
.itemModel-text .ant-form-item-control-wrapper {
width: 100% !important;
}
.box-input .ant-select-selection--single {
height: 38px;
}
.box-input .ant-select-selection--multiple {
height: 38px;
}
.box-input .ant-select-selection__rendered {
line-height: 38px;
height: 38px;
}
.box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
margin-top: 6px;
}
.box-input .ant-calendar-picker {
line-height: 38px;
height: 38px;
}
.box-input .ant-calendar-picker-input {
height: 38px;
}
.box-input .ant-input-number-input-wrap {
line-height: 38px;
height: 38px;
}
</style>
jero-web/src/components/PersonnelSelection/index.vue
+16 -1
View File
@@ -3,10 +3,14 @@
<div class="box-title-text" v-if="!isInput">
<a-input class="box-input" :value="value" @input="indexclick($event)"
:disabled="true"
:title="value"
:placeholder="$t('PleaseSelect')+query.db_field_txt"/>
<a-button type="primary" class="button-box" @click="standardClick">
{{this.$t('PersonnelSelection')}}
</a-button>
<a-button type="primary" v-if='isDelete' class="button-box" @click="standardDelete">
{{this.$t('delete')}}
</a-button>
</div>
<div class="box-title-text" v-if="isInput">
<a-input :class="{'box-input':!isClass}" :value="value"
@@ -54,7 +58,7 @@
export default {
name: 'index',
props: ['query', 'value', 'personneQuery', 'isSingleChoice', 'isInput', 'isClass'],
props: ['query', 'value', 'personneQuery', 'isSingleChoice', 'isInput', 'isClass','isDelete'],
data() {
return {
loading: true,
@@ -86,12 +90,18 @@
this.queryDepartUserTreeList()
this.visible = true
},
standardDelete(){
this.$emit('input', null)
this.$forceUpdate()
this.$emit('deleteData',this.query.db_field_name)
},
// onSelect(selectedKeys, info) {
// console.log(selectedKeys)
// this.selectedKey = selectedKeys
// },
onCheck(checkedKeys, info) {
console.log(checkedKeys)
this.userIds = checkedKeys.checked
this.userName = []
if (info.checkedNodes && info.checkedNodes.length > 0) {
@@ -151,6 +161,11 @@
},
indexclick(event) {
this.$emit('input', event.target.value)
this.departId = ''
this.searchModel = ''
this.userIds = []
this.userName = []
this.defaultCheckedKeys = []
},
onSearch(e) {
this.gData = []
jero-web/src/components/ReferenceParameter/index.vue
+311 -206
View File
@@ -6,41 +6,77 @@
ref='ruleForm'
:model='formInline'
:rules='rules'
:label-col='labelCol'
:wrapper-col='wrapperCol'
>
<a-row :gutter='24'>
<a-col :span='24'>
<a-form-model-item style='line-height: 31.9999px;' prop='sourceConfigId' class='aform'>
<div style='display: flex; justify-content: center'>
<span class="Requireditem">*</span>
<div style='width: 107px;line-height: 29px;'>{{ $t('from') }}&nbsp;&nbsp;&nbsp;</div>
<a-select :placeholder="$t('PleaseSelect')+$t('controlVerification')" v-model="formInline.sourceConfigId" allowClear style='width: 140%'>
<a-select-option v-for="(item, key) in fromDate" :key="key" :value="item.value" style='width: 140%'>
<span style="display: inline-block;width: 140%" :title=" item.label ">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('from')">{{$t('from')}}</span>
</div>
<a-form-model-item class="itemModel" prop="sourceConfigId">
<a-select :placeholder="$t('PleaseSelect')+$t('controlVerification')"
style="width: calc(100% - 90px)"
v-model="formInline.sourceConfigId" allowClear>
<a-select-option v-for="(item, key) in fromDate" :key="key" :value="item.value">
<span :title=" item.label ">
{{ item.label }}
</span>
</a-select-option>
</a-select>
<div style='width: 90px;line-height: 29px;'>&nbsp;&nbsp;&nbsp;&nbsp;{{ $t('configure') }}</div>
</div>
</a-form-model-item>
<span style='width: 90px;line-height: 29px;margin-top: 8px'>&nbsp;&nbsp;&nbsp;&nbsp;{{ $t('configure') }}</span>
</a-form-model-item>
</div>
<!-- <a-form-model-item style='line-height: 31.9999px;' prop='sourceConfigId' class='aform'>-->
<!-- <div style='display: flex; justify-content: center'>-->
<!-- <span class="Requireditem">*</span>-->
<!-- <div style='width: 107px;line-height: 29px;'>{{ $t('from') }}&nbsp;&nbsp;&nbsp;</div>-->
<!-- <a-select :placeholder="$t('PleaseSelect')+$t('controlVerification')" v-model="formInline.sourceConfigId" allowClear style='width: 140%'>-->
<!-- <a-select-option v-for="(item, key) in fromDate" :key="key" :value="item.value" style='width: 140%'>-->
<!-- <span style="display: inline-block;width: 140%" :title=" item.label ">-->
<!-- {{ item.label }}-->
<!-- </span>-->
<!-- </a-select-option>-->
<!-- </a-select>-->
<!-- <div style='width: 90px;line-height: 29px;'>&nbsp;&nbsp;&nbsp;&nbsp;{{ $t('configure') }}</div>-->
<!-- </div>-->
<!-- </a-form-model-item>-->
</a-col>
<a-col :span='24'>
<a-form-model-item style='line-height: 31.9999px;' prop='targetConfigIds' class='aform'>
<div style='display: flex;justify-content: center'>
<span class="Requireditem">*</span>
<div style='line-height: 29px;width: 107px'>{{ $t('ReferenceTo') }}&nbsp;&nbsp;&nbsp;</div>
<a-select :placeholder="$t('PleaseSelect')+$t('controlVerification')" v-model="formInline.targetConfigIds" allowClear mode="multiple" style='width: 140%'>
<a-select-option v-for="(item, key) in fromDateTo" :key="key" :value="item.value" style='width: 140%'>
<span style="display: inline-block;width: 140%" :title=" item.label ">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('ReferenceTo')">{{$t('ReferenceTo')}}</span>
</div>
<a-form-model-item class="itemModel" prop="targetConfigIds">
<a-select :placeholder="$t('PleaseSelect')+$t('controlVerification')"
style="width: calc(100% - 90px)"
v-model="formInline.targetConfigIds" allowClear mode="multiple">
<a-select-option v-for="(item, key) in fromDateTo" :key="key" :value="item.value">
<span class="itemOption" :title=" item.label ">
{{ item.label }}
</span>
</a-select-option>
</a-select>
<div style='width: 90px;line-height: 29px;'>&nbsp;&nbsp;&nbsp;&nbsp;{{ $t('configure') }}</div>
</div>
</a-form-model-item>
<span
style='width: 90px;line-height: 29px;float: right'>&nbsp;&nbsp;&nbsp;&nbsp;{{ $t('configure') }}</span>
</a-form-model-item>
</div>
<!-- <a-form-model-item style='line-height: 31.9999px;' prop='targetConfigIds' class='aform'>-->
<!-- <span class="Requireditem">*</span>-->
<!-- <span style='line-height: 29px;width: 107px;display: inline-block'>{{ $t('ReferenceTo') }}&nbsp;&nbsp;&nbsp;</span>-->
<!-- <a-select :placeholder="$t('PleaseSelect')+$t('controlVerification')"-->
<!-- style="width: calc(100%);display: inline-block"-->
<!-- v-model="formInline.targetConfigIds" allowClear mode="multiple">-->
<!-- <a-select-option v-for="(item, key) in fromDateTo" :key="key" :value="item.value">-->
<!-- <span class="itemOption" :title=" item.label ">-->
<!-- {{ item.label }}-->
<!-- </span>-->
<!-- </a-select-option>-->
<!-- </a-select>-->
<!-- <span style='width: 90px;line-height: 29px;display: inline-block'>&nbsp;&nbsp;&nbsp;&nbsp;{{ $t('configure') }}</span>-->
<!-- </a-form-model-item>-->
</a-col>
</a-row>
</a-form-model>
@@ -53,159 +89,165 @@
</template>
<script>
import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
import axios from 'axios'
import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types'
export default {
name: 'diolagArea',
components: {},
data() {
return {
token:Vue.ls.get(ACCESS_TOKEN),
selectedRowKeysDate: {},
loading: false,
editId: '',
newVisible: false,
labelCol: {
xs: { span: 24 },
sm: { span: 7 }
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 14 }
},
formInline: {},
rules: {
sourceConfigId: [
{ required: true, message: this.$t('pleaseSelect')+this.$t('controlVerification'), trigger: 'change' },
],
targetConfigIds: [
{ required: true, message: this.$t('pleaseSelect')+this.$t('controlVerification'), trigger: 'change' },
],
},
areaTable: [],
flag: false, //表单提交标识
spinLoading: false,
confirmLoading: false,
selectedRowKeys: [],
fromDate: [],
fromDateTo: [],
}
},
props: {
paramsManifest: {
type: Object,
default: {},
require: true
import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
import axios from 'axios'
import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types'
export default {
name: 'diolagArea',
components: {},
data() {
return {
token: Vue.ls.get(ACCESS_TOKEN),
selectedRowKeysDate: {},
loading: false,
editId: '',
newVisible: false,
labelCol: {
xs: { span: 24 },
sm: { span: 7 }
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 14 }
},
formInline: {},
rules: {
sourceConfigId: [
{ required: true, message: this.$t('pleaseSelect') + this.$t('controlVerification'), trigger: 'change' }
],
targetConfigIds: [
{ required: true, message: this.$t('pleaseSelect') + this.$t('controlVerification'), trigger: 'change' }
]
},
areaTable: [],
flag: false, //表单提交标识
spinLoading: false,
confirmLoading: false,
selectedRowKeys: [],
fromDate: [],
fromDateTo: []
}
},
selectedRowKeysArray: {
type: String,
default: '',
require: true
}
},
mounted() {
this.loadData(),
this.loadDataTo()
},
methods: {
loadData() {
let _this = this
let param = {paramsManifestId: this.paramsManifest.id,configFlag: 1}
axios({
url: '/jero-boot/params/collectManifest/getConfigLableListR',
method: 'post',
data: param,
transformRequest: [function (data) {
let ret = ''
for (let it in data) {
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
}
return ret
}],
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
'X-Access-Token':_this.token
}
})
.then( (res) =>{
console.log(res)
if (res.data.success) {
this.fromDate = res.data.result
}else{
_this.$message.warning(res.data.message)
props: {
paramsManifest: {
type: Object,
default: {},
require: true
},
selectedRowKeysArray: {
type: String,
default: '',
require: true
}
},
mounted() {
this.loadData(),
this.loadDataTo()
},
methods: {
loadData() {
let _this = this
let param = { paramsManifestId: this.paramsManifest.id, configFlag: 1 }
axios({
url: '/jero-boot/params/collectManifest/getConfigLableListR',
method: 'post',
data: param,
transformRequest: [function(data) {
let ret = ''
for (let it in data) {
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
}
return ret
}],
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
'X-Access-Token': _this.token
}
})
.catch( (error) =>{
console.log(error);
});
},
loadDataTo() {
let _this = this
let param = {paramsManifestId: this.paramsManifest.id,configFlag: 2}
axios({
url: '/jero-boot/params/collectManifest/getConfigLableListR',
method: 'post',
data: param,
transformRequest: [function (data) {
let ret = ''
for (let it in data) {
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
}
return ret
}],
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
'X-Access-Token':_this.token
}
})
.then( (res) =>{
console.log(res)
if (res.data.success) {
this.fromDateTo = res.data.result
}else{
_this.$message.warning(res.data.result)
}
})
.catch( (error) =>{
console.log(error);
});
},
searchQuery() {
this.loadData()
},
searchReset() {
this.form = {}
this.loadData()
},
handleCancel() {
this.$emit('areaVisibleAssignedbyflag', false)
},
onSelectChange(selectedRowKeys, selectedRowKeysDate) {
this.selectedRowKeysDate = selectedRowKeysDate
this.selectedRowKeys = selectedRowKeys
},
handleTableChange(val) {
},
// 引用参数确定
handleSubmit() {
this.$refs.ruleForm.validate(valid => {
if (valid) {
if(this.formInline.targetConfigIds instanceof Array){
this.formInline.targetConfigIds = this.formInline.targetConfigIds.join(',')
}
let param = {ids: this.selectedRowKeysArray, ...this.formInline }
postAction('params/collectManifest/referParams', param).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.$emit('areaVisibleAssignedbyflag', false)
this.$emit('GetgetTableList')
.then((res) => {
console.log(res)
if (res.data.success) {
this.fromDate = res.data.result
} else {
this.$message.warning(res.message)
_this.$message.warning(res.data.message)
}
})
}})
.catch((error) => {
console.log(error)
})
},
loadDataTo() {
let _this = this
let param = { paramsManifestId: this.paramsManifest.id, configFlag: 2 }
axios({
url: '/jero-boot/params/collectManifest/getConfigLableListR',
method: 'post',
data: param,
transformRequest: [function(data) {
let ret = ''
for (let it in data) {
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
}
return ret
}],
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
'X-Access-Token': _this.token
}
})
.then((res) => {
console.log(res)
if (res.data.success) {
this.fromDateTo = res.data.result
} else {
_this.$message.warning(res.data.result)
}
})
.catch((error) => {
console.log(error)
})
},
searchQuery() {
this.loadData()
},
searchReset() {
this.form = {}
this.loadData()
},
handleCancel() {
this.$emit('areaVisibleAssignedbyflag', false)
},
onSelectChange(selectedRowKeys, selectedRowKeysDate) {
this.selectedRowKeysDate = selectedRowKeysDate
this.selectedRowKeys = selectedRowKeys
},
handleTableChange(val) {
},
// 引用参数确定
handleSubmit() {
this.$refs.ruleForm.validate(valid => {
if (valid) {
let formInline = JSON.parse(JSON.stringify(this.formInline))
if (formInline.targetConfigIds instanceof Array) {
formInline.targetConfigIds = formInline.targetConfigIds.join(',')
}
let param = { ids: this.selectedRowKeysArray, ...formInline }
this.confirmLoading = true
postAction('params/collectManifest/referParams', param).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.$emit('areaVisibleAssignedbyflag', false)
this.$emit('GetgetTableList')
this.confirmLoading = false
} else {
this.$message.warning(res.message)
this.confirmLoading = false
}
})
}
})
// axios({
// url: '/jero-boot/params/collectManifest/referParams',
// method: 'post',
@@ -234,57 +276,120 @@ export default {
// .catch( (error) =>{
// console.log(error);
// });
}
}
}
}
</script>
<style lang='less' scoped>
@import '~@assets/less/common.less';
/deep/.ant-form-explain{
padding-left: 62px;
}
.diolag-area {
.table-area {
margin: 20px 0;
@import '~@assets/less/common.less';
.action-edit {
margin-right: 10px;
/deep/ .ant-form-explain {
padding-left: 62px;
}
.diolag-area {
.table-area {
margin: 20px 0;
.action-edit {
margin-right: 10px;
}
}
.table-del {
color: red;
}
}
.table-del {
color: red;
.drawer-bootom-button {
display: flex;
justify-content: center;
}
.aform {
display: flex;
justify-content: center;
}
.itemOption {
display: inline-block;
width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
}
.itemModel {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
height: 40px;
margin-bottom: 24px;
}
}
.drawer-bootom-button{
display: flex;
justify-content: center;
}
.aform{
display: flex;
justify-content: center;
}
</style>
<style lang='less'>
.area-module {
.ant-modal-wrap {
.ant-modal {
.ant-modal-content {
.ant-modal-footer {
text-align: center;
.area-module {
.ant-modal-wrap {
.ant-modal {
.ant-modal-content {
.ant-modal-footer {
text-align: center;
}
}
}
}
}
}
.page{
display: flex;
justify-content: flex-end;
margin-bottom: 20px;
}
.Requireditem{
color: red;
line-height: 24px;
}
.page {
display: flex;
justify-content: flex-end;
margin-bottom: 20px;
}
.Requireditem {
color: red;
line-height: 24px;
}
.box-title-text {
line-height: 1.4;
display: flex;
/*align-items: center;*/
}
.title-text {
width: 114px;
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: 42px;
}
.box-input {
display: inline-block;
height: 38px;
width: 100%;
}
.itemModel-text {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
}
.Required {
color: red;
margin-right: 4px;
}
.title-text-text {
margin-top: 9px;
}
</style>
jero-web/src/components/SynchronousSubmissionLibrary/index.vue
+4
View File
@@ -92,6 +92,7 @@ export default {
handleSubmit() {
let _this = this
let param = {ids: this.selectedRowKeysArray, paramsManifestId: this.paramsManifest.id }
this.confirmLoading = true
axios({
url: '/jero-boot/params/collectManifest/syncReport',
method: 'post',
@@ -114,12 +115,15 @@ export default {
_this.$message.success(_this.$t('OperationSuccessful'))
this.$emit('areaVisibsynchronous', false)
this.$emit('GetgetTableList')
this.confirmLoading = false
}else{
_this.$message.warning(_this.$t('operationFailed'))
this.confirmLoading = false
}
})
.catch( (error) =>{
console.log(error);
this.confirmLoading = false
});
}
}
jero-web/src/components/TaskCutOffTime/index.vue
+5 -2
View File
@@ -107,12 +107,15 @@ export default {
handleSubmit() {
let _this = this
let param = {ids: this.selectedRowKeysArray, deadline: `${this.pickerDate}`, }
this.confirmLoading = true
postAction('/params/collectManifest/updateDeadlineBatch', param).then((res) => {
if (res.success) {
this.$emit('areaVisibleTaskCutOffTimeflag', false)
this.$message.success(res.message)
this.$message.success(_this.$t('OperationSuccessful'))
this.confirmLoading = false
} else {
this.$message.warning(res.message)
this.$message.warning(_this.$t('operationFailed'))
this.confirmLoading = false
}
})
},
jero-web/src/components/jero/JLoading.vue
+1 -1
View File
@@ -54,7 +54,7 @@
position: absolute;
top: 0;
left: 0;
z-index: 999;
z-index: 111999;
width: 100%;
height: 100%;
background-color: rgba(255, 255, 255, 0.9);
jero-web/src/components/searchalonesplit/index.vue
+1 -1
View File
@@ -23,7 +23,7 @@
<div class="title-text" :title="item.db_field_txt">
<span>{{item.db_field_txt}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
<a-input class="box-input" style='width: 226px' :placeholder="$t('PleaseEnter')+item.db_field_txt"
v-model="queryParam[item.db_field_name]"></a-input>
</div>
<div class="box-title-text" v-else-if="item.field_show_type == '2'">
jero-web/src/components/tableCollection/index.vue
+86 -27
View File
@@ -46,6 +46,18 @@
</span>
</a-table>
</div>
<div class="page">
<a-pagination
:show-total="total => $t('total')+` ${total} `+$t('strip')"
show-quick-jumper
show-size-changer
:page-size.sync="pageSize"
:total="total"
:pageSizeOptions='pageSizeOptions'
@change="pageOnChange"
@showSizeChange="SizeChange"
/>
</div>
<!-- 修改工程接口人--->
<a-modal v-model="areaVisible" :title="$t('modifyprojectInterfacePerson')" width='620px' :footer="null"
@cancel="cancleImports">
@@ -127,6 +139,7 @@
import axios from 'axios'
import Vue from 'vue'
import VueDraggableResizable from 'vue-draggable-resizable'
import { mapGetters } from 'vuex'
export default {
name: 'index',
@@ -206,7 +219,8 @@
selectedRowrowValue: [],
dataSource: [],
pageNo: 1,
pageSize: 10,
pageSize: 100,
pageSizeOptions: ['100', '200'],
total: 0,
searchParmes: {},
loading: false,
@@ -242,8 +256,19 @@
}
},
mounted() {
this.getHeader()
},
watch: {
currentPersonRole: {
handler: function() {
console.log(123)
this.getTableList()
},
immediate: true
}
},
methods: {
...mapGetters(['userInfo']),
rowClassName(row, index) {
if (row.changeFlag == '1') {
return 'rowClassRedYellow'
@@ -252,6 +277,17 @@
return 'rowClassRed'
}
},
pageOnChange(page, pageSize) {
this.pageNo = page
this.$emit('handlePreservation')
this.getTableList()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.$emit('handlePreservation')
this.getTableList()
},
// 查看配置详细信息
onClickSee(val) {
let _this = this
@@ -321,11 +357,11 @@
.then((res) => {
console.log(res)
if (res.data.success) {
_this.$message.success(res.data.result)
_this.$message.success(_this.$t('OperationSuccessful'))
_this.areaVisible = false
this.getLoginUserType()
} else {
_this.$message.warning(res.data.result)
_this.$message.warning(_this.$t('operationFailed'))
}
})
.catch((error) => {
@@ -344,10 +380,10 @@
this.areaVisible = true
// this.$refs.ruleForm.clearValidate()
this.$nextTick(() => {
this.Dateline = { ...this.Dateline }
this.getquerySdtList(record)
this.$refs.ruleForm.clearValidate()
})
this.$refs.ruleForm.clearValidate()
},
dataValueTobeinitiated() {
this.$message.warning(this.$t('certifiedEngineer') + this.$t('and') + this.$t('Statusis') + this.$t('CollectionInitiated') + this.$t('ReturnedPerson') + this.$t('alteration') + this.$t('toHavePermission'))
@@ -364,14 +400,36 @@
paramsManifestId: this.$route.query.id,
projectId: this.$route.query.projectId
}
this.loading = true
getAction(this.url.getLoginUserType, params).then((res) => {
if (res.success) {
this.getTableList(res.result[0].value)
this.$emit('LoginUserType', res.result, this.currentPersonRole)
this.getAndUserId(res.result)
}
})
},
getData() {
getAndUserId(result) {
let query = {
paramsManifestId: this.$route.query.id,
projectId: this.$route.query.projectId,
userId: this.userInfo().id
}
getAction('/params/userTypeLog/queryCurrentType', query).then((res) => {
if (res.success) {
if (res.result && res.result.userType) {
if (!(result.some(val => val.value == res.result.userType))) {
res.result.userType = result[0] ? result[0].value : ''
}
this.getTableList(res.result.userType)
} else {
this.getTableList(result[0].value)
}
this.$emit('LoginUserType', result, this.currentPersonRole, res.result.userType)
} else {
}
})
},
getHeader() {
let paramsManifestid
let url
if (this.$route.query.it === undefined) {
@@ -451,7 +509,7 @@
if (res.success) {
let tt = []
if (this.currentPersonRole !== 'dre') {
res.result.forEach((Obj) => {
res.result.records.forEach((Obj) => {
Object.keys(Obj).forEach((item) => {
if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
Obj[item].list.forEach((itemLi) => {
@@ -465,7 +523,7 @@
tt.push(Obj)
})
} else {
res.result.forEach((Obj) => {
res.result.records.forEach((Obj) => {
Object.keys(Obj).forEach((item) => {
if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
Obj[item].list.forEach((itemLi) => {
@@ -481,7 +539,10 @@
this.dataSource = tt
this.total = res.result.total
this.selectedRowKeys = []
this.loading = false
this.$emit('getDataSource', this.dataSource)
setTimeout(() => {
this.loading = false
}, 500)
} else {
this.loading = false
}
@@ -504,6 +565,8 @@
url = 'params/collectManifestHistory/list'
}
let params = {
pageNo: this.pageNo,
pageSize: this.pageSize,
userTypes: this.currentPersonRole || currentPersonRole,
paramsManifestId: paramsManifestid,
...this.formInline
@@ -530,7 +593,7 @@
// })
let tt = []
if (this.currentPersonRole !== 'dre') {
res.result.forEach((Obj) => {
res.result.records.forEach((Obj) => {
Object.keys(Obj).forEach((item) => {
if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
Obj[item].list.forEach((itemLi) => {
@@ -544,7 +607,7 @@
tt.push(Obj)
})
} else {
res.result.forEach((Obj) => {
res.result.records.forEach((Obj) => {
Object.keys(Obj).forEach((item) => {
if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
Obj[item].list.forEach((itemLi) => {
@@ -563,7 +626,10 @@
this.selectedRowrowValue = []
this.$emit('value', this.selectedRowKeys)
this.$emit('rowValue', this.selectedRowrowValue)
this.loading = false
this.$emit('getDataSource', this.dataSource)
setTimeout(() => {
this.loading = false
}, 500)
} else {
this.loading = false
}
@@ -585,15 +651,6 @@
detailClick(item, index) {
// this.$emit('detailClick', item)
}
},
watch: {
currentPersonRole: {
handler: function() {
this.getTableList()
this.getData()
},
immediate: true
}
}
}
</script>
@@ -690,10 +747,12 @@
transform: none !important;
bottom: 0;
}
.rowClassRed{
background: #f3d9de;
.rowClassRed {
background: #f3d9de;
}
.rowClassRedYellow{
background: yellow;
.rowClassRedYellow {
background: yellow;
}
</style>