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

update 国内标准-编辑完善，AddForm组件完善

Browse Source
This commit is contained in:
赵霄
2023-09-13 17:48:01 +08:00
parent f42ecf2832
commit b159585660
6 changed files with 66 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/standardRegulationLibraryApi.js
+2 -2
View File
@@ -21,9 +21,9 @@ const editDomesticSystemTree = (params) => postAction('/laws/standard/lawsTreeNo
// 国内标准-体系删除 // 国内标准-体系删除
const deleteDomesticSystemTree = (params) => postAction('/laws/standard/lawsTreeNode/domestic/delete', params) const deleteDomesticSystemTree = (params) => postAction('/laws/standard/lawsTreeNode/domestic/delete', params)
// 国内标准-配置标准 // 国内标准-配置标准
const configDomesticStandard = (params) => postAction('', params) const configDomesticStandard = (params) => getAction('/laws/standard/domestic/relatedStandard', params)
// 国内标准-移出标准 // 国内标准-移出标准
const removeDomesticStandard = (params) => postAction('', params) const removeDomesticStandard = (params) => getAction('/laws/standard/domestic/removeStandard', params)
// 国内标准-获取体系树 // 国内标准-获取体系树
const getDomesticStandardTree = (params) => getAction('/laws/standard/lawsTreeNode/domestic', params) const getDomesticStandardTree = (params) => getAction('/laws/standard/lawsTreeNode/domestic', params)
// 国内标准-新增标准 // 国内标准-新增标准
src/common/lang/projectLibrary/en.js
+1
View File
@@ -2,6 +2,7 @@ module.exports = {
projectName: 'Project name', // 项目名称 projectName: 'Project name', // 项目名称
workOrderNumber: 'Work order number', // 工作令编号 workOrderNumber: 'Work order number', // 工作令编号
projectHealthStatus: 'Project health', // 项目健康度 projectHealthStatus: 'Project health', // 项目健康度
selectProject: 'Select Project', // 选择项目
// 车型项目库 // 车型项目库
vehicleItemLibrary: { vehicleItemLibrary: {
src/common/lang/projectLibrary/zh.js
+1
View File
@@ -2,6 +2,7 @@ module.exports = {
projectName: '项目名称', projectName: '项目名称',
workOrderNumber: '工作令编号', workOrderNumber: '工作令编号',
projectHealthStatus: '项目健康度', projectHealthStatus: '项目健康度',
selectProject: '选择项目',
// 车型项目库 // 车型项目库
vehicleItemLibrary: { vehicleItemLibrary: {
src/components/customField/AddForm.vue
+29 -13
View File
@@ -18,7 +18,7 @@
format="YYYY-MM-DD" format="YYYY-MM-DD"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
v-model="formInline[item.dbFieldName]" v-model="formInline[item.dbFieldName]"
:disabled="disabled" :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
style="width: 100%" /> style="width: 100%" />
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -37,12 +37,12 @@
@nameChange="userSelectNameChange" @nameChange="userSelectNameChange"
:nameStr="formInline[item.dbFieldName + '_name']" :nameStr="formInline[item.dbFieldName + '_name']"
type="radio" type="radio"
:disabled="disabled" /> :disabled="disabled || disabledFieldList.includes(item.dbFieldName)" />
<!-- <user-or-organ-selection :placeholder="$t('pleaseSelect')+item.dbFieldTxt"--> <!-- <user-or-organ-selection :placeholder="$t('pleaseSelect')+item.dbFieldTxt"-->
<!-- v-model="formInline[item.dbFieldName]"--> <!-- v-model="formInline[item.dbFieldName]"-->
<!-- type="radio"--> <!-- type="radio"-->
<!-- selectType="user"--> <!-- selectType="user"-->
<!-- :disabled="disabled" />--> <!-- :disabled="disabled || disabledFieldList.includes(item.dbFieldName)" />-->
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -62,7 +62,7 @@
<!-- v-model="formInline[item.dbFieldName]"--> <!-- v-model="formInline[item.dbFieldName]"-->
<!-- selectType="organ"--> <!-- selectType="organ"-->
<!-- type="radio"--> <!-- type="radio"-->
<!-- :disabled="disabled" />--> <!-- :disabled="disabled || disabledFieldList.includes(item.dbFieldName)" />-->
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -75,7 +75,7 @@
</div> </div>
<a-form-model-item class="item-model" :prop="item.dbFieldName"> <a-form-model-item class="item-model" :prop="item.dbFieldName">
<j-multiple-date-picker class="box-input" v-model="formInline[item.dbFieldName]" :fieldName="item.dbFieldName" <j-multiple-date-picker class="box-input" v-model="formInline[item.dbFieldName]" :fieldName="item.dbFieldName"
:disabled="disabled" /> :disabled="disabled || disabledFieldList.includes(item.dbFieldName)" />
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -89,7 +89,7 @@
<a-form-model-item class="item-model-textarea" :prop="item.dbFieldName"> <a-form-model-item class="item-model-textarea" :prop="item.dbFieldName">
<a-textarea <a-textarea
:placeholder="$t('pleaseEnter')+item.dbFieldTxt" :placeholder="$t('pleaseEnter')+item.dbFieldTxt"
:disabled="disabled" :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
:maxLength="500" :maxLength="500"
v-model="formInline[item.dbFieldName]" :rows="4" /> v-model="formInline[item.dbFieldName]" :rows="4" />
</a-form-model-item> </a-form-model-item>
@@ -104,7 +104,7 @@
</div> </div>
<a-form-model-item class="item-model" :prop="item.dbFieldName"> <a-form-model-item class="item-model" :prop="item.dbFieldName">
<standard-selection :query="item" <standard-selection :query="item"
:disabled="disabled" :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
:standard="formInline" :standard="formInline"
@change="standardSelectionChange" @change="standardSelectionChange"
v-model="formInline[item.dbFieldName]" /> v-model="formInline[item.dbFieldName]" />
@@ -129,7 +129,7 @@
<!-- v-model="formInline[item.dbFieldName]"--> <!-- v-model="formInline[item.dbFieldName]"-->
<!-- selectType="organ"--> <!-- selectType="organ"-->
<!-- type="checkbox"--> <!-- type="checkbox"-->
<!-- :disabled="disabled" />--> <!-- :disabled="disabled || disabledFieldList.includes(item.dbFieldName)" />-->
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -162,7 +162,7 @@
</div> </div>
<a-form-model-item class="item-model" :prop="item.dbFieldName"> <a-form-model-item class="item-model" :prop="item.dbFieldName">
<a-input class="box-input" <a-input class="box-input"
:disabled="disabled" :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
v-model="formInline[item.dbFieldName]" v-model="formInline[item.dbFieldName]"
:maxLength="50" :maxLength="50"
:placeholder="specialPlaceholder[item.dbFieldName] || $t('pleaseEnter')+item.dbFieldTxt" /> :placeholder="specialPlaceholder[item.dbFieldName] || $t('pleaseEnter')+item.dbFieldTxt" />
@@ -178,7 +178,7 @@
</div> </div>
<a-form-model-item class="item-model" :prop="item.dbFieldName"> <a-form-model-item class="item-model" :prop="item.dbFieldName">
<j-dict-select-tag class="box-input" v-model="formInline[item.dbFieldName]" <j-dict-select-tag class="box-input" v-model="formInline[item.dbFieldName]"
:disabled="disabled" :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
:placeholder="$t('pleaseSelect')+item.dbFieldTxt" :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
:type="'select'" :type="'select'"
:triggerChange="false" :dictCode="item.dictField" /> :triggerChange="false" :dictCode="item.dictField" />
@@ -194,7 +194,7 @@
</div> </div>
<a-form-model-item class="item-model" :prop="item.dbFieldName"> <a-form-model-item class="item-model" :prop="item.dbFieldName">
<j-multi-select-tag class="box-input" v-model="formInline[item.dbFieldName]" <j-multi-select-tag class="box-input" v-model="formInline[item.dbFieldName]"
:disabled="disabled" :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
:placeholder="$t('pleaseSelect')+item.dbFieldTxt" :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
:type="'select'" :type="'select'"
:triggerChange="false" :dictCode="item.dictField" /> :triggerChange="false" :dictCode="item.dictField" />
@@ -291,6 +291,22 @@ export default {
default: () => { default: () => {
return {} return {}
} }
},
// 默认值
defaultValue: {
type: Object,
required: false,
default: () => {
return {}
}
},
// 不可修改值
disabledFieldList: {
type: Array,
required: false,
default: () => {
return []
}
} }
}, },
data () { data () {
@@ -310,7 +326,7 @@ export default {
}, },
methods: { methods: {
add () { add () {
this.formInline = {} this.formInline = Object.assign({}, this.defaultValue)
this.type = 'add' this.type = 'add'
this.getForm() this.getForm()
}, },
@@ -402,7 +418,7 @@ export default {
this.$set(this.optionsData, item.dbFieldName, res.result) this.$set(this.optionsData, item.dbFieldName, res.result)
} }
}) })
}else if (item.fieldShowType === FieldType.TREE.value && item.dictId) { } else if (item.fieldShowType === FieldType.TREE.value && item.dictId) {
getFormDictTreeList({ dictId: item.dictId }).then(res => { getFormDictTreeList({ dictId: item.dictId }).then(res => {
if (res.success) { if (res.success) {
this.$set(this.optionsData, item.dbFieldName, res.result) this.$set(this.optionsData, item.dbFieldName, res.result)
src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue
+8 -5
View File
@@ -251,7 +251,8 @@ export default {
yesValue: YesOrNoEnum.YES.value, yesValue: YesOrNoEnum.YES.value,
noValue: YesOrNoEnum.NO.value, noValue: YesOrNoEnum.NO.value,
nowShareInfo: {}, // 当前正在分享的数据 nowShareInfo: {}, // 当前正在分享的数据
selectedTreeKeys: [], // 选中的树节点 selectedTreeKeys: [], // 选中的树节点key
selectedTreeNodeCodes: [], // 选中树节点的code
tableSlotField: ['standard_name', 'standard_number'], // 表格中需要插槽的字段 tableSlotField: ['standard_name', 'standard_number'], // 表格中需要插槽的字段
treeLoading: false treeLoading: false
} }
@@ -273,6 +274,7 @@ export default {
getDomesticStandardTree({ nodeName: this.treeInput }).then(res => { getDomesticStandardTree({ nodeName: this.treeInput }).then(res => {
this.treeData = [] this.treeData = []
this.selectedTreeKeys = [] this.selectedTreeKeys = []
this.selectedTreeNodeCodes = []
this.filters.nodeCode = null this.filters.nodeCode = null
if (res.success) { if (res.success) {
const treeData = res.result || [] const treeData = res.result || []
@@ -440,6 +442,7 @@ export default {
*/ */
handleSelectTreeNode ({ dataRef }) { handleSelectTreeNode ({ dataRef }) {
this.selectedTreeKeys = [dataRef.key] this.selectedTreeKeys = [dataRef.key]
this.selectedTreeNodeCodes = [dataRef.nodeCode]
this.filters.nodeCode = dataRef.nodeCode this.filters.nodeCode = dataRef.nodeCode
this.loadData(1) this.loadData(1)
}, },
@@ -448,7 +451,7 @@ export default {
*/ */
handleConfigStandard () { handleConfigStandard () {
// 没选择左侧树节点，需要提示“请先选择二级及以下体系” // 没选择左侧树节点，需要提示“请先选择二级及以下体系”
if (!this.selectedTreeKeys || this.selectedTreeKeys.length === 0) { if (!this.selectedTreeNodeCodes || this.selectedTreeNodeCodes.length === 0) {
this.$message.warn(this.$t('standardRegulationLibrary.configStandardNoTreeNode')) this.$message.warn(this.$t('standardRegulationLibrary.configStandardNoTreeNode'))
return return
} }
@@ -462,7 +465,7 @@ export default {
continueConfigStandard (dbFieldName, standardIds) { continueConfigStandard (dbFieldName, standardIds) {
this.loading = true this.loading = true
const params = { const params = {
nodeId: this.selectedTreeKeys[0], nodeCode: this.selectedTreeNodeCodes[0],
standardIds standardIds
} }
configDomesticStandard(params).then(res => { configDomesticStandard(params).then(res => {
@@ -481,7 +484,7 @@ export default {
*/ */
handleRemoveStandard () { handleRemoveStandard () {
// 没选择左侧树节点，需要提示“请先选择二级及以下体系” // 没选择左侧树节点，需要提示“请先选择二级及以下体系”
if (!this.selectedTreeKeys || this.selectedTreeKeys.length === 0) { if (!this.selectedTreeNodeCodes || this.selectedTreeNodeCodes.length === 0) {
this.$message.warn(this.$t('standardRegulationLibrary.configStandardNoTreeNode')) this.$message.warn(this.$t('standardRegulationLibrary.configStandardNoTreeNode'))
return return
} }
@@ -492,7 +495,7 @@ export default {
} }
this.loading = true this.loading = true
const params = { const params = {
nodeId: this.selectedTreeKeys[0], nodeCode: this.selectedTreeNodeCodes[0],
ids: this.selectedRowKeys.join(',') ids: this.selectedRowKeys.join(',')
} }
removeDomesticStandard(params).then(res => { removeDomesticStandard(params).then(res => {
src/views/standardRegulationLibrary/domesticStandard/modules/DomesticStandardModal.vue
+25 -4
View File
@@ -14,9 +14,9 @@
<add-form ref="addForm" <add-form ref="addForm"
:get-form-func="getFormFunc" :get-form-func="getFormFunc"
:get-document-info-func="getDocumentInfoFunc" :get-document-info-func="getDocumentInfoFunc"
:special-placeholder="{ :special-placeholder="specialPlaceholder"
standard_number: `${$t('standardRegulationLibrary.inputExample')}7258` :default-value="defaultValue"
}" :disabled-field-list="disabledField"
@submitFormData="submitFormData" /> @submitFormData="submitFormData" />
</a-spin> </a-spin>
</div> </div>
@@ -50,18 +50,39 @@ export default {
form: {}, form: {},
confirmLoading: false, confirmLoading: false,
getFormFunc: getDomesticStandardFormModal, getFormFunc: getDomesticStandardFormModal,
getDocumentInfoFunc: getDomesticStandardDocumentInfo getDocumentInfoFunc: getDomesticStandardDocumentInfo,
// 特殊的placeholder
specialPlaceholder: {
standard_number: `${this.$t('standardRegulationLibrary.inputExample')}7258`
},
defaultValue: {
year_number: new Date().getFullYear()
},
isEdit: null // 是否编辑
}
},
computed: {
// 不可编辑的字段
disabledField () {
console.log(this.isEdit)
if (this.isEdit) {
// 标准编号，被代替标准号，被引用标准号
return ['standard_number', 'replaced_by_standard_number', 'referenced_standard']
}
return ['replaced_by_standard_number', 'referenced_standard']
} }
}, },
methods: { methods: {
add () { add () {
this.visible = true this.visible = true
this.isEdit = false
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.addForm.add() this.$refs.addForm.add()
}) })
}, },
edit (record) { edit (record) {
this.visible = true this.visible = true
this.isEdit = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.addForm.edit(record) this.$refs.addForm.edit(record)
}) })