Skip to content

D
dsk-operate-sys-cscec
Commit 4f9afccf authored by danfuman's avatar danfuman
Browse files
Options

修改

parent 0f5de350
Hide whitespace changes
Inline Side-by-side
Showing with 388 additions and 262 deletions
dsk-operate-ui/src/views/monitoring/MonitorSettings.vue
View file @ 4f9afccf
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
placeholder="起始时间" placeholder="起始时间"
v-model="startTime" v-model="startTime"
@change="startChangeTime" @change="startChangeTime"
:clearable="false"
:picker-options="{ :picker-options="{
start: '00:00', start: '00:00',
step: '01:00', step: '01:00',
...@@ -55,7 +54,6 @@ ...@@ -55,7 +54,6 @@
<el-time-select <el-time-select
placeholder="结束时间" placeholder="结束时间"
v-model="endTime" v-model="endTime"
:clearable="false"
:picker-options="{ :picker-options="{
start: '00:00', start: '00:00',
step: '01:00', step: '01:00',
...@@ -69,9 +67,11 @@ ...@@ -69,9 +67,11 @@
<div class="m-main"> <div class="m-main">
<div class="main-item"> <div class="main-item">
<div class="label">接收方式</div> <div class="label">接收方式</div>
<!--<el-radio v-model="queryParams.radio" label="1">全部</el-radio>--> <el-radio-group v-model="queryParams.receiveMode">
<el-radio v-model="queryParams.receiveMode" label="0">手机短信</el-radio> <!--<el-radio v-model="queryParams.radio" label="1">全部</el-radio>-->
<!--<el-radio v-model="queryParams.radio" label="3">PC</el-radio>--> <el-radio label="0" @click.native.prevent="clickRadio()">手机短信</el-radio>
<!--<el-radio v-model="queryParams.radio" label="3">PC</el-radio>-->
</el-radio-group>
</div> </div>
<div class="main-item" style="line-height: 32px;"> <div class="main-item" style="line-height: 32px;">
<div class="label">手机号码</div> <div class="label">手机号码</div>
...@@ -177,6 +177,9 @@ ...@@ -177,6 +177,9 @@
this.endTime = "" this.endTime = ""
}, },
handleAdd(){ handleAdd(){
if(this.queryParams.receiveMode === '0' && !this.queryParams.phones){
return this.$message.warning('手机号码不能为空');
}
let params={ let params={
pushFrequency:Number(this.queryParams.pushFrequency), pushFrequency:Number(this.queryParams.pushFrequency),
riskType:'', riskType:'',
...@@ -220,6 +223,9 @@ ...@@ -220,6 +223,9 @@
changeTime(val){ changeTime(val){
console.log(val) console.log(val)
}, },
clickRadio(){
this.queryParams.receiveMode = this.queryParams.receiveMode === '0' ? '1' : '0'
},
} }
} }
</script> </script>
......
dsk-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/components/unitConversion.vue 0 → 100644
View file @ 4f9afccf
<template>
<el-dialog :visible.sync="dialogVisible" width="720px" append-to-body class="dialogVisible" title="单位换算">
<el-tabs v-model="currentList" @tab-click="handleClickTab">
<el-tab-pane
:key="index"
v-for="(item, index) in toggleTabs"
:label="item.name"
:name="item.value"
>
{{item.content}}
</el-tab-pane>
<div class="detail-cont-tab">
<div class="select">
<el-select v-model="type1" placeholder="请选择">
<el-option v-for="(item,index) in typeList" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
</el-select>
<i class="el-icon-sort icon"></i>
<el-select v-model="type2" placeholder="请选择">
<el-option v-for="(item,index) in typeList" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
</el-select>
</div>
<el-table
:data="tableData"
default-expand-all
border
highlight-current-row
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="50">
</el-table-column>
<el-table-column label="序号" width="50" align="left">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="成本科目" width="190" prop="cbSubjectName"></el-table-column>
<el-table-column label="物料验收系统本月用料" width="195">
<template slot-scope="scope">
<span v-if="scope.row.quantities">{{scope.row.quantities}} {{scope.row.quantitiesUnit}}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="换算后本月用料" prop="hsyl"></el-table-column>
</el-table>
</div>
</el-tabs>
<div slot="footer" class="dialog-footer">
<el-button @click="handleClose()">取消</el-button>
<el-button type="primary">保存结果</el-button>
</div>
</el-dialog>
</template>
<script>
export default {
name: "unitConversion",
props: {
isVisible: {
type: Boolean,
default: false
},
dataList: {
type: Array,
default: () => []
},
},
data() {
return {
dialogVisible:this.isVisible,
currentList: "type1",
toggleTabs:[
{
value: "type1",
name: "长度",
},
{
value: "type2",
name: "面积",
},
{
value: "type3",
name: "重量",
},
{
value: "type4",
name: "体积",
},
// {
// value: "type4",
// name: "质量",
// },
// {
// value: "type5",
// name: "密度",
// },
],
type1:'',
type2:'',
typeList:[
{
dictLabel:'千米',
dictValue:'km'
},
{
dictLabel:'米',
dictValue:'m'
},
{
dictLabel:'分米',
dictValue:'dm'
},
{
dictLabel:'厘米',
dictValue:'cm'
},
{
dictLabel:'毫米',
dictValue:'mm'
},
{
dictLabel:'微米',
dictValue:'μm'
},
],
tableData:this.dataList,
tableList:[]
};
},
//可访问data属性
created() {
console.log(this.dataList)
},
//计算集
computed: {
},
//方法集
methods: {
handleClose () {
this.$emit('refresh')
},
handleClickTab(v){
this.type1='';
this.type2='';
if(v.label === '长度'){
this.typeList=[
{
dictLabel:'千米',
dictValue:'km'
},
{
dictLabel:'米',
dictValue:'m'
},
{
dictLabel:'分米',
dictValue:'dm'
},
{
dictLabel:'厘米',
dictValue:'cm'
},
{
dictLabel:'毫米',
dictValue:'mm'
},
{
dictLabel:'微米',
dictValue:'μm'
},
]
}
if(v.label === '面积'){
this.typeList=[
{
dictLabel:'平方千米',
dictValue:'km²'
},
{
dictLabel:'公顷',
dictValue:'ha'
},
{
dictLabel:'公亩',
dictValue:'a'
},
{
dictLabel:'平方米',
dictValue:'m²'
},
{
dictLabel:'平方分米',
dictValue:'dm²'
},
{
dictLabel:'平方厘米',
dictValue:'cm²'
},
{
dictLabel:'平方毫米',
dictValue:'mm²'
},
]
}
if(v.label === '体积'){
this.typeList=[
{
dictLabel:'吨',
dictValue:'T'
},
{
dictLabel:'千克',
dictValue:'kg'
},
{
dictLabel:'克',
dictValue:'g'
},
]
}
if(v.label === '体积'){
this.typeList=[
{
dictLabel:'立方千米',
dictValue:'km³'
},
{
dictLabel:'立方米',
dictValue:'m³'
},
{
dictLabel:'立方分米',
dictValue:'dm³'
},
{
dictLabel:'立方厘米',
dictValue:'cm³'
},
{
dictLabel:'立方毫米',
dictValue:'mm³'
},
{
dictLabel:'升',
dictValue:'L'
},
{
dictLabel:'分升',
dictValue:'dL'
},
{
dictLabel:'厘升',
dictValue:'cL'
},
{
dictLabel:'毫升',
dictValue:'mL'
},
{
dictLabel:'微升',
dictValue:'μL'
},
]
}
},
handleSelectionChange(val) {
console.log(val)
this.tableList=val;
}
},
}
</script>
<style lang="scss" scoped>
.dialogVisible{
::v-deep .el-dialog {
position:absolute;
top:50%;
left:50%;
transform:translate(-50%,-50%);
margin-top:0 !important;
.el-dialog__body{
flex:1;
overflow: auto;
padding:0;
border-top: 1px solid #EEEEEE;
border-bottom: 1px solid #EEEEEE;
.select{
margin-bottom: 16px;
}
.el-input{
width: 316px !important;
}
.el-tabs__nav-wrap{
padding: 0 16px;
}
.el-tabs__header{
margin: 0;
}
.detail-cont-tab{
padding: 24px 20px;
.icon{
transform: rotate(90deg);
color:#0081FF;
margin: 0 16px;
}
}
}
.el-dialog__footer{
padding: 16px 20px;
}
}
}
</style>
dsk-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/index.vue
View file @ 4f9afccf
...@@ -70,6 +70,9 @@ ...@@ -70,6 +70,9 @@
<!-- 填写实际成本触发 --> <!-- 填写实际成本触发 -->
<add-actual-cost v-model="showAddActualCost" :project-create-time="projectDetailInfo.createTime" @timeSelect="timeSelect"></add-actual-cost> <add-actual-cost v-model="showAddActualCost" :project-create-time="projectDetailInfo.createTime" @timeSelect="timeSelect"></add-actual-cost>
<!-- 单位换算弹窗 -->
<unit-conversion v-if="showUnitConversion" :isVisible="showUnitConversion" :dataList="unitConversionList" @refresh="handleDialogVisible()"></unit-conversion>
</div> </div>
</template> </template>
<script> <script>
...@@ -79,6 +82,7 @@ import DskTableHeaderSetting from "@/components/DskTableHeaderSetting"; ...@@ -79,6 +82,7 @@ import DskTableHeaderSetting from "@/components/DskTableHeaderSetting";
import DskSkeleton from "@/components/DskSkeleton"; import DskSkeleton from "@/components/DskSkeleton";
import CustomTable from "@/components/CustomTable"; import CustomTable from "@/components/CustomTable";
import AddActualCost from "./components/AddActualCost"; import AddActualCost from "./components/AddActualCost";
import unitConversion from "./components/unitConversion";
import { v4 } from 'uuid'; import { v4 } from 'uuid';
import dayjs from "dayjs"; import dayjs from "dayjs";
import { cloneDeep } from "lodash-es"; import { cloneDeep } from "lodash-es";
...@@ -137,7 +141,8 @@ export default { ...@@ -137,7 +141,8 @@ export default {
DskTableHeaderSetting, DskTableHeaderSetting,
CustomTable, CustomTable,
DskSkeleton, DskSkeleton,
AddActualCost AddActualCost,
unitConversion
}, },
data() { data() {
const amountCheckValidator = (rule, value, callback) => { const amountCheckValidator = (rule, value, callback) => {
...@@ -224,7 +229,11 @@ export default { ...@@ -224,7 +229,11 @@ export default {
{ trigger: ["change"], validator: amountCheckValidator } { trigger: ["change"], validator: amountCheckValidator }
] ]
}, },
statisticsTimer: null statisticsTimer: null,
// 单位换算弹窗
showUnitConversion:false,
//单位换算数据
unitConversionList:[]
}; };
}, },
//可访问data属性 //可访问data属性
...@@ -445,17 +454,56 @@ export default { ...@@ -445,17 +454,56 @@ export default {
}, },
async getFeedSummaryConversionNotice(params) { async getFeedSummaryConversionNotice(params) {
const data = await getFeedSummaryConversionNotice(params); const data = await getFeedSummaryConversionNotice(params);
if (data.data == 500) { // const data = {
// "code": 200,
// "msg": "系统检测到您近期未进行物料单位换算，请立即进行换算。",
// "data": [
// {
// "id": "1763389258189500519",
// "cbSubjectName": "钢筋",
// "companyNo": "FG-002-010025",
// "orgNo": "",
// "cbName": "热轧带肋钢筋HRB400E",
// "jobContent": "20mm 定尺12m",
// "calculationRule": "",
// "unit": "吨",
// "materialDescription": "",
// "guidePrice": "",
// "bidUnitPrice": 3513.27,
// "unitPriceDifference": null,
// "quantity": 0.317,
// "combinedPrice": 1113.70659,
// "combinedPriceTax": 1115.154424,
// "brandName": "",
// "bidSource": "请在此处填写",
// "remark": "",
// "quantities": 123123.0,
// "quantitiesUnit": "T",
// "conversionQuantities": null,
// "conversionUnit": null,
// "purchaseUnitPrice": null,
// "createTime": "2024-03-05 16:55:54",
// "totalQuantities": null,
// "actualId": "11111111",
// "pushQuantities": null,
// "ipmProjectCode": null,
// "ipmContractCode": null,
// "ipmJobCode": null
// }
// ]
// };
if (data.data) {
this.$confirm('系统检测到您近一月未进行物料单位换算，是否立即进行换算？', '温馨提示', { this.$confirm('系统检测到您近一月未进行物料单位换算，是否立即进行换算？', '温馨提示', {
confirmButtonText: '立即换算', confirmButtonText: '立即换算',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.unitConversionList=data.data;
this.showUnitConversion=true;
}).catch(() => { }).catch(() => {
this.$message({ this.$message({
type: 'info', type: 'info',
message: '已取消删除' message: '已取消换算'
}); });
}); });
} }
...@@ -536,7 +584,7 @@ export default { ...@@ -536,7 +584,7 @@ export default {
}, },
differentCompare() { differentCompare() {
const originData = this.originTableDataList; const originData = this.originTableDataList;
/** /**
* @type {Array<object>} * @type {Array<object>}
*/ */
let data = cloneDeep(this.dataForm.tableDataList); let data = cloneDeep(this.dataForm.tableDataList);
...@@ -597,7 +645,7 @@ export default { ...@@ -597,7 +645,7 @@ export default {
await this.$nextTick(); await this.$nextTick();
// 获取编辑列所处位置 // 获取编辑列所处位置
const container = document.querySelector(".el-table__body-wrapper"); const container = document.querySelector(".el-table__body-wrapper");
/** /**
* @type {HTMLTableCellElement} * @type {HTMLTableCellElement}
*/ */
const editElement = container.querySelector(".el-table__row [class *= can-edit-column-]"); const editElement = container.querySelector(".el-table__row [class *= can-edit-column-]");
...@@ -617,7 +665,11 @@ export default { ...@@ -617,7 +665,11 @@ export default {
return `can-edit-column-${property}`; return `can-edit-column-${property}`;
} }
return ""; return "";
} },
//关闭单位换算弹窗
handleDialogVisible () {
this.showUnitConversion = false
},
}, },
} }
</script> </script>
......
dsk-operate-ui/src/views/projectCostLedger/detail/components/OtherProjects/index.vue
View file @ 4f9afccf
...@@ -55,52 +55,7 @@ ...@@ -55,52 +55,7 @@
</div> </div>
</div> </div>
<el-dialog :visible.sync="dialogVisible" width="720px" append-to-body class="dialogVisible" title="单位换算">
<el-tabs v-model="currentList" @tab-click="handleClickTab">
<el-tab-pane
:key="index"
v-for="(item, index) in toggleTabs"
:label="item.name"
:name="item.value"
>
{{item.content}}
</el-tab-pane>
<div class="detail-cont-tab">
<div class="select">
<el-select v-model="type1" placeholder="请选择">
<el-option v-for="(item,index) in typeList" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
</el-select>
<i class="el-icon-sort icon"></i>
<el-select v-model="type2" placeholder="请选择">
<el-option v-for="(item,index) in typeList" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
</el-select>
</div>
<el-table
:data="tableData1"
default-expand-all
border
highlight-current-row
>
<el-table-column
type="selection"
width="50">
</el-table-column>
<el-table-column label="序号" width="50" align="left">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="成本科目" width="190" prop="cbkm"></el-table-column>
<el-table-column label="物料验收系统本月用料" width="195" prop="wlyl"></el-table-column>
<el-table-column label="换算后本月用料" prop="hsyl"></el-table-column>
</el-table>
</div>
</el-tabs>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible=false">取消</el-button>
<el-button type="primary">保存结果</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -166,60 +121,9 @@ export default { ...@@ -166,60 +121,9 @@ export default {
nodeName: "itemContent", nodeName: "itemContent",
nodeValue: "menuId", nodeValue: "menuId",
}, },
dialogVisible:false,
currentList: "type1",
toggleTabs:[
{
value: "type1",
name: "长度",
},
{
value: "type2",
name: "面积",
},
{
value: "type3",
name: "体积",
},
// {
// value: "type4",
// name: "质量",
// },
// {
// value: "type5",
// name: "密度",
// },
],
tableData1:[], tableData1:[],
tableDataTotal1:0, tableDataTotal1:0,
type1:'',
type2:'',
typeList:[
{
dictLabel:'千米',
dictValue:'千米'
},
{
dictLabel:'米',
dictValue:'米'
},
{
dictLabel:'分米',
dictValue:'分米'
},
{
dictLabel:'厘米',
dictValue:'厘米'
},
{
dictLabel:'毫米',
dictValue:'毫米'
},
{
dictLabel:'微米',
dictValue:'微米'
},
],
}; };
}, },
watch: { watch: {
...@@ -297,118 +201,7 @@ export default { ...@@ -297,118 +201,7 @@ export default {
sortChange(){ sortChange(){
}, },
handleClickTab(v){
this.type1='';
this.type2='';
if(v.label === '长度'){
this.typeList=[
{
dictLabel:'千米',
dictValue:'千米'
},
{
dictLabel:'米',
dictValue:'米'
},
{
dictLabel:'分米',
dictValue:'分米'
},
{
dictLabel:'厘米',
dictValue:'厘米'
},
{
dictLabel:'毫米',
dictValue:'毫米'
},
{
dictLabel:'微米',
dictValue:'微米'
},
]
}
if(v.label === '面积'){
this.typeList=[
{
dictLabel:'平方千米',
dictValue:'平方千米'
},
{
dictLabel:'公顷',
dictValue:'公顷'
},
{
dictLabel:'公亩',
dictValue:'公亩'
},
{
dictLabel:'平方米',
dictValue:'平方米'
},
{
dictLabel:'平方分米',
dictValue:'平方分米'
},
{
dictLabel:'平方厘米',
dictValue:'平方厘米'
},
{
dictLabel:'平方毫米',
dictValue:'平方毫米'
},
]
}
if(v.label === '体积'){
this.typeList=[
{
dictLabel:'立方千米',
dictValue:'立方千米'
},
{
dictLabel:'立方米',
dictValue:'立方米'
},
{
dictLabel:'立方分米',
dictValue:'立方分米'
},
{
dictLabel:'立方厘米',
dictValue:'立方厘米'
},
{
dictLabel:'立方毫米',
dictValue:'立方毫米'
},
{
dictLabel:'升',
dictValue:'升'
},
{
dictLabel:'分升',
dictValue:'分升'
},
{
dictLabel:'毫升',
dictValue:'毫升'
},
{
dictLabel:'微升',
dictValue:'微升'
},
{
dictLabel:'厘升',
dictValue:'厘升'
},
{
dictLabel:'公石',
dictValue:'公石'
},
]
}
},
}, },
} }
</script> </script>
...@@ -436,43 +229,4 @@ export default { ...@@ -436,43 +229,4 @@ export default {
padding: 16px; padding: 16px;
} }
} }
.dialogVisible{
::v-deep .el-dialog {
position:absolute;
top:50%;
left:50%;
transform:translate(-50%,-50%);
margin-top:0 !important;
.el-dialog__body{
flex:1;
overflow: auto;
padding:0;
border-top: 1px solid #EEEEEE;
border-bottom: 1px solid #EEEEEE;
.select{
margin-bottom: 16px;
}
.el-input{
width: 316px !important;
}
.el-tabs__nav-wrap{
padding: 0 16px;
}
.el-tabs__header{
margin: 0;
}
.detail-cont-tab{
padding: 24px 20px;
.icon{
transform: rotate(90deg);
color:#0081FF;
margin: 0 16px;
}
}
}
.el-dialog__footer{
padding: 16px 20px;
}
}
}
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment