Merge branch 'develop' into 'test'

Develop

See merge request !98
This commit is contained in:
王夏晖
2021-08-25 01:17:53 +00:00
9 changed files with 242 additions and 129 deletions
+1
View File
@@ -407,6 +407,7 @@ export const m = {
PleaseSelectYourFieldOfExpertise: '请选择所属专业领域', PleaseSelectYourFieldOfExpertise: '请选择所属专业领域',
pleaseEnterComments: '请输入备注', pleaseEnterComments: '请输入备注',
standardNo: '标准号', standardNo: '标准号',
enterpriseStandardNumber: '企标号',
nameStandard: '标准名称', nameStandard: '标准名称',
theImportFile: '导入文件', theImportFile: '导入文件',
specialEffectiveDate: '特殊生效日期', specialEffectiveDate: '特殊生效日期',
+1
View File
@@ -236,6 +236,7 @@ export const m = {
pleaseSelectApplicableArea: 'PleaseSelectApplicableArea', pleaseSelectApplicableArea: 'PleaseSelectApplicableArea',
country: 'Country', country: 'Country',
itemNumber: 'ItemNumber', itemNumber: 'ItemNumber',
enterpriseStandardNumber: 'enterpriseStandardNumber',
entryName: 'EntryName', entryName: 'EntryName',
clauseRequirements: 'ClauseRequirements', clauseRequirements: 'ClauseRequirements',
keyPointsOfimplementation: 'KeyPointsOfimplementation', keyPointsOfimplementation: 'KeyPointsOfimplementation',
+29
View File
@@ -27,6 +27,7 @@
<script> <script>
import { mapMutations, mapActions } from 'vuex' import { mapMutations, mapActions } from 'vuex'
import axios from 'axios'
export default { export default {
name: 'Login', name: 'Login',
data () { data () {
@@ -292,6 +293,34 @@ export default {
computed: { computed: {
}, },
mounted () { mounted () {
let url = window.location.search
if (url) {
url = url.substr(1);
url = url.split('&');
let info = [];
let obj = {};
for (let i = 0,len = url.length; i < len; i++) {
info = url[i].split('=')
obj[info[0]] = decodeURI(info[1]);
url[i] = obj;
}
var code = url[0].code
axios.post('http://testsso1.foton.com.cn/oauth2.0/accessTokenByJson',
{
client_id: 'app_slrs',
client_secret: 'wj5iDTqyguQCxnsoo5VU21BoRSZqevhI',
grant_type: 'authorization_code',
redirect_uri: 'http://62.234.136.153:8038',
code: code
}
).then(function (response) {
console.log(response);
}).catch(function (error) {
console.log(error);
});
} else {
}
if (this.$store.state.laws_urm !== '') { if (this.$store.state.laws_urm !== '') {
this.isRemember = true this.isRemember = true
} }
@@ -552,6 +552,10 @@ export default {
if (res.success) { if (res.success) {
this.$message.success('流程发起成功') this.$message.success('流程发起成功')
this.$router.push('/processCenter') this.$router.push('/processCenter')
this.isSubmit = false
} else {
this.$message.warning('流程启动失败')
this.isSubmit = false
} }
}) })
} else { } else {
@@ -221,7 +221,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: "bzzqyjStep3", name: "bzzqyjStep3",
@@ -324,7 +324,22 @@
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,
data: this.data,
commentText: this.commentText,
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() { handleSubmit() {
if (this.data.length < 1) { if (this.data.length < 1) {
this.$message.warning('请输入征求意见') this.$message.warning('请输入征求意见')
@@ -378,11 +393,11 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.cid = data.cid this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname this.form.cname = data.cname || data.form.cname
this.json = data this.json = data
this.data = data.info || [] this.data = data.info || data.data || []
}).catch(e => { }).catch(e => {
}) })
}) })
@@ -301,11 +301,11 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.cid = data.cid this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname this.form.cname = data.cname || data.form.cname
this.json = data this.json = data
this.data = data.info this.data = data.info || data.data
}).catch(e => { }).catch(e => {
}) })
}) })
@@ -352,9 +352,9 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.cid = data.cid this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname this.form.cname = data.cname || data.form.cname
this.oldData = JSON.parse(JSON.stringify(data.summaryList)) this.oldData = JSON.parse(JSON.stringify(data.summaryList))
data.summaryList.forEach( item => { data.summaryList.forEach( item => {
if (item.state) { if (item.state) {
+172 -109
View File
@@ -599,178 +599,232 @@
<el-form :model="standForm" ref="standForm" label-position="right" label-width="150px"> <el-form :model="standForm" ref="standForm" label-position="right" label-width="150px">
<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="standSort">
<el-input v-model="standForm.nameShow" clearable placeholder="根据企标类别查找" <el-select v-model="standForm.standSort" filterable>
@keyup.enter.native="btnSearch"></el-input> <el-option
v-for="item in standSortOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="企标编号" prop="standNumber"> <el-form-item label="企标编号" prop="standCode">
<el-input v-model="standForm.standNumber" clearable <el-input v-model="standForm.standCode" clearable
placeholder="根据企标编号查找" placeholder="请输入企标编号"
@keyup.enter.native="btnSearch"></el-input> @keyup.enter.native="btnSearch"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</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="standYear">
<el-input v-model="standForm.nameShow" clearable placeholder="根据标准年份查找" <el-input v-model.number="standForm.standYear" clearable placeholder="请输入标准年份"></el-input>
@keyup.enter.native="btnSearch"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="企标名称" prop="standNumber"> <el-form-item label="企标名称" prop="standName">
<el-input v-model="standForm.standNumber" clearable <el-input v-model="standForm.standName" clearable
placeholder="根据企标名称查找" placeholder="请输入企标名称"></el-input>
@keyup.enter.native="btnSearch"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</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="standEnName">
<el-input v-model="standForm.nameShow" clearable placeholder="根据企标英文名称查找" <el-input v-model="standForm.standEnName" clearable placeholder="请输入企标英文名称"></el-input>
@keyup.enter.native="btnSearch"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="文本状态" prop="standNumber"> <el-form-item label="文本状态" prop="textStatusBuss">
<el-input v-model="standForm.standNumber" clearable <el-select v-model="standForm.textStatusBuss"
placeholder="根据文本状态查找" placeholder="请选择文本状态"
@keyup.enter.native="btnSearch"></el-input> clearable>
<el-option
v-for="opt in textStatusOptions"
:key="opt.value"
:value="opt.value === undefined ? '' :opt.value" :label="opt.label"
>
{{ opt.label }}
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</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="发布日期" class="add-form-item form-item-disabled">
<el-input v-model="standForm.nameShow" clearable placeholder="根据废止日期查找" <el-datePicker v-model="standForm.issueTime"
@keyup.enter.native="btnSearch"></el-input> :editable="false"
placeholder="请选择发布日期"
value-format="yyyy-MM-dd"
clearable></el-datePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="企标实施日期" prop="standNumber"> <el-form-item label="实施日期" title="标准实施日期" class="add-form-item form-item-disabled">
<el-input v-model="standForm.standNumber" clearable <el-datePicker v-model="standForm.putTime"
placeholder="根据企标实施日期查找" :editable="false"
@keyup.enter.native="btnSearch"></el-input> placeholder="请选择实施日期"
value-format="yyyy-MM-dd"
clearable
></el-datePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</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="FZRQBUSS">
<el-input v-model="standForm.nameShow" clearable placeholder="根据企标发布日期查找" <el-datePicker v-model="standForm.FZRQBUSS"
@keyup.enter.native="btnSearch"></el-input> :editable="false"
placeholder="请选择废止日期"
value-format="yyyy-MM-dd"
clearable
></el-datePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="复审日期" prop="standNumber"> <el-form-item label="复审日期" prop="FSRQBUSS">
<el-input v-model="standForm.standNumber" clearable <el-datePicker v-model="standForm.FSRQBUSS"
placeholder="根据复审日期查找" :editable="false"
@keyup.enter.native="btnSearch"></el-input> placeholder="请选择复审日期"
value-format="yyyy-MM-dd"
clearable
></el-datePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</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="QCDW">
<el-input v-model="standForm.nameShow" clearable placeholder="根据起草部门查找" <el-select v-model="standForm.QCDW" filterable clearable>
@keyup.enter.native="btnSearch"></el-input> <el-option
v-for="item in qcdwOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="起草人" prop="standNumber"> <el-form-item label="起草人" prop="standNumber">
<el-input v-model="standForm.standNumber" clearable <el-select v-model="standForm.QCRBUSS" filterable clearable>
placeholder="根据起草人查找" <el-option
@keyup.enter.native="btnSearch"></el-input> v-for="item in qcrOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</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="nameShow">-->
<el-input v-model="standForm.nameShow" clearable placeholder="根据文件上传人员查找" <!-- <el-input v-model="standForm.nameShow" clearable></el-input>-->
@keyup.enter.native="btnSearch"></el-input> <!-- </el-form-item>-->
</el-form-item> <!-- </el-col>-->
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="适用车型" prop="standNumber"> <el-form-item label="适用车型" prop="standNumber">
<el-input v-model="standForm.standNumber" clearable <el-select v-model="standForm.SYCXCLASS" filterable clearable>
placeholder="根据适用车型查找" <el-option
@keyup.enter.native="btnSearch"></el-input> v-for="item in applyArcticOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="能源类型" prop="NYLXCLASS">
<el-select v-model="standForm.NYLXCLASS" filterable clearable>
<el-option
v-for="item in categoryOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="适用产品线" prop="SYCPXCLASS">
<el-select v-model="standForm.SYCPXCLASS" filterable clearable>
<el-option
v-for="item in sycpxOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="体系类别" prop="TXLBBUSS">
<el-input v-model="standForm.TXLBBUSS" clearable placeholder="请输入体系类别"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="关联模块-VPPS编码" prop="VPPSBMBUSS">
<el-input v-model="standForm.VPPSBMBUSS" clearable
placeholder="请输入关联模块-VPPS编码查找"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="关联模块-中文名称" prop="VPPSCNBUSS">
<el-input v-model="standForm.VPPSCNBUSS" clearable
placeholder="请输入关联模块-中文名称查找"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</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="DTQBBHBUSS">
<el-input v-model="standForm.nameShow" clearable placeholder="根据能源类型查找" <el-input v-model="standForm.DTQBBHBUSS" clearable placeholder="请输入代替企标编号查找"></el-input>
@keyup.enter.native="btnSearch"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="适用产品线" prop="standNumber"> <el-form-item label="被代替企标编号" prop="BDTQBBHBUSS">
<el-input v-model="standForm.standNumber" clearable <el-input v-model="standForm.BDTQBBHBUSS" clearable placeholder="请输入被代替企标编号查找"></el-input>
placeholder="根据适用产品线查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</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-form-item label="体系类别" prop="nameShow"> <!-- <el-col :span="12">-->
<el-input v-model="standForm.nameShow" clearable placeholder="根据体系类别查找" <!-- <el-form-item label="宣贯记录" prop="standNumber">-->
@keyup.enter.native="btnSearch"></el-input> <!-- <el-input v-model="standForm.standNumber" clearable-->
</el-form-item> <!-- placeholder="根据宣贯记录查找"-->
</el-col> <!-- @keyup.enter.native="btnSearch"></el-input>-->
<el-col :span="12"> <!-- </el-form-item>-->
<el-form-item label="关联模块-VPPS编码" prop="standNumber"> <!-- </el-col>-->
<el-input v-model="standForm.standNumber" clearable <!-- </el-row>-->
placeholder="根据关联模块-VPPS编码查找" <!-- <el-row type="flex" justify="space-around" class="code-row-bg">-->
@keyup.enter.native="btnSearch"></el-input> <!-- <el-col :span="12">-->
</el-form-item> <!-- <el-form-item label="上传时间" prop="nameShow">-->
</el-col> <!-- <el-input v-model="standForm.nameShow" clearable placeholder="根据上传时间查找"-->
</el-row> <!-- @keyup.enter.native="btnSearch"></el-input>-->
<el-row type="flex" justify="space-around" class="code-row-bg"> <!-- </el-form-item>-->
<el-col :span="12"> <!-- </el-col>-->
<el-form-item label="代替企标编号" prop="nameShow"> <!-- <el-col :span="12">-->
<el-input v-model="standForm.nameShow" clearable placeholder="根据代替企标编号查找" <!-- </el-col>-->
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="关联模块-中文名称" prop="standNumber">
<el-input v-model="standForm.standNumber" clearable
placeholder="根据关联模块-中文名称查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="被代替企标编号" prop="nameShow">
<el-input v-model="standForm.nameShow" clearable placeholder="根据被代替企标编号查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="宣贯记录" prop="standNumber">
<el-input v-model="standForm.standNumber" clearable
placeholder="根据宣贯记录查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="上传时间" prop="nameShow">
<el-input v-model="standForm.nameShow" clearable placeholder="根据上传时间查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
</el-col>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
@@ -1259,6 +1313,11 @@ export default {
txlbOptions: [], // 体系类别 txlbOptions: [], // 体系类别
// 标准类别 // 标准类别
standSortOptions: [], standSortOptions: [],
textStatusOptions: [],
qcdwOptions:[],//起草单位下拉框
qcrOptions:[],//起草人下拉框
nylxOptions:[],//能源类型下拉框
syrzOptions:[],//适用认证下拉框
// 我司署名人 // 我司署名人
wssmrOptions: [], wssmrOptions: [],
// 体系类别 // 体系类别
@@ -2377,6 +2436,10 @@ export default {
this.bussBigClassOptions = res.data.BUSSBIGCLASS; this.bussBigClassOptions = res.data.BUSSBIGCLASS;
this.bussStandClassOptions = res.data.BUSSSTANDCLASS; this.bussStandClassOptions = res.data.BUSSSTANDCLASS;
this.regionOptions = res.data.REGION; // 区域 this.regionOptions = res.data.REGION; // 区域
this.textStatusOptions = res.data.TEXTSTATUSBUSS // 文本状态
this.qcdwOptions = res.data.QCDW // 起草单位
this.qcrOptions = res.data.QCRBUSS // 起草人
this.syrzOptions = res.data.SYRZCLASS // 适用认证
}, e => { }, e => {
}); });
// 根据资源类型过滤表头 // 根据资源类型过滤表头
@@ -877,9 +877,9 @@
} else if (this.selectIndex === 'laws' && seniortype[i] === 'CYSD') { } else if (this.selectIndex === 'laws' && seniortype[i] === 'CYSD') {
renameType = 'WSSFCY' renameType = 'WSSFCY'
} else if (this.selectIndex === 'enterprise' && seniortype[i] === 'ORGLIST'){ } else if (this.selectIndex === 'enterprise' && seniortype[i] === 'ORGLIST'){
renameType = 'ZQCBM' renameType = 'QCDW'
} else if (this.selectIndex === 'enterprise' && seniortype[i] === 'BUSSSTATE'){ } else if (this.selectIndex === 'enterprise' && seniortype[i] === 'BUSSSTATE'){
renameType = 'statecode' renameType = 'textStatusBuss'
} }
else { else {
renameType = seniortype[i] renameType = seniortype[i]
@@ -1136,11 +1136,11 @@
// 企业标准 // 企业标准
case 'enterprise': case 'enterprise':
//标准状态 //标准状态
filterOptions.BUSSSTATE = originOptions.BUSSSTATE filterOptions.BUSSSTATE = originOptions.TEXTSTATUSBUSS
filterOptions.BUSSSTATE.title = '标准状态' filterOptions.BUSSSTATE.title = '文本状态'
filterOptions.BUSSSTATE.index = 1 filterOptions.BUSSSTATE.index = 1
//主起草部门 //主起草部门
filterOptions.ORGLIST = originOptions.ORGLIST filterOptions.ORGLIST = originOptions.QCDW
filterOptions.ORGLIST.title = '主起草部门' filterOptions.ORGLIST.title = '主起草部门'
filterOptions.ORGLIST.index = 2 filterOptions.ORGLIST.index = 2
break break
@@ -1264,8 +1264,8 @@
} }
if(condition.selectIndex === 'enterprise'){ if(condition.selectIndex === 'enterprise'){
condition.selectIndex='bussstand' condition.selectIndex='bussstand'
condition.standState = condition.BUSSSTATE condition.textStatusBuss = condition.BUSSSTATE
condition.ZQCBM = condition.ORGLIST condition.QCDW = condition.ORGLIST
} }
// 查询为国内外政策时,改变查询参数名 // 查询为国内外政策时,改变查询参数名
if (condition.selectIndex === 'laws') { if (condition.selectIndex === 'laws') {