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

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

Browse Source
This commit is contained in:
wangzhijiang
2022-07-04 18:03:35 +08:00
parent 8c36f0c2fa cccea320d0
commit bf7bf93c92
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/CollectionType/index.vue
+20 -5
View File
@@ -29,7 +29,9 @@
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')" :placeholder="$t('pleaseEnter')+$t('chinese')"
event.returnValue="false" event.returnValue="false"
onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)" ondragenter="return false"
onblur="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正整数 --> <!-- 正整数 -->
@@ -38,6 +40,7 @@
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
:precision="0" :precision="0"
:min="1"
:placeholder="$t('enterPositiveInteger')" :placeholder="$t('enterPositiveInteger')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
@@ -182,8 +185,10 @@
:maxLength="1000" :maxLength="1000"
event.returnValue="false" event.returnValue="false"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
ondragenter="return false"
:placeholder="$t('pleaseEnter')+$t('chinese')" :placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)" onblur="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正整数 --> <!-- 正整数 -->
@@ -191,6 +196,7 @@
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
:min="1"
:precision="0" :precision="0"
:placeholder="$t('enterPositiveInteger')" :placeholder="$t('enterPositiveInteger')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
@@ -277,9 +283,11 @@
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:maxLength="1000" :maxLength="1000"
event.returnValue="false" event.returnValue="false"
ondragenter="return false"
onblur="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')" :placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正整数 --> <!-- 正整数 -->
@@ -288,6 +296,7 @@
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
:precision="0" :precision="0"
:min="1"
:placeholder="$t('enterPositiveInteger')" :placeholder="$t('enterPositiveInteger')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
@@ -385,9 +394,11 @@
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:maxLength="1000" :maxLength="1000"
event.returnValue="false" event.returnValue="false"
ondragenter="return false"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
onblur="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
:placeholder="$t('pleaseEnter')+$t('chinese')" :placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)" onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正整数 --> <!-- 正整数 -->
@@ -396,6 +407,7 @@
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
:precision="0" :precision="0"
:min="1"
:placeholder="$t('enterPositiveInteger')" :placeholder="$t('enterPositiveInteger')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
@@ -549,8 +561,10 @@
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:maxLength="1000" :maxLength="1000"
event.returnValue="false" event.returnValue="false"
ondragenter="return false"
:placeholder="$t('pleaseEnter')+$t('chinese')" :placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)" onblur="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正整数 --> <!-- 正整数 -->
@@ -559,6 +573,7 @@
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
:precision="0" :precision="0"
:min="1"
:placeholder="$t('enterPositiveInteger')" :placeholder="$t('enterPositiveInteger')"
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+5 -1
View File
@@ -1154,7 +1154,11 @@
if (num && num == 1) { if (num && num == 1) {
this.textLoading = true this.textLoading = true
} }
postAction('/params/collectManifest/save', configDataList).then((res) => { let query = {
...configDataList,
paramsManifestId: this.paramsManifest.id
}
postAction('/params/collectManifest/save', query).then((res) => {
if (res.success) { if (res.success) {
if (num && num == 1) { if (num && num == 1) {
_this.$message.success(_this.$t('OperationSuccessful')) _this.$message.success(_this.$t('OperationSuccessful'))