From 1615528985f30b496d3c294e82136434ee36397c Mon Sep 17 00:00:00 2001 From: 李林 <z1292839451@163.com> Date: 星期三, 09 八月 2023 17:54:23 +0800 Subject: [PATCH] 8.9编写销售管理 --- src/components/view/standard.vue | 7 src/main.js | 2 src/App.vue | 28 ++ src/view/index.vue | 21 + src/assets/api/controller.js | 61 +++-- src/components/view/sale.vue | 475 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 554 insertions(+), 40 deletions(-) diff --git a/src/App.vue b/src/App.vue index ccd4a2b..e34819f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -26,7 +26,7 @@ </script> <style> /* @import url("../static/img/alifont/iconfont.css"); */ - @import url("//at.alicdn.com/t/c/font_4179845_y48isucsagi.css"); + @import url("//at.alicdn.com/t/c/font_4179845_enf3r8ak8d.css"); * { margin: 0; @@ -183,8 +183,32 @@ margin-right: 8.5px; } .el-dialog__header .el-dialog__title{ - font-size: 18px !important; + font-size: 16px !important; } + + .el-dialog__footer .el-button *{ + font-size: 14px !important; + } + + .el-dialog__footer .el-button{ + height: 36px; + border: 1px solid rgba(190, 190, 190, 0.44); + box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41); + padding: 0 14px; + } + + .el-button--primary{ + background: #004EA2; + } + + .el-dialog__body{ + padding: 15px 20px; + } + + .el-input.is-disabled input{ + color: #666 !important; + background-color: rgba(0, 0, 0, 0.05) !important; + } /* 鍏ㄥ眬杈撳叆妗嗘牱寮� */ /* 鍏ㄥ眬鎸夐挳鏍峰紡 */ </style> diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js index cb2bc85..ae95499 100644 --- a/src/assets/api/controller.js +++ b/src/assets/api/controller.js @@ -1,43 +1,46 @@ // 鎶�鏈鐞�-鏍囧噯Bom const standard = { - // 鎶�鏈鐞�-鏍囧噯Bom - selectTreeByMaterial: "material/selectTreeByMaterial", //鏌ヨ鐗╂枡鐨勬爲 - selectProductByMaterial: "product/selectTreeByMaterial",//鏍规嵁鐗╂枡鏌ヨ椤圭洰琛ㄦ牸 - selectTechnologyByMaterial: "technology/select", - // 鎶�鏈鐞�-鎶�鏈枃浠� - selectAllOrder: "/orders/selectAllOrder",//鏌ヨ鎵�鏈夎鍗曞垪琛� - selectOrderById: "/orders/selectOrderById",//鏍规嵁璁㈠崟id鏌ヨ璁㈠崟璇︽儏 + // 鎶�鏈鐞�-鏍囧噯Bom + selectTreeByMaterial: "material/selectTreeByMaterial", //鏌ヨ鐗╂枡鐨勬爲 + selectProductByMaterial: "product/selectTreeByMaterial", //鏍规嵁鐗╂枡鏌ヨ椤圭洰琛ㄦ牸 + selectTechnologyByMaterial: "technology/select", + // 鎶�鏈鐞�-鎶�鏈枃浠� + selectAllOrder: "/orders/selectAllOrder", //鏌ヨ鎵�鏈夎鍗曞垪琛� + selectOrderById: "/orders/selectOrderById", //鏍规嵁璁㈠崟id鏌ヨ璁㈠崟璇︽儏 } // 鍘熸潗鏂欐楠� const raw = { - selectRawInspectsList: "rawInspect/selectRawInspectsList",//鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃 - selectRawInspectsListById: "rawInspect/selectRawInspectsListById/",//鏍规嵁妫�楠屽崟id鑾峰彇妫�楠屽崟璇︽儏 - updaterawInsProduct:'rawInsProduct/updaterawInsProduct',//淇敼椤圭洰鐨勬楠屽�� - updateRawInspectsById:"/rawInspect/updateRawInspectsById/",//涓婃姤, - selectRawMaterial:"/rawInspect/selectMaterial",//鏌ヨ鍘熸潗鏂欎俊鎭� - selectSpBySt:"/rawInspect/selectSpBySt",//鏍规嵁鏉愭枡id鏌ヨ鎵�鏈夊瀷鍙�, - addRawInspects :"/rawInspect/addRawInspects" + selectRawInspectsList: "rawInspect/selectRawInspectsList", //鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃 + selectRawInspectsListById: "rawInspect/selectRawInspectsListById/", //鏍规嵁妫�楠屽崟id鑾峰彇妫�楠屽崟璇︽儏 + updaterawInsProduct: 'rawInsProduct/updaterawInsProduct', //淇敼椤圭洰鐨勬楠屽�� + updateRawInspectsById: "/rawInspect/updateRawInspectsById/", //涓婃姤, + selectRawMaterial: "/rawInspect/selectMaterial", //鏌ヨ鍘熸潗鏂欎俊鎭� + selectSpBySt: "/rawInspect/selectSpBySt", //鏍规嵁鏉愭枡id鏌ヨ鎵�鏈夊瀷鍙�, + addRawInspects: "/rawInspect/addRawInspects" } // 鎴愬搧妫�楠� -const finishedIns ={ - finishedInsListPage:"/finished-inspect/list_page",//鑾峰彇鎴愬搧妫�楠屽垪琛� -// listMaterial:"/finished-inspect/list_material",//娣诲姞妫�楠屽崟鏃剁殑椤圭洰鍒楄〃 -finishedInspectUser:"/finished-inspect/page_user",//鑾峰彇鎵�鏈変富鏈哄伐 -projectListByfinishId:"/inspection-item/list_user",//鏍规嵁id鏌ヨ鎵�鏈夐」鐩� - +const finishedIns = { + finishedInsListPage: "/finished-inspect/list_page", //鑾峰彇鎴愬搧妫�楠屽垪琛� + // listMaterial:"/finished-inspect/list_material",//娣诲姞妫�楠屽崟鏃剁殑椤圭洰鍒楄〃 + finishedInspectUser: "/finished-inspect/page_user", //鑾峰彇鎵�鏈変富鏈哄伐 + projectListByfinishId: "/inspection-item/list_user", //鏍规嵁id鏌ヨ鎵�鏈夐」鐩� } + const url = { - enter: "user/enter", //鐧诲綍 - ...standard, - ...raw, - ...finishedIns + enter: "user/enter", //鐧诲綍 + ...standard, + ...raw, + ...finishedIns, + selectSaleList: "sale/selectSaleList", //鏌ヨ閿�鍞崟鍒楄〃 + selectSaleDatilById: "sale/selectSaleDatilById", //鏍规嵁閿�鍞崟id鏌ョ湅璇︽儏, + addSale: "sale/addSale", //鏂板閿�鍞崟 } export default function(Vue) { - //娣诲姞鍏ㄥ眬API - Vue.prototype.$api = { - url - } -} + //娣诲姞鍏ㄥ眬API + Vue.prototype.$api = { + url + } +} \ No newline at end of file diff --git a/src/components/view/sale.vue b/src/components/view/sale.vue new file mode 100644 index 0000000..c229b1f --- /dev/null +++ b/src/components/view/sale.vue @@ -0,0 +1,475 @@ +<style scoped> + .sale .title .el-button { + height: 32px; + border: 1px solid rgba(190, 190, 190, 0.44); + box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41); + padding: 0 12px; + } + + .sale .title { + margin-bottom: 10px; + padding: 0 20px; + } + + .sale .title * { + font-size: 16px; + } + + .choose { + padding: 21px 24px; + display: flex; + align-items: center; + background-color: #fff; + border-bottom: 3px solid rgb(245, 247, 251); + } + + .choose * { + font-size: 14px; + } + + .choose .el-button { + height: 32px; + border: 1px solid rgba(190, 190, 190, 0.44); + box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41); + padding: 0 12px; + } + + .thing { + width: calc(100% - 44px); + height: calc(100% - 42px - 82px - 66px); + background-color: #fff; + overflow: auto; + padding: 33px 22px; + } + + .table_do { + color: #004ea0; + cursor: pointer; + } + + .select-model .body { + padding: 0 20px; + color: #333; + max-height: 70vh; + overflow-y: auto; + } + + .select-model .head { + font-size: 16px; + color: #333; + line-height: 40px; + } + + .select-model .content * { + font-size: 14px; + } + + .select-model .content .value { + font-size: 14px; + padding: 0 15px; + background-color: rgba(0, 0, 0, 0.05); + border: 1px solid rgba(0, 0, 0, 0.1); + border-radius: 4px; + } +</style> +<style> + .sale .title .el-button * { + font-size: 14px; + } + + .sale .title .el-button--default { + color: #004EA2; + } + + .sale .thing * { + font-size: 14px; + } + + .sale .has-gutter .el-table__cell { + background-color: #F0F1F5 !important; + color: #333; + } + + .sale .has-gutter .el-table__cell .cell { + font-size: 16px; + font-weight: 500; + } + + .sale .cell { + color: #333; + padding-left: 17px !important; + } + + .sale .el-table__body-wrapper { + height: 100%; + } + + .sale .el-table__body { + height: 100%; + } +</style> + +<template> + <div class="sale"> + <div class="title"> + <el-row> + <el-col :span="12" style="line-height: 32px;">閿�鍞鐞�</el-col> + <el-col :span="12" style="text-align: right;"> + <el-button type="primary" icon="el-icon-plus" @click="addDia= true">鏂板</el-button> + <el-button icon="el-icon-edit-outline">淇敼</el-button> + <el-button icon="el-icon-delete">鍒犻櫎</el-button> + <el-button icon="el-icon-download">瀵煎嚭</el-button> + </el-col> + </el-row> + </div> + <div class="choose"> + <span>璁㈠崟缂栧彿锛�</span> + <el-input v-model="search.code" size="small" placeholder="璇疯緭鍏�" style="width: 224px;margin-right: 30px;" + clearable></el-input> + <span>浜у搧鍚嶇О锛�</span> + <el-input v-model="search.name" size="small" placeholder="璇疯緭鍏�" style="width: 224px;margin-right: 30px;" + clearable></el-input> + <span>鐘舵�侊細</span> + <el-select v-model="search.type" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;"> + <el-option label="鍏ㄩ儴" :value="null"></el-option> + <el-option label="閫氳繃" :value="0"></el-option> + <el-option label="涓嶉�氳繃" :value="1"></el-option> + <el-option label="鏈鏍�" :value="2"></el-option> + </el-select> + <span>浜よ揣鏃ユ湡锛�</span> + <el-date-picker v-model="search.delTime" size="small" placeholder="璇疯緭鍏�" style="width: 224px;margin-right: 30px;" + clearable value-format="yyyy-MM-dd"></el-date-picker> + <el-button size="mini" @click="clean()"><span>閲� 缃�</span></el-button> + <el-button size="mini" type="primary" style="background: #004EA2;" @click="selectRawInspectsList()"> + <span>鏌ヨ</span> + </el-button> + </div> + <div class="thing"> + <el-table :data="tableData" border style="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)" + max-height="calc(100% - 50px)" @selection-change="handleSelectionChange" default-expand-all row-key="id"> + <el-table-column type="selection" width="50"> + </el-table-column> + <el-table-column type="index" label="搴忓彿" width="65"> + </el-table-column> + <el-table-column prop="order_number" label="璁㈠崟缂栧彿" width="150"> + </el-table-column> + <el-table-column prop="code" label="鍚堝悓缂栧彿" width="220"> + </el-table-column> + <el-table-column prop="name" label="宸ョ▼鍚嶇О"> + </el-table-column> + <el-table-column prop="proname" label="瀹㈡埛鍚嶇О"> + </el-table-column> + <el-table-column prop="浜よ揣鏃ユ湡" label="浜よ揣鏃ユ湡" width="150"> + </el-table-column> + <el-table-column prop="type" label="鐘舵��" width="100"> + <template slot-scope="scope"> + <span style="color: #34BD66;" v-if="scope.row.type==1">閫氳繃</span> + <span style="color: #E84738;" v-else-if="scope.row.type==0">涓嶉�氳繃</span> + <span v-else></span> + </template> + </el-table-column> + <el-table-column label="鎿嶄綔" width="220"> + <template slot-scope="scope"> + <span class="table_do" @click="changeShowDetail(scope.row)"> 鏌ョ湅璇︽儏 </span> + <span class="table_do" v-if="scope.row.type==null"> 瀹℃牳 </span> + <span class="table_do" v-else> </span> + <span class="table_do"> 缂栬緫 </span> + <span class="table_do"> 鍒犻櫎 </span> + </template> + </el-table-column> + </el-table> + <el-col style="height: 50px;display: flex;align-items: center;justify-content: right;"> + <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" + :page-sizes="[1,10, 20, 30, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" + :total="countSize"> + </el-pagination> + </el-col> + </div> + <div class="select-model"> + <el-dialog title="閿�鍞鎯�" :visible.sync="selectDia" width="750px"> + <div class="body" v-if="oneData!=null"> + <div class="head">鍩烘湰淇℃伅</div> + <div class="content"> + <el-row style="line-height: 30px;margin: 15px 0;"> + <el-col :span="3">璁㈠崟缂栧彿</el-col> + <el-col :span="8"> + <div class="value">{{oneData.orderNumber}}</div> + </el-col> + <el-col :span="3" :offset="2">鍚堝悓缂栧彿</el-col> + <el-col :span="8"> + <div class="value">{{oneData.code}}</div> + </el-col> + </el-row> + <el-row style="line-height: 30px;margin: 15px 0;"> + <el-col :span="3">宸ョ▼鍚嶇О</el-col> + <el-col :span="8"> + <div class="value">{{oneData.name}}</div> + </el-col> + <el-col :span="3" :offset="2">鐘舵��</el-col> + <el-col :span="8"> + <div class="value" v-if="oneData.type == 1" style="color: #34BD66;">閫氳繃</div> + <div class="value" v-else-if="oneData.type == 2" style="color: #E84738;">涓嶉�氳繃</div> + <div class="value" v-else> </div> + </el-col> + </el-row> + </div> + <div class="head">瀹㈡埛淇℃伅</div> + <div class="content"> + <el-row style="line-height: 30px;margin: 15px 0;"> + <el-col :span="3">瀹㈡埛鍚嶇О</el-col> + <el-col :span="8"> + <div class="value">{{oneData.proname}}</div> + </el-col> + <el-col :span="3" :offset="2">鏀惰揣鍦板潃</el-col> + <el-col :span="8"> + <div class="value">{{oneData.adress}}</div> + </el-col> + </el-row> + <el-row style="line-height: 30px;margin: 15px 0;"> + <el-col :span="3">鑱旂郴浜�</el-col> + <el-col :span="8"> + <div class="value">{{oneData.username}}</div> + </el-col> + <el-col :span="3" :offset="2">鑱旂郴鐢佃瘽</el-col> + <el-col :span="8"> + <div class="value">{{oneData.phone}}</div> + </el-col> + </el-row> + <el-row style="line-height: 30px;margin: 15px 0;"> + <el-col :span="3">涓氬姟鍛�</el-col> + <el-col :span="8"> + <div class="value">{{JSON.parse(oneData.saleman)}}</div> + </el-col> + <el-col :span="3" :offset="2">涓嬪崟浜�</el-col> + <el-col :span="8"> + <div class="value">{{oneData.orderName}}</div> + </el-col> + </el-row> + <el-row style="line-height: 30px;margin: 15px 0;"> + <el-col :span="3">浜よ揣鏃ユ湡</el-col> + <el-col :span="8"> + <div class="value">{{oneData.delTime}}</div> + </el-col> + <el-col :span="3" :offset="2">瀹℃牳浜�</el-col> + <el-col :span="8"> + <div class="value">{{JSON.parse(oneData.checkname)}}</div> + </el-col> + </el-row> + <el-row style="line-height: 30px;margin: 15px 0;"> + <el-col :span="3">瀹℃牳鏃ユ湡</el-col> + <el-col :span="8"> + <div class="value">{{oneData.checkTime}}</div> + </el-col> + </el-row> + </div> + <div class="head">浜у搧淇℃伅</div> + <div class="content"> + <el-table :data="oneData.saleMaterialList" border style="width: 100%"> + <el-table-column prop="name" label="浜у搧鍚嶇О" width="180"> + </el-table-column> + <el-table-column prop="specifications" label="瑙勬牸鍨嬪彿" width="200"> + </el-table-column> + <el-table-column prop="unit" label="鍗曚綅"> + </el-table-column> + <el-table-column prop="number" label="鏁伴噺"> + </el-table-column> + <el-table-column prop="price" label="鍗曚环"> + </el-table-column> + </el-table> + </div> + </div> + </el-dialog> + </div> + <div class="select-model"> + <el-dialog title="閿�鍞柊澧�" :visible.sync="addDia" width="750px"> + <div class="body"> + <div class="head">鍩烘湰淇℃伅</div> + <div class="content"> + <el-row style="line-height: 30px;margin: 15px 0;"> + <el-col :span="3">璁㈠崟缂栧彿</el-col> + <el-col :span="8"> + <el-input v-model="addData.orderNumber" size="small" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" clearable></el-input> + </el-col> + <el-col :span="3" :offset="2">鍚堝悓缂栧彿</el-col> + <el-col :span="8"> + <el-input v-model="addData.code" size="small" placeholder="璇疯緭鍏ュ悎鍚岀紪鍙�" clearable></el-input> + </el-col> + </el-row> + <el-row style="line-height: 30px;margin: 15px 0;"> + <el-col :span="3">宸ョ▼鍚嶇О</el-col> + <el-col :span="8"> + <el-input v-model="addData.name" size="small" placeholder="璇疯緭鍏ュ伐绋嬪悕绉�" clearable></el-input> + </el-col> + </el-row> + </div> + <div class="head">瀹㈡埛淇℃伅</div> + <div class="content"> + <el-row style="line-height: 30px;margin: 15px 0;"> + <el-col :span="3">瀹㈡埛鍚嶇О</el-col> + <el-col :span="8"> + <el-input v-model="addData.proname" size="small" placeholder="璇疯緭鍏ュ鎴峰悕绉�" clearable></el-input> + </el-col> + <el-col :span="3" :offset="2">鏀惰揣鍦板潃</el-col> + <el-col :span="8"> + <el-input v-model="addData.adress" size="small" placeholder="璇疯緭鍏ユ敹璐у湴鍧�" clearable></el-input> + </el-col> + </el-row> + <el-row style="line-height: 30px;margin: 15px 0;"> + <el-col :span="3">鑱旂郴浜�</el-col> + <el-col :span="8"> + <el-input v-model="addData.username" size="small" placeholder="璇疯緭鍏ヨ仈绯讳汉" clearable></el-input> + </el-col> + <el-col :span="3" :offset="2">鑱旂郴鐢佃瘽</el-col> + <el-col :span="8"> + <el-input v-model="addData.phone" size="small" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" clearable></el-input> + </el-col> + </el-row> + <el-row style="line-height: 30px;margin: 15px 0;"> + <el-col :span="3">涓嬪崟浜�</el-col> + <el-col :span="8"> + <el-input v-model="addData.orderName" size="small" placeholder="璇疯緭鍏ヤ笅鍗曚汉" clearable></el-input> + </el-col> + <el-col :span="3" :offset="2">浜よ揣鏃ユ湡</el-col> + <el-col :span="8"> + <el-date-picker v-model="addData.delTime" size="small" placeholder="璇疯緭鍏ヤ氦璐ф棩鏈�" clearable + value-format="yyyy-MM-dd"></el-date-picker> + </el-col> + </el-row> + </div> + <div class="head" style="line-height: 50px;"> + <el-col :span="12">浜у搧淇℃伅</el-col> + <el-col :span="12" style="text-align: right;"> + <el-button size="mini" @click="addSaleMaterial"><span style="font-size: 12px;">娣诲姞琛�</span></el-button> + </el-col> + </div> + <div class="content"> + <el-table :data="addData.saleMaterialList" border style="width: 100%"> + <el-table-column prop="name" label="浜у搧鍚嶇О" width="180"> + <template slot-scope="scope"> + <el-input v-model="scope.row.name" size="small" clearable placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�"></el-input> + </template> + </el-table-column> + <el-table-column prop="specifications" label="瑙勬牸鍨嬪彿" width="200"> + <template slot-scope="scope"> + <el-input v-model="scope.row.specifications" size="small" clearable placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"></el-input> + </template> + </el-table-column> + <el-table-column prop="unit" label="鍗曚綅"> + <template slot-scope="scope"> + <el-input v-model="scope.row.unit" size="small" clearable placeholder="璇疯緭鍏�"></el-input> + </template> + </el-table-column> + <el-table-column prop="number" label="鏁伴噺"> + <template slot-scope="scope"> + <el-input v-model.number="scope.row.number" size="small" + @change="scope.row.number = isNaN(scope.row.number)?0:scope.row.number" clearable placeholder="璇疯緭鍏�"></el-input> + </template> + </el-table-column> + <el-table-column prop="price" label="鍗曚环"> + <template slot-scope="scope"> + <el-input v-model="scope.row.price" size="small" clearable placeholder="璇疯緭鍏�"></el-input> + </template> + </el-table-column> + </el-table> + </div> + </div> + <span slot="footer" class="dialog-footer"> + <el-button type="primary" @click="addSale">纭� 瀹�</el-button> + <el-button @click="addDia = false">鍙� 娑�</el-button> + </span> + </el-dialog> + </div> + </div> +</template> + +<script> + export default { + data() { + return { + search: { + code: null, + name: null, + type: null, + delTime: null + }, + tableData: [], + selects: [], + currentPage: 1, + countSize: 0, + pageSize: 10, + selectDia: false, + oneData: null, + addDia: true, + addData: { + saleMaterialList: [] + } + } + }, + mounted() { + this.selectRawInspectsList() + }, + methods: { + handleSelectionChange(val) { + this.selects = val; + }, + handleSizeChange(val) { + this.pageSize = val + this.selectRawInspectsList() + }, + handleCurrentChange(val) { + this.currentPage = val + this.selectRawInspectsList() + }, + selectRawInspectsList() { + this.axios.get(this.$api.url.selectSaleList, { + params: { + pageSize: this.currentPage, + countSize: this.pageSize, + delTime: this.search.delTime, + name: this.search.name, + type: this.search.type, + orderNumber: this.search.code + } + }).then(res => { + this.tableData = res.data.row + this.countSize = res.data.total + }) + }, + clean() { + this.selects = [] + this.currentPage = 1 + this.countSize = 0 + this.pageSize = 10 + this.search = { + formTime: null, + createTime: null, + insState: 2, + judgeState: 2 + } + this.selectRawInspectsList() + }, + changeShowDetail(ob) { + this.selectDia = true + this.axios.get(this.$api.url.selectSaleDatilById, { + params: { + id: ob.id + } + }).then(res => { + this.oneData = res.data + }) + }, + addSaleMaterial() { + this.addData.saleMaterialList.push({}) + }, + addSale() { + this.axios.post(this.$api.url.addSale, this.addData, { + headers: { + 'Content-Type': 'application/json' + } + }).then(res => { + console.log(res); + }) + } + } + } +</script> \ No newline at end of file diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue index 883e3f1..4ffb29a 100644 --- a/src/components/view/standard.vue +++ b/src/components/view/standard.vue @@ -153,8 +153,7 @@ <el-dialog title="BOM鏂板" :visible.sync="bomAddModelVisible" - width="30%" - :before-close="handleClose"> + width="30%"> <el-form> </el-form> @@ -207,7 +206,6 @@ this.$refs.tree.filter(val); }, tableType(val){ - console.log(val) this.selectProductTableData() } }, @@ -216,7 +214,6 @@ }, methods: { handleNodeClick(data) { - // console.log(data); this.checkTreeNode = data // this.selectMaterialTree() this.selectProductTableData() @@ -251,7 +248,6 @@ this.$nextTick().then(() => { const firstNode = document.querySelector('.el-tree-node .el-tree-node__children .el-tree-node .el-tree-node__children .el-tree-node .el-tree-node__children .el-tree-node') firstNode.click() - // console.log(firstNode) }) }) @@ -275,7 +271,6 @@ this.tableData = productList break; } - console.log(this.tableData) } } } diff --git a/src/main.js b/src/main.js index 5421a27..3b771af 100644 --- a/src/main.js +++ b/src/main.js @@ -20,7 +20,7 @@ Vue.use(qs); Vue.use(api); -const javaApi = 'http://192.168.110.167:8001/' +const javaApi = 'http://localhost:8001/' axios.defaults.baseURL = javaApi axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8' diff --git a/src/view/index.vue b/src/view/index.vue index b3129ef..d00260b 100644 --- a/src/view/index.vue +++ b/src/view/index.vue @@ -210,7 +210,11 @@ <i class="font icon-shouye"></i> <div>棣栭〉</div> </div> - <el-popover placement="right-start" width="90" trigger="click" v-for="(a, ai) in menu" :key="ai" v-if="a.k!='0'"> + <div :class="`box ${activeBox==3?'active_box':''}`" @click="addTab(menu[1].c[0])"> + <i class="font icon-jine"></i> + <div>閿�鍞鐞�</div> + </div> + <el-popover placement="right-start" width="90" trigger="click" v-for="(a, ai) in menu" :key="ai" v-if="a.k!='0'&&a.k!='3'"> <div :class="`box ${activeBox==a.k?'active_box':''}`" @click="activeBox = a.k" slot="reference"> <i :class="a.i"></i> <div>{{a.v}}</div> @@ -268,6 +272,16 @@ v: "棣栭〉", i: "font icon-shouye", u: "index-index" + }] + },{ + k: 3, + v: "閿�鍞鐞�", + i: "font icon-jine", + c: [{ + k: 11, + v: "閿�鍞鐞�", + i: "font icon-jine", + u: "sale" }] }, { k: 1, @@ -349,6 +363,7 @@ methods: { addTab(ob) { if (ob.k == 0) this.activeBox = 0 + if (ob.k == 11) this.activeBox = 3 this.activeP = ob.k //0 this.tabActive = ob.k //0 let num = -1; @@ -380,7 +395,9 @@ this.activeBox = 1 } else if (num > 2 && num <= 10) { this.activeBox = 2 - } + } else if(num == 11){ + this.activeBox = 3 + } }, out() { sessionStorage.clear() -- Gitblit v1.9.3