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

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-08-06 17:58:42 +08:00
parent 43f5a92ba7 07940a5b8c
commit 0bf76e614a
6 changed files with 114 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+1 -1
View File
@@ -190,7 +190,7 @@
<p>点击或拖拽上传文件</p> <p>点击或拖拽上传文件</p>
</div> </div>
</el-upload> </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> </el-dialog>
</div> </div>
</template> </template>
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+2 -2
View File
@@ -597,13 +597,13 @@
// 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].id this.form.standId = bringData[0].standId
this.sarType = bringData[0].standType this.sarType = bringData[0].standType
this.standId = bringData[0].standId this.standId = bringData[0].standId
this.listModel = false; this.listModel = false;
this.listModel2 = true this.listModel2 = true
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
infoId: this.form.standId, infoId: bringData[0].id,
page: 1, page: 1,
pageSize: 9999 pageSize: 9999
}, { }, {
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+2 -2
View File
@@ -602,13 +602,13 @@
// 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].id this.form.standId = bringData[0].standId
this.sarType = bringData[0].standType this.sarType = bringData[0].standType
this.standId = bringData[0].standId this.standId = bringData[0].standId
this.listModel = false; this.listModel = false;
this.listModel2 = true this.listModel2 = true
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
infoId: this.form.standId, infoId: bringData[0].id,
page: 1, page: 1,
pageSize: 9999 pageSize: 9999
}, { }, {
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+105 -31
View File
@@ -217,14 +217,15 @@
clearable clearable
></el-input> ></el-input>
<div v-if="form.xgdName"> <div v-if="form.xgdName">
{{ form.xgdName }} <!-- {{ form.xgdName }}-->
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
style="margin-left: 10px" style="margin-left: 10px"
@click="fileUpload('xgd')"> @click="fileUpload('xgd')">
重新上传 <i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button> </el-button>
</div> </div>
<div v-else> <div v-else>
@@ -233,7 +234,8 @@
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
@click="fileUpload('xgd')"> @click="fileUpload('xgd')">
点击上传 <i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button> </el-button>
</div> </div>
</el-form-item> </el-form-item>
@@ -245,14 +247,15 @@
clearable clearable
></el-input> ></el-input>
<div v-if="form.fbgbjbdName"> <div v-if="form.fbgbjbdName">
{{ form.fbgbjbdName }} <!-- {{ form.fbgbjbdName }}-->
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
style="margin-left: 10px" style="margin-left: 10px"
@click="fileUpload('fbgbjbd')"> @click="fileUpload('fbgbjbd')">
重新上传 <i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button> </el-button>
</div> </div>
<div v-else> <div v-else>
@@ -261,6 +264,7 @@
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
@click="fileUpload('fbgbjbd')"> @click="fileUpload('fbgbjbd')">
<i class="el-icon-upload el-icon--right"></i>
点击上传 点击上传
</el-button> </el-button>
</div> </div>
@@ -273,14 +277,15 @@
clearable clearable
></el-input> ></el-input>
<div v-if="form.zbjbdName"> <div v-if="form.zbjbdName">
{{ form.zbjbdName }} <!-- {{ form.zbjbdName }}-->
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
style="margin-left: 10px" style="margin-left: 10px"
@click="fileUpload('zbjbd')"> @click="fileUpload('zbjbd')">
重新上传 <i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button> </el-button>
</div> </div>
<div v-else> <div v-else>
@@ -289,6 +294,7 @@
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
@click="fileUpload('zbjbd')"> @click="fileUpload('zbjbd')">
<i class="el-icon-upload el-icon--right"></i>
点击上传 点击上传
</el-button> </el-button>
</div> </div>
@@ -301,14 +307,15 @@
clearable clearable
></el-input> ></el-input>
<div v-if="form.bpgName"> <div v-if="form.bpgName">
{{ form.bpgName }} <!-- {{ form.bpgName }}-->
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
style="margin-left: 10px" style="margin-left: 10px"
@click="fileUpload('bpg')"> @click="fileUpload('bpg')">
重新上传 <i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button> </el-button>
</div> </div>
<div v-else> <div v-else>
@@ -317,6 +324,7 @@
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
@click="fileUpload('bpg')"> @click="fileUpload('bpg')">
<i class="el-icon-upload el-icon--right"></i>
点击上传 点击上传
</el-button> </el-button>
</div> </div>
@@ -329,14 +337,15 @@
clearable clearable
></el-input> ></el-input>
<div v-if="form.ssgName"> <div v-if="form.ssgName">
{{ form.ssgName }} <!-- {{ form.ssgName }}-->
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
style="margin-left: 10px" style="margin-left: 10px"
@click="fileUpload('ssg')"> @click="fileUpload('ssg')">
重新上传 <i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button> </el-button>
</div> </div>
<div v-else> <div v-else>
@@ -345,6 +354,7 @@
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
@click="fileUpload('ssg')"> @click="fileUpload('ssg')">
<i class="el-icon-upload el-icon--right"></i>
点击上传 点击上传
</el-button> </el-button>
</div> </div>
@@ -359,14 +369,15 @@
clearable clearable
></el-input> ></el-input>
<div v-if="form.kwjName"> <div v-if="form.kwjName">
{{ form.kwjName }} <!-- {{ form.kwjName }}-->
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
style="margin-left: 10px" style="margin-left: 10px"
@click="fileUpload('kwj')"> @click="fileUpload('kwj')">
重新上传 <i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button> </el-button>
</div> </div>
<div v-else> <div v-else>
@@ -375,6 +386,7 @@
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
@click="fileUpload('kwj')"> @click="fileUpload('kwj')">
<i class="el-icon-upload el-icon--right"></i>
点击上传 点击上传
</el-button> </el-button>
</div> </div>
@@ -387,14 +399,15 @@
clearable clearable
></el-input> ></el-input>
<div v-if="form.zqyjgName"> <div v-if="form.zqyjgName">
{{ form.zqyjgName }} <!-- {{ form.zqyjgName }}-->
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
style="margin-left: 10px" style="margin-left: 10px"
@click="fileUpload('zqyjg')"> @click="fileUpload('zqyjg')">
重新上传 <i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button> </el-button>
</div> </div>
<div v-else> <div v-else>
@@ -403,6 +416,7 @@
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
@click="fileUpload('zqyjg')"> @click="fileUpload('zqyjg')">
<i class="el-icon-upload el-icon--right"></i>
点击上传 点击上传
</el-button> </el-button>
</div> </div>
@@ -415,14 +429,15 @@
clearable clearable
></el-input> ></el-input>
<div v-if="form.caName"> <div v-if="form.caName">
{{ form.caName }} <!-- {{ form.caName }}-->
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
style="margin-left: 10px" style="margin-left: 10px"
@click="fileUpload('ca')"> @click="fileUpload('ca')">
重新上传 <i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button> </el-button>
</div> </div>
<div v-else> <div v-else>
@@ -431,6 +446,7 @@
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
@click="fileUpload('ca')"> @click="fileUpload('ca')">
<i class="el-icon-upload el-icon--right"></i>
点击上传 点击上传
</el-button> </el-button>
</div> </div>
@@ -443,14 +459,15 @@
clearable clearable
></el-input> ></el-input>
<div v-if="form.jdwjName"> <div v-if="form.jdwjName">
{{ form.jdwjName }} <!-- {{ form.jdwjName }}-->
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
style="margin-left: 10px" style="margin-left: 10px"
@click="fileUpload('jdwj')"> @click="fileUpload('jdwj')">
重新上传 <i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button> </el-button>
</div> </div>
<div v-else> <div v-else>
@@ -459,6 +476,7 @@
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
@click="fileUpload('jdwj')"> @click="fileUpload('jdwj')">
<i class="el-icon-upload el-icon--right"></i>
点击上传 点击上传
</el-button> </el-button>
</div> </div>
@@ -702,7 +720,16 @@
clearable clearable
></el-input> ></el-input>
<div v-if="form.glwjName"> <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>
<div v-else> <div v-else>
<el-button <el-button
@@ -710,6 +737,7 @@
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
@click="fileUpload('glwj')"> @click="fileUpload('glwj')">
<i class="el-icon-upload el-icon--right"></i>
点击上传 点击上传
</el-button> </el-button>
</div> </div>
@@ -1196,6 +1224,16 @@
data () { data () {
return { return {
fileList: [], fileList: [],
caFileList: [],
FBGBJBDFileList: [],
xgdFileList: [],
bpgFileList: [],
ssgFileList: [],
zqyjgFileList: [],
jdwjFileList: [],
zbjbdFileList: [],
kwjFileList: [],
qlwjFileList: [],
filterText:'', filterText:'',
textStatusMap: {}, // 文本状态id与name对应 textStatusMap: {}, // 文本状态id与name对应
standardDrawer: false, standardDrawer: false,
@@ -1332,7 +1370,7 @@
zqyjg: '', // 征求意见稿 zqyjg: '', // 征求意见稿
jdwj: '', // 解读文件 jdwj: '', // 解读文件
zbjbd: '', // 增补件 zbjbd: '', // 增补件
kwj: '', // 勘误件 kwj: '', // 勘 误件
caName: '', // 草案 caName: '', // 草案
fbgbjbdName: '', // 发布稿 fbgbjbdName: '', // 发布稿
xgdName: '', // 修改单 xgdName: '', // 修改单
@@ -1413,9 +1451,9 @@
{ required: true, message: '请选择文本状态', trigger: 'change' } { required: true, message: '请选择文本状态', trigger: 'change' }
] ]
, ,
// issueTime: [ issueTime: [
// { required: true, message: '请选择标准发布日期', trigger: 'change' } { required: false, message: '请选择标准发布日期', trigger: 'change' }
// ], ],
qcdw: [ qcdw: [
{ required: true, message: '请选择起草单位', trigger: 'change' } { required: true, message: '请选择起草单位', trigger: 'change' }
], ],
@@ -2040,43 +2078,54 @@
// 导入标准数据成功后执行 // 导入标准数据成功后执行
importFileSuccess (response, file,fileList) { importFileSuccess (response, file,fileList) {
// 上传成功后判断是否是两条数据是的话替换掉旧数据 // 上传成功后判断是否是两条数据是的话替换掉旧数据
if (fileList.length > 1) { // if (fileList.length > 1) {
this.fileList = fileList.splice(0, 1) // this.fileList = fileList.splice(0, 1)
} // }
if (response.ok) { if (response.ok) {
this.fileMadel = false // this.fileMadel = false
this.fileList = [] // this.fileList = []
if(this.fileType === 'fbgbjbd'){ if(this.fileType === 'fbgbjbd'){
this.FBGBJBDFileList=fileList;
this.form.fbgbjbd = response.data.id; this.form.fbgbjbd = response.data.id;
this.form.fbgbjbdName = response.data.name; this.form.fbgbjbdName = response.data.name;
}else if(this.fileType === 'xgd'){ }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; this.form.xgdName = response.data.name;
}else if(this.fileType === 'bpg'){ }else if(this.fileType === 'bpg'){
this.bpgFileList=fileList;
this.form.bpg = response.data.id; this.form.bpg = response.data.id;
this.form.bpgName = response.data.name; this.form.bpgName = response.data.name;
}else if(this.fileType === 'ssg'){ }else if(this.fileType === 'ssg'){
this.ssgFileList=fileList;
this.form.ssg = response.data.id; this.form.ssg = response.data.id;
this.form.ssgName = response.data.name; this.form.ssgName = response.data.name;
}else if(this.fileType === 'zqyjg'){ }else if(this.fileType === 'zqyjg'){
this.zqyjgFileList=fileList;
this.form.zqyjg = response.data.id; this.form.zqyjg = response.data.id;
this.form.zqyjgName = response.data.name; this.form.zqyjgName = response.data.name;
}else if(this.fileType === 'jdwj'){ }else if(this.fileType === 'jdwj'){
this.jdwjFileList=fileList;
this.form.jdwj = response.data.id; this.form.jdwj = response.data.id;
this.form.jdwjName = response.data.name; this.form.jdwjName = response.data.name;
}else if(this.fileType === 'kwj'){ }else if(this.fileType === 'kwj'){
this.kwjFileList=fileList;
this.form.kwj = response.data.id; this.form.kwj = response.data.id;
this.form.kwjName = response.data.name; this.form.kwjName = response.data.name;
}else if(this.fileType === 'xgd'){ }else if(this.fileType === 'xgd'){
this.xgdFileList=fileList;
this.form.xgd = response.data.id; this.form.xgd = response.data.id;
this.form.xgdName = response.data.name; this.form.xgdName = response.data.name;
}else if(this.fileType === 'glwj'){ }else if(this.fileType === 'glwj'){
this.qlwjFileList=fileList;
this.form.glwj = response.data.id; this.form.glwj = response.data.id;
this.form.glwjName = response.data.name; this.form.glwjName = response.data.name;
}else if(this.fileType === 'ca'){ }else if(this.fileType === 'ca'){
this.caFileList=fileList;
this.form.ca = response.data.id; this.form.ca = response.data.id;
this.form.caName = response.data.name; this.form.caName = response.data.name;
}else if(this.fileType === 'zbjbd'){ }else if(this.fileType === 'zbjbd'){
this.zbjbdFileList=fileList;
this.form.zbjbd = response.data.id; this.form.zbjbd = response.data.id;
this.form.zbjbdName = response.data.name; this.form.zbjbdName = response.data.name;
} }
@@ -2089,8 +2138,33 @@
}, },
fileUpload (type) { fileUpload (type) {
this.fileType = ''; this.fileType = '';
this.fileMadel = true // this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表
this.fileType = type; 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) { popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) { if(checkedData) {
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+2 -2
View File
@@ -1138,13 +1138,13 @@ export default {
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' } { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
], ],
standNature: [ standNature: [
{ required: false, message: '请选择标准性质', trigger: 'change' } { required: true, message: '请选择标准性质', trigger: 'change' }
], ],
textStatus: [ textStatus: [
{ required: true, message: '请选择文本状态', trigger: 'change' } { required: true, message: '请选择文本状态', trigger: 'change' }
], ],
issueTime: [ issueTime: [
{ required: true, message: '请选择标准发布日期', trigger: 'change' } { required: false, message: '请选择标准发布日期', trigger: 'change' }
], ],
qcdw: [ qcdw: [
{ required: true, message: '请选择起草单位', trigger: 'change' } { required: true, message: '请选择起草单位', trigger: 'change' }
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+2
View File
@@ -281,6 +281,7 @@ export default {
cid: '', // 编号 cid: '', // 编号
endTime: '', // 结束日期 endTime: '', // 结束日期
cname: '', // 名称 cname: '', // 名称
standType: '',
}, },
formRules: { formRules: {
cid: [ cid: [
@@ -454,6 +455,7 @@ export default {
} else { } else {
this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber
} }
this.form.standType = bringData[0].standType
this.form.cname = bringData[0].standName; this.form.cname = bringData[0].standName;
this.listModel = false; this.listModel = false;
} else if (this.selectedList.length > 1) { } else if (this.selectedList.length > 1) {