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

制修订类型

Browse Source
This commit is contained in:
zyx.net
2022-11-16 17:03:28 +08:00
parent baff61abed
commit e5988362cb
5 changed files with 3442 additions and 3256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+3250 -3112
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+48 -48
View File
@@ -193,19 +193,19 @@
v-model="qbfsForm.esMatingRelations"
></custom-input-for-all-standards2>
</template>
<!-- <el-form-item label="立项原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- type="textarea"-->
<!-- v-model="qbfsForm.newReason"-->
<!-- placeholder="请输入立项原因"-->
<!-- :maxlength="500"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="立项原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- type="textarea"-->
<!-- v-model="qbfsForm.newReason"-->
<!-- placeholder="请输入立项原因"-->
<!-- :maxlength="500"/>-->
<!-- </el-form-item>-->
<el-form-item label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
<div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<!-- <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
<!-- <el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>-->
<!-- </span>-->
<!-- <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
<!-- <el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>-->
<!-- </span>-->
<span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-edit" @click="handleFilePreview(item,'onlineEdit')"></el-button>
</span>
@@ -842,51 +842,51 @@ export default {
if (res.success) {
const _formData = new FormData()
_formData.append('infoJson', JSON.stringify(this.qbfsForm))
processCreatePlan(_formData).then(res => {
this.qbfsForm.planId = res.data
if (res.code === '200' || res.message === '入库成功'){
this.isSubmit = true;
this.qbfsForm.type = '5'
this.qbfsForm.commentText = this.commentText;
let json = Object.assign(this.qbfsForm, this.roleForm);
this.$http.post("lawss/activiti/startProcessRollBack", {
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '25',
json: JSON.stringify({
roleForm: this.roleForm,
qbfsForm: this.qbfsForm,
commentText: this.commentText
})
// processCreatePlan(_formData).then(res => {
// this.qbfsForm.planId = res.data
// if (res.code === '200' || res.message === '入库成功'){
this.isSubmit = true;
this.qbfsForm.type = '5'
this.qbfsForm.commentText = this.commentText;
let json = Object.assign(this.qbfsForm, this.roleForm);
this.$http.post("lawss/activiti/startProcessRollBack", {
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '25',
json: JSON.stringify({
roleForm: this.roleForm,
qbfsForm: this.qbfsForm,
commentText: this.commentText
})
}, {
_this: this
}, res => {
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success("企标制修订立项计划-立项已完成");
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.isSubmit = false;
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
if (res.success) {
this.$message.success("企标制修订立项计划-立项已完成");
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
});
taskDel(taskId).then(res=>{
return res
})
}
this.isSubmit = false;
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
}
});
}
})
});
// }
// })
}
this.isSubmit = false
}, e => {
src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+14 -1
View File
@@ -282,6 +282,18 @@
placeholder="请输入项目名称"
></el-input>
</el-form-item>
<el-form-item label="适用车型" class="search-item search-item-last">
<el-select :disabled="disabledXX" v-model="projectSearch.carType"
placeholder="请选择适用车型" filterable clearable>
<el-option
v-for="(item, index) in energyKindOptions"
:key="index.value"
:value="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button :disabled="disabledXX"
type="primary"
@@ -863,7 +875,8 @@ export default {
projectName: "",
managementHostName: "", //管理主体
developmentHostName: "", //开发主体
categoryName: "" //项目细分类
categoryName: "", //项目细分类
carType: ""
},
qdform: {
projectId:"",
src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue
+4 -1
View File
@@ -429,7 +429,10 @@ export default {
case 'buss1':
// 企标制修订-技术标准
this.$router.push({
name: 'bussLibrary1'
name: 'bussLibrary1',
query:{
reviseStatus:'3'
},
})
break
case 'buss2':
src/pages/regulatoryRepository/dataCenter/index.vue
+126 -94
View File
@@ -63,11 +63,19 @@
<div class="search-area">
<el-form :modal="dataCenterSearch" :inline="true">
<el-form-item label="类型:">
<el-input
size="small"
v-model="dataCenterSearch.dataType"
placeholder="请输入类型"
></el-input>
<!-- <el-input-->
<!-- size="small"-->
<!-- v-model="dataCenterSearch.dataType"-->
<!-- placeholder="请输入类型"-->
<!-- ></el-input>-->
<el-select size="small" v-model="dataCenterSearch.dataType" filterable placeholder="请输入类型" style="width: 100%;">
<el-option
v-for="(item, index) in cbcdOptions"
:key="index"
:value="item.value"
:label="item.label">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="资料标题:">
<el-input
@@ -77,16 +85,32 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="上传时间:">
<el-form-item label="上传开始时间:">
<!-- <el-date-picker-->
<!-- v-model="dataCenterSearch.dataUploadTime"-->
<!-- clearable-->
<!-- value-format="yyyy-MM-dd"-->
<!-- size="small"-->
<!-- type="daterange"-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期">-->
<!-- </el-date-picker>-->
<el-date-picker
v-model="dataCenterSearch.dataUploadTime"
clearable
value-format="yyyy-MM-dd"
v-model="dataCenterSearch.startDataUploadTime"
size="small"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择上传开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="上传结束时间:">
<el-date-picker
v-model="dataCenterSearch.endDataUploadTime"
size="small"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择上传结束时间">
</el-date-picker>
</el-form-item>
<el-form-item>
@@ -231,21 +255,21 @@
</div>
</el-drawer>
<el-drawer
:title="attributeTitle"
:wrapperClosable="false"
:visible.sync="showInfoModal"
size="800px"
:styles="styles"
:close="cancelModel"
:title="attributeTitle"
:wrapperClosable="false"
:visible.sync="showInfoModal"
size="800px"
:styles="styles"
:close="cancelModel"
>
<div style="height: 92%;margin-left: 3%">
<el-form
ref="attributeEO"
:model="attributeEO"
:rules="attributeEOFormRules"
class="label-input-form"
label-width="130px"
v-if="showInfoModal"
ref="attributeEO"
:model="attributeEO"
:rules="attributeEOFormRules"
class="label-input-form"
label-width="130px"
v-if="showInfoModal"
>
<el-form-item label="所属目录" prop="treeId" class="add-form-item">
<el-select ref="treeSelect" class="tree-select" v-model="attributeEO.treeId" value-key="id" placeholder="请选择所属目录">
@@ -267,61 +291,61 @@
</el-select>
</el-form-item>
<el-form-item
label="类型"
prop="dataType"
class="add-form-item"
label="类型"
prop="dataType"
class="add-form-item"
>
<el-input
v-model="attributeEO.dataType"
placeholder="请输入类型"
clearable
v-model="attributeEO.dataType"
placeholder="请输入类型"
clearable
/>
</el-form-item>
<el-form-item
label="资料标题"
prop="dataTitle"
class="add-form-item"
label="资料标题"
prop="dataTitle"
class="add-form-item"
>
<el-input
v-model="attributeEO.dataTitle"
placeholder="请输入资料标题"
clearable
v-model="attributeEO.dataTitle"
placeholder="请输入资料标题"
clearable
/>
</el-form-item>
<el-form-item
label="资料说明"
prop="dataExplain"
class="add-form-item"
label="资料说明"
prop="dataExplain"
class="add-form-item"
>
<el-input
type="textarea"
:autosize="{ minRows: 1, maxRows: 10}"
resize="none"
style="width: 95%"
maxlength="4000"
show-word-limit
v-model="attributeEO.dataExplain"
placeholder="请输入资料说明"
clearable
type="textarea"
:autosize="{ minRows: 1, maxRows: 10}"
resize="none"
style="width: 95%"
maxlength="4000"
show-word-limit
v-model="attributeEO.dataExplain"
placeholder="请输入资料说明"
clearable
/>
<el-button icon="el-icon-delete" circle type="danger" size="mini" @click="attributeEO.dataExplain = ''"></el-button>
</el-form-item>
<el-form-item
label="附件"
prop="attachFileId"
class="add-form-item"
label="附件"
prop="attachFileId"
class="add-form-item"
>
<el-upload
class="upload-demo"
action="/api/att/attFile/uploadNew"
:before-upload="beginImportFile"
:on-preview="handlePreview"
:on-remove="handleRemove"
multiple
:limit="50"
:on-exceed="handleExceed"
:on-success="uploadSuccess"
:file-list="fileList">
class="upload-demo"
action="/api/att/attFile/uploadNew"
:before-upload="beginImportFile"
:on-preview="handlePreview"
:on-remove="handleRemove"
multiple
:limit="50"
:on-exceed="handleExceed"
:on-success="uploadSuccess"
:file-list="fileList">
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
</el-form-item>
@@ -409,6 +433,7 @@ export default {
total: 0
},
dataCenterTable: [],
cbcdOptions: [],
productModelAdd: {
name: '',
parentId: '',
@@ -730,12 +755,17 @@ export default {
},
searchInfo() {
this.loading = true
if(this.dataCenterSearch.dataUploadTime && this.dataCenterSearch.dataUploadTime.length !== 0){
this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0]
this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1]
}else{
this.dataCenterSearch.startDataUploadTime =''
this.dataCenterSearch.endDataUploadTime = ''
// if(this.dataCenterSearch.dataUploadTime && this.dataCenterSearch.dataUploadTime.length !== 0){
// this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0]
// this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1]
// }else{
// this.dataCenterSearch.startDataUploadTime =''
// this.dataCenterSearch.endDataUploadTime = ''
// }
if(this.dataCenterSearch.endDataUploadTime < this.dataCenterSearch.startDataUploadTime){
this.$message.warning('结束时间不能小于开始时间')
this.loading = false
return
}
this.$http.get('fileMaterialCenter/file-material', this.dataCenterSearch, {
_this: this
@@ -806,35 +836,35 @@ export default {
if (valid) {
if (this.attributeTitle === '新增'){
this.$http.postData(
'fileMaterialCenter/file-material',
this.attributeEO,
{
_this: this,
},
(res) => {
if (res.ok) {
this.$message.success('新增成功')
this.submitLoading = false
this.cancelModel()
this.searchInfo()
}
'fileMaterialCenter/file-material',
this.attributeEO,
{
_this: this,
},
(res) => {
if (res.ok) {
this.$message.success('新增成功')
this.submitLoading = false
this.cancelModel()
this.searchInfo()
}
}
)
}else {
this.$http.putData(
'fileMaterialCenter/file-material',
this.attributeEO,
{
_this: this,
},
(res) => {
if (res.ok) {
this.$message.success('修改成功')
this.submitLoading = false
this.cancelModel()
this.searchInfo()
}
'fileMaterialCenter/file-material',
this.attributeEO,
{
_this: this,
},
(res) => {
if (res.ok) {
this.$message.success('修改成功')
this.submitLoading = false
this.cancelModel()
this.searchInfo()
}
}
)
}
}else{
@@ -868,7 +898,7 @@ export default {
<style scoped lang="less">
#dataCenter {
/deep/ .el-input--small .el-input__inner {
/deep/ .el-input--small .el-input__inner {
width: 160px;
}
background-color: white;
@@ -1032,7 +1062,9 @@ export default {
}
}
}
/deep/.el-input__inner{
width: 180px !important;
}
/deep/ .icon-tree {
margin: 0 5px 0 10px;
position: relative;