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
This commit is contained in:
super_liu
2022-01-06 20:36:19 +08:00
parent 0548db1d0a 8d72f44732
commit 96300ca231
6 changed files with 169 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standardRecognition/index.vue
+30 -4
View File
@@ -23,6 +23,7 @@
style="width: 100%"
height="100%"
@selection-change="standSelectChange"
@sort-change="sortChange"
:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
>
<el-table-column type="selection" align="center" width="50">
@@ -97,13 +98,13 @@
</el-table-column>
<el-table-column
prop="spendTime"
:label="this.$t('m.timeConsuming')"
label="消耗时间(秒)"
align="center"
sortable
width="120"
sortable="custom"
width="140"
>
</el-table-column>
<el-table-column label="操作" align="center" width="150" fixed="right">
<el-table-column label="操作" align="center" width="150" >
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-button
@@ -795,6 +796,8 @@ export default {
isSubmit: false,
showUploadlist: true, // 导入过程中新增数据时，如果数据报错，不出现导入列表
collect: "收藏",
paixu: '',
shunxu: ''
};
},
props: {},
@@ -1052,6 +1055,26 @@ export default {
break;*/
}
},
// 表格排序
sortChange (sortObj) {
if (sortObj.column.order !== 'normal') {
this.shunxu = ''
this.paixu = ''
let order = sortObj.column.order
switch (sortObj.column.property) {
case 'spendTime' :
// 后台联调
this.paixu = 'spendTime'
if (order === 'ascending'){
this.shunxu = 'asc'
} else if (order === 'descending') {
this.shunxu = 'desc'
}
break
}
}
this.getTableData()
},
// 修改成表格样式后，选择项勾选改变
standSelectChange(data) {
this.selectTableData = [];
@@ -1336,6 +1359,8 @@ export default {
{
page: this.page,
pageSize: this.pageSize,
paixu: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
},
{
_this: this,
@@ -1344,6 +1369,7 @@ export default {
(res) => {
if (res.ok) {
this.standRecoList = res.data.list;
console.log(this.standRecoList);
this.total = res.data.count
}
},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+17 -8
View File
@@ -127,14 +127,22 @@
placeholder="请输入指标依据"
:maxlength="500"/>
</el-form-item>
<template v-if="qbfsForm.isRelate === '是'">
<custom-input-for-all-standards
class="classDisplay"
:config="{attrName: '采用标准'}"
:labelWidth="'180px'"
v-model="qbfsForm.esStandRelations"
></custom-input-for-all-standards>
</template>
<!-- <template v-if="qbfsForm.isRelate === '是'">-->
<!-- <custom-input-for-all-standards-->
<!-- class="classDisplay"-->
<!-- :config="{attrName: '采用标准'}"-->
<!-- :labelWidth="'180px'"-->
<!-- v-model="qbfsForm.esStandRelations"-->
<!-- ></custom-input-for-all-standards>-->
<!-- </template>-->
<template v-if="qbfsForm.isRelate === '是'">
<custom-input-for-all-standards2
class="classDisplay"
:config="{attrName: '采用标准'}"
:labelWidth="'180px'"
v-model="qbfsForm.esStandRelations"
></custom-input-for-all-standards2>
</template>
<el-form-item v-if="qbfsForm.isRelate === '是'" prop="useLevel" label="采标程度" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.useLevel" filterable placeholder="请选择采标程度" style="width: 100%;">
@@ -149,6 +157,7 @@
<template>
<custom-input-for-all-standards2
class="classDisplay"
:enterpriseStandard="true"
:placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
:config="{attrName: '引用标准'}"
:labelWidth="'180px'"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+3 -2
View File
@@ -100,6 +100,7 @@
<template>
<custom-input-for-all-standards2
class="classDisplay"
:enterpriseStandard="true"
:placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
:config="{attrName: '引用标准'}"
:labelWidth="'180px'"
@@ -192,12 +193,12 @@
</el-select>
</el-form-item>
<template v-if="qbfsForm.isRelate === '是'">
<custom-input-for-all-standards
<custom-input-for-all-standards2
class="classDisplay"
:config="{attrName: '采用标准'}"
:labelWidth="'180px'"
v-model="qbfsForm.esStandRelations"
></custom-input-for-all-standards>
></custom-input-for-all-standards2>
</template>
</el-col>
</el-row>
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+7 -6
View File
@@ -118,7 +118,7 @@
prop="reviseStatus"
width="150"
align="center"
label="制修订状态">
label="制修订类型">
<template slot-scope="scope">
<div>{{ scope.row.reviseStatus === ''? '' : (scope.row.reviseStatus === '1'? '制定' : '修订') }}</div>
</template>
@@ -235,7 +235,7 @@
</div>
</el-form-item>
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-select :disabled="DrawerType === 'see'" v-model="addForm.planStatus" placeholder="请选择计划状态">
<el-select :disabled="DrawerType === 'see' || DrawerType === 'add' " v-model="addForm.planStatus" placeholder="请选择计划状态">
<el-option label="未开始" value="0"></el-option>
<el-option label="制定中" value="1"></el-option>
<el-option label="修订中" value="2"></el-option>
@@ -243,7 +243,7 @@
<el-option label="已完成" value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-select :disabled="DrawerType === 'see'" v-model="addForm.reviseStatus" placeholder="请选择制修订状态">
<el-option label="制定" value="1"></el-option>
<el-option label="修订" value="2"></el-option>
@@ -357,13 +357,13 @@
</div>
</el-form-item>
<template v-if="addForm.isRelate === '是'">
<custom-input-for-all-standards
<custom-input-for-all-standards2
class="classDisplay"
:config="{attrName: '采用标准'}"
:disabled="DrawerType === 'see'"
:labelWidth="'180px'"
v-model="addForm.esStandRelations"
></custom-input-for-all-standards>
></custom-input-for-all-standards2>
</template>
<el-form-item v-if="addForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" class="add-form-item" prop="useLevel" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
@@ -389,6 +389,7 @@
<template>
<custom-input-for-all-standards2
class="classDisplay"
:enterpriseStandard="true"
:placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
:disabled="DrawerType === 'see'"
:config="{attrName: '引用标准'}"
@@ -584,7 +585,6 @@
</template>
<script>
import CustomInputForAllStandards from '@/components/CustomFormComponents/InputForAllStandards'
import CustomInputForAllStandards2 from '@/components/CustomFormComponents/InputForAllStandards2'
export default {
name: "enterpriseStandardPlan",
@@ -938,6 +938,7 @@
this.addDrawerTitle = '新增'
this.addForm = {}
this.DrawerType = 'add'
this.addForm.planStatus = '0'
this.addDrawer = true
}, // 新增数据
deleteList () {
src/pages/searchCenter/pages/advancedSearch.vue
+47 -11
View File
@@ -154,9 +154,12 @@
<el-form-item label="实施日期" prop="ssrq">
<el-date-picker
v-model="standForm.ssrq"
type="date"
placeholder="请选择标准实施日期(标准文本)"
value-format="yyyy-MM-dd">
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
placeholder="请选择标准实施日期(标准文本)">
</el-date-picker>
</el-form-item>
</el-col>
@@ -166,9 +169,12 @@
<el-form-item label="新车型实施日期" prop="xcxssrq">
<el-date-picker
v-model="standForm.xcxssrq"
type="date"
placeholder="请选择新车型实施日期(标准文本"
value-format="yyyy-MM-dd">
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
placeholder="请选择新车型实施日期(标准文本)">
</el-date-picker>
</el-form-item>
</el-col>
@@ -176,9 +182,12 @@
<el-form-item label="在产车实施日期" prop="zccssrq">
<el-date-picker
v-model="standForm.zccssrq"
type="date"
placeholder="请选择在产车实施日期(标准文本)"
value-format="yyyy-MM-dd">
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
placeholder="请选择在产车实施日期(标准文本)">
</el-date-picker>
</el-form-item>
</el-col>
@@ -1067,8 +1076,8 @@
:label="selectIndex === 'INLAND_LAWS' ? '新车实施日期' :$t('m.putTime')"
width="130">
<template slot-scope="scope">
<div v-if="selectIndex === 'INLAND_STAND' ? (scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== '') : (scope.row.putTime !== null && scope.row.putTime !== undefined && scope.row.putTime !== '')">
{{ $dateFormat(new Date(selectIndex === 'INLAND_STAND' ? scope.row.SSRQ : (selectIndex === 'INLAND_LAWS' ? scope.row.XCXSSRQLAWS : scope.row.putTime)), "yyyy-MM-dd") }}
<div v-if="selectIndex === 'INLAND_STAND' ? (scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== '') : (scope.row.putTime !== null && scope.row.putTime !== undefined && scope.row.putTime !== '')" :title="dateFormat2(selectIndex === 'INLAND_STAND' ? scope.row.SSRQ : (selectIndex === 'INLAND_LAWS' ? scope.row.XCXSSRQLAWS : scope.row.putTime))">
{{ dateFormat2(selectIndex === 'INLAND_STAND' ? scope.row.SSRQ : (selectIndex === 'INLAND_LAWS' ? scope.row.XCXSSRQLAWS : scope.row.putTime)) | ellipsis }}
</div>
<div v-else></div>
</template>
@@ -1213,12 +1222,22 @@
import "../../../assets/zTree/js/jquery.ztree.excheck.js";
import "../../../assets/zTree/js/jquery.ztree.exedit.js";
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import {dateFormat} from '@/common/date'
export default {
name: "advancedSearch",
components: {
TreeSelectNew
},
filters: {
ellipsis (value) {
if (!value) return ''
if (value.length > 10) {
return value.slice(0,11) + '...'
}
return value
}
},
data() {
return {
pickerOptions: {
@@ -1570,6 +1589,23 @@
};
},
methods: {
//时间处理
dateFormat2(str){
if(str === undefined || str === null || str === ''){
return ""
}else {
if(str.indexOf(",") !== -1){
const arr = str.split(",")
const arr1 = str.split(",")
arr.forEach( date =>{
arr1.push(dateFormat(date.trim()))
})
return arr1.toString()
}
}
return dateFormat(str)
},
getAddFormFieldList (isEdit) {
this.$http.get('lawss/sarStandAttrDetails/list', {}, {
_this: this