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