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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
396572590@qq.com
2022-06-24 18:16:29 +08:00
parent deae77876d c24c6cc74f
commit 1c1a7b23c4
14 changed files with 139 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/styles/newStyle.less
+2
View File
@@ -315,6 +315,8 @@ tr.el-table__row{
padding: 13px 10px;
height: 49px;
border: none;
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
font-weight: lighter;
}
}
.el-input-number{
src/pages/personal/pages/my-questions/index.vue
+18 -6
View File
@@ -1321,6 +1321,7 @@ export default {
answerList: [],
standList: [],
questionsList: [],
standMap: new Map()
}
},
mounted(){
@@ -1352,6 +1353,12 @@ export default {
}
},
methods:{
refreshStandMap(){
this.standMap = new Map()
this.standList.forEach(item=>{
this.standMap.set(item.standardId,item)
})
},
checkedRole(data){
if(data[0].id){
let asdId = sessionStorage.getItem('queId')
@@ -1666,15 +1673,16 @@ export default {
queBtn(){
this.fileList = []
// 清空提问
this.standType = "INLAND"
const selectedStand = this.activestand == '0' ? this.standList[0] : this.standMap.get(this.activestand)
this.standType = selectedStand.classification
this.questionForm = {
pubQue : '',//公共问题
classification: 'INLAND', //标准类型
pubQue : selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题
classification: selectedStand.classification, //标准类型
problemDescription: '', //问题
questioner: this.$store.getters.userInfo.userId, //提问人
standardEncdoing: '', //标准编号
standardName: '', //标准名称
standardId:'', //标准id
standardEncdoing: selectedStand.standardEncdoing, //标准编号
standardName: selectedStand.standardName, //标准名称
standardId: selectedStand.standardId, //标准id
fileList: '',
}
this.dialogVisible = true
@@ -1720,6 +1728,7 @@ export default {
_this: this
}, res => {
this.standList = res.data
this.refreshStandMap()
})
},
//问题查询
@@ -1742,6 +1751,7 @@ export default {
_this: this,
}, res => {
this.standList = res.data
this.refreshStandMap()
this.questionClick()
})
},
@@ -1754,6 +1764,7 @@ export default {
_this: this
}, res => {
this.standList = res.data
this.refreshStandMap()
this.questionClick()
}, e =>{
@@ -1765,6 +1776,7 @@ export default {
_this: this
}, res =>{
this.standList = res.data
this.refreshStandMap()
this.questionClick()
}, e => {
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+2 -2
View File
@@ -413,7 +413,7 @@
<div style="display: flex; height: 100%;">
<div style="width: 50%; overflow: auto; border-right: 1px solid #ccc;" v-if="form.itemsNum1 && PLmodalType === 1 ">
<div v-if="BDtext" style="width: 100%; height: 100%;display: flex;">
<div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
<div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; height:auto;max-height:none"></div>
<div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
</div>
<div v-else style="height: 100%;">
@@ -426,7 +426,7 @@
</div>
</div>
<div style="width: 50%; overflow: auto; border-right: 1px solid #ccc;" v-if="!form.itemsNum1 && PLmodalType === 1 ">
<div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
<div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; height:auto;max-height:none"></div>
<div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
</div>
<div style="width: 80%">
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+5 -1
View File
@@ -122,6 +122,8 @@
<el-tooltip :disabled="!form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
type="textarea"
autosize
placeholder="请输入标准中文名称"
clearable
></el-input>
@@ -132,6 +134,8 @@
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
v-model="form.standEnName"
type="textarea"
autosize
placeholder="请输入标准英文名称"
clearable
></el-input>
@@ -3540,7 +3544,7 @@ export default {
}
.prc-content-border {
/deep/ .el-input__inner {
/deep/ .el-textarea__inner,.el-input__inner {
padding-left: 30px;
}
}
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+18 -12
View File
@@ -115,6 +115,8 @@
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
type="textarea"
autosize
disabled
placeholder="请输入标准中文名称"
clearable
@@ -124,6 +126,8 @@
v-else
disabled
v-model="form.standName"
type="textarea"
autosize
placeholder="请输入标准中文名称"
clearable
></el-input>
@@ -134,6 +138,8 @@
<el-input
disabled
v-model="form.standEnName"
type="textarea"
autosize
placeholder="请输入标准英文名称"
clearable
></el-input>
@@ -1288,21 +1294,21 @@ export default {
if (this.form.zrgcs.length === 0) {
this.form.zrgcs = "";
}
let qcdwName = []
if(this.form.qcdw && this.form.qcdw.length > 0){
this.form.qcdw.map(item => {
this.qcdwOptions.forEach(items => {
if(item === items.value){
qcdwName.push(items.label)
}
})
})
}
// let qcdwName = []
// if(this.form.qcdw && this.form.qcdw.length > 0){
// this.form.qcdw.map(item => {
// this.qcdwOptions.forEach(items => {
// if(item === items.value){
// qcdwName.push(items.label)
// }
// })
// })
// }
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.menuIds = this.form.treeListId;
this.form.BBFDTBZ = this.form.bfbdtbzh
this.form.qcdw = qcdwName
this.form.qcdw = qcdwName.splice(',')
// this.form.qcdw = qcdwName
// this.form.qcdw = qcdwName.splice(',')
const json = JSON.stringify(this.form);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+4
View File
@@ -126,6 +126,8 @@
v-else
disabled
v-model="form.standName"
type="textarea"
autosize
placeholder="请输入标准中文名称"
clearable
></el-input>
@@ -136,6 +138,8 @@
<el-input
disabled
v-model="form.standEnName"
type="textarea"
autosize
placeholder="请输入标准英文名称"
clearable
></el-input>
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+4
View File
@@ -127,6 +127,8 @@
<el-tooltip :disabled="!form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
type="textarea"
autosize
placeholder="请输入标准中文名称"
clearable
></el-input>
@@ -137,6 +139,8 @@
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
v-model="form.standEnName"
type="textarea"
autosize
placeholder="请输入标准英文名称"
clearable
></el-input>
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+6
View File
@@ -115,6 +115,8 @@
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
type="textarea"
autosize
disabled
placeholder="请输入标准中文名称"
clearable
@@ -124,6 +126,8 @@
v-else
disabled
v-model="form.standName"
type="textarea"
autosize
placeholder="请输入标准中文名称"
clearable
></el-input>
@@ -134,6 +138,8 @@
<el-input
disabled
v-model="form.standEnName"
type="textarea"
autosize
placeholder="请输入标准英文名称"
clearable
></el-input>
src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
+15
View File
@@ -38,6 +38,16 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
:picker-options="pickerOptions"
v-model="qdform.endTime"
type="date"
placeholder="请选择截止日期"
disabled
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
@@ -635,6 +645,11 @@ export default {
},
data() {
return {
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
},
},
lawInfoTableLoading: true,
lawInfoTable:[],
textState: [],
src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+15
View File
@@ -38,6 +38,16 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
:picker-options="pickerOptions"
v-model="qdform.endTime"
type="date"
placeholder="请选择截止日期"
disabled
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
@@ -659,6 +669,11 @@ export default {
},
data() {
return {
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
},
},
lawInfoTableLoading: true,
lawInfoTable:[],
textState: [],
src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
+15
View File
@@ -38,6 +38,16 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
:picker-options="pickerOptions"
v-model="qdform.endTime"
type="date"
placeholder="请选择截止日期"
disabled
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
@@ -659,6 +669,11 @@ export default {
},
data() {
return {
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
},
},
lawInfoTableLoading: true,
lawInfoTable:[],
textState: [],
src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
+15
View File
@@ -38,6 +38,16 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
:picker-options="pickerOptions"
v-model="qdform.endTime"
type="date"
placeholder="请选择截止日期"
disabled
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
@@ -650,6 +660,11 @@ export default {
},
data() {
return {
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
},
},
lawInfoTableLoading: true,
lawInfoTable:[],
textState: [],
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+2 -2
View File
@@ -39,9 +39,9 @@
<el-row style="margin-top: 10px">
<!--<el-col :span="5">产品线: <span class="valueColor">{{ localProEO.productLine }} </span></el-col>-->
<el-col :span="6">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
<el-col :span="6"> 项目计划开始时间: <span
<el-col :span="6"> 项目计划开始日期: <span
class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col>
<el-col :span="6">项目计划完成时间: <span
<el-col :span="6">项目计划完成日期: <span
class="valueColor">{{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} </span></el-col>
</el-row>
</div>
src/pages/regulatoryRepository/standQA/index.vue
+18 -6
View File
@@ -777,6 +777,7 @@ export default {
standList: [],
standIdList: [],
questionsList: [],
standMap: new Map()
}
},
mounted(){
@@ -819,6 +820,12 @@ export default {
});
},
methods:{
refreshStandMap(){
this.standMap = new Map()
this.standList.forEach(item=>{
this.standMap.set(item.standardId,item)
})
},
changeInput:debounce(function(val){
if(val.length){
this.$http.get('lawss/AskQuestions/resemblance',{
@@ -1040,15 +1047,16 @@ export default {
//提问按钮
queBtn(){
this.fileList = []
this.standType = "INLAND"
const selectedStand = this.activestand == '0' ? this.standList[0] : this.standMap.get(this.activestand)
this.standType = selectedStand.classification
this.questionForm = {
pubQue : '',//公共问题
classification: 'INLAND', //标准类型
pubQue : selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题
classification: selectedStand.classification, //标准类型
problemDescription: '', //问题
questioner: this.$store.getters.userInfo.userId, //提问人
standardEncdoing: '', //标准编号
standardName: '', //标准名称
standardId:'', //标准id
standardEncdoing: selectedStand.standardEncdoing, //标准编号
standardName: selectedStand.standardName, //标准名称
standardId: selectedStand.standardId, //标准id
fileList: '',
}
this.dialogVisible = true
@@ -1076,6 +1084,7 @@ export default {
_this: this
}, res => {
this.standList = res.data
this.refreshStandMap()
})
},
//问题查询
@@ -1107,6 +1116,7 @@ export default {
_this: this
}, res =>{
this.standList = res.data
this.refreshStandMap()
if(this.$route.query.queId){
this.activestand = this.standList[0].standardId
this.queSearch()
@@ -1129,6 +1139,7 @@ export default {
})
if(queNumber === 0){
this.standList = res.data
this.refreshStandMap()
}
}, e => {
@@ -1235,6 +1246,7 @@ export default {
this.standSearch2()
break
}
this.queSearch()
}, e => {
})