Merge branch 'develop' into 'test'

Develop

See merge request !72
This commit is contained in:
王夏晖
2021-08-09 12:43:16 +00:00
34 changed files with 753 additions and 449 deletions
+2 -2
View File
@@ -135,11 +135,11 @@ export default {
// // // title: '本地产品/项目库', // // // title: '本地产品/项目库',
// // // path: '/localProductsOrProjectLibrary' // // // path: '/localProductsOrProjectLibrary'
// // // }, // // // },
{ /*{
title: '企业标准库', title: '企业标准库',
path: '/enterpriseStandardDatabase', path: '/enterpriseStandardDatabase',
menuId: '01ed8f752748227777b3572d56ee9ab5' menuId: '01ed8f752748227777b3572d56ee9ab5'
}, },*/
// { // {
// title: '企标制修订计划', // title: '企标制修订计划',
// path: '/enterBSysRevPlanManaLib', // path: '/enterBSysRevPlanManaLib',
@@ -135,6 +135,7 @@
</el-table> </el-table>
</div> </div>
<ProcessFooter <ProcessFooter
show-save
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@@ -155,7 +156,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process' import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process'
export default { export default {
name: "bzdyStep2", name: "bzdyStep2",
@@ -229,7 +230,21 @@
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
handleSave() {}, handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
commentText: this.commentText,
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() { handleSubmit() {
this.$refs['qbkwForm'].validate((valid) => { this.$refs['qbkwForm'].validate((valid) => {
if (valid) { if (valid) {
@@ -261,11 +276,13 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.title = data.title this.form.title = data.title || data.form.title
this.form.date = data.date this.form.date = data.date || data.form.date
this.json = data this.json = data || data.form
this.form.model = data.model this.form.model = data.model || data.form.model
this.form.modelName = data.modelName this.form.modelName = data.modelName || data.form.modelName
this.form.responUserList = data.form.responUserList
this.form.responUserListName = data.form.responUserListName
}).catch(e => { }).catch(e => {
}) })
}) })
@@ -147,6 +147,7 @@
</el-table> </el-table>
</div> </div>
<ProcessFooter <ProcessFooter
show-save
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@@ -180,7 +181,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process' import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process'
export default { export default {
name: "bzdyStep3", name: "bzdyStep3",
@@ -273,7 +274,21 @@
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
handleSave() {}, handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
commentText: this.commentText,
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() { handleSubmit() {
this.$refs['qbkwForm'].validate((valid) => { this.$refs['qbkwForm'].validate((valid) => {
if (valid) { if (valid) {
@@ -305,13 +320,15 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.title = data.title this.form.title = data.title || data.form.title
this.form.date = data.date this.form.date = data.date || data.form.date
this.json = data this.json = data || data.form
this.form.model = data.model this.form.model = data.model || data.form.model
this.form.modelName = data.modelName this.form.modelName = data.modelName || data.form.modelName
this.form.fileName = data.fileName || '' this.form.responUserList = data.form.responUserList
this.form.fileId = data.fileId || '' this.form.responUserListName = data.form.responUserListName
this.form.fileName = data.form.fileName || data.fileName || ''
this.form.fileId = data.form.fileId || data.fileId || ''
}).catch(e => { }).catch(e => {
}) })
}) })
@@ -252,13 +252,14 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.title = data.title console.log(data);
this.form.date = data.date this.form.title = data.title || data.form.title
this.json = data this.form.date = data.date || data.form.date
this.form.file = data.fileId this.json = data || data.form
this.form.fileName = data.fileName this.form.file = data.fileId || data.form.fileId
this.form.model = data.model this.form.fileName = data.fileName || data.form.fileName
this.form.modelName = data.modelName this.form.model = data.model || data.form.model
this.form.modelName = data.modelName || data.form.modelName
}).catch(e => { }).catch(e => {
}) })
}) })
@@ -174,6 +174,7 @@
</el-table> </el-table>
</div> </div>
<ProcessFooter <ProcessFooter
show-save
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@@ -297,7 +298,21 @@
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
handleSave() {}, handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
commentText: this.commentText,
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() { handleSubmit() {
this.$refs['qbkwForm'].validate((valid) => { this.$refs['qbkwForm'].validate((valid) => {
if (valid) { if (valid) {
@@ -327,12 +342,12 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.title = data.title this.form.title = data.title || data.form.title
this.form.date = data.date this.form.date = data.date || data.form.date
this.json = data this.json = data || data.form
this.tableData = data.responUserList this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName this.form.hzfileName = data.hzfileName || data.form.hzfileName
}).catch(e => { }).catch(e => {
}) })
}) })
@@ -341,12 +341,12 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.title = data.title this.form.title = data.title || data.form.title
this.form.date = data.date this.form.date = data.date || data.form.date
this.json = data this.json = data || data.form
this.tableData = data.responUserList this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileName = data.hzfileName this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileId = data.hzfileId this.form.hzfileName = data.hzfileName || data.form.hzfileName
}).catch(e => { }).catch(e => {
}) })
}) })
@@ -341,12 +341,12 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.title = data.title this.form.title = data.title || data.form.title
this.form.date = data.date this.form.date = data.date || data.form.date
this.json = data this.json = data || data.form
this.tableData = data.responUserList this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileName = data.hzfileName this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileId = data.hzfileId this.form.hzfileName = data.hzfileName || data.form.hzfileName
}).catch(e => { }).catch(e => {
}) })
}) })
@@ -341,12 +341,12 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.title = data.title this.form.title = data.title || data.form.title
this.form.date = data.date this.form.date = data.date || data.form.date
this.json = data this.json = data || data.form
this.tableData = data.responUserList this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileName = data.hzfileName this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileId = data.hzfileId this.form.hzfileName = data.hzfileName || data.form.hzfileName
}).catch(e => { }).catch(e => {
}) })
}) })
@@ -341,12 +341,12 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.title = data.title this.form.title = data.title || data.form.title
this.form.date = data.date this.form.date = data.date || data.form.date
this.json = data this.json = data || data.form
this.tableData = data.responUserList this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileName = data.hzfileName this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileId = data.hzfileId this.form.hzfileName = data.hzfileName || data.form.hzfileName
}).catch(e => { }).catch(e => {
}) })
}) })
@@ -358,6 +358,15 @@
@checkedRole="saveUserInfo" @checkedRole="saveUserInfo"
:nodeList="nodeList" :nodeList="nodeList"
></Role-tree> ></Role-tree>
<el-dialog
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@@ -218,6 +218,15 @@
:nodeList="nodeList2" :nodeList="nodeList2"
></Role-tree> ></Role-tree>
<loading :loading="loading">加载中...</loading> <loading :loading="loading">加载中...</loading>
<el-dialog
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@@ -321,7 +330,6 @@
this.active = name this.active = name
}, },
handleSave() { handleSave() {
this.saveLoading = true this.saveLoading = true
let _formData = new FormData() let _formData = new FormData()
_formData.append('taskIds', this.taskIds) _formData.append('taskIds', this.taskIds)
@@ -360,6 +360,15 @@
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button> <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
</div> </div>
</el-drawer> </el-drawer>
<el-dialog
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
<loading :loading="loading">加载中...</loading> <loading :loading="loading">加载中...</loading>
</div> </div>
</template> </template>
@@ -265,6 +265,15 @@
submitBTNText="同意" submitBTNText="同意"
> >
</ProcessFooter> </ProcessFooter>
<el-dialog
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@@ -264,6 +264,15 @@
submitBTNText="同意" submitBTNText="同意"
> >
</ProcessFooter> </ProcessFooter>
<el-dialog
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
<loading :loading="loading">加载中...</loading> <loading :loading="loading">加载中...</loading>
</div> </div>
</template> </template>
@@ -263,6 +263,15 @@
submitBTNText="同意" submitBTNText="同意"
> >
</ProcessFooter> </ProcessFooter>
<el-dialog
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
<loading :loading="loading">加载中...</loading> <loading :loading="loading">加载中...</loading>
</div> </div>
</template> </template>
@@ -678,7 +678,6 @@ export default {
taskIds: this.taskIds, taskIds: this.taskIds,
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
console.log(res.mesg)
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm) this.getFormFieldList(processForm)
@@ -718,22 +717,19 @@ export default {
this.saveLoading = true; this.saveLoading = true;
let _formData = new FormData(); let _formData = new FormData();
_formData.append("id", this.bpnId || ""); _formData.append("id", this.bpnId || "");
_formData.append("createUser", this.$store.getters.userInfo.userId);
_formData.append("createUserName", this.$store.getters.userInfo.userName);
_formData.append("prcType", "4"); _formData.append("prcType", "4");
_formData.append('taskIds', this.taskIds) _formData.append('taskIds', this.taskIds)
_formData.append("json", JSON.stringify({ _formData.append("json", JSON.stringify({
form: this.listForm, form: this.listForm,
commentText: this.commentText commentText: this.commentText
})); }));
saveTaskForPub(_formData).then(res => {
// saveTaskForPub(_formData).then(res => { this.saveLoading = false;
// this.saveLoading = false; this.$message.success("保存成功");
// this.$message.success("保存成功"); this.bpnId = res.result;
// this.bpnId = res.result; }).catch(e => {
// }).catch(e => { this.saveLoading = false;
// this.saveLoading = false; });
// });
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
@@ -282,6 +282,7 @@ export default {
endTime: '', // 结束日期 endTime: '', // 结束日期
cname: '', // 名称 cname: '', // 名称
standType: '', standType: '',
standId: '',
}, },
formRules: { formRules: {
cid: [ cid: [
@@ -299,6 +300,7 @@ export default {
standSort: '', standSort: '',
standNumber: '', standNumber: '',
standType: '', standType: '',
standId: '',
page: 1, page: 1,
pageSize: this.$store.getters.userInfo.configContent pageSize: this.$store.getters.userInfo.configContent
}, },
@@ -456,6 +458,7 @@ export default {
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.standType = bringData[0].standType
this.form.standId = bringData[0].id
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) {
@@ -345,21 +345,33 @@ export default {
addList() { addList() {
dicTypeData().then(res => { dicTypeData().then(res => {
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
}) standUnqualified(this.queryUnqualidiedData).then(res => {
standUnqualified(this.queryUnqualidiedData).then(res => { this.unqualidiedData = res.data.records
this.unqualidiedData = res.data.records this.unqualidiedData.forEach(item => {
this.unqualidiedData.forEach(item => { // 责任部门转换
this.$set(item,'engineer','') if (item.responsibleUnit !== null || item.responsibleUnit !== "") {
this.$set(item,'engineerId','') let k = (item.responsibleUnit || "").split(',')
this.$set(item,'dutyPeopleInfo','') for (let i in this.zrbmOptions) {
this.$set(item,'dutyPeople','') for (let m = 0; m< k.length; m++) {
this.$set(item,'dutyPeopleInfoId','') if (this.zrbmOptions[i].value === k[m]) {
this.$set(item,'dutyPeopleId','') k[m] = this.zrbmOptions[i].label
this.$set(item,'fileText',[]) }
this.$set(item,'fileTextId',[]) item.responsibleUnit = k.join(',')
this.$set(item,'fileTextPath',[]) }
}
}
this.$set(item,'engineer','')
this.$set(item,'engineerId','')
this.$set(item,'dutyPeopleInfo','')
this.$set(item,'dutyPeople','')
this.$set(item,'dutyPeopleInfoId','')
this.$set(item,'dutyPeopleId','')
this.$set(item,'fileText',[])
this.$set(item,'fileTextId',[])
this.$set(item,'fileTextPath',[])
})
this.total = res.data.total
}) })
this.total = res.data.total
}) })
this.standModel = true; this.standModel = true;
}, },
@@ -409,6 +409,7 @@ export default {
// 查询相关参数 // 查询相关参数
searching: false, searching: false,
commentText:'', commentText:'',
fileType: 'FBGBJBD',
standardSearch: { standardSearch: {
standType: "", standType: "",
standName: "" standName: ""
@@ -847,6 +848,7 @@ export default {
this.$http.post("SarStandItems/sar-stand-items/findStand", { this.$http.post("SarStandItems/sar-stand-items/findStand", {
page: this.page, page: this.page,
size: this.pageSize, size: this.pageSize,
fileType: this.fileType,
...this.standardSearch ...this.standardSearch
}, { }, {
_this: this _this: this
@@ -396,6 +396,7 @@ export default {
drawerTitle: "", //drawer标题 drawerTitle: "", //drawer标题
// 查询相关参数 // 查询相关参数
searching: false, searching: false,
fileType: 'FBGBJBD',
standardSearch: { standardSearch: {
standType: "", standType: "",
standName: "" standName: ""
@@ -822,6 +823,7 @@ export default {
this.$http.post("SarStandItems/sar-stand-items/findStand", { this.$http.post("SarStandItems/sar-stand-items/findStand", {
page: this.page, page: this.page,
size: this.pageSize, size: this.pageSize,
fileType: this.fileType,
...this.standardSearch ...this.standardSearch
}, { }, {
_this: this _this: this
@@ -222,7 +222,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process"; import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
export default { export default {
name: "xmpgStep3", name: "xmpgStep3",
@@ -348,7 +348,6 @@ export default {
taskIds: this.taskIds, taskIds: this.taskIds,
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
console.log(res.mesg)
if (res) { if (res) {
const processForm = JSON.parse(res.mesg); const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm); this.getFormFieldList(processForm);
@@ -362,36 +361,49 @@ export default {
*/ */
getFormFieldList(item) { getFormFieldList(item) {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
this.listForm.prcNum = this.prcNum; if(item.form === undefined){
this.listForm.prcName = this.prcName; this.listForm.prcNum = this.prcNum;
this.listForm["id"] = item.id; this.listForm.prcName = this.prcName;
this.listForm = JSON.parse(JSON.stringify(item.pepdtos[0])); this.listForm["id"] = item.id;
this.listForm.breakdownList = []; this.listForm = JSON.parse(JSON.stringify(item.pepdtos[0]));
for (let i = 0; i < item.pepdtos.length; i++) { this.listForm.breakdownList = [];
for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) { for (let i = 0; i < item.pepdtos.length; i++) {
this.listForm.breakdownList.push({ for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
itemsName: item.pepdtos[i].breakdownList[j].itemsName, if(item.pepdtos[i].xCXSSRQ === null){
itemNum: item.pepdtos[i].breakdownList[j].itemsNum, this.listForm.breakdownList.xCXSSRQ = ""
responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer, } else {
responsibleUnit: item.pepdtos[i].breakdownList[j].responsibleUnit, this.listForm.breakdownList.xCXSSRQ = item.pepdtos[i].xCXSSRQ
productLine: item.pepdtos[i].sarStandProjectLibraries.productLine, }
projectNumber: item.pepdtos[i].sarStandProjectLibraries.projectNumber, if(item.pepdtos[i].zCCSSRQ === null){
projectName: item.pepdtos[i].sarStandProjectLibraries.projectName, this.listForm.breakdownList.zCCSSRQ = ""
implementer: item.pepdtos[i].breakdownList[j].implementer || null, } else {
distributePerson: item.pepdtos[i].distributePerson, this.listForm.breakdownList.zCCSSRQ = item.pepdtos[i].zCCSSRQ
distributePersonId: item.pepdtos[i].distributePersonId, }
uname: item.pepdtos[i].uname, this.listForm.breakdownList.push({
projectManager: item.pepdtos[i].projectManager, itemsName: item.pepdtos[i].breakdownList[j].itemsName,
certifiedEngineerName: item.pepdtos[i].certifiedEngineerName, itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
qualityEngineerName: item.pepdtos[i].qualityEngineerName, responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer,
standNumber: item.pepdtos[i].standNumber, responsibleUnit: item.pepdtos[i].breakdownList[j].responsibleUnit,
standName: item.pepdtos[i].standName, productLine: item.pepdtos[i].sarStandProjectLibraries.productLine,
xCXSSRQ: item.pepdtos[i].xCXSSRQ, projectNumber: item.pepdtos[i].sarStandProjectLibraries.projectNumber,
zCCSSRQ: item.pepdtos[i].zCCSSRQ projectName: item.pepdtos[i].sarStandProjectLibraries.projectName,
}); implementer: item.pepdtos[i].breakdownList[j].implementer || null,
distributePerson: item.pepdtos[i].distributePerson,
distributePersonId: item.pepdtos[i].distributePersonId,
uname: item.pepdtos[i].uname,
projectManager: item.pepdtos[i].projectManager,
certifiedEngineerName: item.pepdtos[i].certifiedEngineerName,
qualityEngineerName: item.pepdtos[i].qualityEngineerName,
standNumber: item.pepdtos[i].standNumber,
standName: item.pepdtos[i].standName,
});
}
} }
} else {
this.listForm = item.form
this.listForm.breakdownList = item.form.breakdownList
} }
console.log(this.listForm.breakdownList);
}, },
checkedRole (data) { checkedRole (data) {
if (this.type === 1) { if (this.type === 1) {
@@ -441,6 +453,22 @@ export default {
//保存事件 //保存事件
handleSave() { handleSave() {
this.saveLoading = true;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "5");
_formData.append('taskIds', this.taskIds)
_formData.append("json", JSON.stringify({
form: this.listForm,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
@@ -347,7 +347,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process"; import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
export default { export default {
name: "xmpgStep4", name: "xmpgStep4",
@@ -454,36 +454,59 @@ export default {
getFormFieldList(item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
if (item.fenFlag === undefined ) { if(item.form === undefined){
item.step3DTOS.forEach(item => { if (item.fenFlag === undefined ) {
item.implementerId = this.$store.getters.userInfo.userId item.step3DTOS.forEach(item => {
item.implementer = this.$store.getters.userInfo.userName item.implementerId = this.$store.getters.userInfo.userId
}) item.implementer = this.$store.getters.userInfo.userName
this.dataList = item.step3DTOS; })
this.dataList = item.step3DTOS;
} else {
this.dataList = item.dataList;
this.dataList.forEach(item => {
item.implementerId = this.$store.getters.userInfo.userId
item.implementer = this.$store.getters.userInfo.userName
})
}
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.standName = item.step3DTOS[0].standName;
this.listForm.standNumber = item.step3DTOS[0].standNumber;
this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName;
this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName;
this.listForm.itemsName = item.step3DTOS[0].itemsName;
this.listForm.itemNum = item.step3DTOS[0].itemNum;
this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit;
this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer;
} else { } else {
this.dataList = item.dataList; this.listForm = item.form
this.dataList.forEach(item => { this.dataList = item.form.dataList
item.implementerId = this.$store.getters.userInfo.userId
item.implementer = this.$store.getters.userInfo.userName
})
} }
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.standName = item.step3DTOS[0].standName;
this.listForm.standNumber = item.step3DTOS[0].standNumber;
this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName;
this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName;
this.listForm.itemsName = item.step3DTOS[0].itemsName;
this.listForm.itemNum = item.step3DTOS[0].itemNum;
this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit;
this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer;
}); });
}, },
//保存事件 //保存事件
handleSave() { handleSave() {
this.saveLoading = true;
let _formData = new FormData();
this.listForm.dataList = this.dataList;
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "5");
_formData.append('taskIds', this.taskIds)
_formData.append("json", JSON.stringify({
form:this.listForm,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
@@ -68,8 +68,10 @@
label="标准号" label="标准号"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a> <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a> }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
{{ scope.row.standNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -484,6 +486,7 @@ export default {
this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, { this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
_this: this _this: this
}, res => { }, res => {
console.log(res.data.records);
this.listForm.dataList = res.data.records; this.listForm.dataList = res.data.records;
this.dataList = res.data.records; this.dataList = res.data.records;
this.listForm.dataList.forEach(item => { this.listForm.dataList.forEach(item => {
@@ -517,7 +520,12 @@ export default {
{ {
_this: this _this: this
}, res => { }, res => {
this.listForm.breakdownList = res.data; if (!res.data.length) {
this.dataList = []
this.$message.warning("请选择带有分解单的标准");
} else {
this.listForm.breakdownList = res.data;
}
}); });
}, },
//标准的多选框改变 //标准的多选框改变
@@ -595,15 +603,15 @@ export default {
}); });
}, },
// 点击查看 // 点击查看
handlePreview (item) { handlePreview(item) {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails', name: "OtherStandardDetails",
params: { params: {
id: item.standId, id: item.standId,
pageType: 'INLAND_STAND' pageType: "INLAND_STAND"
} }
}) });
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, "_blank");
}, },
choiceZRR(type, title, id) { choiceZRR(type, title, id) {
this.nodeList = []; this.nodeList = [];
@@ -219,7 +219,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process"; import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
export default { export default {
name: "xmpg2Step3", name: "xmpg2Step3",
@@ -339,18 +339,39 @@ export default {
getFormFieldList(item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
this.listForm.prcNum = this.prcNum; if (item.form === undefined) {
this.listForm.prcName = this.prcName; this.listForm.prcNum = this.prcNum;
this.listForm["id"] = item.id; this.listForm.prcName = this.prcName;
this.listForm.dataList = item.dataList; this.listForm["id"] = item.id;
this.dataList = item.dataList; this.listForm.dataList = item.dataList;
this.dataList.distributePerson = item.dataList[0].distributePerson; this.dataList = item.dataList;
this.listForm.breakdownList = item.breakdownList; this.dataList.distributePerson = item.dataList[0].distributePerson;
this.listForm.breakdownList = item.breakdownList;
} else {
this.listForm = item.form
this.dataList = item.form.dataList
}
}); });
}, },
//保存事件 //保存事件
handleSave() { handleSave() {
this.saveLoading = true;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "6");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: this.listForm,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
@@ -225,7 +225,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process"; import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
export default { export default {
name: "xmpg2Step4", name: "xmpg2Step4",
@@ -333,6 +333,7 @@ export default {
taskIds: this.taskIds, taskIds: this.taskIds,
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
console.log(res.mesg);
if (res) { if (res) {
const processForm = JSON.parse(res.mesg); const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm); this.getFormFieldList(processForm);
@@ -345,18 +346,38 @@ export default {
getFormFieldList(item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
this.listForm.prcNum = this.prcNum; if(item.form === undefined){
this.listForm.prcName = this.prcName; this.listForm.prcNum = this.prcNum;
this.listForm["id"] = item.id; this.listForm.prcName = this.prcName;
this.listForm.dataList = item.dataList; this.listForm["id"] = item.id;
this.dataList = item.dataList; this.listForm.dataList = item.dataList;
// this.dataList.distributePerson = item.dataList[0].distributePerson; this.dataList = item.dataList;
this.listForm.breakdownList = item.breakdownList; this.listForm.breakdownList = item.breakdownList;
} else {
this.listForm = item.form
this.dataList = item.form.dataList
}
}); });
}, },
//保存事件 //保存事件
handleSave() { handleSave() {
this.saveLoading = true;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "6");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: this.listForm,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
@@ -208,7 +208,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process"; import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
export default { export default {
name: "xmpg2Step5", name: "xmpg2Step5",
@@ -328,43 +328,64 @@ export default {
getFormFieldList(item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
this.listForm.prcNum = this.prcNum; if(item.form === undefined){
this.listForm.prcName = this.prcName; this.listForm.prcNum = this.prcNum;
this.listForm["id"] = item.id; this.listForm.prcName = this.prcName;
this.listForm.dataList = item.dataList; this.listForm["id"] = item.id;
this.dataList = item.dataList; this.listForm.dataList = item.dataList;
// this.dataList.standNumber = item.dataList.standSort + '\xa0\xa0' +item.dataList.standSort + '-' + item.dataList.standYear this.dataList = item.dataList;
let children = []; // this.dataList.standNumber = item.dataList.standSort + '\xa0\xa0' +item.dataList.standSort + '-' + item.dataList.standYear
item.breakdownList.forEach( let children = [];
item => { item.breakdownList.forEach(
let aa = { item => {
key: item.standId, let aa = {
id: item.id, key: item.standId,
standId: item.itemsNum, id: item.id,
itemsNum: item.itemsNum, standId: item.itemsNum,
itemsName: item.itemsName, itemsNum: item.itemsNum,
workPeople: "请选择责任人" itemsName: item.itemsName,
}; workPeople: "请选择责任人"
children.push(aa); };
} children.push(aa);
); }
this.dataList.forEach(key => { );
key["children"] = []; this.dataList.forEach(key => {
children.forEach(breakDown => { key["children"] = [];
if (key.standId === breakDown.key) { children.forEach(breakDown => {
key["children"].push(breakDown); if (key.standId === breakDown.key) {
key["children"].push(breakDown);
}
});
if (key["children"].length === 0) {
delete key["children"];
} }
}); });
if (key["children"].length === 0) { this.listForm.children = children;
delete key["children"]; } else {
} this.listForm = item.form
}); this.dataList = item.form.dataList
this.listForm.children = children; }
}); });
}, },
//保存事件 //保存事件
handleSave() { handleSave() {
this.saveLoading = true;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "6");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: this.listForm,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
@@ -338,7 +338,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process"; import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
export default { export default {
name: "xmpg2Step6", name: "xmpg2Step6",
@@ -470,16 +470,37 @@ export default {
getFormFieldList(item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
this.listForm.prcNum = this.prcNum; if(item.form === undefined){
this.listForm.prcName = this.prcName; this.listForm.prcNum = this.prcNum;
this.listForm["id"] = item.id; this.listForm.prcName = this.prcName;
// this.listForm.dataList = item.dataList; this.listForm["id"] = item.id;
this.dataList = this.listForm.dataList; // this.listForm.dataList = item.dataList;
this.dataList = this.listForm.dataList;
} else {
this.listForm = item.form
this.dataList = item.form.dataList
}
}); });
}, },
//保存事件 //保存事件
handleSave() { handleSave() {
this.saveLoading = true;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "6");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: this.listForm,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
@@ -190,12 +190,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="XCXSSRQ" prop="SSRQ"
sortable="putTime" sortable="custom"
width="150px" width="150px"
label="实施日期"> label="实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
{{ formatIssueDate(scope.row.putTime) }} <!-- {{ formatIssueDate(scope.row.putTime) }}-->
<span>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -3509,6 +3511,10 @@ export default {
if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.ZCCSSRQ) { if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.ZCCSSRQ) {
res.data.list[i].ZCCSSRQ = res.data.list[i].attrInfoMap.ZCCSSRQ res.data.list[i].ZCCSSRQ = res.data.list[i].attrInfoMap.ZCCSSRQ
} }
if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) {
res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ
console.log(res.data.list[i].SSRQ);
}
} }
this.stahndinfoList = res.data.list this.stahndinfoList = res.data.list
this.total = res.data.count this.total = res.data.count
@@ -641,7 +641,7 @@
</el-form-item> </el-form-item>
<el-form-item title="“计划修订”、“修订中”均为现行有效版本;“已修订”标准的有效性根据实际实施情况判定。" <el-form-item title="“计划修订”、“修订中”均为现行有效版本;“已修订”标准的有效性根据实际实施情况判定。"
prop="standState" label-width="150px" class="add-form-item"> prop="standState" label-width="150px" class="add-form-item">
<template slot="label">文本状态<i class="el-icon-warning-outline"></i></template> <template slot="label">文本状态</template>
<el-select v-model="sarStandardsInfoEO.textStatus" <el-select v-model="sarStandardsInfoEO.textStatus"
placeholder="请选择文本状态" placeholder="请选择文本状态"
clearable> clearable>
@@ -15,10 +15,14 @@
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="" class="search-item btn-box"> <el-form-item label="" class="search-item btn-box">
<el-button class="common-button-primary" type="primary" size="mini" @click="searchStandAndLaws" v-btn-permission="'314ad07cd81834dfdd3c58476cdcde68'">查询</el-button> <el-button class="common-button-primary" type="primary" size="mini" @click="searchStandAndLaws"
v-btn-permission="'314ad07cd81834dfdd3c58476cdcde68'">查询
</el-button>
</el-form-item> </el-form-item>
<el-form-item label="" class="search-item btn-box"> <el-form-item label="" class="search-item btn-box">
<el-button class="common-button-default" @click="resetSelect" size="mini" v-btn-permission="'eb402ab8306d437c7d33e9e4b4e4341a'">清空</el-button> <el-button class="common-button-default" @click="resetSelect" size="mini"
v-btn-permission="'eb402ab8306d437c7d33e9e4b4e4341a'">清空
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@@ -27,24 +31,24 @@
</div> </div>
<div class="content"> <div class="content">
<el-table <el-table
stripe stripe
ref="selections" ref="selections"
tooltip-effect="dark" tooltip-effect="dark"
border border
:height="tableHeight" :height="tableHeight"
:data="sarProjectListDatas" :data="sarProjectListDatas"
class="table" class="table"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standType" prop="standType"
label="标准/政策类型" label="标准/政策类型"
width="120" width="120"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.standType === 'INLAND'">国内标准法规</div> <div v-if="scope.row.standType === 'INLAND'">国内标准法规</div>
@@ -55,9 +59,9 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standNumber" prop="standNumber"
label="标准/政策号" label="标准/政策号"
width="180" width="180"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" <a class="table-jump"
@@ -65,8 +69,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
label="标准/政策名称" label="标准/政策名称"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" <a class="table-jump"
@@ -74,15 +78,15 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="interpretationTime" prop="interpretationTime"
label="评估时间" label="评估时间"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
fixed="right" fixed="right"
label="" label=""
width="50" width="50"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<i class="el-icon-view btn-i" @click="handleProjectCompliance(scope.row)"></i> <i class="el-icon-view btn-i" @click="handleProjectCompliance(scope.row)"></i>
</template> </template>
@@ -93,12 +97,12 @@
</div> </div>
<!-- 查看符合标准性弹窗--> <!-- 查看符合标准性弹窗-->
<el-drawer <el-drawer
title="标准涉及项目符合性" title="标准涉及项目符合性"
:visible.sync="showSarProStateModal" :visible.sync="showSarProStateModal"
:wrapperClosable="false" :wrapperClosable="false"
size="1100px" size="1100px"
:before-close="clearSearchPro" :before-close="clearSearchPro"
class="not-footer-drawer" class="not-footer-drawer"
> >
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<div class="el-drawer-form"> <div class="el-drawer-form">
@@ -107,10 +111,10 @@
<el-form :inline="true" :model="sarProStateEO" class="label-input-form"> <el-form :inline="true" :model="sarProStateEO" class="label-input-form">
<el-form-item label="项目名称" class="search-item search-item-last"> <el-form-item label="项目名称" class="search-item search-item-last">
<el-input <el-input
v-model="sarProStateEO.productName" v-model="sarProStateEO.productName"
placeholder="根据项目名称查找" placeholder="根据项目名称查找"
:maxlength="100" :maxlength="100"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目编号" class="search-item search-item-last"> <el-form-item label="项目编号" class="search-item search-item-last">
<el-input <el-input
@@ -121,18 +125,20 @@
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
v-btn-permission="'f0ea68cb2c01cd0063ea639ee9bd4cec'" v-btn-permission="'f0ea68cb2c01cd0063ea639ee9bd4cec'"
@click="querySarProStateZero">查询</el-button> @click="querySarProStateZero">查询
</el-button>
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
class="common-button-default" class="common-button-default"
size="mini" size="mini"
v-btn-permission="'aa4d6d0cc28d016f8241159c9e7d4c80'" v-btn-permission="'aa4d6d0cc28d016f8241159c9e7d4c80'"
@click="clearSearchProState">清空</el-button> @click="clearSearchProState">清空
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@@ -140,141 +146,153 @@
</div> </div>
</div> </div>
<el-table <el-table
ref="multipleTable" ref="multipleTable"
:data="sarProStateListDatas" :data="sarProStateListDatas"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%;" style="width: 100%;"
border border
:height="sarProStateTableHeight" :height="sarProStateTableHeight"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px" width="150px"
align="center" align="center"
prop="productLineId" prop="productLineId"
label="产品线"> label="产品线">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px" width="150px"
align="center" align="center"
prop="productId" prop="productId"
label="项目编号"> label="项目编号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px" width="150px"
align="center" align="center"
prop="productName" prop="productName"
label="项目名称"> label="项目名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px" width="150px"
align="center" align="center"
prop="standNumber" prop="standNumber"
label="标准编号"> label="标准编号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px" width="150px"
align="center" align="center"
prop="standName" prop="standName"
label="标准名称"> label="标准名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px" width="150px"
align="center" align="center"
prop="standardItem" prop="standardItem"
label="条款号"> label="条款号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px" width="150px"
align="center" align="center"
prop="standardInfo" prop="standardInfo"
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="productType" prop="productType"
label="在研产品"> label="在研产品">
<el-table-column <el-table-column
width="150px" width="150px"
align="center" align="center"
prop="researchImplementationTime" prop="researchImplementationTime"
label="实施时间"> label="实施时间">
<template slot-scope="scope">
<span>{{ scope.row.researchImplementationTime ? $moment(scope.row.researchImplementationTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px" width="150px"
align="center" align="center"
prop="researchCompliance" prop="researchCompliance"
label="合规"> label="合规">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px" width="150px"
align="center" align="center"
label="不合规"> label="不合规">
<el-table-column <el-table-column
width="150px" width="150px"
align="center" align="center"
prop="researchNonCompliance" prop="researchNonCompliance"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px" width="150px"
align="center" align="center"
prop="researchCountermeasures" prop="researchCountermeasures"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px" width="150px"
align="center" align="center"
prop="researchCompletionTime" prop="researchCompletionTime"
label="完成时间"> label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.researchCompletionTime ? $moment(scope.row.researchCompletionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="center" prop="center"
label="在产产品"> label="在产产品">
<el-table-column <el-table-column
width="150px" width="150px"
align="center" align="center"
prop="productionImplementationTime" prop="productionImplementationTime"
label="实施时间"> label="实施时间">
<template slot-scope="scope">
<span>{{ scope.row.productionImplementationTime ? $moment(scope.row.productionImplementationTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px" width="150px"
align="center" align="center"
prop="productionCompliance" prop="productionCompliance"
label="合规(具体情况)"> label="合规(具体情况)">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px" width="150px"
align="center" align="center"
label="不合规"> label="不合规">
<el-table-column <el-table-column
width="150px" width="150px"
align="center" align="center"
prop="productionCountermeasures" prop="productionCountermeasures"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="150px" width="150px"
align="center" align="center"
prop="productionCompletionTime" prop="productionCompletionTime"
label="完成时间"> label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.productionCompletionTime ? $moment(scope.row.productionCompletionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
:page="sarProStateTotalPage" :page="sarProStateTotalPage"
:total="sarProStateTotal" :total="sarProStateTotal"
@pageChange="pageProStateChange" @pageChange="pageProStateChange"
@pageSizeChange="pageProStateSizeChange"></pagination> @pageSizeChange="pageProStateSizeChange"></pagination>
</div> </div>
</div> </div>
</el-drawer> </el-drawer>
@@ -283,12 +301,12 @@
<script> <script>
export default { export default {
name: 'standInvolveProjectDetail', name: "standInvolveProjectDetail",
data () { data() {
return { return {
sarProject: { sarProject: {
standName: '', // 标准政策名称 standName: "", // 标准政策名称
standNumber: '', // 标准/政策号 standNumber: "", // 标准/政策号
standApplicationType: 1 standApplicationType: 1
}, // 条件查询 }, // 条件查询
showSarProStateModal: false, // 查看drawer开关 showSarProStateModal: false, // 查看drawer开关
@@ -302,125 +320,127 @@ export default {
page: 1, page: 1,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
sarProStateEO: { sarProStateEO: {
productName: '', productName: "",
standId: '' standId: ""
}, },
sarProStateTotal: 0, sarProStateTotal: 0,
sarProStateTotalPage: 1, sarProStateTotalPage: 1,
sarProStatePageSize: this.$store.getters.userInfo.configContent, sarProStatePageSize: this.$store.getters.userInfo.configContent,
sarProStateListDatas: [], // 符合性项目列表数据 sarProStateListDatas: [], // 符合性项目列表数据
sarProStateTableHeight: null, // 符合性项目列表高度 sarProStateTableHeight: null, // 符合性项目列表高度
standId: '' // 符合性项目Id standId: "" // 符合性项目Id
} };
}, },
methods: { methods: {
searchStandAndLaws () { searchStandAndLaws() {
this.page = 1 this.page = 1;
this.queryStandAndLaws() this.queryStandAndLaws();
}, // 查询 }, // 查询
pageChange (page) { pageChange(page) {
this.page = page this.page = page;
this.queryStandAndLaws() this.queryStandAndLaws();
}, },
pageSizeChange (pageSize) { pageSizeChange(pageSize) {
this.pageSize = pageSize this.pageSize = pageSize;
this.$store.getters.userInfo.configContent = pageSize this.$store.getters.userInfo.configContent = pageSize;
this.queryStandAndLaws() this.queryStandAndLaws();
}, },
//点击查看详情 //点击查看详情
handlePreview(item) { handlePreview(item) {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails', name: "OtherStandardDetails",
params: { params: {
id: item.standId, id: item.standId,
pageType: 'INLAND_STAND' pageType: "INLAND_STAND"
} }
}) });
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, "_blank");
}, },
queryStandAndLaws () { queryStandAndLaws() {
this.sarProject.current = this.page this.sarProject.current = this.page;
this.sarProject.size = this.pageSize this.sarProject.size = this.pageSize;
this.$http.get('sarStandardComplianceAssessResult/standard', this.sarProject, { this.$http.get("sarStandardComplianceAssessResult/standard", this.sarProject, {
_this: this, _this: this,
loading: 'loading', loading: "loading"
}, res => { }, res => {
this.sarProjectListDatas = res.data.records this.sarProjectListDatas = res.data.records;
this.total = res.data.total this.total = res.data.total;
}, e=> {}) }, e => {
}, // 分页查询 });
resetSelect () { }, // 分页查询
this.sarProject.country = '' resetSelect() {
this.sarProject.standCode='' this.sarProject.country = "";
this.sarProject.standName = '' this.sarProject.standCode = "";
this.sarProject.standNumber='' this.sarProject.standName = "";
this.queryStandAndLaws() this.sarProject.standNumber = "";
}, // 外层清空条件查询 this.queryStandAndLaws();
handleProjectCompliance (row) { }, // 外层清空条件查询
this.standId = row.standId handleProjectCompliance(row) {
this.querySarProStateZero() this.standId = row.standId;
}, // 查看项目符合性 this.querySarProStateZero();
querySarProStateZero () { }, // 查看项目符合性
this.sarProStateTotalPage = 1 querySarProStateZero() {
var form = this.sarProStateEO this.sarProStateTotalPage = 1;
// form.standId = this.standId var form = this.sarProStateEO;
form.current = this.sarProStateTotalPage // form.standId = this.standId
form.size = this.sarProStatePageSize form.current = this.sarProStateTotalPage;
this.$http.get('sarStandardComplianceAssessResult/product', form, { form.size = this.sarProStatePageSize;
_this: this, this.$http.get("sarStandardComplianceAssessResult/product", form, {
loading: 'loading' _this: this,
}, res => { loading: "loading"
if (res.ok) { }, res => {
res.data.records.forEach((item)=>{ if (res.ok) {
for(let key in item){ // res.data.records.forEach((item)=>{
if(item[key] == null){ // for(let key in item){
item[key]='无' // if(item[key] == null){
} // item[key]='无'
} // }
}) // }
this.sarProStateListDatas = res.data.records // })
this.sarProStateTotal = res.data.total this.sarProStateListDatas = res.data.records;
} this.sarProStateTotal = res.data.total;
}) }
this.showSarProStateModal = true });
}, // 查询项目数据 this.showSarProStateModal = true;
clearSearchProState () { }, // 查询项目数据
this.sarProStateEO.productName = '' clearSearchProState() {
this.sarProStateEO.standId = '' this.sarProStateEO.productName = "";
this.sarProStateTotalPage = 1 this.sarProStateEO.standId = "";
this.querySarProStateZero() this.sarProStateTotalPage = 1;
}, // 清空条件查询 this.querySarProStateZero();
clearSearchPro () { }, // 清空条件查询
this.sarProStateEO.productName = '' clearSearchPro() {
this.sarProStateEO.standId = '' this.sarProStateEO.productName = "";
this.showSarProStateModal = false this.sarProStateEO.standId = "";
this.standId = '' this.showSarProStateModal = false;
}, // 关闭查看事件 this.standId = "";
pageProStateChange (page) { }, // 关闭查看事件
this.sarProStateTotalPage = page pageProStateChange(page) {
this.querySarProStateZero() this.sarProStateTotalPage = page;
}, this.querySarProStateZero();
pageProStateSizeChange (pageSize) { },
this.sarProStatePageSize = pageSize pageProStateSizeChange(pageSize) {
this.$store.getters.userInfo.configContent = pageSize this.sarProStatePageSize = pageSize;
this.querySarProStateZero() this.$store.getters.userInfo.configContent = pageSize;
}, this.querySarProStateZero();
},
mounted () {
this.queryStandAndLaws()
this.tableHeight = $('.regulatory-repository').height() - 159
this.sarProStateTableHeight=$('.regulatory-repository').height() -120
window.onresize = () => {
this.tableHeight = $('.regulatory-repository').height() - 159
this.sarProStateTableHeight=$('.regulatory-repository').height() - 120
} }
},
mounted() {
this.queryStandAndLaws();
this.tableHeight = $(".regulatory-repository").height() - 159;
this.sarProStateTableHeight = $(".regulatory-repository").height() - 120;
window.onresize = () => {
this.tableHeight = $(".regulatory-repository").height() - 159;
this.sarProStateTableHeight = $(".regulatory-repository").height() - 120;
};
} }
} };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.stand-involve-project-detail{ .stand-involve-project-detail {
height: 100%; height: 100%;
.laws-details-header { .laws-details-header {
background: #fff; background: #fff;
// height: 30px; // height: 30px;
@@ -431,6 +451,7 @@ export default {
display: inline-block; display: inline-block;
margin-right: 10px; margin-right: 10px;
} }
.title { .title {
display: inline-block; display: inline-block;
font-weight: bold; font-weight: bold;
@@ -440,6 +461,7 @@ export default {
text-align: center; text-align: center;
} }
} }
.contaiiner { .contaiiner {
background: #fff; background: #fff;
padding: 5px 10px; padding: 5px 10px;
@@ -447,8 +469,8 @@ export default {
} }
</style> </style>
<style lang="less"> <style lang="less">
.stand-involve-project-detail{ .stand-involve-project-detail {
.search-area .search-item .el-input--suffix .el-input__inner{ .search-area .search-item .el-input--suffix .el-input__inner {
padding-right: 15px; padding-right: 15px;
} }
} }
@@ -458,8 +458,22 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.myLoading.loadData = false this.myLoading.loadData = false
this.nonList = res.data.records
this.total = res.data.total this.total = res.data.total
this.nonList = res.data.records
this.nonList.forEach(item => {
// 责任部门转换
if (item.responsibleUnit !== null || item.responsibleUnit !== "") {
let k = (item.responsibleUnit || "").split(",");
for (let i in this.zrbmOptions) {
for (let m = 0; m < k.length; m++) {
if (this.zrbmOptions[i].value === k[m]) {
k[m] = this.zrbmOptions[i].label;
}
item.responsibleUnit = k.join(",");
}
}
}
});
}, e => { }, e => {
this.myLoading.loadData = false this.myLoading.loadData = false
}) })
@@ -665,18 +679,15 @@ export default {
}, },
}, },
mounted () { mounted () {
// 从数据库中查询各下拉框数据 // 从数据库中查询各下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this _this: this
}, res => { }, res => {
this.allSelectOptions = res.data || {}
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.getTableByPage()
this.getGzzOption()
this.setMap(this.standStateOptions)
}, e => { }, e => {
}) })
this.getTableByPage()
// 加载所有的部门 // 加载所有的部门
this.getOrgTreeSource() this.getOrgTreeSource()
} }
@@ -11,19 +11,27 @@
<div v-show="heightShow" class="transition-box"> <div v-show="heightShow" class="transition-box">
<p class="transition-box-p"> <p class="transition-box-p">
<label class="transition-box-label">标准号</label> <label class="transition-box-label">标准号</label>
<span class="transition-box-span" @click="handlePreview($route.query.item)">{{ $route.query.item.cid }}</span> <span class="transition-box-span table-jump"
@click="handlePreview(itemData)"
>
{{ this.$route.query.item.cid }}
</span>
</p> </p>
<p class="transition-box-p"> <p class="transition-box-p">
<label class="transition-box-label">标准名称</label> <label class="transition-box-label">标准名称</label>
<span class="transition-box-span">{{ $route.query.item.cname || '-' }}</span> <span class="transition-box-span table-jump"
@click="handlePreview(itemData)"
>
{{ this.$route.query.item.cname || '-' }}
</span>
</p> </p>
<p class="transition-box-p"> <p class="transition-box-p">
<label class="transition-box-label">上传时间</label> <label class="transition-box-label">上传时间</label>
<span class="transition-box-span">{{ $route.query.item.endTime || '-' }}</span> <span class="transition-box-span">{{ this.$route.query.item.startTime || '-' }}</span>
</p> </p>
<p class="transition-box-p"> <p class="transition-box-p">
<label class="transition-box-label">征求意见周期</label> <label class="transition-box-label">征求意见周期</label>
<span class="transition-box-span" v-if="$route.query.item.startTime && $route.query.item.endTime">{{ $route.query.item.startTime + ' ~ ' + $route.query.item.endTime}}</span> <span class="transition-box-span" v-if="this.$route.query.item.startTime && this.$route.query.item.endTime">{{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}}</span>
<span class="transition-box-span" v-else>-</span> <span class="transition-box-span" v-else>-</span>
</p> </p>
</div> </div>
@@ -120,6 +128,7 @@
name: 'consultationDetails', name: 'consultationDetails',
data () { data () {
return { return {
itemData: this.$route.query.item,
id: '', // 选中id id: '', // 选中id
type: '', // 选中状态 type: '', // 选中状态
spinShow: false, spinShow: false,
@@ -152,6 +161,17 @@
} }
}, },
methods: { methods: {
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
exportAll () { exportAll () {
window.open('/api/slrs/sar-public-idea-all/tuallStand?cid=' + this.$route.query.item.cid) window.open('/api/slrs/sar-public-idea-all/tuallStand?cid=' + this.$route.query.item.cid)
}, },
@@ -166,21 +186,6 @@
} }
}) })
}, },
//点击查看
handlePreview(data) {
console.log(data);
return
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: data.id,
pageType: data.standType
}
});
window.open(routeUrl.href, "_blank");
},
// 获取详情信息列表 // 获取详情信息列表
getList() { getList() {
this.spinShow = true this.spinShow = true
@@ -188,7 +193,6 @@
_this: this _this: this
}, res => { }, res => {
this.standinfoList = res.data.records this.standinfoList = res.data.records
console.log(this.standinfoList);
this.total = res.data.total this.total = res.data.total
this.spinShow = false this.spinShow = false
}, e => { }, e => {
@@ -272,10 +276,10 @@
cid: this.$route.query.item.cid, cid: this.$route.query.item.cid,
content: this.opinionContent.content, content: this.opinionContent.content,
partCode: this.opinionContent.partCode, partCode: this.opinionContent.partCode,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId || '',
userName: this.$store.getters.userInfo.account, userName: this.$store.getters.userInfo.userName || '',
deptName: this.$store.getters.userInfo.orgName, deptName: this.$store.getters.userInfo.orgName || '',
deptId: this.$store.getters.userInfo.orgId deptId: this.$store.getters.userInfo.orgId || ''
} }
if (this.type === 'edit') { if (this.type === 'edit') {
form.id = this.id form.id = this.id
@@ -324,8 +324,8 @@
</el-row> </el-row>
<el-row type="flex" justify="space-around" class="code-row-bg"> <el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="代替标准号" prop="nameShow"> <el-form-item label="代替标准号" prop="dtbjh">
<el-input v-model="standForm.nameShow" clearable placeholder="根据代替标准号查找" <el-input v-model="standForm.dtbjh" clearable placeholder="根据代替标准号查找"
@keyup.enter.native="btnSearch"></el-input> @keyup.enter.native="btnSearch"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -938,7 +938,7 @@
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommand('l',scope.row)">查看</el-dropdown-item> <el-dropdown-item :command="beforeHandleCommand('l',scope.row)">查看</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand('a',scope.row)">取消收藏</el-dropdown-item> <el-dropdown-item :command="beforeHandleCommand('a',scope.row)">取消收藏</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item> <!-- <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
@@ -962,7 +962,7 @@
<div v-else> <div v-else>
<el-button size="mini" type="primary" v-if="scope.row.collectId" @click="clickCollection(scope.row)">取消收藏</el-button> <el-button size="mini" type="primary" v-if="scope.row.collectId" @click="clickCollection(scope.row)">取消收藏</el-button>
<el-button size="mini" type="primary" v-else @click="clickCollection(scope.row)">收藏</el-button> <el-button size="mini" type="primary" v-else @click="clickCollection(scope.row)">收藏</el-button>
<el-button sizi="mini" @click="clickShare(scope.row)">分享</el-button> <!-- <el-button sizi="mini" @click="clickShare(scope.row)">分享</el-button>-->
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@@ -215,7 +215,7 @@
</div> </div>
<div class="AllBoxContent" v-html="item.textContent"></div> <div class="AllBoxContent" v-html="item.textContent"></div>
<div v-if="item.indexType !== 'items' && item.indexType !== 'msgdyinfo'" class="AllTime"> <div v-if="item.indexType !== 'items' && item.indexType !== 'msgdyinfo'" class="AllTime">
<div style="margin-right: 15px;">发布日期: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }} </div> <div style="margin-right: 15px;">发布日期11: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }} </div>
<!-- <div>{{$t('m.putTime')}}: {{ item.issue_time !== null && item.issue_time !== '' ? $dateFormat(new Date(item.put_time), 'yyyy-MM-dd') : '&#45;&#45;' }} </div>--> <!-- <div>{{$t('m.putTime')}}: {{ item.issue_time !== null && item.issue_time !== '' ? $dateFormat(new Date(item.put_time), 'yyyy-MM-dd') : '&#45;&#45;' }} </div>-->
</div> </div>
</div> </div>
@@ -2531,7 +2531,7 @@
//display: -webkit-box; //display: -webkit-box;
//-webkit-line-clamp: 3; //-webkit-line-clamp: 3;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
max-height: 60px; max-height: 78px;
} }
.AllTime { .AllTime {
margin-top: 15px; margin-top: 15px;