Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
super_liu
@@ -310,12 +310,13 @@
|
||||
type: 'warning'
|
||||
})
|
||||
}
|
||||
if (this.selectedListRep.length + textArr.length > 20) {
|
||||
return this.$message({
|
||||
message: '代替标准号最多选择20项',
|
||||
type: 'warning'
|
||||
})
|
||||
}
|
||||
//去除最多勾选20条限制
|
||||
// if (this.selectedListRep.length + textArr.length > 20) {
|
||||
// return this.$message({
|
||||
// message: '代替标准号最多选择20项',
|
||||
// type: 'warning'
|
||||
// })
|
||||
// }
|
||||
this.selectedListRep.map((item) => {
|
||||
let texts = ''
|
||||
if (item.standYear != null && item.standYear !== '') {
|
||||
|
||||
@@ -351,12 +351,12 @@ export default {
|
||||
type: 'warning'
|
||||
})
|
||||
}
|
||||
if (this.selectedListRep.length + textArr.length > 20) {
|
||||
return this.$message({
|
||||
message: `${this.config.attrName}最多选择20项`,
|
||||
type: 'warning'
|
||||
})
|
||||
}
|
||||
// if (this.selectedListRep.length + textArr.length > 20) {
|
||||
// return this.$message({
|
||||
// message: `${this.config.attrName}最多选择20项`,
|
||||
// type: 'warning'
|
||||
// })
|
||||
// }
|
||||
this.selectedListRep.map((item) => {
|
||||
let texts = ''
|
||||
if (item.standYear != null && item.standYear !== '') {
|
||||
|
||||
@@ -13,19 +13,21 @@
|
||||
placeholder="输入关键字进行过滤"
|
||||
v-model="filterText">
|
||||
</el-input>
|
||||
<el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps"
|
||||
:load="loadNode"
|
||||
:lazy="lazy"
|
||||
:show-checkbox="multiple"
|
||||
:node-key="nodeKey"
|
||||
:check-strictly="checkStrictly"
|
||||
:expand-on-click-node="false"
|
||||
:filter-node-method="filterNode"
|
||||
:default-checked-keys="defaultCheckedKeys"
|
||||
:highlight-current="true"
|
||||
@node-click="handleNodeClick"
|
||||
@check-change="handleCheckChange">
|
||||
</el-tree>
|
||||
<div class="tree-height">
|
||||
<el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps"
|
||||
:load="loadNode"
|
||||
:lazy="lazy"
|
||||
:show-checkbox="multiple"
|
||||
:node-key="nodeKey"
|
||||
:check-strictly="checkStrictly"
|
||||
:expand-on-click-node="false"
|
||||
:filter-node-method="filterNode"
|
||||
:default-checked-keys="defaultCheckedKeys"
|
||||
:highlight-current="true"
|
||||
@node-click="handleNodeClick"
|
||||
@check-change="handleCheckChange">
|
||||
</el-tree>
|
||||
</div>
|
||||
<div id="roleFormButton" class="demo-drawer-footer">
|
||||
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
|
||||
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>
|
||||
@@ -289,6 +291,10 @@ export default {
|
||||
background-image: none !important;
|
||||
background-size:100% 100%;
|
||||
}
|
||||
.tree-height{
|
||||
height: calc(~'100% - 65px');
|
||||
overflow: auto;
|
||||
}
|
||||
.el-drawer__body{
|
||||
/* & > div:first-child{
|
||||
display: flex;
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
clearable
|
||||
></el-input>
|
||||
<div v-if="form.modelList.length > 0">
|
||||
<div v-for="(item, index) in form.modelList" :key="index" style="margin-right: 5px;">
|
||||
<div v-for="(item, index) in form.modelList" :key="index" style="margin-right: 5px;padding-left: 10px">
|
||||
<div class="fileClass" >
|
||||
<span @click="handlePreview(item)">{{ item.name }}</span>
|
||||
<el-button
|
||||
@@ -83,7 +83,7 @@
|
||||
clearable
|
||||
></el-input>
|
||||
<div v-if="form.fjList.length > 0">
|
||||
<div v-for="(item, index) in form.fjList" :key="index" style="margin-right: 5px;">
|
||||
<div v-for="(item, index) in form.fjList" :key="index" style="margin-right: 5px;padding-left: 10px">
|
||||
<div class="fileClass" >
|
||||
<span @click="handlePreview(item)">{{ item.name }}</span>
|
||||
<el-button
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
clearable
|
||||
></el-input>
|
||||
<div v-if="form.modelList.length > 0">
|
||||
<div v-for="(item, index) in form.modelList" :key="index" style="margin-right: 5px;">
|
||||
<div v-for="(item, index) in form.modelList" :key="index" style="margin-right: 5px; padding-left: 10px">
|
||||
<div class="fileClass" >
|
||||
<span @click="handlePreview(item)">{{ item.name }}</span>
|
||||
<el-button
|
||||
@@ -83,7 +83,7 @@
|
||||
clearable
|
||||
></el-input>
|
||||
<div v-if="form.fjList.length > 0">
|
||||
<div v-for="(item, index) in form.fjList" :key="index" style="margin-right: 5px;">
|
||||
<div v-for="(item, index) in form.fjList" :key="index" style="margin-right: 5px;padding-left: 10px">
|
||||
<div class="fileClass" >
|
||||
<span @click="handlePreview(item)">{{ item.name }}</span>
|
||||
<el-button
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled">
|
||||
<div v-if="form.modelList.length > 0">
|
||||
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
|
||||
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px">
|
||||
<span @click="clickButtonToUpload(item)">{{ item.name }}</span>
|
||||
<el-button
|
||||
size="small"
|
||||
@@ -67,7 +67,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled">
|
||||
<div v-if="form.fjList.length > 0">
|
||||
<div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;">
|
||||
<div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px">
|
||||
<span @click="clickButtonToUpload(item)">{{ item.name }}</span>
|
||||
<el-button
|
||||
size="small"
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled">
|
||||
<div v-if="form.modelList.length > 0">
|
||||
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
|
||||
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px">
|
||||
<span @click="clickButtonToUpload(item)">{{ item.name }}</span>
|
||||
<el-button
|
||||
size="small"
|
||||
@@ -67,7 +67,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled">
|
||||
<div v-if="form.fjList.length > 0">
|
||||
<div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;">
|
||||
<div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px">
|
||||
<span @click="clickButtonToUpload(item)">{{ item.name }}</span>
|
||||
<el-button
|
||||
size="small"
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled">
|
||||
<div v-if="form.modelList.length > 0">
|
||||
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
|
||||
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px">
|
||||
<span @click="clickButtonToUpload(item)">{{ item.name }}</span>
|
||||
<el-button
|
||||
size="small"
|
||||
@@ -67,7 +67,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled">
|
||||
<div v-if="form.fjList.length > 0">
|
||||
<div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;">
|
||||
<div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px">
|
||||
<span @click="clickButtonToUpload(item)">{{ item.name }}</span>
|
||||
<el-button
|
||||
size="small"
|
||||
|
||||
@@ -438,7 +438,7 @@
|
||||
maxlength="500"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
|
||||
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
|
||||
<el-input
|
||||
type="textarea"
|
||||
v-model="plForm.changePoint"
|
||||
@@ -446,7 +446,7 @@
|
||||
maxlength="500"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
|
||||
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:autosize="{ minRows: 4, maxRows: 14}"
|
||||
@@ -731,7 +731,9 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
//编辑按钮
|
||||
itemEdit (row, type, index) {
|
||||
console.log(row);
|
||||
this.itermsConditions = row.itermsConditions.replace(/''/g, '\'')
|
||||
let itemsEoPage = {
|
||||
oldItemId: row.itemsId,
|
||||
@@ -954,6 +956,7 @@ export default {
|
||||
for (let i = 0; i < this.selectedList.length; i++) {
|
||||
bringData.push(deposit.get(this.selectedList[i]));
|
||||
}
|
||||
console.log(bringData);
|
||||
this.form.itemsNum = bringData[0].showNumber
|
||||
this.form.itemsName = bringData[0].standName
|
||||
this.form.standId = bringData[0].standId
|
||||
|
||||
@@ -1269,19 +1269,19 @@
|
||||
:maxlength="100"></el-input>
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
<el-form-item label="标准名称" prop="standName" class="search-item">
|
||||
<el-form-item v-if="standardSearchForm.standType === 'INLAND' || form.standInData === '0'" label="标准名称" prop="standName" class="search-item">
|
||||
<el-input v-model="standardSearchForm.standName"
|
||||
placeholder="请输入标准名称"
|
||||
clearable
|
||||
:maxlength="500"></el-input>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="英文名称" prop="standEnName" class="search-item">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="standardSearchForm.standEnName"-->
|
||||
<!-- maxlength="1000"-->
|
||||
<!-- placeholder="请输入英文名称"-->
|
||||
<!-- clearable></el-input>-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item v-else label="英文名称" prop="standEnName" class="search-item">
|
||||
<el-input
|
||||
v-model="standardSearchForm.standEnName"
|
||||
maxlength="1000"
|
||||
placeholder="请输入英文名称"
|
||||
clearable></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button
|
||||
type="primary"
|
||||
@@ -1334,7 +1334,7 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="standTypeModel === 'INLAND'"
|
||||
v-if="standardSearchForm.standType === 'INLAND' || form.standInData === '0'"
|
||||
prop="standName"
|
||||
label="标准名称"
|
||||
align="center">
|
||||
@@ -1342,7 +1342,7 @@
|
||||
<el-table-column
|
||||
v-else
|
||||
prop="standEnName"
|
||||
label="标准名称"
|
||||
label="英文名称"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -1450,6 +1450,7 @@ export default {
|
||||
callback()
|
||||
}
|
||||
return {
|
||||
textList: [],
|
||||
gdType: '', //归档位置的赋值
|
||||
standTypeModel: 'INLAND',
|
||||
submitType: '',
|
||||
@@ -2651,8 +2652,8 @@ export default {
|
||||
},
|
||||
// 代替政策编号确定
|
||||
replaceLawsNumModelBt() {
|
||||
let subFlag = true
|
||||
let textArr = []
|
||||
|
||||
if (typeof this.value === 'string') {
|
||||
if (this.value) {
|
||||
textArr = this.value.split(',')
|
||||
@@ -2677,7 +2678,23 @@ export default {
|
||||
} else {
|
||||
texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
|
||||
}
|
||||
textArr.push(texts)
|
||||
// textArr.push(texts)
|
||||
if(this.textList.length < 1){
|
||||
textArr.push(texts)
|
||||
}else{
|
||||
this.textList.forEach(item =>{
|
||||
if(item !== texts){
|
||||
textArr.push(texts)
|
||||
}else{
|
||||
this.$message.warning('请勿重复添加数据')
|
||||
subFlag = false
|
||||
return
|
||||
}
|
||||
})
|
||||
}
|
||||
if(!subFlag){
|
||||
textArr = []
|
||||
}
|
||||
textArr = [...new Set(textArr)]
|
||||
this.replaceLawsNumModel = false
|
||||
})
|
||||
@@ -2722,6 +2739,15 @@ export default {
|
||||
this.getReplaceLawsNumRow()
|
||||
},
|
||||
selectLaws(type) {
|
||||
if(type === 'dtbjh'){
|
||||
this.textList = this.form.dtbjh.split(',')
|
||||
}else if(type === 'bfbdtbzh'){
|
||||
this.textList = this.form.bfbdtbzh.split(',')
|
||||
}else if(type === 'cbbh'){
|
||||
this.textList = this.form.cbbh.split(',')
|
||||
}else if(type === 'yybj'){
|
||||
this.textList = this.form.yybj.split(',')
|
||||
}
|
||||
// if (this.standNumFlag === 1) {
|
||||
// this.$refs.selections.selectAll(false)
|
||||
// }
|
||||
|
||||
@@ -838,7 +838,7 @@ export default {
|
||||
if (nameList.length) {
|
||||
nameList += ",";
|
||||
idList += ",";
|
||||
unitList += ",";
|
||||
unitList += ","
|
||||
unitNameList += ",";
|
||||
}
|
||||
idList += item.id;
|
||||
|
||||
Reference in New Issue
Block a user