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

Merge branch 'develop' into 'FOTON'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!290
This commit is contained in:
王夏晖
2022-01-10 15:42:00 +08:00
parent 3fd11b0838 e3f233d6f0
commit ff2f1b4332
15 changed files with 495 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+5 -5
View File
@@ -266,9 +266,9 @@
<p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{
sarStandardsInfoEO.issueTime || '-'
}}</span></p>
<p class="half" v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准性质</label><span>{{
standMap[sarStandardsInfoEO.standNature] || '-'
}}</span></p>
<!-- <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准性质</label><span>{{-->
<!-- standMap[sarStandardsInfoEO.standNature] || '-'-->
<!-- }}</span></p>-->
<p class="half" v-if="saveStandType === 'INLAND_STAND'"><label
style=" margin-right: 150px;">标准体系</label><span>{{
sarStandardsInfoEO.standSystem || '-'
@@ -374,7 +374,7 @@
v-else-if="child.attrType === 'DATE_PICKER'"
class="modular-content-p-val"
>
{{ child.value ? child.value.substring(0, 10) : '-' }}
{{ child.value ? child.value : '-' }}
</span>
<span
v-else-if="child.attrType !== 'FILE'"
@@ -3124,7 +3124,6 @@ export default {
},
// 分解单----查看标准条款相关
selectSarStandItems(id, flag) {
this.page7 = 1
this.standItemSearch.standId = this.sarStandardsInfoEO.id
this.standItemSearch.fileType = this.fileType
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
@@ -3675,6 +3674,7 @@ export default {
// return
// }
displayLocation.forEach((location) => {
console.log(location);
location.isShowImp = '0'
if (dynamicFormField) {
let value = dynamicFormField[field.attrField]
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+2 -2
View File
@@ -380,7 +380,7 @@
name="file"
drag
:file-list="rh_pageData.infoSources"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF, .pptx"
:http-request="httpRequest"
:before-upload="handleBeforeUpload"
:before-remove="handleBeforeRemove"
@@ -603,7 +603,7 @@ export default {
// 判断上传文件格式
if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip'
|| fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF'
|| fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.PPT'
|| fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.pptx'
|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.bmp') {
return true
} else {
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+3 -1
View File
@@ -142,7 +142,7 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="add-form-item" label="身份:">
<el-form-item class="add-form-item" label="职务/名称:">
<el-input
style="width: 100%"
placeholder="请填写身份"
@@ -181,6 +181,8 @@
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="add-form-item" label="资料:">
<el-upload
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
+14 -4
View File
@@ -81,7 +81,7 @@
</a>
<el-button
size="mini"
@click="previews(item.id)"
@click="previews(item.id, 'down')"
icon="el-icon-download"
style="height: 25px; margin-left: 5px;"
></el-button>
@@ -120,14 +120,20 @@
<el-table-column prop="fillPeople" align="center" label="参与人"/>
<el-table-column prop="fillUnit" align="center" label="单位"/>
<el-table-column prop="fillDept" align="center" label="部门"/>
<el-table-column prop="fillPost" align="center" label="身份"/>
<el-table-column prop="fillPost" align="center" label="职务/名称"/>
<el-table-column prop="fillTel" align="center" label="电话"/>
<el-table-column prop="fillMail" align="center" label="邮箱"/>
<el-table-column prop="fillFile" align="center" label="资料">
<template slot-scope="scope">
<span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
<span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
<span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id, 'onLine')">
{{ item.name }} {{ ';' }}
<el-button
size="mini"
@click="previews(item.id, 'down')"
icon="el-icon-download"
style="height: 25px; margin-left: 5px;"
></el-button>
</span>
</template>
</el-table-column>
@@ -417,10 +423,14 @@ export default {
this.$preview(attId)
},
/** 点击对应附件进行下载*/
previews(val) {
previews(val,type) {
let attId = val
if (attId != null && attId !== "") {
if (type === 'down') {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
} else {
this.$preview(attId)
}
}
},
}
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
+9 -1
View File
@@ -176,7 +176,7 @@
{{ scope.row.fillDept || '' }}
</template>
</el-table-column>
<el-table-column prop="fillPost" align="center" label="身份">
<el-table-column prop="fillPost" align="center" label="职务/名称">
<template slot-scope="scope">
{{ scope.row.fillPost || '' }}
</template>
@@ -368,6 +368,7 @@
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
:http-request="httpRequest"
:before-upload="handleBeforeUpload"
:on-preview="handlePreview"
:before-remove="handleBeforeRemove"
:on-success="handleOnsuccess"
>
@@ -625,6 +626,13 @@ export default {
this.fileListData.fillFile = this.reData
},
handlePreview(file) {
let attId = file.id
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
},
handleClose() {
this.upDialog = false
},
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue
+1 -1
View File
@@ -114,7 +114,7 @@
<el-table-column prop="fillPeople" align="center" label="参与人"/>
<el-table-column prop="fillUnit" align="center" label="单位"/>
<el-table-column prop="fillDept" align="center" label="部门"/>
<el-table-column prop="fillPost" align="center" label="身份"/>
<el-table-column prop="fillPost" align="center" label="职务/名称"/>
<el-table-column prop="fillTel" align="center" label="电话"/>
<el-table-column prop="fillMail" align="center" label="邮箱"/>
<el-table-column prop="fillFile" align="center" label="资料">
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
+1 -1
View File
@@ -125,7 +125,7 @@
<el-table-column prop="fillPeople" align="center" label="参与人"/>
<el-table-column prop="fillUnit" align="center" label="单位"/>
<el-table-column prop="fillDept" align="center" label="部门"/>
<el-table-column prop="fillPost" align="center" label="身份"/>
<el-table-column prop="fillPost" align="center" label="职务/名称"/>
<el-table-column prop="fillTel" align="center" label="电话"/>
<el-table-column prop="fillMail" align="center" label="邮箱"/>
<el-table-column prop="fillFile" align="center" label="资料">
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+2 -2
View File
@@ -312,7 +312,7 @@
name="file"
drag
:file-list="ch_pageData.fileTextList"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF,.pptx"
:http-request="httpRequest"
:before-upload="handleBeforeUpload"
:before-remove="handleBeforeRemove"
@@ -539,7 +539,7 @@ export default {
// 判断上传文件格式
if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip'
|| fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF'
|| fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.PPT'
|| fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.pptx'
|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.bmp'
) {
return true
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+13 -4
View File
@@ -1695,6 +1695,17 @@ export default {
filterText(val) {
this.$refs.tree.filter(val);
},
'form.standInData' : {
handler: function () {
if(this.form.standInData === '1') {
this.rules.standYear[0].required = false;
this.rules.standName[0].required = false
} else {
this.rules.standYear[0].required = true;
this.rules.standName[0].required = true
}
}
},
/*'form.standInData': {
handler: function (val) {
this.verifySarStandard = false
@@ -1840,14 +1851,10 @@ export default {
this.rules.standName[0].required = false
this.rules.standEnName[0].required = true;
this.rules.standNature[0].required = false
this.rules.standYear[0].required = false;
this.rules.standName[0].required = false
} else {
this.rules.standName[0].required = true
this.rules.standNature[0].required = true
this.rules.standEnName[0].required = false;
this.rules.standYear[0].required = true;
this.rules.standName[0].required = true
}
this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
//切换清空表单
@@ -3054,6 +3061,8 @@ export default {
this.isSubmit = false
}
})
} else {
this.isSubmit = false
}
})
} else {
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+4 -2
View File
@@ -158,6 +158,7 @@
:disabled="true"
></custom-date-pick-group>
<custom-date-pick-group
:labelWidth="210"
:key="'zccssrq'"
:config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
v-model="form.zccssrq"
@@ -184,6 +185,7 @@
</el-col>
<el-col :span="12">
<custom-date-pick-group
:labelWidth="210"
:key="'zccssrq'"
:config="{attrName:'新车型实施日期(标准文本)',attrField:'zccssrq'}"
v-model="form.xcxssrq"
@@ -421,14 +423,14 @@
></el-option>
</el-select>
</el-form-item>-->
<el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
<el-form-item label="关联模块--乘用车vpps中文名称" label-width="210px" prop="cycvppscn" class="add-form-item form-item-disabled">
<el-input
v-model="form.cycvppscn"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车vpps中文名称" prop="kccvppscn" class="add-form-item form-item-disabled">
<el-form-item label="关联模块--卡车vpps中文名称" label-width="210px" prop="kccvppscn" class="add-form-item form-item-disabled">
<el-input
v-model="form.kccvppscn"
disabled
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+14 -6
View File
@@ -55,14 +55,14 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准年份" v-show="form.standInData === '0'" prop="standYear" class="add-form-item form-item-disabled">
<el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
<el-input
v-model="form.standYear"
placeholder="请输入标准标准年份"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准中文名称"v-show="form.standInData === '0'" prop="standName" class="add-form-item form-item-disabled">
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="form.standName"
placeholder="请输入标准中文名称"
@@ -125,6 +125,7 @@
<el-radio label="1">是</el-radio>
<el-radio label="2">否</el-radio>
</el-radio-group>
<el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess !== null>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
@@ -1688,14 +1689,10 @@ export default {
this.rules.standName[0].required = false
this.rules.standEnName[0].required = true;
this.rules.standNature[0].required = false
this.rules.standYear[0].required = false;
this.rules.standName[0].required = false
} else {
this.rules.standName[0].required = true
this.rules.standNature[0].required = true
this.rules.standEnName[0].required = false;
this.rules.standYear[0].required = true;
this.rules.standName[0].required = true
}
this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
},
@@ -2662,6 +2659,17 @@ export default {
}
}
},
'form.standInData' : {
handler: function () {
if(this.form.standInData === '1') {
this.rules.standYear[0].required = false;
this.rules.standName[0].required = false
} else {
this.rules.standYear[0].required = true;
this.rules.standName[0].required = true
}
}
},
form(val){
if(this.form){
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+1 -1
View File
@@ -162,7 +162,7 @@
<el-input v-model="roleForm.ministerUser" style="display: none;"/>
<el-input
v-model="roleForm.ministerUserName"
placeholder="选择标准法规部部长·"
placeholder="选择标准法规部部长"
@click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"
/>
</div>
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+42 -10
View File
@@ -76,6 +76,14 @@
- -
</div>
</el-form-item>
<el-form-item label="审批领导" prop="user7" class="add-form-item form-item-disabled">
<el-input
v-model="form.user7"
style="display: none;"
clearable
></el-input>
<el-input v-model="form.user7Name" readonly placeholder="请选择审批领导" @click.native="choiceZRR"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -265,17 +273,24 @@
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
<Role-tree
check-box
is-title="选择审批领导"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole2"
:nodeList="nodeList"
></Role-tree>
</div>
</template>
<script>
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from "api/process";
import axios from "axios";
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from "api/process";
import axios from "axios";
export default {
export default {
name: "bzzqyjStep6",
data() {
return {
@@ -316,6 +331,8 @@ export default {
textType: '',
modelList: [],
modelNameList: '',
user7: '',
user7Name: ''
},
formRules: {
responUserList: [
@@ -331,6 +348,17 @@ export default {
ProcessTitle
},
methods: {
choiceZRR () {
this.nodeList = [];
if (this.form.user7) {
this.nodeList.push(this.form.user7)
}
this.modalshowflag = true;
},
checkedRole2(data) {
this.form.user7 = data[0].id
this.form.user7Name = data[0].name
},
filesUpload (file) { // 下载
const attId = file.attId
if (attId) {
@@ -446,6 +474,8 @@ export default {
var json = this.json;
json.hqFlag = '0';
json.commentText = this.commentText6;
json.user7 = this.form.user7;
json.user7Name = this.form.user7Name;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -492,6 +522,8 @@ export default {
this.form.endTime = data.endTime || data.form.endTime;
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.form.user7 = data.form ? data.form.user7 : (data.user7 ? data.user7 : '')
this.form.user7Name = data.form ? data.form.user7Name : (data.user7Name ? data.user7Name : '')
this.oldData = JSON.parse(JSON.stringify(data.info))
var arr = []
data.info.forEach(item => {
@@ -510,13 +542,13 @@ export default {
this.getHistoryData();
this.getData();
}
};
};
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
@import '~@/assets/styles/style';
.bzdyStep6 {
.bzdyStep6 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
@@ -580,5 +612,5 @@ export default {
}
}
}
}
}
</style>
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+34 -20
View File
@@ -1437,25 +1437,26 @@
</template>
<script>
import CustomInput from '@/components/CustomFormComponents/Input'
import CustomTextarea from '@/components/CustomFormComponents/Textarea'
import CustomSearchSelect from '@/components/CustomFormComponents/SearchSelect'
import CustomSelect from '@/components/CustomFormComponents/Select'
import CustomDatePick from '@/components/CustomFormComponents/DatePicker'
import CustomFile from '@/components/CustomFormComponents/File'
import CustomInputForStandards from '@/components/CustomFormComponents/InputForStandardsForEnterprise'
import customSelectArray from '@/components/CustomFormComponents/SelectArray'
import CustomOrg from '@/components/CustomFormComponents/OrgTree'
import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
import CustomInput from "@/components/CustomFormComponents/Input";
import CustomTextarea from "@/components/CustomFormComponents/Textarea";
import CustomSearchSelect from "@/components/CustomFormComponents/SearchSelect";
import CustomSelect from "@/components/CustomFormComponents/Select";
import CustomDatePick from "@/components/CustomFormComponents/DatePicker";
import CustomFile from "@/components/CustomFormComponents/File";
import CustomInputForStandards from "@/components/CustomFormComponents/InputForStandardsForEnterprise";
import customSelectArray from "@/components/CustomFormComponents/SelectArray";
import CustomOrg from "@/components/CustomFormComponents/OrgTree";
import CustomSVPPS from "@/components/CustomFormComponents/SVPPS";
import TreeSelect from "@/components/treeSelect/treeSelect.vue";
import TreeSelectNew from "@/components/treeSelect/treeSelectNew.vue";
import ProcessTitle from "@/pages/processCenter/pages/components/ProcessTitle";
import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
import {mapGetters} from 'vuex'
import { mapGetters } from "vuex";
import store from "@/store";
export default {
name: 'EnterpriseStandardDatabase',
name: "EnterpriseStandardDatabase",
components: {
CustomFile,
CustomInput,
@@ -3916,17 +3917,30 @@ export default {
formFieldList.forEach((item) => {
const value = this.sarBussionessSearch[item.attrField]
// 时间格式处理
if (value !== undefined && value !== null && value !== '') {
if (value !== undefined && value !== null && value !== "") {
advanceSearchVOList.push({
connect: advanceSearchVOList.length > 0 ? "and" : "",
field: item.attrField || '',
type: 'like',
field: item.attrField || "",
type: "like",
value: value
})
});
}
})
}
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
// formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
this.SarExportSearchEo = formData;
formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null;
formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null;
formData.startFSRQBUSS = formData.FSRQBUSS ? formData.FSRQBUSS[0] : null;
formData.endFSRQBUSS = formData.FSRQBUSS ? formData.FSRQBUSS[1] : null;
formData.startFZRQBUSS = formData.FZRQBUSS ? formData.FZRQBUSS[0] : null;
formData.endFZRQBUSS = formData.FZRQBUSS ? formData.FZRQBUSS[1] : null;
formData.startPutTime = formData.putTime ? formData.putTime[0] : null;
formData.endPutTime = formData.putTime ? formData.putTime[1] : null;
formData.FSRQBUSS = null;
formData.FZRQBUSS = null;
formData.putTime = null;
formData.issueTime = null;
}
this.SarExportSearchEo = formData
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', formData, {
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1 -1
View File
@@ -3713,7 +3713,7 @@ export default {
}
break
case 'textStatus' :
this.orderBy = 5;
this.orderBy = 4;
this.nowOrder = sortObj.column.order
if (this.nowOrder === 'ascending') {
this.nowOrder = 2