FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
super_liu
2022-03-26 17:37:44 +08:00
parent f5f97265db e375ccc5b2
commit c1a3c9e854
11 changed files with 86 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/InputForAllStandards2.vue
+7 -6
View File
@@ -310,12 +310,13 @@
type: 'warning' type: 'warning'
}) })
} }
if (this.selectedListRep.length + textArr.length > 20) { //去除最多勾选20条限制
return this.$message({ // if (this.selectedListRep.length + textArr.length > 20) {
message: '代替标准号最多选择20项', // return this.$message({
type: 'warning' // message: '代替标准号最多选择20项',
}) // type: 'warning'
} // })
// }
this.selectedListRep.map((item) => { this.selectedListRep.map((item) => {
let texts = '' let texts = ''
if (item.standYear != null && item.standYear !== '') { if (item.standYear != null && item.standYear !== '') {
src/components/CustomFormComponents/InputForStandards.vue
+6 -6
View File
@@ -351,12 +351,12 @@ export default {
type: 'warning' type: 'warning'
}) })
} }
if (this.selectedListRep.length + textArr.length > 20) { // if (this.selectedListRep.length + textArr.length > 20) {
return this.$message({ // return this.$message({
message: `${this.config.attrName}最多选择20项`, // message: `${this.config.attrName}最多选择20项`,
type: 'warning' // type: 'warning'
}) // })
} // }
this.selectedListRep.map((item) => { this.selectedListRep.map((item) => {
let texts = '' let texts = ''
if (item.standYear != null && item.standYear !== '') { if (item.standYear != null && item.standYear !== '') {
src/components/treeSelect/treeSelectStand.vue
+19 -13
View File
@@ -13,19 +13,21 @@
placeholder="输入关键字进行过滤" placeholder="输入关键字进行过滤"
v-model="filterText"> v-model="filterText">
</el-input> </el-input>
<el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps" <div class="tree-height">
:load="loadNode" <el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps"
:lazy="lazy" :load="loadNode"
:show-checkbox="multiple" :lazy="lazy"
:node-key="nodeKey" :show-checkbox="multiple"
:check-strictly="checkStrictly" :node-key="nodeKey"
:expand-on-click-node="false" :check-strictly="checkStrictly"
:filter-node-method="filterNode" :expand-on-click-node="false"
:default-checked-keys="defaultCheckedKeys" :filter-node-method="filterNode"
:highlight-current="true" :default-checked-keys="defaultCheckedKeys"
@node-click="handleNodeClick" :highlight-current="true"
@check-change="handleCheckChange"> @node-click="handleNodeClick"
</el-tree> @check-change="handleCheckChange">
</el-tree>
</div>
<div id="roleFormButton" class="demo-drawer-footer"> <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-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> <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-image: none !important;
background-size:100% 100%; background-size:100% 100%;
} }
.tree-height{
height: calc(~'100% - 65px');
overflow: auto;
}
.el-drawer__body{ .el-drawer__body{
/* & > div:first-child{ /* & > div:first-child{
display: flex; display: flex;
src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+2 -2
View File
@@ -55,7 +55,7 @@
clearable clearable
></el-input> ></el-input>
<div v-if="form.modelList.length > 0"> <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" > <div class="fileClass" >
<span @click="handlePreview(item)">{{ item.name }}</span> <span @click="handlePreview(item)">{{ item.name }}</span>
<el-button <el-button
@@ -83,7 +83,7 @@
clearable clearable
></el-input> ></el-input>
<div v-if="form.fjList.length > 0"> <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" > <div class="fileClass" >
<span @click="handlePreview(item)">{{ item.name }}</span> <span @click="handlePreview(item)">{{ item.name }}</span>
<el-button <el-button
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+2 -2
View File
@@ -55,7 +55,7 @@
clearable clearable
></el-input> ></el-input>
<div v-if="form.modelList.length > 0"> <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" > <div class="fileClass" >
<span @click="handlePreview(item)">{{ item.name }}</span> <span @click="handlePreview(item)">{{ item.name }}</span>
<el-button <el-button
@@ -83,7 +83,7 @@
clearable clearable
></el-input> ></el-input>
<div v-if="form.fjList.length > 0"> <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" > <div class="fileClass" >
<span @click="handlePreview(item)">{{ item.name }}</span> <span @click="handlePreview(item)">{{ item.name }}</span>
<el-button <el-button
src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
+2 -2
View File
@@ -51,7 +51,7 @@
</el-form-item> </el-form-item>
<el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled"> <el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0"> <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> <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
<el-button <el-button
size="small" size="small"
@@ -67,7 +67,7 @@
</el-form-item> </el-form-item>
<el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled"> <el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.fjList.length > 0"> <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> <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
<el-button <el-button
size="small" size="small"
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+2 -2
View File
@@ -51,7 +51,7 @@
</el-form-item> </el-form-item>
<el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled"> <el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0"> <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> <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
<el-button <el-button
size="small" size="small"
@@ -67,7 +67,7 @@
</el-form-item> </el-form-item>
<el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled"> <el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.fjList.length > 0"> <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> <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
<el-button <el-button
size="small" size="small"
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+2 -2
View File
@@ -51,7 +51,7 @@
</el-form-item> </el-form-item>
<el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled"> <el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0"> <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> <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
<el-button <el-button
size="small" size="small"
@@ -67,7 +67,7 @@
</el-form-item> </el-form-item>
<el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled"> <el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.fjList.length > 0"> <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> <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
<el-button <el-button
size="small" size="small"
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+5 -2
View File
@@ -438,7 +438,7 @@
maxlength="500" maxlength="500"
></el-input> ></el-input>
</el-form-item> </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 <el-input
type="textarea" type="textarea"
v-model="plForm.changePoint" v-model="plForm.changePoint"
@@ -446,7 +446,7 @@
maxlength="500" maxlength="500"
></el-input> ></el-input>
</el-form-item> </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 <el-input
type="textarea" type="textarea"
:autosize="{ minRows: 4, maxRows: 14}" :autosize="{ minRows: 4, maxRows: 14}"
@@ -731,7 +731,9 @@ export default {
} }
}) })
}, },
//编辑按钮
itemEdit (row, type, index) { itemEdit (row, type, index) {
console.log(row);
this.itermsConditions = row.itermsConditions.replace(/''/g, '\'') this.itermsConditions = row.itermsConditions.replace(/''/g, '\'')
let itemsEoPage = { let itemsEoPage = {
oldItemId: row.itemsId, oldItemId: row.itemsId,
@@ -954,6 +956,7 @@ export default {
for (let i = 0; i < this.selectedList.length; i++) { for (let i = 0; i < this.selectedList.length; i++) {
bringData.push(deposit.get(this.selectedList[i])); bringData.push(deposit.get(this.selectedList[i]));
} }
console.log(bringData);
this.form.itemsNum = bringData[0].showNumber this.form.itemsNum = bringData[0].showNumber
this.form.itemsName = bringData[0].standName this.form.itemsName = bringData[0].standName
this.form.standId = bringData[0].standId this.form.standId = bringData[0].standId
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+38 -12
View File
@@ -1269,19 +1269,19 @@
:maxlength="100"></el-input> :maxlength="100"></el-input>
</el-form-item> </el-form-item>
</el-row> </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" <el-input v-model="standardSearchForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable clearable
:maxlength="500"></el-input> :maxlength="500"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="英文名称" prop="standEnName" class="search-item">--> <el-form-item v-else label="英文名称" prop="standEnName" class="search-item">
<!-- <el-input--> <el-input
<!-- v-model="standardSearchForm.standEnName"--> v-model="standardSearchForm.standEnName"
<!-- maxlength="1000"--> maxlength="1000"
<!-- placeholder="请输入英文名称"--> placeholder="请输入英文名称"
<!-- clearable></el-input>--> clearable></el-input>
<!-- </el-form-item>--> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
type="primary" type="primary"
@@ -1334,7 +1334,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="standTypeModel === 'INLAND'" v-if="standardSearchForm.standType === 'INLAND' || form.standInData === '0'"
prop="standName" prop="standName"
label="标准名称" label="标准名称"
align="center"> align="center">
@@ -1342,7 +1342,7 @@
<el-table-column <el-table-column
v-else v-else
prop="standEnName" prop="standEnName"
label="标准名称" label="英文名称"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -1450,6 +1450,7 @@ export default {
callback() callback()
} }
return { return {
textList: [],
gdType: '', //归档位置的赋值 gdType: '', //归档位置的赋值
standTypeModel: 'INLAND', standTypeModel: 'INLAND',
submitType: '', submitType: '',
@@ -2651,8 +2652,8 @@ export default {
}, },
// 代替政策编号确定 // 代替政策编号确定
replaceLawsNumModelBt() { replaceLawsNumModelBt() {
let subFlag = true
let textArr = [] let textArr = []
if (typeof this.value === 'string') { if (typeof this.value === 'string') {
if (this.value) { if (this.value) {
textArr = this.value.split(',') textArr = this.value.split(',')
@@ -2677,7 +2678,23 @@ export default {
} else { } else {
texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber 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)] textArr = [...new Set(textArr)]
this.replaceLawsNumModel = false this.replaceLawsNumModel = false
}) })
@@ -2722,6 +2739,15 @@ export default {
this.getReplaceLawsNumRow() this.getReplaceLawsNumRow()
}, },
selectLaws(type) { 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) { // if (this.standNumFlag === 1) {
// this.$refs.selections.selectAll(false) // this.$refs.selections.selectAll(false)
// } // }
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+1 -1
View File
@@ -838,7 +838,7 @@ export default {
if (nameList.length) { if (nameList.length) {
nameList += ","; nameList += ",";
idList += ","; idList += ",";
unitList += ","; unitList += ","
unitNameList += ","; unitNameList += ",";
} }
idList += item.id; idList += item.id;