diff --git a/.env.dev b/.env.dev
index e0b89faf..526323a3 100644
--- a/.env.dev
+++ b/.env.dev
@@ -12,9 +12,9 @@ VUE_APP_TITLE = 洛玻集团驾驶舱
# 杨姗姗
# VUE_APP_BASE_API = 'http://172.16.20.218:7070'
# 小田
-# VUE_APP_BASE_API = 'http://172.16.19.232:7070'
+VUE_APP_BASE_API = 'http://172.16.19.232:7070'
# 测试
-VUE_APP_BASE_API = 'http://192.168.0.35:8080'
+# VUE_APP_BASE_API = 'http://192.168.0.35:8080'
# 闫阳
# VUE_APP_BASE_API = 'http://172.16.19.131:7070'
diff --git a/src/api/cockpit.js b/src/api/cockpit.js
index 14b1c154..65ac5e11 100644
--- a/src/api/cockpit.js
+++ b/src/api/cockpit.js
@@ -316,6 +316,24 @@ export function updateTargetYearData(data) {
data: data,
});
}
+// 预算填报模板下载/导出
+export function importTemplateYS(data) {
+ return request({
+ url: '/lb/index-target-month/export',
+ method: "post",
+ data: data,
+ responseType: 'blob'
+ })
+}
+// 指标填报模板下载/导出
+export function importTemplateZB(data) {
+ return request({
+ url: '/lb/index-real-month/export',
+ method: "post",
+ data: data,
+ responseType: 'blob'
+ })
+}
export function getRealMonthPage(data) {
return request({
diff --git a/src/utils/dict.js b/src/utils/dict.js
index a1416290..20a2c921 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -85,8 +85,8 @@ export const DICT_TYPE = {
// ========== 模块 ==========
LB_DW: 'lb_dw',
PROCESS:'process',
- IMPORTANT_WORK_METHOD:'important_work_method'
-
+ IMPORTANT_WORK_METHOD:'important_work_method',
+ TARGET_PROPERTY:'target_property'
}
/**
diff --git a/src/views/home/basicInfoConfiguration/components/groupKeyAdd.vue b/src/views/home/basicInfoConfiguration/components/groupKeyAdd.vue
index 5050c676..60204abb 100644
--- a/src/views/home/basicInfoConfiguration/components/groupKeyAdd.vue
+++ b/src/views/home/basicInfoConfiguration/components/groupKeyAdd.vue
@@ -30,6 +30,13 @@
+
+
+
+
+
+
+
@@ -46,7 +53,8 @@ export default {
importantWork: '',
unit: '',
time:'',
- calculateMethod:''
+ calculateMethod:'',
+ targetProperty:'',
},
isEdit: false, //是否是编辑
rules: {
@@ -54,9 +62,11 @@ export default {
unit: [{ required: true, message: '请选择单位', trigger: 'change' }],
time: [{ required: true, message: '请选择所属年份', trigger: 'change' }],
calculateMethod: [{ required: true, message: '请选择累计值计算方式', trigger: 'change' }],
+ targetProperty: [{ required: true, message: '请选择数值目标属性', trigger: 'change' }],
},
unitList:getDictDatas('lb_dw'),
- calculateMethodList:getDictDatas('important_work_method')
+ calculateMethodList:getDictDatas('important_work_method'),
+ targetPropertyList:getDictDatas('target_property')
}
},
methods: {
diff --git a/src/views/home/basicInfoConfiguration/customerInfoConfiguration.vue b/src/views/home/basicInfoConfiguration/customerInfoConfiguration.vue
index fec5d61f..a04c1be3 100644
--- a/src/views/home/basicInfoConfiguration/customerInfoConfiguration.vue
+++ b/src/views/home/basicInfoConfiguration/customerInfoConfiguration.vue
@@ -44,6 +44,22 @@ export default {
data () {
return {
formConfig: [
+ {
+ type: 'select',
+ label: '所属基地',
+ selectOptions: [
+ { id: 2, name: '桐城' },
+ { id: 3, name: '自贡' },
+ { id: 5, name: '合肥' },
+ { id: 6, name: '宿迁' },
+ { id: 7, name: '宜兴' },
+ { id: 8, name: '漳州' },
+ { id: 9, name: '洛阳' },
+ { id: 10, name: '秦皇岛' },
+ ],
+ param: 'factory',
+ onchange: true
+ },
{
type: 'input',
label: '客户名称',
@@ -74,6 +90,7 @@ export default {
}
],
listQuery:{
+ factory:'',
name:'',
code:'',
pageSize:20,
@@ -106,6 +123,7 @@ export default {
case 'search':
this.listQuery.name = val.name
this.listQuery.code = val.code
+ this.listQuery.factory = val.factory
this.listQuery.pageNo = 1;
this.getDataList();
break;
diff --git a/src/views/home/basicInfoConfiguration/groupKeyTaskConfiguration.vue b/src/views/home/basicInfoConfiguration/groupKeyTaskConfiguration.vue
index e5d650c5..338f62d0 100644
--- a/src/views/home/basicInfoConfiguration/groupKeyTaskConfiguration.vue
+++ b/src/views/home/basicInfoConfiguration/groupKeyTaskConfiguration.vue
@@ -45,6 +45,11 @@ const tableProps = [
label: '累计值计算方式',
filter: publicFormatter('important_work_method')
},
+ {
+ prop: 'targetProperty',
+ label: '数值目标属性',
+ filter: publicFormatter('target_property')
+ },
];
export default {
name: 'GroupKeyTaskConfiguration',
diff --git a/src/views/home/budgetSubmissionDetails.vue b/src/views/home/budgetSubmissionDetails.vue
index 47f0f6a9..be554bda 100644
--- a/src/views/home/budgetSubmissionDetails.vue
+++ b/src/views/home/budgetSubmissionDetails.vue
@@ -14,7 +14,7 @@
diff --git a/src/views/home/components/budgetCalendar.vue b/src/views/home/components/budgetCalendar.vue
index 5e9796ca..eaabaacf 100644
--- a/src/views/home/components/budgetCalendar.vue
+++ b/src/views/home/components/budgetCalendar.vue
@@ -1,14 +1,13 @@
-
+
+ style="width: 100%;margin-top: 8px;background-color: rgba(249, 252, 255, 1);height: 844px;padding: 26px 0px;">
-
+
查询
+ 模板下载
导入
+ 导出
@@ -99,7 +101,7 @@