From 72a3040049e1221571d2898eb21d3647c7252e35 Mon Sep 17 00:00:00 2001 From: 石广澎 <shiguangpeng@163.com> Date: 星期三, 29 十一月 2023 11:16:34 +0800 Subject: [PATCH] feat: 1、删除无用文件 2、首页待办、预警对接 --- admin-web/src/views/stock/ledger/alertQuery/index.vue | 2 /dev/null | 222 --------------------------- admin-web/src/api/stock/ledger.js | 8 + admin-web/src/views/dashboard/index.vue | 210 ++++++++++++++++++------- 4 files changed, 158 insertions(+), 284 deletions(-) diff --git a/admin-web/src/api/projectConfig/buildPlan.js b/admin-web/src/api/projectConfig/buildPlan.js deleted file mode 100644 index 3b100c6..0000000 --- a/admin-web/src/api/projectConfig/buildPlan.js +++ /dev/null @@ -1,64 +0,0 @@ -import request from '@/utils/request'; - - -//澧炲姞 -export function add(data) { - return request({ - url: '/pc/p/temp/project/add', - method: 'post', - data - }); -} -//鍒犻櫎 -export function del(data) { - return request({ - url: '/pc/p/temp/project/del', - method: 'delete', - data - }); -} - -//缂栬緫 -export function upd(data) { - return request({ - url: '/pc/p/temp/project/upd', - method: 'post', - data - }); -} - -//璇︽儏 -export function getDetail(params) { - return request({ - url: '/pc/p/temp/project/detail', - method: 'get', - params - }); -} -//淇敼鐘舵�� -export function updStatus(data) { - return request({ - url: '/pc/p/temp/project/updStatus', - method: 'post', - data - }); -} - -//鏌ヨ鍒楄〃 -export function getList(params) { - return request({ - url: '/pc/p/temp/project/list', - method: 'get', - params - }); -} - -// 鑾峰彇鍒嗙被 -export function getPlanType(params) { - return request({ - url: '/permit/dict/data/type/PLAN_TYPE', - method: 'get', - params - }); -} - diff --git a/admin-web/src/api/projectConfig/buildPlanNode.js b/admin-web/src/api/projectConfig/buildPlanNode.js deleted file mode 100644 index 46d0136..0000000 --- a/admin-web/src/api/projectConfig/buildPlanNode.js +++ /dev/null @@ -1,36 +0,0 @@ -import request from '@/utils/request'; - - -//璁剧疆椤圭洰妯$増涓嬮樁娈佃妭鐐� -export function updPStageNode(data) { - return request({ - url: '/pc/p/temp/project/stage/node/save', - method: 'post', - data - }); -} -//鏌ヨ椤圭洰妯$増涓嬮樁娈佃妭鐐� -export function getStageNode(params) { - return request({ - url: '/pc/p/temp/project/stage/node', - method: 'get', - params - }); -} -//鏌ヨ椤圭洰妯$増涓嬮樁娈佃妭鐐� -export function getPStageNode(params) { - return request({ - url: '/pc/p/temp/project/stage/node/tree', - method: 'get', - params - }); -} -//鏌ヨ棰勮鏁版嵁 -export function getPreview(data) { - return request({ - url: '/pc/p/temp/project/stage/node/preview', - method: 'post', - data - }); -} - diff --git a/admin-web/src/api/projectConfig/kanbanConfig.js b/admin-web/src/api/projectConfig/kanbanConfig.js deleted file mode 100644 index bc71c65..0000000 --- a/admin-web/src/api/projectConfig/kanbanConfig.js +++ /dev/null @@ -1,55 +0,0 @@ -import request from '@/utils/request'; - - -//澧炲姞 -export function add(data) { - return request({ - url: '/pc/p/temp/project/board/add', - method: 'post', - data - }); -} -//鍒犻櫎 -export function del(data) { - return request({ - url: '/pc/p/temp/project/board/del', - method: 'delete', - data - }); -} - -//缂栬緫 -export function upd(data) { - return request({ - url: '/pc/p/temp/project/board/upd', - method: 'post', - data - }); -} - -//闃舵璇︽儏 -export function getDetail(params) { - return request({ - url: '/pc/p/temp/project/board/detail', - method: 'get', - params - }); -} -//淇敼鐘舵�� -export function updStatus(data) { - return request({ - url: '/pc/p/temp/project/board/updStatus', - method: 'post', - data - }); -} - -//鏌ヨ鍒楄〃 -export function getList(params) { - return request({ - url: '/pc/p/temp/project/board/list', - method: 'get', - params - }); -} - diff --git a/admin-web/src/api/projectConfig/kanbanNode.js b/admin-web/src/api/projectConfig/kanbanNode.js deleted file mode 100644 index edb190e..0000000 --- a/admin-web/src/api/projectConfig/kanbanNode.js +++ /dev/null @@ -1,28 +0,0 @@ -import request from '@/utils/request'; - -/*鐪嬫澘鑺傜偣*/ - -//缂栬緫 -export function upd(data) { - return request({ - url: '/pc/p/temp/project/board/node/upd', - method: 'post', - data - }); -} -//鍒楄〃 -export function getTree(params) { - return request({ - url: '/pc/p/temp/project/board/node/tree', - method: 'get', - params - }); -} -//鍒楄〃 -export function getList(params) { - return request({ - url: '/pc/p/temp/project/board/node/list', - method: 'get', - params - }); -} diff --git a/admin-web/src/api/projectConfig/stageConfig.js b/admin-web/src/api/projectConfig/stageConfig.js deleted file mode 100644 index 18578dd..0000000 --- a/admin-web/src/api/projectConfig/stageConfig.js +++ /dev/null @@ -1,55 +0,0 @@ -import request from '@/utils/request'; - - -//澧炲姞 -export function add(data) { - return request({ - url: '/pc/p/temp/stage/add', - method: 'post', - data - }); -} -//鍒犻櫎 -export function del(data) { - return request({ - url: '/pc/p/temp/stage/del', - method: 'delete', - data - }); -} - -//缂栬緫 -export function upd(data) { - return request({ - url: '/pc/p/temp/stage/upd', - method: 'post', - data - }); -} - -//璇︽儏 -export function getDetail(params) { - return request({ - url: '/pc/p/temp/stage/detail', - method: 'get', - params - }); -} -//淇敼鐘舵�� -export function updStatus(data) { - return request({ - url: '/pc/p/temp/stage/updStatus', - method: 'post', - data - }); -} - -//鏌ヨ鍒楄〃 -export function getList(params) { - return request({ - url: '/pc/p/temp/stage/list', - method: 'get', - params - }); -} - diff --git a/admin-web/src/api/projectConfig/stageNode.js b/admin-web/src/api/projectConfig/stageNode.js deleted file mode 100644 index 8fffc03..0000000 --- a/admin-web/src/api/projectConfig/stageNode.js +++ /dev/null @@ -1,68 +0,0 @@ -import request from '@/utils/request'; - -/*闃舵鑺傜偣*/ - -//澧炲姞 -export function add(data) { - return request({ - url: '/pc/p/temp/stage/node/add', - method: 'post', - data - }); -} - -//鍒犻櫎 -export function del(data) { - return request({ - url: '/pc/p/temp/stage/node/del', - method: 'delete', - data - }); -} - -//缂栬緫 -export function upd(data) { - return request({ - url: '/pc/p/temp/stage/node/upd', - method: 'post', - data - }); -} - -//璇︽儏 -export function getDetail(params) { - return request({ - url: '/pc/p/temp/stage/node/detail', - method: 'get', - params - }); -} - -//淇敼鐘舵�� -export function updStatus(data) { - return request({ - url: '/pc/p/temp/stage/node/updStatus', - method: 'post', - data - }); -} - -//鏌ヨ鍒楄〃 -export function getList(params) { - return request({ - url: '/pc/p/temp/stage/node/list', - method: 'get', - params - }); -} - - -//鏌ヨ闃舵鑺傜偣鏍� -export function getStageNodeTree(params) { - return request({ - url: '/pc/p/temp/stage/node/tree', - method: 'get', - params - }); -} - diff --git a/admin-web/src/api/projectConfig/warningConfig.js b/admin-web/src/api/projectConfig/warningConfig.js deleted file mode 100644 index fe43509..0000000 --- a/admin-web/src/api/projectConfig/warningConfig.js +++ /dev/null @@ -1,55 +0,0 @@ -import request from '@/utils/request'; - - -//澧炲姞 -export function add(data) { - return request({ - url: '/pc/p/temp/expiration/notify/add', - method: 'post', - data - }); -} -//鍒犻櫎 -export function del(data) { - return request({ - url: '/pc/p/temp/expiration/notify/del', - method: 'delete', - data - }); -} - -//缂栬緫 -export function upd(data) { - return request({ - url: '/pc/p/temp/expiration/notify/upd', - method: 'post', - data - }); -} - -//璇︽儏 -export function getDetail(params) { - return request({ - url: '/pc/p/temp/expiration/notify/detail', - method: 'get', - params - }); -} -//淇敼鐘舵�� -export function updStatus(data) { - return request({ - url: '/pc/p/temp/expiration/notify/updStatus', - method: 'post', - data - }); -} - -//鏌ヨ鍒楄〃 -export function getList(params) { - return request({ - url: '/pc/p/temp/expiration/notify/list', - method: 'get', - params - }); -} - diff --git a/admin-web/src/api/projectManage/audit.js b/admin-web/src/api/projectManage/audit.js deleted file mode 100644 index ea0133f..0000000 --- a/admin-web/src/api/projectManage/audit.js +++ /dev/null @@ -1,10 +0,0 @@ -import request from '@/utils/request'; -// 椤圭洰瀹℃牳 -export function auditUpd(data) { - return request({ - url: '/pc/p/project/info/audit', - method: 'post', - data: data - }) -} - diff --git a/admin-web/src/api/projectManage/cancel.js b/admin-web/src/api/projectManage/cancel.js deleted file mode 100644 index 658e808..0000000 --- a/admin-web/src/api/projectManage/cancel.js +++ /dev/null @@ -1,10 +0,0 @@ -import request from '@/utils/request'; -// 椤圭洰鍙栨秷 -export function cancelSave(data) { - return request({ - url: '/pc/p/project/info/cancel/save', - method: 'post', - data: data - }) -} - diff --git a/admin-web/src/api/projectManage/classify.js b/admin-web/src/api/projectManage/classify.js deleted file mode 100644 index baa30f0..0000000 --- a/admin-web/src/api/projectManage/classify.js +++ /dev/null @@ -1,51 +0,0 @@ -import request from '@/utils/request'; -// 椤圭洰鍒嗙被 -// 宸︿晶鏍� -export function classifyTree(params) { - return request({ - url: '/pc/p/project/category/tree', - method: 'get', - params - }) -} -// 淇敼鐘舵�� -export function updateStatus(data) { - return request({ - url: '/pc/p/project/category/updateStatus', - method: 'post', - data: data - }) -} -// 鏂板鍒嗙被 -export function add(data) { - return request({ - url: '/pc/p/project/category/add', - method: 'post', - data: data - }) -} -// 鏍规嵁鍒嗙被鑾峰彇璇︽儏 -export function getdetail(params) { - return request({ - url: '/pc/p/project/category/detail', - method: 'get', - params - }) -} -// 淇敼鍒嗙被 -export function edit(data) { - return request({ - url: '/pc/p/project/category/upd', - method: 'post', - data - }) -} -// 鍒犻櫎 -export function del(data) { - return request({ - url: '/pc/p/project/category/del', - method: 'delete', - data: data - }) -} - diff --git a/admin-web/src/api/projectManage/info.js b/admin-web/src/api/projectManage/info.js deleted file mode 100644 index 76c465f..0000000 --- a/admin-web/src/api/projectManage/info.js +++ /dev/null @@ -1,20 +0,0 @@ -import request from '@/utils/request'; - -// 椤圭洰鏂板 -export function add(data) { - return request({ - url: '/pc/p/project/info/add', - method: 'post', - data: data - }) -} - -// 璇︽儏 -export function getInfo(params) { - return request({ - url: '/pc/p/project/info/getInfo', - method: 'get', - params - }) -} - diff --git a/admin-web/src/api/projectManage/information.js b/admin-web/src/api/projectManage/information.js deleted file mode 100644 index e064809..0000000 --- a/admin-web/src/api/projectManage/information.js +++ /dev/null @@ -1,91 +0,0 @@ -import request from '@/utils/request'; -// 椤堕儴椤圭洰淇℃伅缁熻 -export function getTotal(params) { - return request({ - url: '/pc/p/project/info/total', - method: 'get', - params - }) -} -// 椤圭洰淇℃伅鍒楄〃 -export function getInfolist(params) { - return request({ - url: '/pc/p/project/info/list', - method: 'get', - params - }) -} -// 棰勮璁剧疆 淇敼鍒楄〃涓婇」鐩璀︾姸鎬� -export function updateInfoStatus(data) { - return request({ - url: '/pc/p/project/info/status/update', - method: 'post', - data: data - }) -} -// 棰勮璁剧疆 鑾峰彇棰勮鍒楄〃 -export function getWarnTempletelist(params) { - return request({ - url: '/pc/p/temp/expiration/notify/list', - method: 'get', - params - }) -} -// 棰勮璁剧疆 淇濆瓨 -export function warnTempleteSave(data) { - return request({ - url: '/pc/p/project/info/tempNotify/save', - method: 'post', - data: data - }) -} -// 涓嬭揪鎶曡祫 鑾峰彇宸茬粡涓嬭揪鎶曡祫鐨勯搴� -export function getInvestInfoList(params) { - return request({ - url: '/pc/p/release/invest/info/list', - method: 'get', - params - }) -} -// 涓嬭揪鎶曡祫 淇濆瓨 -export function investInfoSave(data) { - return request({ - url: '/pc/p/project/info/investInfo/save', - method: 'post', - data: data - }) -} -// 闃舵 鑺傜偣杩涘害 -export function nodeStageList(params) { - return request({ - url: '/pc/p/project/stage/node/report/alreadyByStageId', - method: 'get', - params - }) -} -// 璇︽儏 鑺傜偣杩涘害 -export function nodeItemList(params) { - return request({ - url: '/pc/p/project/stage/node/report/already', - method: 'get', - params - }) -} -// 涓婃姤鍒ゆ柇鏂囦欢鏄惁蹇呬紶 -export function getIsMustFile(params) { - return request({ - url: '/pc/p/project/stage/node/report/isMustFile', - method: 'get', - params - }) -} -// 璇︽儏 鑺傜偣涓婃姤 -export function nodeItemSave(data) { - return request({ - url: '/pc/p/project/stage/node/report/add', - method: 'post', - data: data - }) -} - - diff --git a/admin-web/src/api/projectManage/record.js b/admin-web/src/api/projectManage/record.js deleted file mode 100644 index db8ae9f..0000000 --- a/admin-web/src/api/projectManage/record.js +++ /dev/null @@ -1,18 +0,0 @@ -import request from '@/utils/request'; -// 椤圭洰褰掓。 -export function recordSave(data) { - return request({ - url: '/pc/p/project/info/record/save', - method: 'post', - data: data - }) -} -// 椤圭洰杩樺師 -export function recordUpd(data) { - return request({ - url: '/pc/p/project/info/record/upd', - method: 'post', - data: data - }) -} - diff --git a/admin-web/src/api/stock/ledger.js b/admin-web/src/api/stock/ledger.js index 577fdb2..07081e4 100644 --- a/admin-web/src/api/stock/ledger.js +++ b/admin-web/src/api/stock/ledger.js @@ -64,3 +64,11 @@ params, }); } +// 鏌ヨ棰勮淇℃伅鍒楄〃 +export function geWarningList(params) { + return request({ + url: '/pc/warehouse/warning/getList', + method: 'get', + params, + }); +} diff --git a/admin-web/src/views/dashboard/index.vue b/admin-web/src/views/dashboard/index.vue index 1d92ebb..a82a8cc 100644 --- a/admin-web/src/views/dashboard/index.vue +++ b/admin-web/src/views/dashboard/index.vue @@ -4,20 +4,24 @@ <el-col :span="12"> <el-card shadow="never"> <div slot="header" class="clearfix"> - <span class="font-18 font-bold">寰呭姙鍚嶇О</span> + <span class="font-18 font-bold">璋冩嫧寰呭姙</span> </div> <div class="f-r f-r-between m-b-10"> - <el-radio-group v-model="waitType" size="mini"> - <el-radio-button label="1">鍏ㄩ儴</el-radio-button> + <el-radio-group @change="changeAudit" v-model="waitType" size="mini"> + <el-radio-button label="0">寰呭嚭搴�</el-radio-button> + <el-radio-button label="1">寰呭叆搴�</el-radio-button> </el-radio-group> <div class="to-more" @click="nav('/stock/transfer/transferissue')">鏌ョ湅鏇村 ></div> </div> - <el-table :data="waitWorkData" class="top-tb" :show-header="false" size="medium"> + <el-table v-loading="waitLoading" :data="waitWorkData" class="top-tb" height="265" :show-header="false" size="medium"> <el-table-column prop="businessFormCode" align="center" width="130"></el-table-column> - <el-table-column prop="inWarehouseName" align="center" min-width="130"> + <el-table-column prop="inWarehouseName" align="left" min-width="130"> <template slot-scope="{row}"> <el-tooltip class="item" effect="dark" :content="row.inWarehouseName " placement="top-start"> - <div class="font-14 color-333" style="width: 100%;white-space:nowrap;text-overflow: ellipsis;overflow: hidden">{{ row.inWarehouseName }}</div> + <div class="font-14 color-333" + style="width: 100%;white-space:nowrap;text-overflow: ellipsis;overflow: hidden"> + {{ row.inWarehouseName }} + </div> </el-tooltip> </template> </el-table-column> @@ -29,9 +33,10 @@ </el-table-column> <el-table-column prop="date" label="鎿嶄綔" fixed="right" align="center" width="80"> <template slot-scope="scope"> - <el-button @click.native.prevent="aduitThis(scope.row.id)" type="primary">澶勭悊</el-button> + <el-button @click.native.prevent="aduitThis(scope.row)" size="mini" type="primary">澶勭悊</el-button> </template> </el-table-column> + <el-empty slot="empty" description="鏆傛棤鏁版嵁"></el-empty> </el-table> </el-card> </el-col> @@ -42,31 +47,44 @@ </div> <div class="f-r f-r-between m-b-10"> <el-radio-group size="mini" v-model="earlyWarningType" @change="changeEarlyWarning"> - <el-radio-button label="1">鍏ㄩ儴</el-radio-button> + <el-radio-button label="">鍏ㄩ儴</el-radio-button> <el-radio-button label="2">缂鸿揣锛�12锛�</el-radio-button> - <el-radio-button label="3">瓒呭嚭锛�3锛�</el-radio-button> + <el-radio-button label="1">瓒呭嚭锛�3锛�</el-radio-button> </el-radio-group> <div class="to-more" @click="nav('/stock/ledger/alertQuery')">鏌ョ湅鏇村 ></div> </div> - <el-table :data="earlyWarningData" class="top-tb" :show-header="false" size="medium"> - <el-table-column prop="type" align="center"></el-table-column> - <el-table-column prop="name" align="center" width="100"></el-table-column> - <el-table-column prop="orgName" align="center" width="100"></el-table-column> - <el-table-column prop="surplus" align="center" width="100"> - <template slot-scope="scope"> - <span class="font-14 color-333">鍓╀綑{{ scope.row.surplus }}濂�</span> + <el-table v-loading="earlyLoading" :data="earlyWarningData" class="top-tb" height="265" :show-header="false" size="medium"> + <el-table-column prop="baseGoodsTemplateName" align="left" min-width="130"> + <template slot-scope="{row}"> + <el-tooltip class="item" effect="dark" :content="row.baseGoodsTemplateName " placement="top-start"> + <div class="font-14 color-333" + style="width: 100%;white-space:nowrap;text-overflow: ellipsis;overflow: hidden"> + {{ row.baseGoodsTemplateName }} + </div> + </el-tooltip> </template> </el-table-column> - <el-table-column prop="createTime" align="center" width="180"> - <template slot-scope="scope"> - <span class="font-14 color-333">{{ formattTime(scope.row.createTime) }}</span> + <el-table-column prop="baseGoodsModelsName" align="left" min-width="130"> + <template slot-scope="{row}"> + <el-tooltip class="item" effect="dark" :content="row.baseGoodsModelsName " placement="top-start"> + <div class="font-14 color-333" + style="width: 100%;white-space:nowrap;text-overflow: ellipsis;overflow: hidden"> + {{ row.baseGoodsModelsName }} + </div> + </el-tooltip> </template> </el-table-column> - <el-table-column prop="date" label="鎿嶄綔" align="center" width="120"> - <template slot-scope="scope"> - <el-button @click.native.prevent="aduitThis(scope.row.id)" size="small" type="primary">澶勭悊</el-button> + <el-table-column prop="surplus" align="left" min-width="130"> + <template slot-scope="{row}"> + <span class="font-14 color-333">鍓╀綑{{ row.warehouseCount }}{{ row.unit }}</span> </template> </el-table-column> + <el-table-column prop="warningTime" align="center" width="160"> + <template slot-scope="{row}"> + <span class="font-14 color-333">{{ formattTime(row.warningTime) }}</span> + </template> + </el-table-column> + <el-empty slot="empty" description="鏆傛棤鏁版嵁"></el-empty> </el-table> </el-card> </el-col> @@ -75,23 +93,29 @@ <div class="f-r f-r-between total-list"> <div class="total-item"> <div class="font-14 color-666">鐗╁搧鏁伴噺</div> - <div class="font-14 color-333" style="margin-top:6px;"><span class="total-num">{{goodsNumPrice.totalNum}}</span></div> + <div class="font-14 color-333" style="margin-top:6px;"><span + class="total-num">{{ goodsNumPrice.totalNum }}</span></div> </div> <div class="total-item"> <div class="font-14 color-666">璧勪骇鎬婚噾棰�</div> - <div class="font-14 color-333" style="margin-top:6px;"><span class="total-num">{{goodsNumPrice.totalPrice}}</span>涓囧厓</div> + <div class="font-14 color-333" style="margin-top:6px;"><span + class="total-num">{{ goodsNumPrice.totalPrice }}</span>涓囧厓 + </div> </div> <div class="total-item"> <div class="font-14 color-666">鐗╁搧鍗犵敤鐜�</div> - <div class="font-14 color-333" style="margin-top:6px;"><span class="total-num">{{goodsNumPrice.zhanYouPercent}}%</span></div> + <div class="font-14 color-333" style="margin-top:6px;"><span + class="total-num">{{ goodsNumPrice.zhanYouPercent }}%</span></div> </div> <div class="total-item"> <div class="font-14 color-666">A绫荤墿鍝佹暟閲�</div> - <div class="font-14 color-333" style="margin-top:6px;"><span class="total-num">{{goodsNumPrice.aTotalNum}}</span></div> + <div class="font-14 color-333" style="margin-top:6px;"><span + class="total-num">{{ goodsNumPrice.aTotalNum }}</span></div> </div> <div class="total-item"> <div class="font-14 color-666">B绫荤墿鍝佹暟閲�</div> - <div class="font-14 color-333" style="margin-top:6px;"><span class="total-num">{{goodsNumPrice.bTotalNum}}</span></div> + <div class="font-14 color-333" style="margin-top:6px;"><span + class="total-num">{{ goodsNumPrice.bTotalNum }}</span></div> </div> </div> <!-- 绫诲埆閲戦缁熻/绫诲埆鏁伴噺缁熻 --> @@ -109,10 +133,13 @@ </template> <script> +import listPage from '@/views/mixins/listPage'; import {getGoodsNumPrice} from '@/api/dashboard' // 鍒涘缓Context import {LongToDateTime} from "@/utils/DateFormatter"; -import {transferList} from "@/api/stock/transfer"; +import {transfeIncome, transferList, transferOutput} from "@/api/stock/transfer"; +import {geWarningList} from '@/api/stock/ledger' +import transfer from "@/views/mixins/transfer"; const ComponentContext = require.context('./components', false, /\.vue$/i); let res_components = {}; @@ -124,8 +151,11 @@ export default { name: 'Dashboard', components: {...res_components}, + mixins: [listPage], data() { return { + earlyLoading: false, + waitLoading: false, goodsNumPrice: { aTotalNum: 0, aTotalPrice: 0, @@ -139,47 +169,104 @@ xiaFaNum: 0, zhanYouPercent: 0, }, - waitType: '1', + waitType: '0', waitWorkData: [], // 寰呭姙宸ヤ綔 - earlyWarningType: '1', - earlyWarningData: [ - {type: '鏂戒箰澶嶅嵃鏈虹⒊绮�', name: '鏂戒箰c2201', surplus: 4, createTime: 20231127150606, id: 1}, - {type: '鏂戒箰澶嶅嵃鏈虹⒊绮�', name: '鏂戒箰c2201', surplus: 5, createTime: 20231127150606, id: 2}, - {type: '鏂戒箰澶嶅嵃鏈虹⒊绮�', name: '鏂戒箰c2201', surplus: 6, createTime: 20231127150606, id: 3}, - {type: '鏂戒箰澶嶅嵃鏈虹⒊绮�', name: '鏂戒箰c2201', surplus: 6, createTime: 20231127150606, id: 4}, - ] // 棰勮閫氱煡 + earlyWarningType: '', + earlyWarningData: [] // 棰勮閫氱煡 }; }, created() { - this.init() + this.getAuditList() + this.getWarningList() getGoodsNumPrice().then(res => { this.goodsNumPrice = res }) }, methods: { - init(){ - transferList({ - qryType: 0, - pageNum: 1, - pageSize: 5, - }).then((res) => { - this.waitWorkData = res.datas; - }); - }, // 鏍煎紡鍖栨椂闂� formattTime(time) { return LongToDateTime(time) }, + changeAudit(e) { + this.waitType = e + this.$nextTick(() => { + this.getAuditList() + }) + }, // 鑾峰彇棰勮閫氱煡鍒楄〃鏁版嵁 - getAduitList() { - let form = { - pageSize: 5, + getAuditList() { + this.waitLoading = true + this.waitWorkData = [] + let params = { pageNum: 1, - waitType: this.waitType + pageSize: 5, + } + if (this.waitType === '0') { + params.outAgencyId = this.userInfo.tenantId + params.states = 0 + } else { + params.inAgencyId = this.userInfo.tenantId + params.states = 1 + } + transferList(params).then((res) => { + this.waitLoading = false + this.waitWorkData = res.datas; + }).catch(() => { + this.waitLoading = false + }); + }, + aduitThis(row){ + if (this.waitType === '0') { + this.handleOutput(row) + } else { + this.handleIncome(row) } }, - // 澶勭悊寰呭姙宸ヤ綔 - aduitThis(id) { + // 鍏ュ簱 + handleIncome(row) { + this.$confirm(`鎮ㄧ‘瀹� 鍗曞彿锛�${row.businessFormCode} 鎺ユ敹鍏ュ簱鍚�?`, '鎺ユ敹鍏ュ簱', { + beforeClose: (action, instance, done) => { + if (action == 'confirm') { + instance.confirmButtonLoading = true; + instance.confirmButtonText = '鎵ц涓�...'; + transfeIncome({ id: row.id }) + .then((res) => { + this.$message.success('鎺ユ敹鍏ュ簱鎴愬姛锛�'); + done(); + instance.confirmButtonLoading = false; + this.search(1); + }) + .catch(() => { + done(); + }); + } else { + done(); + } + }, + }); + }, + //鍑哄簱 + handleOutput(row) { + this.$confirm(`鎮ㄧ‘瀹� 鍗曞彿锛�${row.businessFormCode} 璋冩嫧鍑哄簱鍚�?`, '璋冩嫧鍑哄簱', { + beforeClose: (action, instance, done) => { + if (action == 'confirm') { + instance.confirmButtonLoading = true; + instance.confirmButtonText = '鎵ц涓�...'; + transferOutput({ id: row.id }) + .then((res) => { + this.$message.success('璋冩嫧鍑哄簱鎴愬姛锛�'); + done(); + instance.confirmButtonLoading = false; + this.search(1); + }) + .catch(() => { + done(); + }); + } else { + done(); + } + }, + }); }, // 鍒囨崲棰勮閫氱煡 changeEarlyWarning(e) { @@ -190,11 +277,18 @@ }, // 鑾峰彇棰勮閫氱煡鍒楄〃鏁版嵁 getWarningList() { - let form = { - pageSize: 5, + this.earlyLoading = true + this.earlyWarningData = [] + geWarningList({ + warningType: this.earlyWarningType, pageNum: 1, - earlyWarningType: this.earlyWarningType - } + pageSize: 5, + }).then(res => { + this.earlyLoading = false + this.earlyWarningData = res.datas; + }).catch(() => { + this.waitLoading = false + }); }, // 璺宠浆 nav(url) { @@ -221,10 +315,6 @@ .top-tb { width: 100%; -} - -> > > .el-table__body { - min-height: 265px; } .total-list { diff --git a/admin-web/src/views/home/index.vue b/admin-web/src/views/home/index.vue deleted file mode 100644 index 4d0395e..0000000 --- a/admin-web/src/views/home/index.vue +++ /dev/null @@ -1,241 +0,0 @@ -<template> - <div> - <el-container> - <!--宸︿笂瑙掓暟鎹� --> - <div class="total-main f-r f-r-top"> - <img src="@/assets/images/map/close-total.png" alt="鍏抽棴" v-if="totalShow" @click="totalShow = false" class="open-icon"> - <img src="@/assets/images/map/open-total.png" alt="灞曞紑" v-if="!totalShow" @click="totalShow = true" class="open-icon"> - <transition name="el-zoom-in-left"> - <div class="total-box" v-show="totalShow"> - <div class="font-18 color-333 font-bold">褰撳墠鑼冨洿锛歿{ cityName }}</div> - <div class="f-r total-list"> - <div class="total-item f-r f-r-top" v-for="(t,index) in totalList" :key="index"> - <img :src="typeIcon(t.type)" class="t-icon"/> - <div> - <div class="font-13 color-333">{{t.name}}</div> - <div class="font-20 color-333 font-bold">{{t.num}}</div> - </div> - </div> - </div> - </div> - </transition> - </div> - <div style="position: relative; z-index: 0; width: 100%; height: 100%"> - <div id="home"></div> - </div> - <!-- 鍙充晶鍒楄〃 --> - <div class="toggle-box" :class="projectShow ? 'toggle-box-right' : ''" @click="showProject"> - <i style="font-size: 16px" class="el-icon-arrow-left"/> - </div> - <project-lists v-if="projectShow" @close="projectShow=false"></project-lists> - </el-container> - </div> -</template> - -<script> -import projectLists from "@/views/home/projectList"; - -export default { - name: "index", - components: {projectLists}, - data() { - return { - projectShow: false, - loading: false, - totalShow: false, // 鏄惁鏄剧ず宸︿笂瑙掓�昏 - map: null, - windowHeight: document.documentElement.clientHeight, // 瀹炴椂灞忓箷楂樺害 - cityName: "閮戝窞甯�", - centerLatLng: '', - zoom: 8, - cur: null, // 褰撴湡閫変腑鍦板尯涓嬫爣 - infoWindow: { - show: false, - data: "", // 寮圭獥淇℃伅 - img: '', // 寮圭獥鍥炬爣 - lat: '', - lng: '', - }, - markerArr:[], - totalList: [ - {id: 1, type: 1, num: 6,name:'缁煎悎涓氬姟妤�'}, - {id: 2, type: 2, num: 7,name:'鐪佽涓績'}, - {id: 3, type: 3, num: 8,name:'甯傚鐞嗕腑蹇�'}, - {id: 4, type: 4, num: 9,name:'鍘夸粨閰嶄腑蹇�'}, - {id: 5, type: 5, num: 10,name:'璐疆'}, - {id: 6, type: 6, num: 11,name:'鏀瑰缓'}, - {id: 7, type: 7, num: 12,name:'淇℃伅鍖�'}, - {id: 8, type: 8, num: 13,name:'宸ヨ壓鏀归��'}, - {id: 9, type: 9, num: 14,name:'鍏朵粬'}, - {id: 10, type: 10, num: 15,name:'涓夊啘'}, - {id: 11, type: 11, num: 16,name:'涓夌骇鐗╂祦浣撶郴'}, - ], - projectList: [], // 椤圭洰缁熻鍒楄〃 - cityList: [] // 鍩庡競鍒楄〃 - } - }, - mounted() { - setTimeout(() => { - try { - this.initMap();// 娓叉煋鍦板浘 - } catch (e) { - console.log(e) - } - }, 50); - }, - methods: { - initMap() { - var center = new TMap.LatLng(39.984120, 116.307484) - //瀹氫箟map鍙橀噺锛岃皟鐢� TMap.Map() 鏋勯�犲嚱鏁板垱寤哄湴鍥� - this.map = new TMap.Map(document.getElementById('home'), { - center: center,//璁剧疆鍦板浘涓績鐐瑰潗鏍� - zoom: this.zoom, //璁剧疆鍦板浘缂╂斁绾у埆 - }); - this.map.removeControl(TMap.constants.DEFAULT_CONTROL_ID.SCALE);//绉婚櫎鑵捐鍦板浘姣斾緥灏� - this.map.removeControl(TMap.constants.DEFAULT_CONTROL_ID.ROTATION);//绉婚櫎鑵捐鍦板浘鏃嬭浆鎺т欢 - }, - initMarkerObj() { - var that = this - this.marker = new TMap.MultiMarker({ - id: 'marker_s', - map: this.map, // 鏄剧ずMarker鍥惧眰鐨勫簳鍥� - styles: { - markerStyle: new TMap.MarkerStyle({ // markerStyle鏄懠鍚哥偣鏍峰紡鍚嶇О - // 鐐规爣娉ㄧ殑鐩稿叧鏍峰紡 - width: 78, // 瀹藉害 - height: 100, // 楂樺害 - anchor: { x: 39, y: 50 }, // 鏍囨敞鐐瑰浘鐗囩殑閿氱偣浣嶇疆 - src: require("@/assets/images/map/icon-gj.png"), // 鏍囨敞鐐瑰浘鐗噓rl鎴朾ase64鍦板潃 - color: '#fff', // 鏍囨敞鐐规枃鏈鑹� - size: 18, // 鏍囨敞鐐规枃鏈枃瀛楀ぇ灏� - direction: 'top', // 鏍囨敞鐐规枃鏈枃瀛楃浉瀵逛簬鏍囨敞鐐瑰浘鐗囩殑鏂逛綅 - offset: { x: 0, y: 10 }, // 鏍囨敞鐐规枃鏈枃瀛楀熀浜巇irection鏂逛綅鐨勫亸绉诲睘鎬� - strokeColor: '#fff', // 鏍囨敞鐐规枃鏈弿杈归鑹� - strokeWidth: 0.5, // 鏍囨敞鐐规枃鏈弿杈瑰搴� - }) - }, - enableCollision: true, // 寮�鍚鎾� - geometries: that.markerArr,//浣嶇偣鏁扮粍 - }) - }, - showProject(){ - this.projectShow = !this.projectShow - }, - // 宸︿笂瑙掑睍绀轰笉鍚屽浘鏍� - typeIcon(type) { - // type 1缁煎悎涓氬姟妤� 2 鐪佽涓績 3 甯傚鐞嗕腑蹇� 4鍘夸粨閰嶄腑蹇� 5璐疆 6鏀瑰缓 7淇℃伅鍖� 8 宸ヨ壓鏀归�� 9鍏朵粬 10涓夊啘 11 榛樿 - let src = require('@/assets/images/map/icon-other.png') - switch (type) { - case 1: - src = require("@/assets/images/map/icon-zhywl.png") - break - case 2: - src = require("@/assets/images/map/icon-sjzx.png") - break - case 3: - src = require("@/assets/images/map/icon-sclzx.png") - break - case 4: - src = require("@/assets/images/map/icon-xcpzx.png") - break - case 5: - src = require("@/assets/images/map/icon-gz.png") - break - case 6: - src = require("@/assets/images/map/icon-gj.png") - break - case 7: - src = require("@/assets/images/map/icon-xxh.png") - break - case 8: - src = require("@/assets/images/map/icon-gygz.png") - break - case 9: - src = require("@/assets/images/map/icon-qt.png") - break - case 10: - src = require("@/assets/images/map/icon-sn.png") - break - default: - src = require("@/assets/images/map/icon-other.png") - break - } - return src - }, - // 闅忔満棰滆壊 - ranDombg() { - var r = Math.floor((Math.random() + 0.3) * 256); - var g = Math.floor((Math.random() + 0.3) * 256); - var b = Math.floor((Math.random() + 0.3) * 256); - return "rgb(" + r + "," + g + "," + b + ")"; - } - } -} -</script> - -<style scoped lang="scss"> -.total-main { - position: absolute; - top: 0; - left: 0; - padding: 15px; - z-index: 10; -} -.total-box{ - width: 530px; - margin-left: 15px; - background-color: #FFFFFF; - border-radius: 8px; - padding: 15px 30px; -} -.total-list { - margin-top: 5px; - flex-wrap: wrap; -} - -.total-item { - width: 25%; - margin:10px 0; -} - -.t-icon { - width: 28px; - height: 28px; - margin-right: 8px; -} -.open-icon{ - cursor: pointer; -} -.font-20{ - font-size: 20px; -} -.toggle-box { - cursor: pointer; - width: 23px; - height: 97px; - border-radius: 31px 0 0 31px; - border: 1px solid #eeeeee; - box-sizing: border-box; - background: #0D997C; - position: absolute; - display: flex; - align-items: center; - justify-content: center; - font-size: 24px; - top: 50%; - right: 0; - z-index: 2; - transform: rotate(0); - transform: translateY(-50%); - i { - color: #fff; - } -} -.toggle-box-right { - right: 400px; - i { - transform: rotate(180deg); - transition-delay: 0.2s; - } -} -</style> diff --git a/admin-web/src/views/home/projectList.vue b/admin-web/src/views/home/projectList.vue deleted file mode 100644 index a022e23..0000000 --- a/admin-web/src/views/home/projectList.vue +++ /dev/null @@ -1,172 +0,0 @@ -<template> - <div> - <transition name="el-zoom-in-right"> - <div class="project-main"> - <div> - <div class="f-r f-r-between project-top"> - <div class="font-14 search-switch" @click="formShow=true"> - 鏉′欢绛涢�� <i style="font-size: 16px" class="el-icon-arrow-down"></i> - </div> - <div class="font-14 color-333">鍏ㄩ儴{{total}}鏉$粨鏋�</div> - </div> - <!-- 鍒楄〃 --> - <div class="com-c-box" :loading="loading"> - <div class="info-main"> - <div class="p-item f-r f-r-top" v-for="(t,index) in projectLists" :key="index"> - <img :src="typeIcon(t.type)" class="t-icon"/> - <div class="f-1"> - <div class="font-18 project-name font-bold">{{t.projectName}}</div> - <div style="color:#235686" class="font-12">{{t.projectCategoryName}}</div> - <div class="f-r f-r-between"> - <div class="font-14 color-999">寤鸿鍗曚綅</div> - <div class="font-14 color-333">{{t.buildOrgName}}</div> - </div> - <div class="f-r f-r-between"> - <div class="font-14 color-999">寤鸿璧锋骞撮檺</div> - <div class="font-14 color-333">{{t.buildYearStart}}-{{t.buildYearEnd}}</div> - </div> - <div class="f-r f-r-between"> - <div class="font-14 color-999">涓昏寤鸿鍐呭</div> - <div class="font-14 color-333">{{t.detail}}</div> - </div> - </div> - </div> - </div> - </div> - <div class="f-r f-r-center btn-bot"> - <!-- 鍒嗛〉--> - <el-pagination - small - :current-page="page.pageNum" - :page-size="page.pageSize" - layout="prev, pager, next" - :total="total" - @size-change="handleSizeChange" - @current-change="handleCurrentChange"> - </el-pagination> - </div> - </div> - </div> - </transition> - <searchForm v-if="formShow" @close="formShow=false"></searchForm> - </div> -</template> - -<script> -import searchForm from "@/views/home/searchForm"; -export default { - name: "projectList", - components:{ searchForm }, - data(){ - return { - loading:false, // 鍒楄〃鍔犺浇 - formShow:false, // 鍙充晶琛ㄥ崟 - total:23, - page:{ - pageNum:1, - pageSize:10 - }, - projectLists:[ - { projectName:'xxxxx鍥哄畾璧勪骇椤圭洰涓�',projectCategoryName:'缁煎悎涓氬姟妤�',buildOrgName:'璁告槍灏夋皬鍘垮垎鍏徃',buildYearStart:2023,buildYearEnd:2025,detail:'寤鸿瑙勬ā5200骞虫硶绫�'}, - { projectName:'xxxxx鍥哄畾璧勪骇椤圭洰涓�',projectCategoryName:'缁煎悎涓氬姟妤�',buildOrgName:'璁告槍灏夋皬鍘垮垎鍏徃',buildYearStart:2023,buildYearEnd:2025,detail:'寤鸿瑙勬ā5200骞虫硶绫�'}, - { projectName:'xxxxx鍥哄畾璧勪骇椤圭洰涓�',projectCategoryName:'缁煎悎涓氬姟妤�',buildOrgName:'璁告槍灏夋皬鍘垮垎鍏徃',buildYearStart:2023,buildYearEnd:2025,detail:'寤鸿瑙勬ā5200骞虫硶绫�'}, - { projectName:'xxxxx鍥哄畾璧勪骇椤圭洰涓�',projectCategoryName:'缁煎悎涓氬姟妤�',buildOrgName:'璁告槍灏夋皬鍘垮垎鍏徃',buildYearStart:2023,buildYearEnd:2025,detail:'寤鸿瑙勬ā5200骞虫硶绫�'}, - { projectName:'xxxxx鍥哄畾璧勪骇椤圭洰涓�',projectCategoryName:'缁煎悎涓氬姟妤�',buildOrgName:'璁告槍灏夋皬鍘垮垎鍏徃',buildYearStart:2023,buildYearEnd:2025,detail:'寤鸿瑙勬ā5200骞虫硶绫�'}, - { projectName:'xxxxx鍥哄畾璧勪骇椤圭洰涓�',projectCategoryName:'缁煎悎涓氬姟妤�',buildOrgName:'璁告槍灏夋皬鍘垮垎鍏徃',buildYearStart:2023,buildYearEnd:2025,detail:'寤鸿瑙勬ā5200骞虫硶绫�'}, - { projectName:'xxxxx鍥哄畾璧勪骇椤圭洰涓�',projectCategoryName:'缁煎悎涓氬姟妤�',buildOrgName:'璁告槍灏夋皬鍘垮垎鍏徃',buildYearStart:2023,buildYearEnd:2025,detail:'寤鸿瑙勬ā5200骞虫硶绫�'}, - ] - } - }, - methods:{ - close(){ - this.$emit('close') - }, - // 灞曠ず涓嶅悓鍥炬爣 - typeIcon(type) { - // type 1 鏈繘琛� 2宸插畬鎴� 3杩涜涓� 4宸插彇娑� - let src = require('@/assets/images/map/wait.png') - switch (type) { - case 1: - src = require("@/assets/images/map/wait.png") - break - case 2: - src = require("@/assets/images/map/end.png") - break - case 3: - src = require("@/assets/images/map/ing.png") - break - default: - src = require("@/assets/images/map/cancel.png") - break - } - return src - }, - search(pageNum){ - if(pageNum){ - this.page.pageNum = pageNum - } - this.loading = true - }, - //鍒嗛〉 - handleSizeChange(pageSize) { - this.page.pageSize = pageSize; - this.search(1); - }, - handleCurrentChange(pageNum) { - this.page.pageNum = pageNum; - this.search(1); - }, - } -} -</script> - -<style scoped> -.project-main{ - position: absolute; - top:0; - right: 0; - bottom: 0; - width: 400px; - background-color: #FFFFFF; -} -.project-top{ - padding:15px; -} -.search-switch{ - width: 100px; - line-height: 32px; - border-radius: 4px; - text-align: center; - cursor: pointer; - border: 1px solid #c8ced5; -} -.com-c-box{ - overflow-y: auto; - max-height: calc(100vh - 240px); -} ->>>.com-c-box::-webkit-scrollbar { - display: none; -} -.info-main{ - padding: 15px; - position: relative; -} -.t-icon{ - min-width: 40px; - max-width: 40px; - height: 40px; - margin-right: 10px; -} -.p-item{ - line-height: 24px; - padding:15px 0; - border-top: 1px solid #eeeeee; -} -.project-name{ - color: #333333; -} -.project-name:hover{ - color: #0D997C; - cursor: pointer; -} -</style> diff --git a/admin-web/src/views/home/searchForm.vue b/admin-web/src/views/home/searchForm.vue deleted file mode 100644 index 299dda6..0000000 --- a/admin-web/src/views/home/searchForm.vue +++ /dev/null @@ -1,222 +0,0 @@ -<template> - <div> - <transition name="el-zoom-in-top"> - <div class="search-main"> - <div class="info-main"> - <div class="f-r f-r-between topic-title"> - <div class="font-16 color-333">鏉′欢绛涢��</div> - <i class="el-icon-close font-18 pointer" @click="close"></i> - </div> - <div class="com-c-box"> - <el-form ref="dataForm" :model="formData" label-width="90px"> - <el-form-item label="閫夋嫨鍖哄煙"> - <el-cascader - :options="orgOptions" - :show-all-levels="false" - :props="{ value: 'id',label:'label' }" - v-model="formData.orgId" - style="width:100%"></el-cascader> - </el-form-item> - <el-form-item label="椤圭洰鐘舵��"> - <el-checkbox-group v-model="formData.status" size="small"> - <el-checkbox-button v-for="(c,j) in statusList" :label="c.value" :key="c.value">{{c.name}}</el-checkbox-button> - </el-checkbox-group> - </el-form-item> - <el-form-item label="椤圭洰鍒嗙被"> - <el-cascader - :options="categoryOptions" - :show-all-levels="false" - :props="{ value: 'id',label:'label' }" - v-model="formData.projectCategoryId" - style="width:100%"></el-cascader> - </el-form-item> - <el-form-item label="鐩磋惀鍗曚綅"> - <el-cascader - :options="orgZsOptions" - :props="{ value: 'dict_code',label:'dict_label' }" - v-model="formData.directUnitCode" - style="width:100%"></el-cascader> - </el-form-item> - <el-form-item label="寤鸿鍗曚綅"> - <el-cascader - :options="buildOrgOptions" - :props="{ value: 'id',label:'label', checkStrictly: true }" - v-model="formData.buildOrgId" - style="width:100%"></el-cascader> - </el-form-item> - <div class="f-r f-r-between"> - <el-form-item label="寤鸿骞撮檺"> - <el-date-picker - style="width:100%" - v-model="buildDate" - type="daterange" - range-separator="鑷�" - start-placeholder="寮�濮嬫棩鏈�" - end-placeholder="缁撴潫鏃ユ湡"> - </el-date-picker> - </el-form-item> - </div> - <el-form-item label="椤圭洰鎵规"> - <el-select v-model="formData.projectBatchCode" placeholder="璇烽�夋嫨" style="width:100%"> - <el-option - v-for="item in batchOptions" - :label="item.dict_label" - :value="item.dict_code"> - </el-option> - </el-select> - </el-form-item> - <el-form-item label="鎶曡祫涓撲笟"> - <el-select v-model="formData.investMajorCode" placeholder="璇烽�夋嫨" style="width:100%"> - <el-option - v-for="item in investOptions" - :key="item.dict_code" - :label="item.dict_label" - :value="item.dict_code"> - </el-option> - </el-select> - </el-form-item> - </el-form> - </div> - <div class="f-r f-r-center btn-bot"> - <my-button name="纭畾" site="form" @click="save"/> - <my-button name="閲嶇疆" site="form" @click="reset"/> - </div> - </div> - </div> - </transition> - </div> -</template> - -<script> -import * as finsystenant from "@/api/baseSetting/finsystenant"; -import * as classify from "@/api/projectManage/classify"; -import * as system from "@/api/system/dict/data"; -import myButton from '@/components/myButton/myButton' -export default { - name: "searchForm", - components:{ myButton }, - data(){ - return { - formShow:true, - orgOptions:[], // 閫夋嫨鍖哄煙 - categoryOptions:[], // 椤圭洰鍒嗙被 - orgZsOptions:[], // 鐩磋惀鍗曚綅 - buildOrgOptions:[], // 寤鸿鍗曚綅 - batchOptions:[], // 椤圭洰鎵规 - investOptions:[], // 鎶曡祫涓撲笟 - statusList:[ - {name:'鏈紑濮�',value:1}, - {name:'杩涜涓�',value:2}, - {name:'宸插畬宸�',value:3}, - {name:'宸插彇娑�',value:4}, - // {name:'宸查�炬湡',value:5}, - ], - formData: { - projectCategoryId: '', - planTypeCode: '', - projectName: '', - projectCode: '', - status:[], - directUnitCode: '', - buildOrgId:'', - buildYearStart:'', - buildYearEnd:'', - projectBatchCode:'', - investMajorCode:'', - }, - buildDate:[] - } - }, - created() { - this.getProjectClass() // 鑾峰彇椤圭洰鍒嗙被 - this.getProjectBatch() // 鑾峰彇椤圭洰鎵规 - this.getProjectInvest() // 鑾峰彇鎶曢�掍笓涓� - this.getProjectDirect() // 鑾峰彇鐩磋惀鍗曚綅 - this.getOrg() // 鑾峰彇寤鸿鍗曚綅 - }, - methods:{ - // 鑾峰彇椤圭洰鍒嗙被 - getProjectClass(){ - classify.classifyTree().then(res => { - const content = res || [] - this.categoryOptions = content - }) - }, - // 鑾峰彇椤圭洰鎵规 - getProjectBatch(){ - system.getDicts('project_batch').then(res=>{ - this.batchOptions = res - }) - }, - // 鑾峰彇鎶曢�掍笓涓� - getProjectInvest(){ - system.getDicts('INVEST_MAJOR').then(res=>{ - this.investOptions = res - }) - }, - // 鑾峰彇鐩磋惀鍗曚綅 - getProjectDirect(){ - system.getDicts('DIRECT_UNIT').then(res=>{ - this.orgZsOptions = res - }) - }, - // 鑾峰彇寤鸿鍗曚綅 - getOrg() { - finsystenant.getTree().then(res => { - if (res) { - this.buildOrgOptions = res - } else { - this.buildOrgOptions = [] - } - this.$forceUpdate() - }) - }, - // 纭畾 - save(){}, - // 閲嶇疆 - reset(){}, - close(){ - this.$emit('close') - } - } -} -</script> - -<style scoped> -.search-main{ - position: absolute; - top:0; - right: 0; - bottom: 0; - width: 400px; - z-index: 101; - background-color: #FFFFFF; - box-sizing: border-box; -} -.com-c-box{ - padding-right:15px; - overflow-y: auto; - max-height: calc(100vh - 240px); -} ->>>.com-c-box::-webkit-scrollbar { - display: none; -} -.topic-title{ - padding: 0 20px 20px 20px; -} -.pointer{ - cursor: pointer; -} -.info-main{ - box-sizing: border-box; - padding:20px 0; - position: relative; -} -.btn-bot{ - width: 100%; - padding:15px 0; - background-color: #FFFFFF; - border-top:1px solid #eeeeee; - z-index: 11; -} -</style> diff --git a/admin-web/src/views/stock/ledger/alertQuery/index.vue b/admin-web/src/views/stock/ledger/alertQuery/index.vue index b27f0e8..c1f3529 100644 --- a/admin-web/src/views/stock/ledger/alertQuery/index.vue +++ b/admin-web/src/views/stock/ledger/alertQuery/index.vue @@ -24,8 +24,6 @@ import MyButton from '@/components/myButton/myButton'; import SettingIplatform from '@/utils/settingIplatform'; import * as finsystenant from '@/api/baseSetting/finsystenant'; -import {goodsModel, getCategorySelectTree} from '@/api/baseSetting/finsystenant'; -import {getDicts} from '@/api/system/dict/data'; import * as DateFormatter from '@/utils/DateFormatter'; export default { -- Gitblit v1.9.1