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

Merge branch 'dev_test' into dev_20230829_change

Browse Source
This commit is contained in:
zyn
2023-11-20 09:13:59 +08:00
parent ab429566e3 f3fc569c6c
commit e7e463f7bf
16 changed files with 174 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/dragDialogWidth/index.js
+70
View File
@@ -0,0 +1,70 @@
import Vue from "vue";
const dragDialogWidth = {
bind(el, binding, vnode) {
const dragDom = el.querySelector('.el-dialog');
// 容器初始宽度
const initWidth = Number(dragDom.style.width.replace('px', ''));
// 添加可拖拽对象
const lineEl = document.createElement('div');
lineEl.style = 'width: 5px; background: inherit; height: 100%; position: absolute; right: 0; top: 0; bottom: 0; margin: auto; z-index: 1; cursor: w-resize;'
lineEl.addEventListener('mousedown', (ee) => {
// ee 鼠标按下时的事件对象
// 拖动时容器初始宽度
const initDragDomWidth = Number(dragDom.style.width.replace('px', ''));
document.onmousemove = function (e) {
// e 鼠标拖动时的事件对象
e.preventDefault(); // 移动时禁用默认事件
// ee.clientX 鼠标按下时指针距离可视区最左边的距离
// e.clientX 鼠标拖动时指针距离可视区最左边的距离
// 向右拖动1px，容器宽度需要增加2px，需要*2
const x = (e.clientX - ee.clientX) * 2 + initDragDomWidth
if (e.clientX >= window.innerWidth * 0.9) {
// 鼠标拖动到可视区最右边时，容器宽度为可视区宽度,防止拖出可视区
// window.innerWidth 可视区域宽度
// 当鼠标移动到可视宽度的90%时，鼠标距离最右边为10%，所以容器距离最右边为10%，容器距离左边也为10%，所以需要减去20%
dragDom.style.width = `${window.innerWidth * 0.8}px`;
} else if (x <= initWidth) {
// 设置最小宽度
dragDom.style.width = `${initWidth}px`;
} else {
dragDom.style.width = `${x}px`;
}
}
document.onmouseup = function (e) {
document.onmousemove = null;
document.onmouseup = null;
}
}, false)
dragDom.appendChild(lineEl);
},
update (el, binding, vnode) {
Vue.nextTick(() => {
// 设置el-upload上传组件拖拽容器宽度
const elUploadDom = el.querySelector('.el-upload');
const elUploadDraggerDom = el.querySelector('.el-upload-dragger');
if (elUploadDom && elUploadDraggerDom) {
elUploadDom.style.width = '100%'
elUploadDraggerDom.style.width = '100%'
// 文件名换行
const fileNameNodes = el.querySelectorAll('.el-upload-list__item-name')
if (fileNameNodes.length > 0) {
fileNameNodes.forEach(node => {
node.style.whiteSpace = 'inherit'
})
}
}
});
}
}
const install = function(Vue) {
Vue.directive('dragDialogWidth', dragDialogWidth);
}
export default install
src/components/CustomFormComponents/File.vue
+2
View File
@@ -42,11 +42,13 @@
</el-button>
</template>
<el-dialog
v-dragDialogWidth
width='400px'
:visible.sync="importModalshowflagtemp"
:title="processModel && disabled ? '查看已上传的文件' : (title || '导入文件')"
:footer-hide="true"
append-to-body
:close-on-click-modal="false"
>
<el-upload
class="customer-upload"
src/main.js
+2
View File
@@ -28,6 +28,7 @@ import $axios from '@/common/axios'
import components from '@/components'
// 自定义插件
import common from '@/common'
import dragDialogWidth from '@/common/dragDialogWidth'
// 自定义按钮显示指令
import btnPermission from '@/common/btnPermission' // eslint-disable-line
import VueI18n from 'vue-i18n' // 国际化
@@ -521,6 +522,7 @@ Vue.config.productionTip = false
Vue.prototype.$ = $
Vue.use(ElementUI)
Vue.use(common)
Vue.use(dragDialogWidth)
Vue.use(components)
Vue.use(VueI18n)
Vue.use(VueClipboard)
src/pages/details/otherBussStandardDetails/index.vue
+5 -1
View File
@@ -37,7 +37,11 @@
label="序号"
width="55"
align="center"
/>
>
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (form.page - 1) * form.pageSize }}
</template>
</el-table-column>
<el-table-column prop="threeIndexTitle" label="评价指标" width="300">
<!--commentTarget-->
<template slot-scope="scope">
src/pages/localTool/standardRecognition/index.vue
+1 -1
View File
@@ -1346,7 +1346,7 @@ export default {
changeData() {},
// 分页点击后方法
pageChange(page) {
this.page = page;
this.handleSelectForm.page = page;
this.getTableData();
},
// 分页每页显示数改变后方法
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+49 -6
View File
@@ -1086,14 +1086,20 @@
type="index"
label="序号"
width="80"
align="center"
></el-table-column>
align="center">
<template slot-scope="scope">
<span :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}">{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column
v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
prop="bussSort"
label="企标类别"
align="center"
width="120">
<template slot-scope="scope">
<span :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}">{{ scope.row.bussSort }}</span>
</template>
</el-table-column>
<el-table-column
v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
@@ -1101,6 +1107,9 @@
label="企标名称"
align="center"
width="120">
<template slot-scope="scope">
<span :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}">{{ scope.row.esName }}</span>
</template>
</el-table-column>
<el-table-column
v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
@@ -1109,7 +1118,8 @@
align="center"
width="150">
<template slot-scope="scope">
<div>{{ getMap1(scope.row.planStatus)}}</div>
<div :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}"
>{{ getMap1(scope.row.planStatus)}}</div>
</template>
</el-table-column>
<el-table-column
@@ -1119,7 +1129,8 @@
align="center"
label="制修订状态">
<template slot-scope="scope">
<div>{{ scope.row.reviseStatus === ''? '' : (scope.row.reviseStatus === '1'? '制定' :
<div :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}"
>{{ scope.row.reviseStatus === ''? '' : (scope.row.reviseStatus === '1'? '制定' :
'修订') }}
</div>
</template>
@@ -1130,6 +1141,9 @@
width="120"
align="center"
label="起草人">
<template slot-scope="scope">
<span :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}">{{ scope.row.drafterName }}</span>
</template>
</el-table-column>
<el-table-column
v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
@@ -1137,6 +1151,9 @@
width="120"
align="center"
label="评审责任人">
<template slot-scope="scope">
<span :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}">{{ scope.row.resPersonName }}</span>
</template>
</el-table-column>
<el-table-column
v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
@@ -1144,6 +1161,9 @@
width="120"
align="center"
label="工作组组长">
<template slot-scope="scope">
<span :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}">{{ scope.row.wgLeaderName }}</span>
</template>
</el-table-column>
<el-table-column
v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
@@ -1152,7 +1172,8 @@
align="center"
label="计划标准初稿完成时间">
<template slot-scope="scope">
<span>{{ scope.row.draftTime ? $moment(scope.row.draftTime).format("YYYY-MM-DD") : "" }}</span>
<span :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}"
>{{ scope.row.draftTime ? $moment(scope.row.draftTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -1162,7 +1183,8 @@
align="center"
label="计划标准发布时间">
<template slot-scope="scope">
<span>{{ scope.row.releaseTime ? $moment(scope.row.releaseTime).format("YYYY-MM-DD") : "" }}</span>
<span :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}"
>{{ scope.row.releaseTime ? $moment(scope.row.releaseTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -1170,42 +1192,63 @@
align="center"
prop="unitName"
label="起草责任单位">
<template slot-scope="scope">
<span :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}">{{ scope.row.unitName }}</span>
</template>
</el-table-column>
<el-table-column
v-if="this.form.reviseStatus === '3'"
align="center"
prop="standCode"
label="企标编号">
<template slot-scope="scope">
<span :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}">{{ scope.row.standCode }}</span>
</template>
</el-table-column>
<el-table-column
v-if="this.form.reviseStatus === '3'"
align="center"
prop="standName"
label="中文名称">
<template slot-scope="scope">
<span :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}">{{ scope.row.standName }}</span>
</template>
</el-table-column>
<el-table-column
v-if="this.form.reviseStatus === '3'"
align="center"
prop="standStatusShow"
label="文本状态">
<template slot-scope="scope">
<span :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}">{{ scope.row.standStatusShow }}</span>
</template>
</el-table-column>
<el-table-column
v-if="this.form.reviseStatus === '3'"
align="center"
prop="dtqbbhbuss"
label="代替企标编号">
<template slot-scope="scope">
<span :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}">{{ scope.row.dtqbbhbuss }}</span>
</template>
</el-table-column>
<el-table-column
v-if="this.form.reviseStatus === '3'"
align="center"
prop="issueTime"
label="发布日期">
<template slot-scope="scope">
<span :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}">{{ scope.row.issueTime }}</span>
</template>
</el-table-column>
<el-table-column
v-if="this.form.reviseStatus === '3'"
align="center"
prop="putTime"
label="实施日期">
<template slot-scope="scope">
<span :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}">{{ scope.row.putTime }}</span>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- v-if="this.form.reviseStatus === '3'"-->
src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue
+3
View File
@@ -51,6 +51,9 @@
label="序号"
width="50"
>
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (formQuery.page - 1) * formQuery.pageSize }}
</template>
</el-table-column>
<el-table-column
align="center"
src/pages/regulatoryRepository/dataStatis/miniPages/inComeSubsidy.vue
+3
View File
@@ -48,6 +48,9 @@
type="index"
label="序号"
width="50">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (formQuery.page - 1) * formQuery.pageSize }}
</template>
</el-table-column>
<el-table-column
align="center"
src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue
+3
View File
@@ -57,6 +57,9 @@
label="序号"
width="50"
>
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (formQuery.page - 1) * formQuery.pageSize }}
</template>
</el-table-column>
<el-table-column
align="center"
src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue
+3
View File
@@ -48,6 +48,9 @@
type="index"
label="序号"
width="50">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (formQuery.page - 1) * formQuery.pageSize }}
</template>
</el-table-column>
<el-table-column
align="center"
src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue
+3
View File
@@ -65,6 +65,9 @@
type="index"
width="50"
label="序号">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (formQuery.page - 1) * formQuery.pageSize }}
</template>
</el-table-column>
<el-table-column
align="center"
src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue
+5 -1
View File
@@ -45,7 +45,11 @@
fontWeight: 'bold', height: '48px'}"
@selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="50"/>
<el-table-column align="center" type="index" width="50" label="序号"/>
<el-table-column align="center" type="index" width="50" label="序号">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (formQuery.page - 1) * formQuery.pageSize }}
</template>
</el-table-column>
<el-table-column align="center" prop="scName" label="协会名称-标委会">
<template slot-scope="scope">
{{ scope.row.scName || '-' }}
src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue
+3
View File
@@ -48,6 +48,9 @@
type="index"
label="序号"
width="50">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (formQuery.page - 1) * formQuery.pageSize }}
</template>
</el-table-column>
<el-table-column
align="center"
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+4 -4
View File
@@ -4672,10 +4672,10 @@ export default {
// 分页每页显示数改变后方法
pageSizeChange(pageSize) {
this.sarStandardsSearch.pageSize = this.$store.getters.userInfo.configContent
let tabFlag = JSON.parse(sessionStorage.getItem('tableFlag'))
if (tabFlag !== '') {
this.sarStandardsSearch.page = tabFlag.page
}
// let tabFlag = JSON.parse(sessionStorage.getItem('tableFlag'))
// if (tabFlag !== '') {
// this.sarStandardsSearch.page = tabFlag.page
// }
this.getDomesticStandardTable(this.sarStandardsSearch)
this.selectConfiguraStand()
// 此处需要调用接口，修改个人配置
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+3
View File
@@ -102,6 +102,9 @@
label="序号"
align="center"
width="50">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (form.page - 1) * form.size }}
</template>
</el-table-column>
<el-table-column
prop="partCode"
src/pages/searchCenter/pages/standardSearch.vue
+15 -7
View File
@@ -183,9 +183,17 @@
min-width="12%">
<template slot-scope="scope">
<!-- <span v-if="selectIndex === 'laws'">{{ getLawsState(scope.row.statecode) }}</span>-->
<div :class="selectIndex === 'enterprise' || selectIndex === 'laws' ? (scope.row.textStatusBussName === '参考' || scope.row.textStatusBussName === '被代替' ? 'yellowClass' :
(scope.row.textStatusBussName || scope.row.lawsTextStateName === '作废' ? 'redClass' : '')) : ''">
{{ selectIndex === 'stand'|| (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN') ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.lawsTextStateName : scope.row.textStatusBussName) }}</div>
<!--<div :class="selectIndex === 'enterprise' || selectIndex === 'laws' ? (scope.row.textStatusBussName === '参考' || scope.row.textStatusBussName === '被代替' ? 'yellowClass' :-->
<!--(scope.row.textStatusBussName || scope.row.lawsTextStateName === '作废' ? 'redClass' : '')) : ''">-->
<!-- {{ selectIndex === 'stand'|| (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN') ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.lawsTextStateName : scope.row.textStatusBussName) }}</div>-->
<div v-if="selectIndex === 'stand' || selectIndex === 'bussstand'"
:class="(scope.row.textStatusName === '废止' || scope.row.textStatusName === '被代替') ? 'redClass' : ''"
>{{ scope.row.textStatusName }}</div>
<div v-else-if="selectIndex === 'laws'"
:class="(scope.row.textStatusBussName === '作废' || scope.row.textStatusBussName === '被代替') ? 'redClass' : ''"
>{{ scope.row.lawsTextStateName }}</div>
<div v-else :class="(scope.row.textStatusBussName === '作废' || scope.row.textStatusBussName === '被代替') ? 'redClass' : ''"
>{{ scope.row.textStatusBussName }}</div>
</template>
</el-table-column>
<el-table-column
@@ -457,10 +465,10 @@
label: '国外标准法规', // value没改
value: 'bussstand'
},
{
label: '国内外政策',
value: 'laws'
},
// {
// label: '国内外政策',
// value: 'laws'
// },
{
label: '企业标准',
value: 'enterprise'