Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop
This commit is contained in:
宋伟佳
@@ -190,7 +190,7 @@
|
||||
<p>点击或拖拽上传文件</p>
|
||||
</div>
|
||||
</el-upload>
|
||||
<el-progress style="width: 380px; margin-top: 5px;" v-show="progressType" :percentage="loadProgress"></el-progress>
|
||||
<!-- <el-progress style="width: 380px; margin-top: 5px;" v-show="progressType" :percentage="loadProgress"></el-progress>-->
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -597,13 +597,13 @@
|
||||
// this.form.itemsNum = bringData[0].showNumber
|
||||
// this.form.itemsName = bringData[0].standName
|
||||
// }
|
||||
this.form.standId = bringData[0].id
|
||||
this.form.standId = bringData[0].standId
|
||||
this.sarType = bringData[0].standType
|
||||
this.standId = bringData[0].standId
|
||||
this.listModel = false;
|
||||
this.listModel2 = true
|
||||
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
|
||||
infoId: this.form.standId,
|
||||
infoId: bringData[0].id,
|
||||
page: 1,
|
||||
pageSize: 9999
|
||||
}, {
|
||||
|
||||
@@ -602,13 +602,13 @@
|
||||
// this.form.itemsNum = bringData[0].showNumber
|
||||
// this.form.itemsName = bringData[0].standName
|
||||
// }
|
||||
this.form.standId = bringData[0].id
|
||||
this.form.standId = bringData[0].standId
|
||||
this.sarType = bringData[0].standType
|
||||
this.standId = bringData[0].standId
|
||||
this.listModel = false;
|
||||
this.listModel2 = true
|
||||
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
|
||||
infoId: this.form.standId,
|
||||
infoId: bringData[0].id,
|
||||
page: 1,
|
||||
pageSize: 9999
|
||||
}, {
|
||||
|
||||
@@ -217,14 +217,15 @@
|
||||
clearable
|
||||
></el-input>
|
||||
<div v-if="form.xgdName">
|
||||
{{ form.xgdName }}
|
||||
<!-- {{ form.xgdName }}-->
|
||||
<el-button
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
style="margin-left: 10px"
|
||||
@click="fileUpload('xgd')">
|
||||
重新上传
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
查看已上传的文件
|
||||
</el-button>
|
||||
</div>
|
||||
<div v-else>
|
||||
@@ -233,7 +234,8 @@
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
@click="fileUpload('xgd')">
|
||||
点击上传
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
点击上传
|
||||
</el-button>
|
||||
</div>
|
||||
</el-form-item>
|
||||
@@ -245,14 +247,15 @@
|
||||
clearable
|
||||
></el-input>
|
||||
<div v-if="form.fbgbjbdName">
|
||||
{{ form.fbgbjbdName }}
|
||||
<!-- {{ form.fbgbjbdName }}-->
|
||||
<el-button
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
style="margin-left: 10px"
|
||||
@click="fileUpload('fbgbjbd')">
|
||||
重新上传
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
查看已上传的文件
|
||||
</el-button>
|
||||
</div>
|
||||
<div v-else>
|
||||
@@ -261,6 +264,7 @@
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
@click="fileUpload('fbgbjbd')">
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
点击上传
|
||||
</el-button>
|
||||
</div>
|
||||
@@ -273,14 +277,15 @@
|
||||
clearable
|
||||
></el-input>
|
||||
<div v-if="form.zbjbdName">
|
||||
{{ form.zbjbdName }}
|
||||
<!-- {{ form.zbjbdName }}-->
|
||||
<el-button
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
style="margin-left: 10px"
|
||||
@click="fileUpload('zbjbd')">
|
||||
重新上传
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
查看已上传的文件
|
||||
</el-button>
|
||||
</div>
|
||||
<div v-else>
|
||||
@@ -289,6 +294,7 @@
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
@click="fileUpload('zbjbd')">
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
点击上传
|
||||
</el-button>
|
||||
</div>
|
||||
@@ -301,14 +307,15 @@
|
||||
clearable
|
||||
></el-input>
|
||||
<div v-if="form.bpgName">
|
||||
{{ form.bpgName }}
|
||||
<!-- {{ form.bpgName }}-->
|
||||
<el-button
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
style="margin-left: 10px"
|
||||
@click="fileUpload('bpg')">
|
||||
重新上传
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
查看已上传的文件
|
||||
</el-button>
|
||||
</div>
|
||||
<div v-else>
|
||||
@@ -317,6 +324,7 @@
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
@click="fileUpload('bpg')">
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
点击上传
|
||||
</el-button>
|
||||
</div>
|
||||
@@ -329,14 +337,15 @@
|
||||
clearable
|
||||
></el-input>
|
||||
<div v-if="form.ssgName">
|
||||
{{ form.ssgName }}
|
||||
<!-- {{ form.ssgName }}-->
|
||||
<el-button
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
style="margin-left: 10px"
|
||||
@click="fileUpload('ssg')">
|
||||
重新上传
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
查看已上传的文件
|
||||
</el-button>
|
||||
</div>
|
||||
<div v-else>
|
||||
@@ -345,6 +354,7 @@
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
@click="fileUpload('ssg')">
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
点击上传
|
||||
</el-button>
|
||||
</div>
|
||||
@@ -359,14 +369,15 @@
|
||||
clearable
|
||||
></el-input>
|
||||
<div v-if="form.kwjName">
|
||||
{{ form.kwjName }}
|
||||
<!-- {{ form.kwjName }}-->
|
||||
<el-button
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
style="margin-left: 10px"
|
||||
@click="fileUpload('kwj')">
|
||||
重新上传
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
查看已上传的文件
|
||||
</el-button>
|
||||
</div>
|
||||
<div v-else>
|
||||
@@ -375,6 +386,7 @@
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
@click="fileUpload('kwj')">
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
点击上传
|
||||
</el-button>
|
||||
</div>
|
||||
@@ -387,14 +399,15 @@
|
||||
clearable
|
||||
></el-input>
|
||||
<div v-if="form.zqyjgName">
|
||||
{{ form.zqyjgName }}
|
||||
<!-- {{ form.zqyjgName }}-->
|
||||
<el-button
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
style="margin-left: 10px"
|
||||
@click="fileUpload('zqyjg')">
|
||||
重新上传
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
查看已上传的文件
|
||||
</el-button>
|
||||
</div>
|
||||
<div v-else>
|
||||
@@ -403,6 +416,7 @@
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
@click="fileUpload('zqyjg')">
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
点击上传
|
||||
</el-button>
|
||||
</div>
|
||||
@@ -415,14 +429,15 @@
|
||||
clearable
|
||||
></el-input>
|
||||
<div v-if="form.caName">
|
||||
{{ form.caName }}
|
||||
<!-- {{ form.caName }}-->
|
||||
<el-button
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
style="margin-left: 10px"
|
||||
@click="fileUpload('ca')">
|
||||
重新上传
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
查看已上传的文件
|
||||
</el-button>
|
||||
</div>
|
||||
<div v-else>
|
||||
@@ -431,6 +446,7 @@
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
@click="fileUpload('ca')">
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
点击上传
|
||||
</el-button>
|
||||
</div>
|
||||
@@ -443,14 +459,15 @@
|
||||
clearable
|
||||
></el-input>
|
||||
<div v-if="form.jdwjName">
|
||||
{{ form.jdwjName }}
|
||||
<!-- {{ form.jdwjName }}-->
|
||||
<el-button
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
style="margin-left: 10px"
|
||||
@click="fileUpload('jdwj')">
|
||||
重新上传
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
查看已上传的文件
|
||||
</el-button>
|
||||
</div>
|
||||
<div v-else>
|
||||
@@ -459,6 +476,7 @@
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
@click="fileUpload('jdwj')">
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
点击上传
|
||||
</el-button>
|
||||
</div>
|
||||
@@ -702,7 +720,16 @@
|
||||
clearable
|
||||
></el-input>
|
||||
<div v-if="form.glwjName">
|
||||
{{ form.glwjName }}
|
||||
|
||||
<el-button
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
@click="fileUpload('glwj')">
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
查看已上传文件
|
||||
</el-button>
|
||||
<!-- {{ form.glwjName }}-->
|
||||
</div>
|
||||
<div v-else>
|
||||
<el-button
|
||||
@@ -710,6 +737,7 @@
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
@click="fileUpload('glwj')">
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
点击上传
|
||||
</el-button>
|
||||
</div>
|
||||
@@ -1196,6 +1224,16 @@
|
||||
data () {
|
||||
return {
|
||||
fileList: [],
|
||||
caFileList: [],
|
||||
FBGBJBDFileList: [],
|
||||
xgdFileList: [],
|
||||
bpgFileList: [],
|
||||
ssgFileList: [],
|
||||
zqyjgFileList: [],
|
||||
jdwjFileList: [],
|
||||
zbjbdFileList: [],
|
||||
kwjFileList: [],
|
||||
qlwjFileList: [],
|
||||
filterText:'',
|
||||
textStatusMap: {}, // 文本状态id与name对应
|
||||
standardDrawer: false,
|
||||
@@ -1332,7 +1370,7 @@
|
||||
zqyjg: '', // 征求意见稿
|
||||
jdwj: '', // 解读文件
|
||||
zbjbd: '', // 增补件
|
||||
kwj: '', // 勘误件
|
||||
kwj: '', // 勘 误件
|
||||
caName: '', // 草案
|
||||
fbgbjbdName: '', // 发布稿
|
||||
xgdName: '', // 修改单
|
||||
@@ -1413,9 +1451,9 @@
|
||||
{ required: true, message: '请选择文本状态', trigger: 'change' }
|
||||
]
|
||||
,
|
||||
// issueTime: [
|
||||
// { required: true, message: '请选择标准发布日期', trigger: 'change' }
|
||||
// ],
|
||||
issueTime: [
|
||||
{ required: false, message: '请选择标准发布日期', trigger: 'change' }
|
||||
],
|
||||
qcdw: [
|
||||
{ required: true, message: '请选择起草单位', trigger: 'change' }
|
||||
],
|
||||
@@ -2040,43 +2078,54 @@
|
||||
// 导入标准数据成功后执行
|
||||
importFileSuccess (response, file,fileList) {
|
||||
// 上传成功后判断是否是两条数据是的话替换掉旧数据
|
||||
if (fileList.length > 1) {
|
||||
this.fileList = fileList.splice(0, 1)
|
||||
}
|
||||
// if (fileList.length > 1) {
|
||||
// this.fileList = fileList.splice(0, 1)
|
||||
// }
|
||||
if (response.ok) {
|
||||
this.fileMadel = false
|
||||
this.fileList = []
|
||||
// this.fileMadel = false
|
||||
// this.fileList = []
|
||||
if(this.fileType === 'fbgbjbd'){
|
||||
this.FBGBJBDFileList=fileList;
|
||||
this.form.fbgbjbd = response.data.id;
|
||||
this.form.fbgbjbdName = response.data.name;
|
||||
}else if(this.fileType === 'xgd'){
|
||||
this.form.xgd = response.data.id;
|
||||
this.xgdFileList=fileList;
|
||||
this.form.xgd = response.data.id;
|
||||
this.form.xgdName = response.data.name;
|
||||
}else if(this.fileType === 'bpg'){
|
||||
this.bpgFileList=fileList;
|
||||
this.form.bpg = response.data.id;
|
||||
this.form.bpgName = response.data.name;
|
||||
}else if(this.fileType === 'ssg'){
|
||||
this.ssgFileList=fileList;
|
||||
this.form.ssg = response.data.id;
|
||||
this.form.ssgName = response.data.name;
|
||||
}else if(this.fileType === 'zqyjg'){
|
||||
this.zqyjgFileList=fileList;
|
||||
this.form.zqyjg = response.data.id;
|
||||
this.form.zqyjgName = response.data.name;
|
||||
}else if(this.fileType === 'jdwj'){
|
||||
this.jdwjFileList=fileList;
|
||||
this.form.jdwj = response.data.id;
|
||||
this.form.jdwjName = response.data.name;
|
||||
}else if(this.fileType === 'kwj'){
|
||||
this.kwjFileList=fileList;
|
||||
this.form.kwj = response.data.id;
|
||||
this.form.kwjName = response.data.name;
|
||||
}else if(this.fileType === 'xgd'){
|
||||
this.xgdFileList=fileList;
|
||||
this.form.xgd = response.data.id;
|
||||
this.form.xgdName = response.data.name;
|
||||
}else if(this.fileType === 'glwj'){
|
||||
this.qlwjFileList=fileList;
|
||||
this.form.glwj = response.data.id;
|
||||
this.form.glwjName = response.data.name;
|
||||
}else if(this.fileType === 'ca'){
|
||||
this.caFileList=fileList;
|
||||
this.form.ca = response.data.id;
|
||||
this.form.caName = response.data.name;
|
||||
}else if(this.fileType === 'zbjbd'){
|
||||
this.zbjbdFileList=fileList;
|
||||
this.form.zbjbd = response.data.id;
|
||||
this.form.zbjbdName = response.data.name;
|
||||
}
|
||||
@@ -2089,8 +2138,33 @@
|
||||
},
|
||||
fileUpload (type) {
|
||||
this.fileType = '';
|
||||
this.fileMadel = true
|
||||
// this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表
|
||||
|
||||
this.fileType = type;
|
||||
if (type==='ca'){
|
||||
this.fileList=this.caFileList;
|
||||
}else if (type==='fbgbjbd'){
|
||||
this.fileList=this.FBGBJBDFileList;
|
||||
}else if (type==='xgd'){
|
||||
this.fileList=this.xgdFileList;
|
||||
}else if(type==='bpg'){
|
||||
this.fileList=this.bpgFileList;
|
||||
}else if (type==='ssg'){
|
||||
this.fileList=this.ssgFileList;
|
||||
}else if (type==='zqyjg'){
|
||||
this.fileList=this.zqyjgFileList;
|
||||
}else if (type==='jdwj'){
|
||||
this.fileList=this.jdwjFileList;
|
||||
}else if (type==='zbjbd'){
|
||||
this.fileList=this.zbjbdFileList;
|
||||
}else if (type==='kwj'){
|
||||
this.fileList=this.kwjFileList;
|
||||
}else if (type==='glwj'){
|
||||
this.fileList=this.qlwjFileList;
|
||||
}
|
||||
|
||||
this.fileMadel = true;
|
||||
|
||||
},
|
||||
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
|
||||
if(checkedData) {
|
||||
|
||||
@@ -1138,13 +1138,13 @@ export default {
|
||||
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
|
||||
],
|
||||
standNature: [
|
||||
{ required: false, message: '请选择标准性质', trigger: 'change' }
|
||||
{ required: true, message: '请选择标准性质', trigger: 'change' }
|
||||
],
|
||||
textStatus: [
|
||||
{ required: true, message: '请选择文本状态', trigger: 'change' }
|
||||
],
|
||||
issueTime: [
|
||||
{ required: true, message: '请选择标准发布日期', trigger: 'change' }
|
||||
{ required: false, message: '请选择标准发布日期', trigger: 'change' }
|
||||
],
|
||||
qcdw: [
|
||||
{ required: true, message: '请选择起草单位', trigger: 'change' }
|
||||
|
||||
@@ -281,6 +281,7 @@ export default {
|
||||
cid: '', // 编号
|
||||
endTime: '', // 结束日期
|
||||
cname: '', // 名称
|
||||
standType: '',
|
||||
},
|
||||
formRules: {
|
||||
cid: [
|
||||
@@ -454,6 +455,7 @@ export default {
|
||||
} else {
|
||||
this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber
|
||||
}
|
||||
this.form.standType = bringData[0].standType
|
||||
this.form.cname = bringData[0].standName;
|
||||
this.listModel = false;
|
||||
} else if (this.selectedList.length > 1) {
|
||||
|
||||
Reference in New Issue
Block a user