From d8e78fa8610d65f6bfa23e0dd7070672f41ba3e4 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期六, 03 八月 2024 22:15:16 +0800
Subject: [PATCH] 调整
---
module/flow/page/flow_sales_list.html | 104 ++++++++++++++++++++++++----------------------------
1 files changed, 48 insertions(+), 56 deletions(-)
diff --git a/module/flow/page/flow_sales_list.html b/module/flow/page/flow_sales_list.html
index ed91521..3c4f134 100644
--- a/module/flow/page/flow_sales_list.html
+++ b/module/flow/page/flow_sales_list.html
@@ -18,8 +18,8 @@
title: "閿�鍞祦鍚�",
//Tab椤硅缃�
tabs_d: [
- {code: "month", name: "鏈堟祦鍚�", dataname: "flow_daily_sell", filterTxt: "", orderby: ""},
- {code: "daily", name: "鏃ユ祦鍚�", dataname: "flow_month_sell", filterTxt: "", orderby: ""},
+ {code: "month", name: "鏈堟祦鍚�", dataname: "flow_month_sell", filterTxt: "", orderby: ""},
+ {code: "daily", name: "鏃ユ祦鍚�", dataname: "flow_daily_sell", filterTxt: "", orderby: ""},
],
d_tabs: {
month: true,
@@ -41,6 +41,21 @@
{isshow: "T", field: "org_code", name: "缁忛攢鍟嗙紪鐮�", filterfield:"", filteroperator: "like", type: ""},
{isshow: "T", field: "org_name", name: "缁忛攢鍟嗗悕绉�", filterfield:"", filteroperator: "like", type: ""},
],
+ default_filterObj: {
+ month: {
+ dataversion: "鏈堝害鍒濈増"
+ //year: new Date().getFullYear().toString(),
+ //month: (new Date().getMonth() + 1).toString(),
+ // month: dateFormat(new Date(), "yyyy-MM"),
+ //month: new Date().getFullYear() + "-" + new Date().getMonth()+1,
+ // dataversion: "1"
+ },
+ daily: {
+ //year: new Date().getFullYear().toString(),
+ //month: (new Date().getMonth()+1).toString(),
+ // month: dateFormat(new Date(), "yyyy-MM"),
+ },
+ },
cbuttons_r: {},
ctabs_r: {},
@@ -50,8 +65,14 @@
isSales: false,//閿�鍞汉鍛橈紙閿�鍞唬琛ㄣ�佸ぇ鍖虹粡鐞嗐�佸皬鍖虹粡鐞嗭級
isRegionR: false,//澶у尯缁忕悊
saveUser: null,//鐧诲綍鑰卛d
+
+ newdate_month: "",
+ newdate_day: "",
+
},
created() {
+ this.newdate_month = dateFormat(new Date(), "yyyy骞碝M鏈�")
+ this.newdate_day = dateFormat(new Date(), "yyyy骞碝M鏈坉d鏃�")
if (window.top.vue.userinfo) {
this.saveUser = window.top.vue.userinfo.id;
if (window.top.vue.userinfo.currentactor.code == "Capacity-Sale" || window.top.vue.userinfo.currentactor.code == "Capacity-Region-R" || window.top.vue.userinfo.currentactor.code == "Capacity-Region-M") {
@@ -176,6 +197,8 @@
if (!me.selectTabObj.filterFields || (me.selectTabObj.filterFields && me.selectTabObj.filterFields.length == 0)) {
me.selectTabObj.filterFields = clone(filterFields_);
me.selectTabObj.tableFields = clone(tableFields_);
+
+ me.selectTabObj.filterObj = clone(me.default_filterObj[me.selectTabObj.code])
//瀛楁鏁扮粍杞瓧娈祇bj锛岀洰鐨勪负浜嗙瓫閫夋椂鑾峰彇瀛楁灞炴��
me.fieldsToFieldsObj();
@@ -988,65 +1011,34 @@
<div v-cloak id="vbody">
<div id="page_root">
<div class="topbar">
- <span>{{title}}</span>
+ <span style="float: left;">{{title}}</span>
- <div style="float: right;">
- <el-button-group style="margin-left: 3px">
- <el-button v-show="cbuttons_r.linkpharmacy" @click="onShowLinkPharmacy">鍏宠仈闄㈠搴�</el-button>
- <el-button v-show="cbuttons_r.downloadTemplate" @click="DownloadTemplate">妯℃澘涓嬭浇</el-button>
- <el-tooltip class="item" effect="dark" :content="buttonsconfig.clearandappend.tooltip" placement="top-start">
- <el-button v-show="cbuttons_r.import" @click="onPopupByUploadFile":icon="buttonsconfig.clearandappend.icon">{{buttonsconfig.clearandappend.name}}</el-button>
- </el-tooltip>
- <el-button v-show="cbuttons_r.export" type="primary" @click="onDownload" :icon="buttonsconfig.export.icon">{{buttonsconfig.export.name}}</el-button>
- </el-button-group>
- <!-- <el-button
- v-show="cbuttons_r.Add && selectTabObj.code == 'hospital'" @click="addData":icon="buttonsconfig.add.icon">{{buttonsconfig.add.name}}
- </el-button>
- <el-button
- v-show="cbuttons_r.Add && selectTabObj.code == 'hospital'"
- :disabled="!(selectTabObj.selectedrow && selectTabObj.selectedrow.id)"
- @click="onEditDataChange" :icon="buttonsconfig.change.icon">鍙樻洿
- </el-button>
-
- <el-button
- v-show="cbuttons_r.Auth && selectTabObj.code == 'hospital'"
- :disabled="!(selectTabObj.selectedrow && selectTabObj.selectedrow.id)"
- @click="onAuthorize('add')" :icon="buttonsconfig.authorize.icon">鏂板鎺堟潈
- </el-button>
-
- <el-button-group v-show="selectTabObj.code == 'authorize'" style="margin-left: 3px;">
- <el-button
- v-show="cbuttons_r.Auth"
- @click="onAuthorize('add')" :icon="buttonsconfig.authorize.icon">鏂板鎺堟潈
- </el-button>
- <el-button
- v-show="cbuttons_r.Auth"
- :disabled="!(selectTabObj.selectedrow && selectTabObj.selectedrow.id)"
- @click="onAuthorize('change')" :icon="buttonsconfig.authorize.icon">鍙樻洿鎺堟潈
- </el-button>
- <el-button
- v-show="cbuttons_r.Auth"
- :disabled="!(selectTabObj.selectedrow && selectTabObj.selectedrow.id)"
- type="danger"
- @click="onAuthorize('delete')" :icon="buttonsconfig.authorize.icon">鍙栨秷鎺堟潈
- </el-button>
+ <div style="float: right; margin-right: 18px;">
+ <el-button-group
+ v-if="selectTabObj && selectTabObj.code == 'month' && selectTabObj.filterObj.dataversion == '鏈堝害鍒濈増'"
+ style="margin-left: 3px;">
+ <el-button :disabled="!(selectTabObj.selectedrow && selectTabObj.selectedrow.biz_date)"
+ type="primary" @click="onAddSS" :icon="buttonsconfig.add.icon">鐢宠瘔</el-button>
</el-button-group>
- <el-button-group v-show="selectTabObj.code == 'infoAll'" style="margin-left: 3px;">
- <el-button
- v-show="cbuttons_r.Add"
- :disabled="!(selectTabObj.selectedrow && selectTabObj.selectedrow.id && (selectTabObj.selectedrow.state_code == 'Rejected' || selectTabObj.selectedrow.state_code == 'Input') && selectTabObj.selectedrow.create_id == saveUser)"
- @click="reEditInfo" :icon="buttonsconfig.edit.icon">缂栬緫
- </el-button>
+ <el-button-group style="margin-left: 3px;">
+ <el-button type="primary" @click=""
+ :icon="buttonsconfig.import.icon">{{buttonsconfig.import.name}}</el-button>
+ <el-button type="primary" @click=""
+ :icon="buttonsconfig.export.icon">{{buttonsconfig.export.name}}</el-button>
</el-button-group>
+ </div>
- <el-button-group v-show="selectTabObj.code == 'authAll'" style="margin-left: 3px;">
- <el-button
- v-show="cbuttons_r.Auth"
- :disabled="!(selectTabObj.selectedrow && selectTabObj.selectedrow.id && (selectTabObj.selectedrow.state_code == 'Rejected' || selectTabObj.selectedrow.state_code == 'Input') && selectTabObj.selectedrow.create_id == saveUser)"
- @click="reEditAuth" :icon="buttonsconfig.edit.icon">缂栬緫
- </el-button>
- </el-button-group> -->
+ <div style="float: left; margin-left: 20%;">
+ <span>鎶ュ憡鏃ユ湡锛�</span>
+ <span v-if="selectTabObj && selectTabObj.code == 'month'">{{newdate_month}}</span>
+ <span v-if="selectTabObj && selectTabObj.code == 'daily'">{{newdate_day}}</span>
+ <el-radio-group style="margin-left: 10px;"
+ v-if="selectTabObj && selectTabObj.filterObj && selectTabObj.code=='month'"
+ v-model="selectTabObj.filterObj.dataversion" size="mini" fill="#4cb108">
+ <el-radio-button label="鏈堝害鍒濈増">鍒濈増</el-radio-button>
+ <el-radio-button label="鏈堝害缁堢増">缁堢増</el-radio-button>
+ </el-radio-group>
</div>
</div>
--
Gitblit v1.8.0