ZQ/laws-sinotruk-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 78336、78330

Browse Source
This commit is contained in:
赵霄
2023-11-08 15:56:26 +08:00
parent 6ea3dae3d6
commit 257c10cb62
5 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/lang/zh-cn.js
+2
View File
@@ -458,6 +458,8 @@ module.exports = {
},
// 文档比对
comparison: {
textNumber:'文本号',
textName: '文本名称',
oldDocumentTextNumber: '旧文档文本号',
oldDocumentTextName: '旧文档文本名称',
oldTextState: '旧文本状态',
src/views/documentTool/documentComparison/DocumentComparison.vue
+6 -6
View File
@@ -3,17 +3,17 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<!--编号-->
<!--文本号-->
<a-col :md="6" :sm="8">
<a-form-item :label="$t('number')" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
<a-input :placeholder="$t('pleaseEnter') + $t('number')"
<a-form-item :label="$t('docTool.comparison.textNumber')" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
<a-input :placeholder="$t('pleaseEnter') + $t('docTool.comparison.textNumber')"
v-model="queryParam.serialNumber"></a-input>
</a-form-item>
</a-col>
<!--标题-->
<!--文本名称-->
<a-col :md="6" :sm="8">
<a-form-item :label="$t('title')" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
<a-input :placeholder="$t('pleaseEnter') + $t('title')"
<a-form-item :label="$t('docTool.comparison.textName')" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
<a-input :placeholder="$t('pleaseEnter') + $t('docTool.comparison.textName')"
v-model="queryParam.title"></a-input>
</a-form-item>
</a-col>
src/views/documentTool/documentComparison/InitiateComparison.vue
+17 -10
View File
@@ -19,10 +19,10 @@
</a-col>
<span style="text-align:right;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="8" :sm="24">
<a-button style="margin-left: 8px" type="primary" @click="searchQueryLeft" v-has="'docComparsion:initiate:search'">
<a-button type="primary" @click="searchQueryLeft" v-has="'docComparsion:initiate:search'">
{{ $t('query') }}
</a-button>
<a-button @click="searchResetLeft">{{ $t('reset') }}</a-button>
<a-button style="margin-left: 8px" @click="searchResetLeft">{{ $t('reset') }}</a-button>
</a-col>
</span>
</a-row>
@@ -49,7 +49,9 @@
@click="selectLeftClick(selectedRowsLeft[0])"
:title="selectedRowsLeft[0]?selectedRowsLeft[0].serialNumber+' '+selectedRowsLeft[0].fileName:$t('docTool.comparison.noComparisonDocumentSelected')"
:class="{'box-button-standard-right-color':selectedRowsLeft[0]}">
{{ selectedRowsLeft[0] ? selectedRowsLeft[0].serialNumber + ' ' + selectedRowsLeft[0].fileName : $t('docTool.comparison.noComparisonDocumentSelected') }}
{{
selectedRowsLeft[0] ? selectedRowsLeft[0].serialNumber + ' ' + selectedRowsLeft[0].fileName : $t('docTool.comparison.noComparisonDocumentSelected')
}}
</span>
</div>
</div>
@@ -58,22 +60,24 @@
<a-row>
<a-col :md="8" :sm="8">
<a-form-item :label="$t('number')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :placeholder="$t('pleaseEnter')+$t('number')" @change="event => event.target.value = event.target.value.trim()"
<a-input :placeholder="$t('pleaseEnter')+$t('number')"
@change="event => event.target.value = event.target.value.trim()"
v-model="queryParamRight.serialNumber"></a-input>
</a-form-item>
</a-col>
<a-col :md="8" :sm="8">
<a-form-item :label="$t('title')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :placeholder="$t('pleaseEnter')+$t('title')" @change="event => event.target.value = event.target.value.trim()"
<a-input :placeholder="$t('pleaseEnter')+$t('title')"
@change="event => event.target.value = event.target.value.trim()"
v-model="queryParamRight.title"></a-input>
</a-form-item>
</a-col>
<span style="text-align:right;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="8" :sm="24">
<a-button style="margin-left: 8px" type="primary" @click="searchQueryRight" v-has="'docComparsion:initiate:search'">
<a-button type="primary" @click="searchQueryRight" v-has="'docComparsion:initiate:search'">
{{ $t('query') }}
</a-button>
<a-button @click="searchResetRight">{{ $t('reset') }}</a-button>
<a-button style="margin-left: 8px" @click="searchResetRight">{{ $t('reset') }}</a-button>
</a-col>
</span>
</a-row>
@@ -100,7 +104,8 @@
@click="selectLeftClick(selectedRowsRight[0])"
:title="selectedRowsRight[0]?selectedRowsRight[0].serialNumber+' '+selectedRowsRight[0].fileName:$t('docTool.comparison.noComparisonDocumentSelected')"
:class="{'box-button-standard-right-color':selectedRowsRight[0]}">
{{ selectedRowsRight[0] ? selectedRowsRight[0].serialNumber + ' ' + selectedRowsRight[0].fileName : $t('docTool.comparison.noComparisonDocumentSelected')
{{
selectedRowsRight[0] ? selectedRowsRight[0].serialNumber + ' ' + selectedRowsRight[0].fileName : $t('docTool.comparison.noComparisonDocumentSelected')
}}
</span>
</div>
@@ -126,7 +131,9 @@
<div class="box-button">
<!--发起文档对比-->
<a-button type="primary" @click="submit" v-has="'docComparsion:initiate:initiateComparison'">{{ $t('docTool.comparison.initiateDocumentComparison') }}</a-button>
<a-button type="primary" @click="submit" v-has="'docComparsion:initiate:initiateComparison'">
{{ $t('docTool.comparison.initiateDocumentComparison') }}
</a-button>
</div>
<div id="images">
<div class="image" v-viewer="{movable: false}">
@@ -333,7 +340,7 @@ export default {
},
submit () {
if (!this.selectedRowsRight[0] || !this.selectedRowsLeft[0]) {
this.$message.warning(this.$t('pleaseSelectTheDataCompared'))
this.$message.warning(this.$t('docTool.comparison.pleaseSelectTheDataCompared'))
return
}
this.$refs.ruleForm.validate(valid => {
src/views/documentTool/documentSplit/modules/SplitText.vue
+4 -3
View File
@@ -32,7 +32,8 @@
<!--标准名称-->
<a-col :md="8" :sm="12">
<a-form-item :label="$t('standardSelect.standardName')">
<a-input :placeholder="$t('pleaseEnter') + $t('standardSelect.standardName')" v-model="queryParam.standardName"></a-input>
<a-input :placeholder="$t('pleaseEnter') + $t('standardSelect.standardName')"
v-model="queryParam.standardName"></a-input>
</a-form-item>
</a-col>
<!--文本状态-->
@@ -50,10 +51,10 @@
</a-row>
</a-form>
<div class="table-page-search-submitButtons">
<a-button type="primary" @click="searchReset" icon="reload" ghost>{{ $t('reset') }}</a-button>
<a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">
<a-button type="primary" @click="searchQuery" icon="search">
{{ $t('query') }}
</a-button>
<a-button type="primary" @click="searchReset" icon="reload" ghost style="margin-left: 8px">{{ $t('reset') }}</a-button>
</div>
</div>
<j-table
src/views/documentTool/standardWarning/StandardWarningList.vue
+1 -1
View File
@@ -166,7 +166,7 @@ export default {
*/
log
return `calc(100vh - ${this.defaultHeight['user-info-height']} - ${this.defaultHeight['breadcrumb-height']} - ${this.defaultHeight.oneLineSearchHeight} - 56px - 48px - 48px - 54px - ${this.isBackTitle ? '56px' : '0'})`
},
}
},
created () {
this.queryParam.responsibleDepartment = this.userInfo.departIds