Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
hanshaozhuang
@@ -462,7 +462,7 @@ html[dir='rtl'] #outerContainer.sidebarOpen > #sidebarContainer {
|
||||
html[dir='ltr'] #outerContainer.sidebarOpen > #mainContainer {
|
||||
-webkit-transition-property: left;
|
||||
transition-property: left;
|
||||
left: 200px;
|
||||
/*left: 200px;*/
|
||||
}
|
||||
html[dir='rtl'] #outerContainer.sidebarOpen > #mainContainer {
|
||||
-webkit-transition-property: right;
|
||||
|
||||
@@ -232,7 +232,7 @@ See https://github.com/adobe-type-tools/cmap-resources
|
||||
<!-- </div>-->
|
||||
<div id="outerContainer">
|
||||
|
||||
<div id="sidebarContainer">
|
||||
<div id="sidebarContainer" style="display: none">
|
||||
<div id="toolbarSidebar">
|
||||
<div class="splitToolbarButton toggled">
|
||||
<button id="viewThumbnail" class="toolbarButton toggled" title="Show Thumbnails" tabindex="2" data-l10n-id="thumbs">
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
<div v-else class="title">{{item.standSort + '  ' + item.standNumber }}</div>
|
||||
</div>
|
||||
<div class="standContent">
|
||||
<div class="standState">{{item.standName}}</div>
|
||||
<div class="standState">{{item.standName && item.standName !== '' ? item.standName : item.standEnName}}</div>
|
||||
<!-- <div class="standSubTime">标准性质:-->
|
||||
<!-- <span v-if="natureMap[item.standNature] === '强制性' "-->
|
||||
<!-- style="color: #F56C6C; padding-left: 5px;">-->
|
||||
|
||||
@@ -373,20 +373,23 @@
|
||||
this.foldFormFlag = !this.foldFormFlag
|
||||
},
|
||||
getData () {
|
||||
const queryId = this.$route.query.bpnId
|
||||
if(queryId !== null && queryId !== undefined && queryId !==''){
|
||||
queryTaskFirst({
|
||||
bpnId: this.$route.query.bpnId
|
||||
bpnId: this.$route.query.bpnId
|
||||
}).then(res => {
|
||||
this.bpnId = this.$route.query.bpnId
|
||||
let mes = JSON.parse(res.mes)
|
||||
if (mes.form.date) {
|
||||
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
|
||||
} else {
|
||||
mes.form.date = ''
|
||||
}
|
||||
this.form = mes.form
|
||||
this.roleForm = mes.roleForm
|
||||
this.commentText1 = mes.commentText1 || ''
|
||||
this.bpnId = this.$route.query.bpnId
|
||||
let mes = JSON.parse(res.mes)
|
||||
if (mes.form.date) {
|
||||
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
|
||||
} else {
|
||||
mes.form.date = ''
|
||||
}
|
||||
this.form = mes.form
|
||||
this.roleForm = mes.roleForm
|
||||
this.commentText1 = mes.commentText1 || ''
|
||||
})
|
||||
}
|
||||
},
|
||||
checkedRole2 (data) {
|
||||
var idList = ''
|
||||
@@ -597,9 +600,11 @@
|
||||
let taskId = {
|
||||
id: this.$route.query.bpnId
|
||||
}
|
||||
taskDel(taskId).then(res=>{
|
||||
if(taskId !=='' && taskId !== undefined && taskId !== null){
|
||||
taskDel(taskId).then(res=>{
|
||||
return res
|
||||
})
|
||||
})
|
||||
}
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
this.isSubmit = false
|
||||
|
||||
@@ -589,9 +589,11 @@ export default {
|
||||
let taskId = {
|
||||
id: this.$route.query.bpnId
|
||||
}
|
||||
taskDel(taskId).then(res=>{
|
||||
return res
|
||||
})
|
||||
if(taskId !== '' && taskId !== undefined && taskId !== null){
|
||||
taskDel(taskId).then(res=>{
|
||||
return res
|
||||
})
|
||||
}
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
this.isSubmit = false
|
||||
|
||||
@@ -862,22 +862,25 @@
|
||||
this.itermsConditionsTitle = row.replace(/''/g, '\'')
|
||||
},
|
||||
getData () {
|
||||
const queryId =this.$route.query.bpnId
|
||||
if(queryId !== null && queryId !== undefined && queryId !==''){
|
||||
queryTaskFirst({
|
||||
bpnId: this.$route.query.bpnId
|
||||
bpnId: this.$route.query.bpnId
|
||||
}).then(res => {
|
||||
let mes = JSON.parse(res.mes)
|
||||
this.bpnId = this.$route.query.bpnId
|
||||
if (mes.form.date) {
|
||||
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
|
||||
} else {
|
||||
mes.form.date = ''
|
||||
}
|
||||
this.form = mes.form
|
||||
this.roleForm = mes.roleForm
|
||||
this.commentText1 = mes.commentText1 || ''
|
||||
this.itemList = mes.itemList
|
||||
this.sarType = mes.sarType
|
||||
let mes = JSON.parse(res.mes)
|
||||
this.bpnId = this.$route.query.bpnId
|
||||
if (mes.form.date) {
|
||||
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
|
||||
} else {
|
||||
mes.form.date = ''
|
||||
}
|
||||
this.form = mes.form
|
||||
this.roleForm = mes.roleForm
|
||||
this.commentText1 = mes.commentText1 || ''
|
||||
this.itemList = mes.itemList
|
||||
this.sarType = mes.sarType
|
||||
})
|
||||
}
|
||||
},
|
||||
setMap(data){
|
||||
data.forEach(item => {
|
||||
@@ -1136,9 +1139,11 @@
|
||||
let taskId = {
|
||||
id: this.$route.query.bpnId
|
||||
}
|
||||
if(taskId !== '' && taskId !== undefined && taskId !== null){
|
||||
taskDel(taskId).then(res=>{
|
||||
return res
|
||||
return res
|
||||
})
|
||||
}
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
})
|
||||
|
||||
@@ -661,30 +661,33 @@ export default {
|
||||
window.open(routeUrl.href, '_blank')
|
||||
},
|
||||
getData() {
|
||||
queryTaskFirst({
|
||||
bpnId: this.$route.query.bpnId
|
||||
}).then(res => {
|
||||
let mes = JSON.parse(res.mes)
|
||||
console.log(mes);
|
||||
this.bpnId = this.$route.query.bpnId
|
||||
if (mes.form.endTime) {
|
||||
mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD'))
|
||||
} else {
|
||||
mes.form.endTime = ''
|
||||
}
|
||||
this.addFjList = mes.filesId || mes.form.filesId || ''
|
||||
this.form.fjListName = mes.filesName
|
||||
this.form = mes.form
|
||||
this.roleForm = mes.roleForm
|
||||
this.commentText1 = mes.commentText1 || ''
|
||||
if (this.form.standId) {
|
||||
this.$http.get('SarStandItems/sar-stand-items/getFileTypeHG', {
|
||||
standId: this.form.standId
|
||||
}, {}, res => {
|
||||
this.textTypeList = res.data
|
||||
})
|
||||
}
|
||||
})
|
||||
const queryId = this.$route.query.bpnId
|
||||
if(queryId !== null && queryId !== undefined && queryId !==''){
|
||||
queryTaskFirst({
|
||||
bpnId: this.$route.query.bpnId
|
||||
}).then(res => {
|
||||
let mes = JSON.parse(res.mes)
|
||||
console.log(mes);
|
||||
this.bpnId = this.$route.query.bpnId
|
||||
if (mes.form.endTime) {
|
||||
mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD'))
|
||||
} else {
|
||||
mes.form.endTime = ''
|
||||
}
|
||||
this.addFjList = mes.filesId || mes.form.filesId || ''
|
||||
this.form.fjListName = mes.filesName
|
||||
this.form = mes.form
|
||||
this.roleForm = mes.roleForm
|
||||
this.commentText1 = mes.commentText1 || ''
|
||||
if (this.form.standId) {
|
||||
this.$http.get('SarStandItems/sar-stand-items/getFileTypeHG', {
|
||||
standId: this.form.standId
|
||||
}, {}, res => {
|
||||
this.textTypeList = res.data
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
addZqyjList() {
|
||||
this.title = '国内外标准库'
|
||||
@@ -860,9 +863,11 @@ export default {
|
||||
let taskId = {
|
||||
id: this.$route.query.bpnId
|
||||
}
|
||||
taskDel(taskId).then(res=>{
|
||||
return res
|
||||
})
|
||||
if(taskId !== '' && taskId !== undefined && taskId !== null){
|
||||
taskDel(taskId).then(res=>{
|
||||
return res
|
||||
})
|
||||
}
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
})
|
||||
|
||||
@@ -337,7 +337,10 @@
|
||||
<div class="prc-content-border" v-show="verifySarStandard">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="代替企标编号"
|
||||
prop="DTQBBHBUSS"
|
||||
:rules="form.reviseStatus === '1' ? rules.DTQBBHBUSSNot : rules.DTQBBHBUSS"
|
||||
class="add-form-item form-item-disabled">
|
||||
<el-input :disabled="disabledXX"
|
||||
v-model="form.DTQBBHBUSS"
|
||||
placeholder="请输入代替标准号"
|
||||
@@ -1543,6 +1546,7 @@
|
||||
DTQBBHBUSS: [
|
||||
{ required: true, message: '请选择代替企标编号', trigger: 'change' }
|
||||
],
|
||||
DTQBBHBUSSNot: [],
|
||||
},
|
||||
zrUserIds: [], // 选择多个会签责任人
|
||||
userType:'', // 选择用户ID判断
|
||||
|
||||
Reference in New Issue
Block a user